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

5 files changed, 25 insertions, 23 deletions

diff --git a/ksirc/KSProgress/ksprogress.cpp b/ksirc/KSProgress/ksprogress.cpp
index ccf3b194..d299f22a 100644
--- a/ksirc/KSProgress/ksprogress.cpp
+++ b/ksirc/KSProgress/ksprogress.cpp
@@ -10,11 +10,11 @@
 
 KSProgress::KSProgress
 (
-	TQWidget* parent,
+	TQWidget* tqparent,
 	const char* name
 )
 	:
-	Inherited( parent, name )
+	Inherited( tqparent, name )
 {
   setCaption("KSProgress");
   id = "";
@@ -39,7 +39,7 @@ void KSProgress::setTopText(TQString text)
 
 void KSProgress::setBotText(TQString text)
 {
-  transferStatus->setText(text);
+  transfertqStatus->setText(text);
 }
 
 void KSProgress::setValue(int value)
diff --git a/ksirc/KSProgress/ksprogress.dlg b/ksirc/KSProgress/ksprogress.dlg
index 5484c4d6..4d1b065d 100644
--- a/ksirc/KSProgress/ksprogress.dlg
+++ b/ksirc/KSProgress/ksprogress.dlg
@@ -124,7 +124,7 @@
           </Frame>
         </Label>
         <Label  nested="true" >
-          <Text >XferStatus</Text>
+          <Text >XfertqStatus</Text>
           <Alignment >AlignLeft|AlignVCenter|ExpandTabs</Alignment>
           <Indent type="integer">-1</Indent>
           <TextFormat type="qstring">AutoText</TextFormat>
@@ -138,7 +138,7 @@
                 <Y type="integer">35</Y>
               </Rect>
               <Name >Label_2</Name>
-              <Variable >transferStatus</Variable>
+              <Variable >transfertqStatus</Variable>
               <SignalConnection  list="true"  nested="true" >
               </SignalConnection>
               <MinimumSize type="qsize" complex="true"  nested="true" >
diff --git a/ksirc/KSProgress/ksprogress.h b/ksirc/KSProgress/ksprogress.h
index 2613047d..91f915c5 100644
--- a/ksirc/KSProgress/ksprogress.h
+++ b/ksirc/KSProgress/ksprogress.h
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-	--- Qt Architect generated file ---
+	--- TQt Architect generated file ---
 
 	File: ksprogress.h
 	Last generated: Thu Dec 18 08:01:39 1997
@@ -15,12 +15,13 @@
 class KSProgress : public ksprogressData
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
     KSProgress
     (
-        TQWidget* parent = NULL,
+        TQWidget* tqparent = NULL,
         const char* name = NULL
     );
 
diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp
index 7d146fd9..5abbc735 100644
--- a/ksirc/KSProgress/ksprogressdata.cpp
+++ b/ksirc/KSProgress/ksprogressdata.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-	--- Qt Architect generated file ---
+	--- TQt Architect generated file ---
 
 	File: ksprogressdata.cpp
 	Last generated: Thu Dec 18 09:09:53 1997
@@ -13,7 +13,7 @@
 #include "ksprogressdata.h"
 
 #undef Inherited
-#define Inherited QFrame
+#define Inherited TQFrame
 
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
@@ -22,11 +22,11 @@
 
 ksprogressData::ksprogressData
 (
-	TQWidget* parent,
+	TQWidget* tqparent,
 	const char* name
 )
 	:
-	Inherited( parent, name, 0 )
+	Inherited( tqparent, name, 0 )
 {
 	progress = new KProgress( this, "User_1" );
 	progress->setGeometry( 10, 60, 230, 20 );
@@ -46,16 +46,16 @@ ksprogressData::ksprogressData
 	fileName->setMinimumSize( 10, 10 );
 	fileName->setMaximumSize( 32767, 32767 );
 	fileName->setText( i18n("File Name") );
-	fileName->setAlignment( 289 );
+	fileName->tqsetAlignment( 289 );
 	fileName->setMargin( -1 );
 
-	transferStatus = new TQLabel( this, "Label_2" );
-	transferStatus->setGeometry( 10, 35, 230, 20 );
-	transferStatus->setMinimumSize( 10, 10 );
-	transferStatus->setMaximumSize( 32767, 32767 );
-	transferStatus->setText( i18n("Transfer Status") );
-	transferStatus->setAlignment( 289 );
-	transferStatus->setMargin( -1 );
+	transfertqStatus = new TQLabel( this, "Label_2" );
+	transfertqStatus->setGeometry( 10, 35, 230, 20 );
+	transfertqStatus->setMinimumSize( 10, 10 );
+	transfertqStatus->setMaximumSize( 32767, 32767 );
+	transfertqStatus->setText( i18n("Transfer tqStatus") );
+	transfertqStatus->tqsetAlignment( 289 );
+	transfertqStatus->setMargin( -1 );
 
 	resize( 250,130 );
 	setMinimumSize( 250, 140 );
diff --git a/ksirc/KSProgress/ksprogressdata.h b/ksirc/KSProgress/ksprogressdata.h
index 37e3cf29..afd3b15e 100644
--- a/ksirc/KSProgress/ksprogressdata.h
+++ b/ksirc/KSProgress/ksprogressdata.h
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-	--- Qt Architect generated file ---
+	--- TQt Architect generated file ---
 
 	File: ksprogressdata.h
 	Last generated: Thu Dec 18 09:09:53 1997
@@ -17,15 +17,16 @@
 #include <tqlabel.h>
 #include "kprogress.h"
 
-class ksprogressData : public QFrame
+class ksprogressData : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
     ksprogressData
     (
-        TQWidget* parent = NULL,
+        TQWidget* tqparent = NULL,
         const char* name = NULL
     );
 
@@ -41,7 +42,7 @@ protected slots:
 protected:
     KProgress* progress;
     TQLabel* fileName;
-    TQLabel* transferStatus;
+    TQLabel* transfertqStatus;
 
 };