TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 6 insertions, 5 deletions

diff --git a/ksirc/dockservercontroller.h b/ksirc/dockservercontroller.h
index 97d0befd..4083c044 100644
--- a/ksirc/dockservercontroller.h
+++ b/ksirc/dockservercontroller.h
@@ -36,7 +36,7 @@ public:
     void setOffline() { m_status = isOffline; m_offline = TQTime::currentTime(); }
     const TQTime offline() { return m_offline; }
 
-    void setStatus(enum status stat) { m_status = stat; }
+    void settqStatus(enum status stat) { m_status = stat; }
     enum status status() { return m_status; }
 
 private:
@@ -51,12 +51,13 @@ private:
 class dockServerController : public KSystemTray
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  dockServerController(servercontroller *_sc, TQWidget *parent = 0x0, const char *_name = 0x0);
+  dockServerController(servercontroller *_sc, TQWidget *tqparent = 0x0, const char *_name = 0x0);
   ~dockServerController();
 
-  void startBlink(const TQString& reason = TQString::null, const TQString& text = TQString::null);
-  void stopBlink(const TQString& reason = TQString::null, bool clear = false);
+  void startBlink(const TQString& reason = TQString(), const TQString& text = TQString());
+  void stopBlink(const TQString& reason = TQString(), bool clear = false);
 
   void nickOnline(TQString server, TQString nick);
   void nickOffline(TQString server, TQString nick);
@@ -99,7 +100,7 @@ private:
     bool m_mainPopVisible;
 
     bool m_blinkActive;
-    bool m_blinkStatus; // true: blue icon, false: normal icon
+    bool m_blinktqStatus; // true: blue icon, false: normal icon
     TQTimer* m_blinkTimer;
 
     TQStringList m_blink_reason;