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

14 files changed, 99 insertions, 99 deletions

diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp
index 37917c7..4b70c3d 100644
--- a/src/devices/pic/gui/pic_config_editor.cpp
+++ b/src/devices/pic/gui/pic_config_editor.cpp
@@ -17,8 +17,8 @@
 #include "common/gui/misc_gui.h"
 
 //----------------------------------------------------------------------------
-Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent)
-  : Device::MemoryEditorGroup(&memory, tqparent, "pic_config_editor_widget"),
+Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *parent)
+  : Device::MemoryEditorGroup(&memory, parent, "pic_config_editor_widget"),
     MemoryCaster(MemoryRangeType::Config, memory)
 {
   TQHBoxLayout *hb = new TQHBoxLayout(_top);
@@ -55,8 +55,8 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit
 }
 
 //----------------------------------------------------------------------------
-Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
-  : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, tqparent, "pic_config_editor")
+Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *parent)
+  : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, parent, "pic_config_editor")
 {}
 
 void Pic::MemoryConfigEditor::init(bool first)
diff --git a/src/devices/pic/gui/pic_config_editor.h b/src/devices/pic/gui/pic_config_editor.h
index d8072ca..045ca4d 100644
--- a/src/devices/pic/gui/pic_config_editor.h
+++ b/src/devices/pic/gui/pic_config_editor.h
@@ -21,7 +21,7 @@ class MemoryConfigEditorWidget : public Device::MemoryEditorGroup, public Memory
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent);
+  MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *parent);
 };
 
 //----------------------------------------------------------------------------
@@ -30,7 +30,7 @@ class MemoryConfigEditor : public MemoryTypeEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
+  MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *parent);
   virtual void init(bool first);
 };
 
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index 82b24b7..67c5cc9 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -18,8 +18,8 @@
 #include "common/gui/misc_gui.h"
 
 //----------------------------------------------------------------------------
-Pic::ConfigWordComboBox::ConfigWordComboBox(TQWidget *tqparent)
-  : ComboBox(tqparent)
+Pic::ConfigWordComboBox::ConfigWordComboBox(TQWidget *parent)
+  : ComboBox(parent)
 {
   setIgnoreWheelEvent(true);
 }
@@ -47,8 +47,8 @@ void Pic::ConfigWordComboBox::setInvalidItem(uint i, const TQString &label)
 }
 
 //----------------------------------------------------------------------------
-Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget *tqparent)
-  : Dialog(tqparent, "config_word_dialog", true, i18n("Config Word Details"), Close, Close, false)
+Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget *parent)
+  : Dialog(parent, "config_word_dialog", true, i18n("Config Word Details"), Close, Close, false)
 {
   uint nbChars = memory.device().nbCharsWord(MemoryRangeType::Config);
   const Config::Word &cword = memory.device().config()._words[ci];
@@ -87,24 +87,24 @@ Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget
   row++;
   label = new TQLabel(i18n("Write Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new TQLabel(toHexLabel(cword.wtqmask, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.wmask, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
   label = new TQLabel(i18n("Protected Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new TQLabel(toHexLabel(cword.ptqmask, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.pmask, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
   label = new TQLabel(i18n("Checksum Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new TQLabel(toHexLabel(cword.ctqmask, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.cmask, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
 }
 
 //----------------------------------------------------------------------------
-Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEditor, TQWidget *tqparent)
-  : MemoryEditor(MemoryRangeType::Config, memory, tqparent, "pic_config_word_editor"), _configIndex(ci)
+Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEditor, TQWidget *parent)
+  : MemoryEditor(MemoryRangeType::Config, memory, parent, "pic_config_word_editor"), _configIndex(ci)
 {
   if (withWordEditor) {
     TQHBoxLayout *hbox = new TQHBoxLayout(_top);
@@ -126,16 +126,16 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd
   _combos.resize(cword.masks.count());
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = cword.masks[k];
-    TQLabel *label = new TQLabel(Config::maskLabel(ctqmask.name) + ":", this);
+    const Config::Mask &cmask = cword.masks[k];
+    TQLabel *label = new TQLabel(Config::maskLabel(cmask.name) + ":", this);
     grid->addWidget(label, k, 0);
-    label = new TQLabel(ctqmask.name, this);
+    label = new TQLabel(cmask.name, this);
     grid->addWidget(label, k, 1);
     _combos[k] = new ConfigWordComboBox(this);
-    for (uint i=0; i<ctqmask.values.count(); i++) {
-      if ( !ctqmask.values[i].isValid() ) continue;
-      TQString label = Config::valueLabel(ctqmask.name, ctqmask.values[i].name);
-      label += " (" + toHexLabel(ctqmask.values[i].value, nbChars) + ")";
+    for (uint i=0; i<cmask.values.count(); i++) {
+      if ( !cmask.values[i].isValid() ) continue;
+      TQString label = Config::valueLabel(cmask.name, cmask.values[i].name);
+      label += " (" + toHexLabel(cmask.values[i].value, nbChars) + ")";
       _combos[k]->appendItem(label, i);
     }
     connect(_combos[k], TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified()));
@@ -148,8 +148,8 @@ void Pic::ConfigWordEditor::setReadOnly(bool readOnly)
   if (_mdb) _mdb->setReadOnly(readOnly);
   const Config::Word &cword = device().config()._words[_configIndex];
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = cword.masks[k];
-    _combos[k]->setEnabled(!readOnly && !ctqmask.value.isOverlapping(cword.ptqmask) && ctqmask.values.count()!=1);
+    const Config::Mask &cmask = cword.masks[k];
+    _combos[k]->setEnabled(!readOnly && !cmask.value.isOverlapping(cword.pmask) && cmask.values.count()!=1);
   }
 }
 
@@ -158,9 +158,9 @@ void Pic::ConfigWordEditor::slotModified()
   BitValue v = memory().word(MemoryRangeType::Config, _configIndex);
   //qDebug("BinWordEditor::slotModified %i: %s", _configIndex, toHex(v, 4).data());
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k];
-    v = v.clearMaskBits(ctqmask.value);
-    v |= ctqmask.values[_combos[k]->index()].value; // set value
+    const Config::Mask &cmask = device().config()._words[_configIndex].masks[k];
+    v = v.clearMaskBits(cmask.value);
+    v |= cmask.values[_combos[k]->index()].value; // set value
   }
   memory().setWord(MemoryRangeType::Config, _configIndex, v);
   //qDebug("  now: %s", toHex(v, 4).data());
@@ -174,12 +174,12 @@ void Pic::ConfigWordEditor::updateDisplay()
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   //qDebug("BinWordEditor::updateDisplay %i: %s", _configIndex, toHex(v, 4).data());
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k];
-    for (int i=ctqmask.values.count()-1; i>=0; i--) {
-      if ( ctqmask.values[i].value.isInside(v) ) {
-        if ( ctqmask.values[i].isValid() ) _combos[k]->setItem(i);
+    const Config::Mask &cmask = device().config()._words[_configIndex].masks[k];
+    for (int i=cmask.values.count()-1; i>=0; i--) {
+      if ( cmask.values[i].value.isInside(v) ) {
+        if ( cmask.values[i].isValid() ) _combos[k]->setItem(i);
         else {
-          TQString label = i18n("<invalid>") + " (" + toHexLabel(ctqmask.values[i].value, nbChars) + ")";
+          TQString label = i18n("<invalid>") + " (" + toHexLabel(cmask.values[i].value, nbChars) + ")";
           _combos[k]->setInvalidItem(i, label);
         }
         break;
diff --git a/src/devices/pic/gui/pic_config_word_editor.h b/src/devices/pic/gui/pic_config_word_editor.h
index 1b4077b..38f9573 100644
--- a/src/devices/pic/gui/pic_config_word_editor.h
+++ b/src/devices/pic/gui/pic_config_word_editor.h
@@ -24,7 +24,7 @@ class ConfigWordDialog : public Dialog
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWordDialog(const Memory &memory, uint index, TQWidget *tqparent);
+  ConfigWordDialog(const Memory &memory, uint index, TQWidget *parent);
 };
 
 //----------------------------------------------------------------------------
@@ -33,7 +33,7 @@ class ConfigWordComboBox : public ComboBox
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWordComboBox(TQWidget *tqparent);
+  ConfigWordComboBox(TQWidget *parent);
   void appendItem(const TQString &text, uint index) { insertItem(text); _map.append(index); }
   uint index() const;
   void setItem(uint index);
@@ -52,7 +52,7 @@ class ConfigWordEditor : public MemoryEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, TQWidget *tqparent);
+  ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, TQWidget *parent);
   virtual void setReadOnly(bool readOnly);
 
 public slots:
diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp
index 5483ee4..fa4aa56 100644
--- a/src/devices/pic/gui/pic_group_ui.cpp
+++ b/src/devices/pic/gui/pic_group_ui.cpp
@@ -18,19 +18,19 @@
 #include "libgui/gui_debug_manager.h"
 #include "common/gui/list_container.h"
 
-Device::HexView *Pic::GroupUI::createHexView(const HexEditor &editor, TQWidget *tqparent) const
+Device::HexView *Pic::GroupUI::createHexView(const HexEditor &editor, TQWidget *parent) const
 {
-  return new HexView(editor, tqparent);
+  return new HexView(editor, parent);
 }
 
-Register::View *Pic::GroupUI::createRegisterView(TQWidget *tqparent) const
+Register::View *Pic::GroupUI::createRegisterView(TQWidget *parent) const
 {
-  return new RegisterView(tqparent);
+  return new RegisterView(parent);
 }
 
-Device::MemoryEditor *Pic::GroupUI::createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const
+Device::MemoryEditor *Pic::GroupUI::createConfigEditor(Device::Memory &memory, TQWidget *parent) const
 {
-  return new MemoryConfigEditorWidget(static_cast<Memory &>(memory), false, tqparent);
+  return new MemoryConfigEditorWidget(static_cast<Memory &>(memory), false, parent);
 }
 
 void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const
@@ -81,7 +81,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVecto
   }
 }
 
-Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const
+Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *parent) const
 {
-  return new Pic::RegisterListViewItem(data, tqparent);
+  return new Pic::RegisterListViewItem(data, parent);
 }
diff --git a/src/devices/pic/gui/pic_group_ui.h b/src/devices/pic/gui/pic_group_ui.h
index ac97f22..d5dba86 100644
--- a/src/devices/pic/gui/pic_group_ui.h
+++ b/src/devices/pic/gui/pic_group_ui.h
@@ -17,11 +17,11 @@ namespace Pic
 class GroupUI : public Device::GroupUI
 {
 public:
-  virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const;
-  virtual Register::View *createRegisterView(TQWidget *tqparent) const;
-  virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const;
+  virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *parent) const;
+  virtual Register::View *createRegisterView(TQWidget *parent) const;
+  virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *parent) const;
   virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const;
-  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const;
+  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const;
 };
 
 } // namespace
diff --git a/src/devices/pic/gui/pic_hex_view.cpp b/src/devices/pic/gui/pic_hex_view.cpp
index 760b1ed..bbcc161 100644
--- a/src/devices/pic/gui/pic_hex_view.cpp
+++ b/src/devices/pic/gui/pic_hex_view.cpp
@@ -17,8 +17,8 @@
 #include "pic_memory_editor.h"
 #include "pic_config_editor.h"
 
