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

42 files changed, 133 insertions, 133 deletions

diff --git a/src/progs/base/prog_config.cpp b/src/progs/base/prog_config.cpp
index 9802fba..b9d88b6 100644
--- a/src/progs/base/prog_config.cpp
+++ b/src/progs/base/prog_config.cpp
@@ -66,7 +66,7 @@ void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const T
 
 //----------------------------------------------------------------------------
 const Programmer::Config::Data Programmer::Config::DATA[Nb_Types] = {
-  { "only_program_non_tqmask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) },
+  { "only_program_non_mask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) },
   { "verify_after_program", I18N_NOOP("Verify device memory after programming."), TQVariant(true, 0) },
   { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), TQVariant(true, 0) },
   { "power_down_after_programming", I18N_NOOP("Power down target after programming."), TQVariant(true, 0) },
diff --git a/src/progs/direct/base/direct.cpp b/src/progs/direct/base/direct.cpp
index c0d7de6..7603ca3 100644
--- a/src/progs/direct/base/direct.cpp
+++ b/src/progs/direct/base/direct.cpp
@@ -375,7 +375,7 @@ int Direct::Hardware::timing_test()
         for (long j=0; j<loop; ++j)
         {
             int d = 0x2AAA ;
-            d &= 0x3FFF ;               // tqmask unused msb
+            d &= 0x3FFF ;               // mask unused msb
             d <<= 1;                // insert start bit
 
             for (uint x = 0; x<16; x++) {
diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp
index 330c037..ef17479 100644
--- a/src/progs/direct/base/direct_16.cpp
+++ b/src/progs/direct/base/direct_16.cpp
@@ -87,10 +87,10 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const
     const Device::Array wdata = static_cast<const Pic::Memory &>(vdata->memory).arrayForWriting(type);
     if (only) nbWords = findNonMaskEnd(type, wdata)+1;
   }
-  BitValue tqmask = device().tqmask(type);
+  BitValue mask = device().mask(type);
   for (uint i = 0; i<nbWords; i++) {
-    if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
-      data[i] = readWord(type).maskWith(tqmask);
+    if ( !only || data[i]!=mask || type!=Pic::MemoryRangeType::Code ) {
+      data[i] = readWord(type).maskWith(mask);
       if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
     }
     incrementPC(1);
@@ -117,7 +117,7 @@ bool Direct::pic16::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
   if (force) return false;
   uint nb = (type==Pic::MemoryRangeType::Code ? nbWordsCodeProg() : 1);
   for (uint k=0; k<nb; k++)
-    if ( data[i+k]!=device().tqmask(type) ) return false;
+    if ( data[i+k]!=device().mask(type) ) return false;
   incrementPC(nb);
   i += nb;
   return true;
diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp
index 5760bf8..0ad5533 100644
--- a/src/progs/direct/base/direct_18F.cpp
+++ b/src/progs/direct/base/direct_18F.cpp
@@ -17,7 +17,7 @@ bool Direct::P18F::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
 {
   if (forceProgram) return false;
   for (uint k=0; k<nb; k++)
-    if ( data[i+k]!=device().tqmask(type) ) return false;
+    if ( data[i+k]!=device().mask(type) ) return false;
   i += nb;
   return true;
 }
@@ -82,7 +82,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       nbWords = findNonMaskEnd(type, wdata)+1;
     }
   }
-  BitValue tqmask = device().tqmask(type);
+  BitValue mask = device().mask(type);
   //qDebug("read %s %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, device().nbWords(type));
   //pulseEngine("w300000"); // what for ?
   directAccess(type);
@@ -91,7 +91,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       for (uint i = 0; i<data.count(); i++) {
         setPointer(type, i);
         pulseEngine("k0,X80A6,k0,X50A8,k0,X6EF5,k0,X0000");
-        data[i] = pulseEngine("r").maskWith(tqmask);
+        data[i] = pulseEngine("r").maskWith(mask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
       }
       _base.progressMonitor().addTaskProgress(data.count());
@@ -100,7 +100,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       setPointer(type, offset);
       //pulseEngine("w1000"); ??
       for (uint i=0; i<nbWords; i++) {
-        data[i] = pulseEngine("R").maskWith(tqmask);
+        data[i] = pulseEngine("R").maskWith(mask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
       }
       _base.progressMonitor().addTaskProgress(data.count());
@@ -111,7 +111,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       setPointer(type, 0);
       for (uint i = 0; i<data.count(); i+=2) {
         BitValue w = pulseEngine("R");
-        data[i] = w.maskWith(tqmask);
+        data[i] = w.maskWith(mask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
         data[i+1] = w >> 8;
         if ( vdata && !hardware().verifyWord(offset+i+1, data[i+1], type, *vdata) ) return false;
diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp
index fc7b867..36a8f11 100644
--- a/src/progs/direct/gui/direct_config_widget.cpp
+++ b/src/progs/direct/gui/direct_config_widget.cpp
@@ -18,17 +18,17 @@
 #include "progs/direct/base/direct_prog.h"
 
 //-----------------------------------------------------------------------------
-::Programmer::ConfigWidget *Direct::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Direct::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);
 }
 
 //-----------------------------------------------------------------------------
 const char * const INV_PIN_LABEL = I18N_NOOP("Check this option if your hardware uses negative logic for this pin.");
 const char * const DELAY_LABEL = I18N_NOOP("Some programming cards need low clock rate:\nadding delay to clock pulses might help.");
 
-Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit)
-  : ::Hardware::HConfigWidget(base, tqparent, edit)
+Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit)
+  : ::Hardware::HConfigWidget(base, parent, edit)
 {
   // pins assignment
   TQGroupBox *groupb = new TQGroupBox(1,Qt::Horizontal, i18n("Pin assignment"), this);
@@ -239,11 +239,11 @@ Hardware::Data *Direct::HConfigWidget::data() const
 }
 
 //-----------------------------------------------------------------------------
-Direct::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent)
-  : ::Hardware::ConfigWidget(new ::Direct::PicBase(group, 0), new Config, tqparent)
+Direct::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent)
+  : ::Hardware::ConfigWidget(new ::Direct::PicBase(group, 0), new Config, parent)
 {}
 
-Hardware::HConfigWidget *Direct::ConfigWidget::createHardwareConfigWidget(TQWidget *tqparent, bool edit) const
+Hardware::HConfigWidget *Direct::ConfigWidget::createHardwareConfigWidget(TQWidget *parent, bool edit) const
 {
-  return new HConfigWidget(*_base, tqparent, edit);
+  return new HConfigWidget(*_base, parent, edit);
 }
diff --git a/src/progs/direct/gui/direct_config_widget.h b/src/progs/direct/gui/direct_config_widget.h
index 093e9fa..d61be1a 100644
--- a/src/progs/direct/gui/direct_config_widget.h
+++ b/src/progs/direct/gui/direct_config_widget.h
@@ -22,7 +22,7 @@ namespace Direct
 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 false; }
   virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; }
 };
@@ -33,7 +33,7 @@ class HConfigWidget : public ::Hardware::HConfigWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-  HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit);
+  HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit);
   virtual bool set(const Port::Description &pd, const ::Hardware::Data &data);
   virtual ::Hardware::Data *data() const;
 
@@ -67,8 +67,8 @@ class ConfigWidget : public ::Hardware::ConfigWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent);
-  virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const;
+  ConfigWidget(const ::Programmer::Group &group, TQWidget *parent);
+  virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const;
 };
 
 } // namespace
diff --git a/src/progs/gpsim/gui/gpsim_group_ui.cpp b/src/progs/gpsim/gui/gpsim_group_ui.cpp
index f3375cc..74e6edf 100644
--- a/src/progs/gpsim/gui/gpsim_group_ui.cpp
+++ b/src/progs/gpsim/gui/gpsim_group_ui.cpp
@@ -14,8 +14,8 @@
 #include "progs/gpsim/base/gpsim.h"
 
 //----------------------------------------------------------------------------
-GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent)
-  : ::Programmer::ConfigWidget(group, tqparent)
+GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent)
+  : ::Programmer::ConfigWidget(group, parent)
 {
   uint row = numRows();
   TQLabel *label = new TQLabel(i18n("tqStatus:"), this);
@@ -36,7 +36,7 @@ void GPSim::ConfigWidget::updatetqStatus()
 }
 
 //----------------------------------------------------------------------------
-::Programmer::ConfigWidget *GPSim::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *GPSim::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/gpsim/gui/gpsim_group_ui.h b/src/progs/gpsim/gui/gpsim_group_ui.h
index 7916a1d..1978574 100644
--- a/src/progs/gpsim/gui/gpsim_group_ui.h
+++ b/src/progs/gpsim/gui/gpsim_group_ui.h
@@ -20,7 +20,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);
 
 private slots:
   void updatetqStatus();
@@ -33,7 +33,7 @@ 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 false; }
   virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; }
 };
diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp
index 999a188..193fdfb 100644
--- a/src/progs/gui/hardware_config_widget.cpp
+++ b/src/progs/gui/hardware_config_widget.cpp
@@ -17,8 +17,8 @@
 #include "common/gui/misc_gui.h"
 
 //-----------------------------------------------------------------------------
-Hardware::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit)
-  : TQFrame(tqparent, "hardware_config_widget"), _edit(edit), _connected(false), _base(base)
+Hardware::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit)
+  : TQFrame(parent, "hardware_config_widget"), _edit(edit), _connected(false), _base(base)
 {
   _hardware = 0;
 
@@ -94,8 +94,8 @@ void Hardware::EditDialog::slotCancel()
 }
 
 //-----------------------------------------------------------------------------
-Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *tqparent)
-  : ::Programmer::ConfigWidget(base->group(), tqparent), _base(base), _config(config), _hc(0)
+Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent)
+  : ::Programmer::ConfigWidget(base->group(), parent), _base(base), _config(config), _hc(0)
 {
 // programmer combo
   uint row = numRows();
diff --git a/src/progs/gui/hardware_config_widget.h b/src/progs/gui/hardware_config_widget.h
index 2f94e81..d6a943f 100644
--- a/src/progs/gui/hardware_config_widget.h
+++ b/src/progs/gui/hardware_config_widget.h
@@ -29,7 +29,7 @@ class HConfigWidget : public TQFrame
 Q_OBJECT
   TQ_OBJECT
 public:
-  HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit);
+  HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit);
   virtual ~HConfigWidget() { delete _hardware; }
   virtual bool set(const Port::Description &pd, const Data &data) = 0;
   virtual Data *data() const = 0;
@@ -50,7 +50,7 @@ class EditDialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-  EditDialog(ConfigWidget *tqparent, const TQString &name, const Port::Description &pd, Data *data);
+  EditDialog(ConfigWidget *parent, const TQString &name, const Port::Description &pd, Data *data);
   TQString savedName() const { return _savedName; }
 
 private slots:
@@ -71,11 +71,11 @@ class ConfigWidget : public ::Programmer::ConfigWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *tqparent);
+  ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent);
   virtual ~ConfigWidget() { delete _base; }
   virtual void saveConfig();
   virtual bool setPort(const ::Programmer::HardwareDescription &hd);
-  virtual HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const = 0;
+  virtual HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const = 0;
 
 private slots:
   void editClicked();
diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp
index 644caaf..f34d426 100644
--- a/src/progs/gui/port_selector.cpp
+++ b/src/progs/gui/port_selector.cpp
@@ -21,8 +21,8 @@ const char * const PortSelector::LABELS[PortType::Nb_Types] = {
   I18N_NOOP("Serial"), I18N_NOOP("Parallel"), I18N_NOOP("USB")
 };
 
-PortSelector::PortSelector(TQWidget *tqparent)
-  : TQFrame(tqparent, "port_selector"), _group(0), _main(0)
+PortSelector::PortSelector(TQWidget *parent)
+  : TQFrame(parent, "port_selector"), _group(0), _main(0)
 {
   _top = new TQGridLayout(this, 1, 1, 0, 10);
   _top->setRowStretch(1, 1);
diff --git a/src/progs/gui/port_selector.h b/src/progs/gui/port_selector.h
index 86a0d4d..5127976 100644
--- a/src/progs/gui/port_selector.h
+++ b/src/progs/gui/port_selector.h
@@ -23,7 +23,7 @@ class PortSelector : public TQFrame
   Q_OBJECT
   TQ_OBJECT
 public:
-  PortSelector(TQWidget *tqparent);
+  PortSelector(TQWidget *parent);
   void setGroup(const Programmer::Group &group);
   Port::Description portDescription() const { return Port::Description(type(), device(type())); }
   void saveConfig();
diff --git a/src/progs/gui/prog_config_widget.cpp b/src/progs/gui/prog_config_widget.cpp
index 5ff6047..1578e3b 100644
--- a/src/progs/gui/prog_config_widget.cpp
+++ b/src/progs/gui/prog_config_widget.cpp
@@ -17,8 +17,8 @@
 #include "progs/base/prog_config.h"
 #include "progs/base/prog_group.h"
 
-Programmer::ConfigWidget::ConfigWidget(const Group &group, TQWidget *tqparent)
-  : ::ConfigWidget(tqparent), _group(group)
+Programmer::ConfigWidget::ConfigWidget(const Group &group, TQWidget *parent)
+  : ::ConfigWidget(parent), _group(group)
 {
   if ( group.properties() & NeedDeviceSpecificFirmware ) {
     uint row = numRows();
diff --git a/src/progs/gui/prog_config_widget.h b/src/progs/gui/prog_config_widget.h
index 2dc8b7e..2da2330 100644
--- a/src/progs/gui/prog_config_widget.h
+++ b/src/progs/gui/prog_config_widget.h
@@ -25,7 +25,7 @@ class ConfigWidget: public ::ConfigWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWidget(const Group &group, TQWidget *tqparent);
+  ConfigWidget(const Group &group, TQWidget *parent);
   virtual void loadConfig();
   const Group &group() const { return _group; }
   virtual void saveConfig();
diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp
index 90643a0..2dd14ea 100644
--- a/src/progs/gui/prog_group_ui.cpp
+++ b/src/progs/gui/prog_group_ui.cpp
@@ -24,8 +24,8 @@
 #include "devices/pic/prog/pic_prog.h"
 
 //----------------------------------------------------------------------------
-Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *tqparent)
-  : Pic::MemoryCalibrationEditor(0, const_cast<Pic::Memory &>(memory), tqparent)
+Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent)
+  : Pic::MemoryCalibrationEditor(0, const_cast<Pic::Memory &>(memory), parent)
 {}
 
 void Programmer::StandaloneMemoryCalibrationEditor::init(bool first)
@@ -39,15 +39,15 @@ void Programmer::StandaloneMemoryCalibrationEditor::init(bool first)
 
 //----------------------------------------------------------------------------
 Programmer::ButtonContainer::ButtonContainer(const TQString &title,
-                                    TQObject *receiver, const char *updateSlot, TQWidget *tqparent)
-  : ::ButtonContainer(title, tqparent)
+                                    TQObject *receiver, const char *updateSlot, TQWidget *parent)
+  : ::ButtonContainer(title, parent)
 {
   if (receiver) button().appendAction(i18n("Read"), "reload", receiver, updateSlot);
 }
 
 //----------------------------------------------------------------------------
-Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *tqparent, const char *name)
-  : Dialog(IconList, i18n("Advanced Dialog"), Close, Close, tqparent, name, true, false),
+Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const char *name)
+  : Dialog(IconList, i18n("Advanced Dialog"), Close, Close, parent, name, true, false),
     _base(base), _calEditor(0)
 {
   // programmer
diff --git a/src/progs/gui/prog_group_ui.h b/src/progs/gui/prog_group_ui.h
index edc15ee..47ae425 100644
--- a/src/progs/gui/prog_group_ui.h
+++ b/src/progs/gui/prog_group_ui.h
@@ -29,7 +29,7 @@ class StandaloneMemoryCalibrationEditor : public Pic::MemoryCalibrationEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *tqparent);
+  StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent);
   virtual void init(bool first);
   virtual bool hasAction(Device::Action) const { return false; }
 
@@ -44,7 +44,7 @@ class ButtonContainer : public ::ButtonContainer
 Q_OBJECT
   TQ_OBJECT
 public:
-  ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *tqparent);
+  ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *parent);
 };
 
 //----------------------------------------------------------------------------
@@ -53,7 +53,7 @@ class AdvancedDialog : public Dialog
 Q_OBJECT
   TQ_OBJECT
 public:
-  AdvancedDialog(Base &base, TQWidget *tqparent, const char *name);
+  AdvancedDialog(Base &base, TQWidget *parent, const char *name);
   virtual void updateDisplay();
 
 protected:
@@ -80,9 +80,9 @@ private:
 class GroupUI : public ::Group::BaseGui
 {
 public:
-  virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const = 0;
+  virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const = 0;
   virtual bool hasAdvancedDialog() const = 0;
-  virtual AdvancedDialog *createAdvancedDialog(Base &base, TQWidget *tqparent) const = 0;
+  virtual AdvancedDialog *createAdvancedDialog(Base &base, TQWidget *parent) const = 0;
 };
 
 inline const ::Programmer::GroupUI &groupui(const ::Programmer::Base &base) { return static_cast<const ::Programmer::GroupUI &>(*base.group().gui()); }
diff --git a/src/progs/icd1/gui/icd1_group_ui.cpp b/src/progs/icd1/gui/icd1_group_ui.cpp
index 1ae73a3..a386190 100644
--- a/src/progs/icd1/gui/icd1_group_ui.cpp
+++ b/src/progs/icd1/gui/icd1_group_ui.cpp
@@ -13,8 +13,8 @@
 #include "progs/icd1/base/icd1_prog.h"
 
 //----------------------------------------------------------------------------
-Icd1::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent)
-  : ::Programmer::PicAdvancedDialog(base, tqparent, "icd1_advanced_dialog")
+Icd1::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent)
+  : ::Programmer::PicAdvancedDialog(base, parent, "icd1_advanced_dialog")
 {
   uint row = _selfTestContainer->numRows();
   TQLabel *label = new TQLabel(i18n("Result:"), _selfTestContainer);
@@ -30,12 +30,12 @@ void Icd1::AdvancedDialog::updateDisplay()
 }
 
 //----------------------------------------------------------------------------
-::Programmer::ConfigWidget *Icd1::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Icd1::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 *Icd1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Icd1::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/icd1/gui/icd1_group_ui.h b/src/progs/icd1/gui/icd1_group_ui.h
index c4f1c33..ecfef92 100644
--- a/src/progs/icd1/gui/icd1_group_ui.h
+++ b/src/progs/icd1/gui/icd1_group_ui.h
@@ -22,7 +22,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:
@@ -34,9 +34,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
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
diff --git a/src/progs/manager/prog_manager.cpp b/src/progs/manager/prog_manager.cpp
index c39d955..fddd60c 100644
--- a/src/progs/manager/prog_manager.cpp
+++ b/src/progs/manager/prog_manager.cpp
@@ -18,8 +18,8 @@
 //----------------------------------------------------------------------------
 Programmer::Manager *Programmer::manager = 0;
 
