summaryrefslogtreecommitdiffstats
path: root/src/progs/pickit2v2
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitf7ceb2957839027e8027a9a4c0dfff730cb9b704 (patch)
treed1d583f11612d149bc0718c80779df4653699dbb /src/progs/pickit2v2
parentd98fea1f859d23e1b1220a65d7a8eda3b757fd08 (diff)
downloadpiklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.tar.gz
piklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/progs/pickit2v2')
-rw-r--r--src/progs/pickit2v2/base/pickit2v2.cpp2
-rw-r--r--src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp8
-rw-r--r--src/progs/pickit2v2/gui/pickit2v2_group_ui.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/pickit2v2/base/pickit2v2.cpp b/src/progs/pickit2v2/base/pickit2v2.cpp
index 8deddc4..478a0f7 100644
--- a/src/progs/pickit2v2/base/pickit2v2.cpp
+++ b/src/progs/pickit2v2/base/pickit2v2.cpp
@@ -327,7 +327,7 @@ bool Pickit2V2::Hardware::readMemory(Pic::MemoryRangeType otype, Device::Array &
if ( i>=nbWords ) break;
data[i] = words[k];
if (fdata->progMemShift) data[i] >>= 1;
- data[i] = data[i].maskWith(device().tqmask(type)); // ### correct ?
+ data[i] = data[i].maskWith(device().mask(type)); // ### correct ?
if ( vdata && !verifyWord(i, data[i], type, *vdata) ) return false;
if ( type==Pic::MemoryRangeType::Code && i!=0x0 && i%0x8000==0 ) setAddress = true;
i++;
diff --git a/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp b/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp
index 1deff68..596e239 100644
--- a/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp
+++ b/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp
@@ -11,12 +11,12 @@
#include "progs/gui/prog_config_widget.h"
#include "progs/pickit2v2/base/pickit2v2_prog.h"
-::Programmer::ConfigWidget *Pickit2V2::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Pickit2V2::GroupUI::createConfigWidget(TQWidget *parent) const
{
- return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent);
+ return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent);
}
-::Programmer::AdvancedDialog *Pickit2V2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Pickit2V2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const
{
- return new ::Programmer::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit2v2_advanced_dialog");
+ return new ::Programmer::AdvancedDialog(static_cast<Base &>(base), parent, "pickit2v2_advanced_dialog");
}
diff --git a/src/progs/pickit2v2/gui/pickit2v2_group_ui.h b/src/progs/pickit2v2/gui/pickit2v2_group_ui.h
index 7023367..555913a 100644
--- a/src/progs/pickit2v2/gui/pickit2v2_group_ui.h
+++ b/src/progs/pickit2v2/gui/pickit2v2_group_ui.h
@@ -16,9 +16,9 @@ namespace Pickit2V2
class GroupUI : public ::Programmer::GroupUI
{
public:
- virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const;
+ virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const;
virtual bool hasAdvancedDialog() const { return true; }
- virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const;
+ virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const;
};
} // namespace