-Pic::HexView::HexView(const HexEditor &editor, TQWidget *tqparent)
-  : Device::HexView(editor, tqparent, "pic_hex_view")
+Pic::HexView::HexView(const HexEditor &editor, TQWidget *parent)
+  : Device::HexView(editor, parent, "pic_hex_view")
 {}
 
 const Pic::MemoryRangeType::Type Pic::HexView::MEMORY_DATA[] = {
diff --git a/src/devices/pic/gui/pic_hex_view.h b/src/devices/pic/gui/pic_hex_view.h
index 54b679d..c3a53f8 100644
--- a/src/devices/pic/gui/pic_hex_view.h
+++ b/src/devices/pic/gui/pic_hex_view.h
@@ -23,7 +23,7 @@ class HexView : public Device::HexView
 Q_OBJECT
   TQ_OBJECT
 public:
-  HexView(const HexEditor &editor, TQWidget *tqparent);
+  HexView(const HexEditor &editor, TQWidget *parent);
   Memory *memory() { return static_cast<Memory *>(_memory); }
   const Memory *memory() const { return static_cast<Memory *>(_memory); }
   virtual uint nbChecksumChars() const { return 4; }
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index bb06f3d..a964988 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -34,17 +34,17 @@
 #include "pic_hex_view.h"
 
 //-----------------------------------------------------------------------------
-Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *tqparent)
+Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *parent)
 {
-  button = new PopupButton(text, tqparent);
+  button = new PopupButton(text, parent);
   KActionCollection *ac = 0;
-  KAction *a = new KAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(tqparent), TQT_SLOT(gotoStart()), ac);
+  KAction *a = new KAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoStart()), ac);
   actions.append(a);
   button->appendAction(a);
-  a = new KAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(tqparent), TQT_SLOT(gotoEnd()), ac);
+  a = new KAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoEnd()), ac);
   actions.append(a);
   button->appendAction(a);
-  label = new TQLabel(tqparent);
+  label = new TQLabel(parent);
 }
 
 void Pic::MemoryEditorLegend::Data::setProtected(bool on)
@@ -64,8 +64,8 @@ const char * const Pic::MemoryEditorLegend::BLOCK_COLORS[Protection::MAX_NB_BLOC
   "#88FF88", "#88FFFF", "#FFFF88", "#FF88FF", "#0088FF", "#88FF00", "#00FF88", "#FF8800"
 };
 
-Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent)
-  : MemoryEditor(type, memory, tqparent, "memory_displayer_legend")
+Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *parent)
+  : MemoryEditor(type, memory, parent, "memory_displayer_legend")
 {
   TQGridLayout *grid = new TQGridLayout(_top);
 
@@ -165,8 +165,8 @@ void Pic::MemoryEditorLegend::gotoEnd()
 
 
 //-----------------------------------------------------------------------------
-Pic::HexWordEditor::HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent)
-  : Device::HexWordEditor(memory, memory.device().nbCharsWord(type), tqparent),
+Pic::HexWordEditor::HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *parent)
+  : Device::HexWordEditor(memory, memory.device().nbCharsWord(type), parent),
     MemoryCaster(type, memory)
 {}
 
@@ -174,7 +174,7 @@ void Pic::HexWordEditor::setWord(BitValue value)
 {
   if ( type()==MemoryRangeType::Config ) {
     const Config::Word &cword = device().config()._words[_offset];
-    value |= cword.usedMask().complementInMask(device().tqmask(MemoryRangeType::Config));
+    value |= cword.usedMask().complementInMask(device().mask(MemoryRangeType::Config));
   }
   memory().setWord(type(), _offset, value);
 }
