1 files changed, 29 insertions, 21 deletions

diff --git a/src/devices/pic/gui/pic_memory_editor.h b/src/devices/pic/gui/pic_memory_editor.h
index bf67cd1..2a6f72f 100644
--- a/src/devices/pic/gui/pic_memory_editor.h
+++ b/src/devices/pic/gui/pic_memory_editor.h
@@ -10,8 +10,8 @@
 #ifndef PIC_MEMORY_EDITOR_H
 #define PIC_MEMORY_EDITOR_H
 
-#include <qscrollbar.h>
-#include <qgroupbox.h>
+#include <tqscrollbar.h>
+#include <tqgroupbox.h>
 class KToggleAction;
 
 #include "devices/gui/memory_editor.h"
@@ -42,22 +42,24 @@ private:
 class MemoryEditor : public Device::MemoryEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryEditor(MemoryRangeType type, Memory &memory, QWidget *parent, const char *name)
-    : Device::MemoryEditor(&memory, parent, name), MemoryCaster(type, memory) {}
+  MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name)
+    : Device::MemoryEditor(&memory, tqparent, name), MemoryCaster(type, memory) {}
 };
 
 //-----------------------------------------------------------------------------
 class MemoryEditorLegend : public MemoryEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryEditorLegend(MemoryRangeType type, Memory &memory, QWidget *parent);
+  MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent);
   virtual void setReadOnly(bool) {}
 
-  static QColor protectedColor() { return QColor("#FF8888"); }
-  static QColor bootColor() { return QColor("#8888FF"); }
-  static QColor blockColor(uint i) { return QColor(BLOCK_COLORS[i]); }
+  static TQColor protectedColor() { return TQColor("#FF8888"); }
+  static TQColor bootColor() { return TQColor("#8888FF"); }
+  static TQColor blockColor(uint i) { return TQColor(BLOCK_COLORS[i]); }
 
 signals:
   void setStartWord(int i);
@@ -74,15 +76,15 @@ private:
   class Data {
   public:
     Data() : button(0), label(0) {}
-    Data(const QString &text, QWidget *parent);
+    Data(const TQString &text, TQWidget *tqparent);
     void setProtected(bool on);
     bool hasAction(const KAction *action) const;
     PopupButton *button;
-    QLabel      *label;
-    QValueVector<KAction *> actions;
+    TQLabel      *label;
+    TQValueVector<KAction *> actions;
   };
   Data _boot;
-  QValueVector<Data> _blocks;
+  TQValueVector<Data> _blocks;
 
   static const char * const BLOCK_COLORS[Protection::MAX_NB_BLOCKS];
 };
@@ -91,11 +93,12 @@ private:
 class HexWordEditor : public Device::HexWordEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexWordEditor(MemoryRangeType type, Memory &memory, QWidget *parent);
+  HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent);
 
 private:
-  virtual BitValue mask() const { return memory().device().mask(type()); }
+  virtual BitValue tqmask() const { return memory().device().tqmask(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);
@@ -105,9 +108,10 @@ private:
 class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   MemoryRangeEditor(MemoryRangeType type, Memory &memory,
-                    uint nbLines, uint nbCols, uint wordOffset, int nbWords, QWidget *parent);
+                    uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *tqparent);
 
 public slots:
   virtual void updateDisplay();
@@ -121,18 +125,19 @@ 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(QWidget *parent);
+  virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent);
   virtual void updateAddressColor(uint i, Address address);
   virtual bool isRangeReadOnly() const;
-  virtual void addLegend(QVBoxLayout *vbox);
+  virtual void addLegend(TQVBoxLayout *vbox);
 };
 
 //-----------------------------------------------------------------------------
 class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, QWidget *parent, const char *name);
+  MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name);
   virtual void init(bool first);
 
 private:
@@ -143,8 +148,9 @@ private:
 class MemoryTypeRangeEditor : public MemoryTypeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, QWidget *parent);
+  MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
 
 protected:
@@ -155,8 +161,9 @@ protected:
 class MemoryUserIdEditor : public MemoryTypeRangeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryUserIdEditor(const HexView *hexview, Memory &memory, QWidget *parent);
+  MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
   virtual void setReadOnly(bool readOnly);
 
@@ -175,8 +182,9 @@ private:
 class MemoryCalibrationEditor : public MemoryTypeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryCalibrationEditor(const HexView *hexview, Memory &memory, QWidget *parent);
+  MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
 
 private: