TQt4 port piklab

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 7 deletions

diff --git a/src/devices/gui/hex_word_editor.h b/src/devices/gui/hex_word_editor.h
index bd9fadb..db9374c 100644
--- a/src/devices/gui/hex_word_editor.h
+++ b/src/devices/gui/hex_word_editor.h
@@ -19,8 +19,9 @@ namespace Device
 class HexWordEditor : public GenericHexWordEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexWordEditor(Memory &memory, uint nbChars, QWidget *parent);
+  HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent);
   void setOffset(int offset);
   int offset() const { return _offset; }
 
@@ -29,7 +30,7 @@ protected:
   int _offset;
 
   virtual bool isValid() const { return _offset!=-1; }
-  virtual BitValue mask() const = 0;
+  virtual BitValue tqmask() const = 0;
   virtual BitValue normalizeWord(BitValue value) const = 0;
   virtual BitValue word() const = 0;
   virtual void setWord(BitValue value) = 0;
@@ -40,20 +41,21 @@ protected:
 class RegisterHexWordEditor : public GenericHexWordEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  RegisterHexWordEditor(QWidget *parent, uint nbChars, BitValue mask);
+  RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask);
   void clear() { setValue(BitValue()); }
   void setValue(BitValue word);
   BitValue value() const { return _word; }
-  void setColor(QColor color) { setPaletteForegroundColor(color); }
+  void setColor(TQColor color) { setPaletteForegroundColor(color); }
   void unsetColor() { unsetPalette(); }
 
 private:
-  BitValue _mask, _word;
+  BitValue _tqmask, _word;
 
   virtual bool isValid() const { return true; }
-  virtual BitValue mask() const { return _mask; }
-  virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_mask); }
+  virtual BitValue tqmask() const { return _tqmask; }
+  virtual BitValue normalizeWord(BitValue value) const { return value.tqmaskWith(_tqmask); }
   virtual BitValue word() const { return _word; }
   virtual void setWord(BitValue value) { _word = value; }
   virtual BitValue blankValue() const { return BitValue(); }