@@ -182,8 +182,8 @@ void Pic::HexWordEditor::setWord(BitValue value)
 //-----------------------------------------------------------------------------
 Pic::MemoryRangeEditor::MemoryRangeEditor(MemoryRangeType type, Memory &memory,
                                           uint nbLines, uint nbCols,
-                                          uint wordOffset, int nbWords, TQWidget *tqparent)
-  : Device::MemoryRangeEditor(memory, nbLines, nbCols, wordOffset, nbWords, tqparent, "pic_memory_range_editor"),
+                                          uint wordOffset, int nbWords, TQWidget *parent)
+  : Device::MemoryRangeEditor(memory, nbLines, nbCols, wordOffset, nbWords, parent, "pic_memory_range_editor"),
     MemoryCaster(type, memory), _legend(0)
 {
   if ( type==MemoryRangeType::Code ) _blockRanges.resize(memory.device().config().protection().nbBlocks());
@@ -234,14 +234,14 @@ void Pic::MemoryRangeEditor::updateAddressColor(uint i, Address address)
   }
 }
 
-Device::HexWordEditor *Pic::MemoryRangeEditor::createHexWordEditor(TQWidget *tqparent)
+Device::HexWordEditor *Pic::MemoryRangeEditor::createHexWordEditor(TQWidget *parent)
 {
-  return new HexWordEditor(type(), memory(), tqparent);
+  return new HexWordEditor(type(), memory(), parent);
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name)
-  : Device::MemoryTypeEditor(hexview, memory, tqparent, name), MemoryCaster(type, memory)
+Pic::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name)
+  : Device::MemoryTypeEditor(hexview, memory, parent, name), MemoryCaster(type, memory)
 {}
 
 void Pic::MemoryTypeEditor::init(bool first)
@@ -251,10 +251,10 @@ void Pic::MemoryTypeEditor::init(bool first)
 
   uint nbChars = device().nbCharsWord(type());
   TQString add;
-  if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended tqmask: %1").tqarg(toHexLabel(device().userIdRecommendedMask(), nbChars));
+  if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended mask: %1").tqarg(toHexLabel(device().userIdRecommendedMask(), nbChars));
   if ( type()==MemoryRangeType::Cal && _hexview ) add = i18n(" - not programmed by default");
-  TQString comment = i18n("%1-bit words - tqmask: %2")
-                   .tqarg(device().nbBitsWord(type())).tqarg(toHexLabel(device().tqmask(type()), nbChars));
+  TQString comment = i18n("%1-bit words - mask: %2")
+                   .tqarg(device().nbBitsWord(type())).tqarg(toHexLabel(device().mask(type()), nbChars));
   _comment->setText(comment + add);
 }
 
@@ -291,8 +291,8 @@ bool Pic::MemoryTypeEditor::internalDoAction(Device::Action action)
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryTypeRangeEditor::MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent)
-  : MemoryTypeEditor(hexview, type, memory, tqparent, "pic_memory_type_range_editor"), _mre(0)
+Pic::MemoryTypeRangeEditor::MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent)
+  : MemoryTypeEditor(hexview, type, memory, parent, "pic_memory_type_range_editor"), _mre(0)
 {}
 
 void Pic::MemoryTypeRangeEditor::init(bool first)
@@ -309,8 +309,8 @@ void Pic::MemoryTypeRangeEditor::init(bool first)
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
-  : MemoryTypeRangeEditor(hexview, MemoryRangeType::UserId, memory, tqparent), _saveReadOnly(false)
+Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *parent)
+  : MemoryTypeRangeEditor(hexview, MemoryRangeType::UserId, memory, parent), _saveReadOnly(false)
 {}
 
 void Pic::MemoryUserIdEditor::init(bool first)
@@ -347,8 +347,8 @@ void Pic::MemoryUserIdEditor::setReadOnly(bool readOnly)
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryCalibrationEditor::MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
-  : MemoryTypeEditor(hexview, MemoryRangeType::Cal, memory, tqparent, "pic_memory_calibration_editor")
+Pic::MemoryCalibrationEditor::MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *parent)
+  : MemoryTypeEditor(hexview, MemoryRangeType::Cal, memory, parent, "pic_memory_calibration_editor")
 {}
 
 void Pic::MemoryCalibrationEditor::init(bool first)
