diff options
Diffstat (limited to 'src/progs/tbl_bootloader')
-rw-r--r-- | src/progs/tbl_bootloader/base/tbl_bootloader.cpp | 4 | ||||
-rw-r--r-- | src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp | 8 | ||||
-rw-r--r-- | src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/progs/tbl_bootloader/base/tbl_bootloader.cpp b/src/progs/tbl_bootloader/base/tbl_bootloader.cpp index 9c52fb7..3b8c324 100644 --- a/src/progs/tbl_bootloader/base/tbl_bootloader.cpp +++ b/src/progs/tbl_bootloader/base/tbl_bootloader.cpp @@ -158,7 +158,7 @@ bool TinyBootloader::Hardware::writeCode(const Device::Array &data, bool erase) // check that there is nothing on top of bootloader for (uint i=nb; i<data.size(); i++) { - 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; @@ -194,7 +194,7 @@ bool TinyBootloader::Hardware::writeCode(const Device::Array &data, bool erase) if ( !erase ) { bool write = false; for (uint k=0; k<nbWords; k++) { - if ( wdata[i+k]==device().tqmask(Pic::MemoryRangeType::Code) ) continue; + if ( wdata[i+k]==device().mask(Pic::MemoryRangeType::Code) ) continue; write = true; break; } diff --git a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp index f0c1725..7328aa5 100644 --- a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp +++ b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp @@ -12,8 +12,8 @@ #include "common/port/serial.h" //----------------------------------------------------------------------------- -TinyBootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +TinyBootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) { uint row = numRows(); @@ -74,7 +74,7 @@ void TinyBootloader::ConfigWidget::loadConfig() } //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *TinyBootloader::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *TinyBootloader::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/tbl_bootloader/gui/tbl_bootloader_ui.h b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h index 442b879..fb85c0f 100644 --- a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h +++ b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h @@ -22,7 +22,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(); @@ -35,7 +35,7 @@ private: class GroupUI : public ::Bootloader::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; }; } // namespace |