1 files changed, 12 insertions, 12 deletions
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: