diff options
Diffstat (limited to 'src/progs/pickit2_bootloader')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp index 5a60a28..7620a9b 100644 --- a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp +++ b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp @@ -48,7 +48,7 @@ bool Pickit2Bootloader::Hardware::write(Pic::MemoryRangeType type, const Device: // check that there is nothing in bootloader reserved area for (uint i=0; i<data.count(); i++) { if ( i>=0x1000 && i<0x3FF0 ) continue; - if ( data[i]==device().tqmask(Pic::MemoryRangeType::Code) ) continue; + if ( data[i]==device().mask(Pic::MemoryRangeType::Code) ) continue; uint address = device().addressIncrement(Pic::MemoryRangeType::Code) * i; log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").tqarg(toHexLabel(address, device().nbCharsAddress()))); break; diff --git a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp index f68e39a..be2a348 100644 --- a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp +++ b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp @@ -9,12 +9,12 @@ #include "pickit2_bootloader_ui.h" //----------------------------------------------------------------------------- -Pickit2Bootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +Pickit2Bootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) {} //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *Pickit2Bootloader::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Pickit2Bootloader::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } diff --git a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h index e1c88fc..8b72728 100644 --- a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h +++ b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h @@ -19,7 +19,7 @@ class ConfigWidget: public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const::Programmer::Group &group, TQWidget *tqparent); + ConfigWidget(const::Programmer::Group &group, TQWidget *parent); virtual void loadConfig() {} virtual void saveConfig() {} }; @@ -29,7 +29,7 @@ public: class GroupUI : public ::Bootloader::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; }; } // namespace |