-Programmer::Manager::Manager(TQObject *tqparent)
-  : TQObject(tqparent, "programmer_manager"), _programmer(0)
+Programmer::Manager::Manager(TQObject *parent)
+  : TQObject(parent, "programmer_manager"), _programmer(0)
 {}
 
 Programmer::Manager::~Manager()
diff --git a/src/progs/manager/prog_manager.h b/src/progs/manager/prog_manager.h
index 233013b..0f0fe01 100644
--- a/src/progs/manager/prog_manager.h
+++ b/src/progs/manager/prog_manager.h
@@ -27,7 +27,7 @@ class Manager : public TQObject, public Log::Base
 Q_OBJECT
   TQ_OBJECT
 public:
-  Manager(TQObject *tqparent);
+  Manager(TQObject *parent);
   virtual ~Manager();
   ::Programmer::Base *programmer() { return _programmer; }
   virtual void createProgrammer(const Device::Data *data) = 0;
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
 
diff --git a/src/progs/pickit1/gui/pickit1_group_ui.cpp b/src/progs/pickit1/gui/pickit1_group_ui.cpp
index 795533e..e2e3b30 100644
--- a/src/progs/pickit1/gui/pickit1_group_ui.cpp
+++ b/src/progs/pickit1/gui/pickit1_group_ui.cpp
@@ -12,12 +12,12 @@
 #include "progs/pickit2/gui/pickit2_group_ui.h"
 #include "progs/pickit1/base/pickit1_prog.h"
 
-::Programmer::ConfigWidget *Pickit1::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Pickit1::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 *Pickit1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Pickit1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const
 {
-  return new Pickit::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit1_advanced_dialog");
+  return new Pickit::AdvancedDialog(static_cast<Base &>(base), parent, "pickit1_advanced_dialog");
 }
diff --git a/src/progs/pickit1/gui/pickit1_group_ui.h b/src/progs/pickit1/gui/pickit1_group_ui.h
index 147f99c..95db598 100644
--- a/src/progs/pickit1/gui/pickit1_group_ui.h
+++ b/src/progs/pickit1/gui/pickit1_group_ui.h
@@ -17,9 +17,9 @@ namespace Pickit1
 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
diff --git a/src/progs/pickit2/gui/pickit2_group_ui.cpp b/src/progs/pickit2/gui/pickit2_group_ui.cpp
index 473dea7..66f9b67 100644
--- a/src/progs/pickit2/gui/pickit2_group_ui.cpp
+++ b/src/progs/pickit2/gui/pickit2_group_ui.cpp
@@ -18,8 +18,8 @@
 #include "progs/pickit2/base/pickit2.h"
 
 //----------------------------------------------------------------------------
-Pickit::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *tqparent, const char *name)
-  : ::Programmer::PicAdvancedDialog(base, tqparent, name)
+Pickit::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const char *name)
+  : ::Programmer::PicAdvancedDialog(base, parent, name)
 {}
 
 void Pickit::AdvancedDialog::regenerateCalibration()
@@ -41,12 +41,12 @@ void Pickit::AdvancedDialog::regenerateCalibration()
 }
 
 //----------------------------------------------------------------------------
-::Programmer::ConfigWidget *Pickit2::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Pickit2::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 *Pickit2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Pickit2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const
 {
-  return new Pickit::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit2_advanced_dialog");
+  return new Pickit::AdvancedDialog(static_cast<Base &>(base), parent, "pickit2_advanced_dialog");
 }
diff --git a/src/progs/pickit2/gui/pickit2_group_ui.h b/src/progs/pickit2/gui/pickit2_group_ui.h
index 78da904..3c8e34d 100644
--- a/src/progs/pickit2/gui/pickit2_group_ui.h
+++ b/src/progs/pickit2/gui/pickit2_group_ui.h
@@ -20,7 +20,7 @@ class AdvancedDialog : public ::Programmer::PicAdvancedDialog
 Q_OBJECT
   TQ_OBJECT
 public:
