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, 10 insertions, 8 deletions

diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h
index 3b24a04c..d27aef50 100644
--- a/ksirc/servercontroller.h
+++ b/ksirc/servercontroller.h
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-	--- Qt Architect generated file ---
+	--- TQt Architect generated file ---
 
 	File: servercontroller.h
 	Last generated: Sat Nov 29 08:50:19 1997
@@ -64,12 +64,13 @@ class ServCommand // ServerController message
   } command;
 };
 
-class scInside : QFrame
+class scInside : TQFrame
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class servercontroller;
  public:
-  scInside ( TQWidget *parent = 0L, const char * name = 0, WFlags f=0 );
+  scInside ( TQWidget *tqparent = 0L, const char * name = 0, WFlags f=0 );
   ~scInside();
 
  protected:
@@ -84,10 +85,11 @@ class scInside : QFrame
 class servercontroller : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class dockServerController;
 public:
 
-    servercontroller ( TQWidget* parent = 0L, const char* name = NULL );
+    servercontroller ( TQWidget* tqparent = 0L, const char* name = NULL );
     virtual ~servercontroller();
 
     const TQDict<KSircProcess> &processes() const { return proc_list; }
@@ -97,13 +99,13 @@ public:
     /**
      * Someone is talking to the user (blue icon), notify him (using the docked icon).
      */
-    void increaseNotificationCount(const TQString& reason = TQString::null, const TQString& text = TQString::null);
+    void increaseNotificationCount(const TQString& reason = TQString(), const TQString& text = TQString());
 
     /**
      * The channel in which the user was talked to, has been read.
      * -> decrease count of blue icons.
      */
-    void decreaseNotificationCount(TQString reason = TQString::null);
+    void decreaseNotificationCount(TQString reason = TQString());
 
     /**
      * This resets all notificaiton counts and allows new ones
@@ -191,7 +193,7 @@ public slots:
     void start_autoconnect_check();
 
 
-    TQListViewItem * findChild( TQListViewItem *parent, const TQString& text );
+    TQListViewItem * findChild( TQListViewItem *tqparent, const TQString& text );
 
 protected slots:
   void WindowSelected(TQListViewItem *);
@@ -204,7 +206,7 @@ protected:
   virtual void showEvent( TQShowEvent *e );
   virtual void hideEvent( TQHideEvent *e );
   virtual void closeEvent( TQCloseEvent * );
-  void saveDockingStatus();
+  void saveDockingtqStatus();
 
   void saveGlobalProperties(KConfig *);
   void readGlobalProperties(KConfig *);