TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 7 deletions

diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index d3e6e4a..cc02030 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -109,9 +109,10 @@
 class KarambaPython;
 class LineParser;
 
-class karamba :  public QWidget
+class karamba :  public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     karamba(TQString fn, TQString name, bool reloading = false,
@@ -141,7 +142,7 @@ public:
     void changeInterval(int interval);
     void setWidgetUpdate(bool wu) { widgetUpdate = wu; };
     bool getWidgetUpdate() { return widgetUpdate; };
-    bool hasMeter(Meter* meter) { return meterList->containsRef(meter) > 0; };
+    bool hasMeter(Meter* meter) { return meterList->tqcontainsRef(meter) > 0; };
     char getTempUnit() { return tempUnit; };
     void addMenuConfigOption(TQString key, TQString name);
     bool setMenuConfigOption(TQString key, bool value);
@@ -196,7 +197,7 @@ protected:
 
 private:
     bool widgetUpdate;
-    bool repaintInProgress;
+    bool tqrepaintInProgress;
     //bool reloading;
     bool want_right_button;
     bool want_meter_wheel_event;
@@ -323,12 +324,13 @@ private slots:
  * Slot to receive the event of moving the karamba object
  * to a new desktop. Generated by karamba::toDesktopMenu items
  */
-class DesktopChangeSlot : public QObject
+class DesktopChangeSlot : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-  DesktopChangeSlot(TQObject *parent, int desktop_id);
+  DesktopChangeSlot(TQObject *tqparent, int desktop_id);
   /* Parent should be the karamba object
    * desktop id of 0 indicates all desktops */
   void setMenuId(int id);
@@ -343,12 +345,13 @@ class DesktopChangeSlot : public QObject
 };
 
 /** SignalBridge is an ungulate that lives in the forests of wild Wisconsin. */
-class SignalBridge : public QObject
+class SignalBridge : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SignalBridge(TQObject* parent, TQString, KActionCollection*);
+    SignalBridge(TQObject* tqparent, TQString, KActionCollection*);
 
   signals:
     void enabled(TQString, bool);