diff options
Diffstat (limited to 'src/progs/picdem_bootloader')
-rw-r--r-- | src/progs/picdem_bootloader/base/picdem_bootloader.cpp | 2 | ||||
-rw-r--r-- | src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp | 8 | ||||
-rw-r--r-- | src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/picdem_bootloader/base/picdem_bootloader.cpp b/src/progs/picdem_bootloader/base/picdem_bootloader.cpp index 90fed61..347ec52 100644 --- a/src/progs/picdem_bootloader/base/picdem_bootloader.cpp +++ b/src/progs/picdem_bootloader/base/picdem_bootloader.cpp @@ -106,7 +106,7 @@ bool PicdemBootloader::Hardware::write(Pic::MemoryRangeType type, const Device:: if ( type==Pic::MemoryRangeType::Code ) { // check that there is nothing in bootloader reserved area for (uint i=0; i<data.count(); i++) { if ( i>=0x400 ) 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/picdem_bootloader/gui/picdem_bootloader_ui.cpp b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp index fdfa3d1..3e374da 100644 --- a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp +++ b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp @@ -11,8 +11,8 @@ #include "progs/picdem_bootloader/base/picdem_bootloader.h" //----------------------------------------------------------------------------- -PicdemBootloader::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +PicdemBootloader::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) { uint row = numRows(); @@ -42,7 +42,7 @@ void PicdemBootloader::ConfigWidget::loadConfig() } //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *PicdemBootloader::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *PicdemBootloader::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/picdem_bootloader/gui/picdem_bootloader_ui.h b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h index 0540625..b23c157 100644 --- a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h +++ b/src/progs/picdem_bootloader/gui/picdem_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(); @@ -31,7 +31,7 @@ private: class GroupUI : public ::Bootloader::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; }; } // namespace |