-  AdvancedDialog(Base &base, TQWidget *tqparent, const char *name);
+  AdvancedDialog(Base &base, TQWidget *parent, const char *name);
   Base &base() { return static_cast<Base &>(_base); }
 
 public slots:
@@ -34,9 +34,9 @@ namespace Pickit2
 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
 
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
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
 
diff --git a/src/progs/psp/base/psp.cpp b/src/progs/psp/base/psp.cpp
index 188fbcb..0f86180 100644
--- a/src/progs/psp/base/psp.cpp
+++ b/src/progs/psp/base/psp.cpp
@@ -46,7 +46,7 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data)
   array[0] = v.byte(1);
   array[1] = v.byte(0);
   // address word width
-  v = data.tqmask(Pic::MemoryRangeType::Code);
+  v = data.mask(Pic::MemoryRangeType::Code);
   array[2] = v.byte(1);
   array[3] = v.byte(0);
   // data word width
@@ -59,12 +59,12 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data)
     if ( data.nbBytesWord(Pic::MemoryRangeType::UserId)==1 ) v += v << 8;
     array[6] = v.byte(1);
     array[7] = v.byte(0);
-    // user id tqmask
+    // user id mask
     array[8] = v.byte(1);
     array[9] = v.byte(0);
   }
 
-  // memory config tqmask
+  // memory config mask
   array[10] = config[0];
   array[11] = config[1];
   array[12] = config[16];
@@ -72,20 +72,20 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data)
 
   if ( data.isReadable(Pic::MemoryRangeType::Eeprom) ) {
     // memory eeprom width
-    v = data.tqmask(Pic::MemoryRangeType::Eeprom);
+    v = data.mask(Pic::MemoryRangeType::Eeprom);
     array[14] = v.byte(1);
     array[15] = v.byte(0);
-    // memory eeprom tqmask
+    // memory eeprom mask
     array[16] = v.byte(1);
     array[17] = v.byte(0);
   }
 
   if ( data.isReadable(Pic::MemoryRangeType::Cal) ) {
     // memory calibration width
-    v = data.tqmask(Pic::MemoryRangeType::Cal);
+    v = data.mask(Pic::MemoryRangeType::Cal);
     array[18] = v.byte(1);
     array[19] = v.byte(0);
-    // memory calibration tqmask
+    // memory calibration mask
     array[20] = v.byte(1);
     array[21] = v.byte(0);
   }
diff --git a/src/progs/psp/gui/psp_group_ui.cpp b/src/progs/psp/gui/psp_group_ui.cpp
index ac9c70c..982c4e9 100644
--- a/src/progs/psp/gui/psp_group_ui.cpp
+++ b/src/progs/psp/gui/psp_group_ui.cpp
@@ -11,12 +11,12 @@
 #include "progs/gui/prog_config_widget.h"
 #include "devices/pic/gui/pic_prog_group_ui.h"
 
-::Programmer::ConfigWidget *Psp::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Psp::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 *Psp::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Psp::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const
 {
-  return new ::Programmer::PicAdvancedDialog(static_cast< ::Programmer::PicBase &>(base), tqparent, "psp_advanced_dialog");
+  return new ::Programmer::PicAdvancedDialog(static_cast< ::Programmer::PicBase &>(base), parent, "psp_advanced_dialog");
 }
diff --git a/src/progs/psp/gui/psp_group_ui.h b/src/progs/psp/gui/psp_group_ui.h
index be0b4ac..a856bcf 100644
--- a/src/progs/psp/gui/psp_group_ui.h
+++ b/src/progs/psp/gui/psp_group_ui.h
@@ -18,9 +18,9 @@ class Group;
 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
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