3 files changed, 10 insertions, 10 deletions
diff --git a/src/progs/icd2/base/icd.cpp b/src/progs/icd2/base/icd.cpp
index 3fd3de8..18e9574 100644
--- a/src/progs/icd2/base/icd.cpp
+++ b/src/progs/icd2/base/icd.cpp
@@ -87,7 +87,7 @@ bool Icd::DeviceSpecific::doErase(bool)
 {
   if ( device().architecture()==Pic::Architecture::P18J ) { // ### also true for others ?
     Device::Array data(device().nbWords(Pic::MemoryRangeType::Config));
-    for (uint i=0; i<data.size(); i++) data[i] = device().config()._words[i].wtqmask;
+    for (uint i=0; i<data.size(); i++) data[i] = device().config()._words[i].wmask;
     if ( !doWrite(Pic::MemoryRangeType::Config, data, true) ) return false;
   }
   return hardware().eraseAll();
diff --git a/src/progs/icd2/gui/icd2_group_ui.cpp b/src/progs/icd2/gui/icd2_group_ui.cpp
index b8d71df..4fbed5c 100644
--- a/src/progs/icd2/gui/icd2_group_ui.cpp
+++ b/src/progs/icd2/gui/icd2_group_ui.cpp
@@ -14,8 +14,8 @@
 #include "progs/icd2/base/icd2_debug.h"
 
 //----------------------------------------------------------------------------
-Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent)
-  : ::Programmer::PicAdvancedDialog(base, tqparent, "icd2_advanced_dialog")
+Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent)
+  : ::Programmer::PicAdvancedDialog(base, parent, "icd2_advanced_dialog")
 {
   uint row = _firmwareContainer->numRows();
   TQLabel *label = new TQLabel(i18n("Id:"), _firmwareContainer);
@@ -70,12 +70,12 @@ void Icd2::AdvancedDialog::updateDisplay()
 }
 
 //----------------------------------------------------------------------------
-::Programmer::ConfigWidget *Icd2::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Icd2::GroupUI::createConfigWidget(TQWidget *parent) const
 {
-  return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), tqparent);
+  return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), parent);
 }
 
-::Programmer::AdvancedDialog *Icd2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Icd2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const
 {
-  return new AdvancedDialog(static_cast<ProgrammerBase &>(base), tqparent);
+  return new AdvancedDialog(static_cast<ProgrammerBase &>(base), parent);
 }
diff --git a/src/progs/icd2/gui/icd2_group_ui.h b/src/progs/icd2/gui/icd2_group_ui.h
index 14c0fdb..ecb7cc7 100644
--- a/src/progs/icd2/gui/icd2_group_ui.h
+++ b/src/progs/icd2/gui/icd2_group_ui.h
@@ -23,7 +23,7 @@ class AdvancedDialog : public ::Programmer::PicAdvancedDialog
 Q_OBJECT
   TQ_OBJECT
 public:
-  AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent);
+  AdvancedDialog(ProgrammerBase &base, TQWidget *parent);
   virtual void updateDisplay();
 
 private slots:
@@ -39,9 +39,9 @@ private:
 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