diff --git a/src/devices/pic/gui/pic_memory_editor.h b/src/devices/pic/gui/pic_memory_editor.h
index 2a6f72f..e641ec4 100644
--- a/src/devices/pic/gui/pic_memory_editor.h
+++ b/src/devices/pic/gui/pic_memory_editor.h
@@ -44,8 +44,8 @@ class MemoryEditor : public Device::MemoryEditor, public MemoryCaster
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name)
-    : Device::MemoryEditor(&memory, tqparent, name), MemoryCaster(type, memory) {}
+  MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name)
+    : Device::MemoryEditor(&memory, parent, name), MemoryCaster(type, memory) {}
 };
 
 //-----------------------------------------------------------------------------
@@ -54,7 +54,7 @@ class MemoryEditorLegend : public MemoryEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent);
+  MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *parent);
   virtual void setReadOnly(bool) {}
 
   static TQColor protectedColor() { return TQColor("#FF8888"); }
@@ -76,7 +76,7 @@ private:
   class Data {
   public:
     Data() : button(0), label(0) {}
-    Data(const TQString &text, TQWidget *tqparent);
+    Data(const TQString &text, TQWidget *parent);
     void setProtected(bool on);
     bool hasAction(const KAction *action) const;
     PopupButton *button;
@@ -95,10 +95,10 @@ class HexWordEditor : public Device::HexWordEditor, public MemoryCaster
 Q_OBJECT
   TQ_OBJECT
 public:
-  HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent);
+  HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *parent);
 
 private:
-  virtual BitValue tqmask() const { return memory().device().tqmask(type()); }
+  virtual BitValue mask() const { return memory().device().mask(type()); }
   virtual BitValue normalizeWord(BitValue value) const { return memory().normalizeWord(type(), _offset, value); }
   virtual BitValue word() const { return memory().word(type(), _offset); }
   virtual void setWord(BitValue value);
@@ -111,7 +111,7 @@ class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster
   TQ_OBJECT
 public:
   MemoryRangeEditor(MemoryRangeType type, Memory &memory,
-                    uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *tqparent);
+                    uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *parent);
 
 public slots:
   virtual void updateDisplay();
@@ -125,7 +125,7 @@ private:
   virtual uint nbWords() const { return device().nbWords(type()); }
   virtual uint addressIncrement() const { return device().addressIncrement(type()); }
   virtual Address startAddress() const { return device().range(type()).start; }
-  virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent);
+  virtual Device::HexWordEditor *createHexWordEditor(TQWidget *parent);
   virtual void updateAddressColor(uint i, Address address);
   virtual bool isRangeReadOnly() const;
   virtual void addLegend(TQVBoxLayout *vbox);
@@ -137,7 +137,7 @@ class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name);
+  MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name);
   virtual void init(bool first);
 
 private:
@@ -150,7 +150,7 @@ class MemoryTypeRangeEditor : public MemoryTypeEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent);
+  MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent);
   virtual void init(bool first);
 
 protected:
@@ -163,7 +163,7 @@ class MemoryUserIdEditor : public MemoryTypeRangeEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
+  MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *parent);
   virtual void init(bool first);
   virtual void setReadOnly(bool readOnly);
 
@@ -184,7 +184,7 @@ class MemoryCalibrationEditor : public MemoryTypeEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-  MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
+  MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *parent);
   virtual void init(bool first);
 
 private:
diff --git a/src/devices/pic/gui/pic_prog_group_ui.cpp b/src/devices/pic/gui/pic_prog_group_ui.cpp
index 8f2f225..6e350ed 100644
--- a/src/devices/pic/gui/pic_prog_group_ui.cpp
+++ b/src/devices/pic/gui/pic_prog_group_ui.cpp
@@ -11,8 +11,8 @@
 #include "progs/gui/prog_config_widget.h"
 #include "progs/base/prog_group.h"
 
