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, 18 insertions, 16 deletions

diff --git a/src/devices/gui/register_view.h b/src/devices/gui/register_view.h
index 7ef8a54..60c8194 100644
--- a/src/devices/gui/register_view.h
+++ b/src/devices/gui/register_view.h
@@ -9,7 +9,7 @@
 #ifndef REGISTER_VIEW_H
 #define REGISTER_VIEW_H
 
-#include <qframe.h>
+#include <tqframe.h>
 
 #include "devices/base/register.h"
 #include "common/gui/number_gui.h"
@@ -23,15 +23,15 @@ enum { PortBitRtti = 1000, RegisterRtti = 1001 };
 class PortBitListViewItem : public KListViewItem
 {
 public:
-  PortBitListViewItem(uint address, uint bit, KListViewItem *parent);
+  PortBitListViewItem(uint address, uint bit, KListViewItem *tqparent);
   virtual int rtti() const { return PortBitRtti; }
   void updateView();
-  QString tooltip(int column) const;
+  TQString tooltip(int column) const;
 
 private:
   uint _index, _bit;
 
-  virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
+  virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
 };
 
 //-----------------------------------------------------------------------------
@@ -42,23 +42,23 @@ public:
   virtual int rtti() const { return RegisterRtti; }
   virtual void updateView();
   const TypeData &data() const { return _data; }
-  QString tooltip(int column) const;
+  TQString tooltip(int column) const;
   NumberBase base() const { return _base; }
   void setBase(NumberBase base);
-  virtual QString label() const = 0;
-  virtual int compare(QListViewItem *item, int, bool) const;
+  virtual TQString label() const = 0;
+  virtual int compare(TQListViewItem *item, int, bool) const;
 
 protected:
   TypeData _data;
-  QValueList<PortBitListViewItem *> _items;
+  TQValueList<PortBitListViewItem *> _items;
   NumberBase _base;
 
-  virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
-  virtual QWidget *editWidgetFactory(int col) const;
+  virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
+  virtual TQWidget *editWidgetFactory(int col) const;
   virtual bool alwaysAcceptEdit(int) const { return false; }
-  virtual void editDone(int col, const QWidget *editWidget);
+  virtual void editDone(int col, const TQWidget *editWidget);
   virtual uint nbCharsAddress() const = 0;
-  virtual QString text() const;
+  virtual TQString text() const;
   virtual void activate() {}
 };
 
@@ -66,8 +66,9 @@ protected:
 class LineEdit : public NumberLineEdit
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  LineEdit(QWidget *parent, const char *name = 0);
+  LineEdit(TQWidget *tqparent, const char *name = 0);
   void setValue(NumberBase base, BitValue value, uint nbChars);
   BitValue value() const { return _value; }
 
@@ -75,7 +76,7 @@ signals:
   void modified();
 
 protected:
-  virtual void keyPressEvent(QKeyEvent *e);
+  virtual void keyPressEvent(TQKeyEvent *e);
 
 private slots:
   void updateText();
@@ -88,11 +89,12 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-class View : public QFrame, public GenericView
+class View : public TQFrame, public GenericView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  View(QWidget *parent, const char *name);
+  View(TQWidget *tqparent, const char *name);
 
 signals:
   void readSignal(uint address);