-Programmer::PicAdvancedDialog::PicAdvancedDialog(PicBase &base, TQWidget *tqparent, const char *name)
-  : AdvancedDialog(base, tqparent, name)
+Programmer::PicAdvancedDialog::PicAdvancedDialog(PicBase &base, TQWidget *parent, const char *name)
+  : AdvancedDialog(base, parent, name)
 {
   if (_voltagesContainer) {
     uint k = _voltagesContainer->numRows();
diff --git a/src/devices/pic/gui/pic_prog_group_ui.h b/src/devices/pic/gui/pic_prog_group_ui.h
index 1a8540e..c203da3 100644
--- a/src/devices/pic/gui/pic_prog_group_ui.h
+++ b/src/devices/pic/gui/pic_prog_group_ui.h
@@ -19,7 +19,7 @@ class PicAdvancedDialog : public ::Programmer::AdvancedDialog
 Q_OBJECT
   TQ_OBJECT
 public:
-  PicAdvancedDialog(PicBase &base, TQWidget *tqparent, const char *name);
+  PicAdvancedDialog(PicBase &base, TQWidget *parent, const char *name);
   virtual void updateDisplay();
 
 private:
diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp
index ced5085..b640036 100644
--- a/src/devices/pic/gui/pic_register_view.cpp
+++ b/src/devices/pic/gui/pic_register_view.cpp
@@ -29,8 +29,8 @@
 #include "coff/base/text_coff.h"
 
 //-----------------------------------------------------------------------------
-Pic::BankWidget::BankWidget(uint i, TQWidget *tqparent)
-  : TQFrame(tqparent, "bank_widget"), _bindex(i), _bankCombo(0)
+Pic::BankWidget::BankWidget(uint i, TQWidget *parent)
+  : TQFrame(parent, "bank_widget"), _bindex(i), _bankCombo(0)
 {
   setFrameStyle(WinPanel | Sunken);
   TQGridLayout *top = new TQGridLayout(this, 1, 1, 5, 0);
@@ -245,8 +245,8 @@ void Pic::BankWidget::updateView()
 }
 
 //-----------------------------------------------------------------------------
-Pic::RegisterView::RegisterView(TQWidget *tqparent)
-  : Register::View(tqparent, "pic_register_view"),
+Pic::RegisterView::RegisterView(TQWidget *parent)
+  : Register::View(parent, "pic_register_view"),
     _readAllButton(0), _clearAllButton(0)
 {
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 10, 10);
@@ -306,8 +306,8 @@ void Pic::RegisterView::stopWatchAllRegisters()
 }
 
 //----------------------------------------------------------------------------
-Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *tqparent)
-  : Register::ListViewItem(data, tqparent)
+Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent)
+  : Register::ListViewItem(data, parent)
 {}
 
 uint Pic::RegisterListViewItem::nbCharsAddress() const
diff --git a/src/devices/pic/gui/pic_register_view.h b/src/devices/pic/gui/pic_register_view.h
index 0f347e4..f7a07ac 100644
--- a/src/devices/pic/gui/pic_register_view.h
+++ b/src/devices/pic/gui/pic_register_view.h
@@ -29,7 +29,7 @@ class BankWidget : public TQFrame
 Q_OBJECT
   TQ_OBJECT
 public:
-  BankWidget(uint bank, TQWidget *tqparent);
+  BankWidget(uint bank, TQWidget *parent);
   void updateView();
 
 private slots:
@@ -63,7 +63,7 @@ class RegisterView : public Register::View
 Q_OBJECT
   TQ_OBJECT
 public:
-  RegisterView(TQWidget *tqparent);
+  RegisterView(TQWidget *parent);
   virtual void updateView();
 
 private slots:
@@ -78,7 +78,7 @@ private:
 class RegisterListViewItem : public Register::ListViewItem
 {
 public:
-  RegisterListViewItem(const Register::TypeData &data, KListViewItem *tqparent);
+  RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent);
 
 private:
   virtual uint nbCharsAddress() const;