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, 37 insertions, 35 deletions

diff --git a/ksirc/KSOpenkSirc/enter_combo.h b/ksirc/KSOpenkSirc/enter_combo.h
index 7af88d8f..bca46165 100644
--- a/ksirc/KSOpenkSirc/enter_combo.h
+++ b/ksirc/KSOpenkSirc/enter_combo.h
@@ -10,13 +10,14 @@
 
 class EnterCombo : public TQComboBox {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  EnterCombo ( TQWidget * parent=0, const char * name=0 )
-    : TQComboBox(TRUE, parent, name)
+  EnterCombo ( TQWidget * tqparent=0, const char * name=0 )
+    : TQComboBox(TRUE, tqparent, name)
     {
     }
-  EnterCombo ( bool rw, TQWidget * parent=0, const char * name=0 )
-      : TQComboBox(rw, parent, name)
+  EnterCombo ( bool rw, TQWidget * tqparent=0, const char * name=0 )
+      : TQComboBox(rw, tqparent, name)
       {
         TQKeyEvent ke(TQEvent::KeyPress, SHIFT|Key_Home, 0, 0);
         keyPressEvent(&ke);
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index d3ff7488..f005394b 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-	--- Qt Architect generated file ---
+	--- TQt Architect generated file ---
 
 	File: open_ksirc.cpp
 	Last generated: Wed Jul 29 16:41:26 1998
@@ -35,11 +35,11 @@ TQPtrList<Server> Groups;
 
 open_ksirc::open_ksirc
 (
-	TQWidget* parent,
+	TQWidget* tqparent,
 	const char* name
 )
 	:
-	Inherited( parent, name, true )
+	Inherited( tqparent, name, true )
 {
   setCaption( i18n("Connect to Server") );
 
@@ -137,7 +137,7 @@ void open_ksirc::insertGroupList()
   Server *serv;
 
   for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) {
-      if (tempgroups.find(serv->group()) == -1)
+      if (tempgroups.tqfind(serv->group()) == -1)
           tempgroups.inSort( serv->group() );
   }
 
@@ -233,7 +233,7 @@ TQString open_ksirc::encryptPassword( const TQString &password )
   memcpy(result.data(), kapp->randomString(utf8Length).latin1(), utf8Length);
   for (unsigned int i = 0; i < utf8Length; ++i)
     result[i + utf8Length] = utf8[i] ^ result[i];
-  return TQString::fromLatin1(KCodecs::base64Encode(result));
+  return TQString::tqfromLatin1(KCodecs::base64Encode(result));
 }
 
 TQString open_ksirc::decryptPassword( const TQString &scrambled )
@@ -307,8 +307,8 @@ void open_ksirc::clickConnect()
   conf->setGroup("ServerList");
   conf->writeEntry("StorePasswords", CheckB_StorePassword->isChecked());
   TQStringList recent = conf->readListEntry("RecentServers");
-  if(recent.contains(server)){
-      TQStringList::Iterator it = recent.find(server);
+  if(recent.tqcontains(server)){
+      TQStringList::Iterator it = recent.tqfind(server);
       recent.remove(it);
   }
 
diff --git a/ksirc/KSOpenkSirc/open_ksirc.h b/ksirc/KSOpenkSirc/open_ksirc.h
index 29fb4f60..238d6b84 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.h
+++ b/ksirc/KSOpenkSirc/open_ksirc.h
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-	--- Qt Architect generated file ---
+	--- TQt Architect generated file ---
 
 	File: open_ksirc.h
 	Last generated: Wed Jul 29 16:41:26 1998
@@ -19,12 +19,13 @@ class KSircServer;
 class open_ksirc : public open_ksircData
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
     open_ksirc
     (
-        TQWidget* parent = NULL,
+        TQWidget* tqparent = NULL,
         const char* name = NULL
     );
 
diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui
index ae97f341..df4ae7c6 100644
--- a/ksirc/KSOpenkSirc/open_ksircData.ui
+++ b/ksirc/KSOpenkSirc/open_ksircData.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>open_ksircData</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <cstring>ComboB_ServerName</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="4">
+        <widget class="TQLabel" row="0" column="4">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <cstring>ComboB_ServerPort</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>ComboB_ServerGroup</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <string>Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, you can select the closest server for your favorite network.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <string>If you selected an IRC Network in &lt;i&gt;"Group"&lt;/i&gt;, this window shows all of its servers. If you did not choose a group, you can enter your own here or select one of the recently used ones (&lt;i&gt;"Quick Connect"&lt;/i&gt;).</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="4">
+        <widget class="TQComboBox" row="1" column="4">
             <property name="name">
                 <cstring>ComboB_ServerPort</cstring>
             </property>
@@ -102,7 +102,7 @@
                 <string>Using &lt;i&gt;"6667"&lt;/i&gt; or &lt;i&gt;"6666"&lt;/i&gt; here is safe in most cases. Only use other values if you have been told so.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -122,7 +122,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>Label_ServerDesc</cstring>
                     </property>
@@ -134,7 +134,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop|AlignLeft</set>
                     </property>
                     <property name="vAlign" stdset="0">
@@ -144,7 +144,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="2" column="3" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="2" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -169,7 +169,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -180,7 +180,7 @@
                         <cstring>LineE_Password</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+                <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>LineE_Password</cstring>
                     </property>
@@ -196,7 +196,7 @@
                         <enum>Password</enum>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>CheckB_UseSSL</cstring>
                     </property>
@@ -207,7 +207,7 @@
                         <string>This will use a secure connection to the server. This must be supported by the server.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="2">
+                <widget class="TQCheckBox" row="1" column="2">
                     <property name="name">
                         <cstring>CheckB_StorePassword</cstring>
                     </property>
@@ -220,7 +220,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="3" column="4">
+        <widget class="TQPushButton" row="3" column="4">
             <property name="name">
                 <cstring>PB_Cancel</cstring>
             </property>
@@ -234,7 +234,7 @@
                 <string>Cancel Connect</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="3">
+        <widget class="TQPushButton" row="3" column="3">
             <property name="name">
                 <cstring>PB_Connect</cstring>
             </property>
@@ -259,7 +259,7 @@
                 <string>Connect to the server given in &lt;i&gt;"Server / Quick Connect to:"&lt;/i&gt; on the port given in &lt;i&gt;"Port:"&lt;/i&gt;.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>PB_Edit</cstring>
             </property>
@@ -280,7 +280,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -330,8 +330,8 @@
     <tabstop>PB_Connect</tabstop>
     <tabstop>PB_Cancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">passwordChanged(const QString &amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSOpenkSirc/serverDataType.h b/ksirc/KSOpenkSirc/serverDataType.h
index 157be09e..417625e8 100644
--- a/ksirc/KSOpenkSirc/serverDataType.h
+++ b/ksirc/KSOpenkSirc/serverDataType.h
@@ -26,7 +26,7 @@ public:
 	    TQPtrList<port> ports,
 	    const TQString &serverdesc,
 	    const TQString &script,
-	    const TQString &password  = TQString::null,
+	    const TQString &password  = TQString(),
             bool dossl = false
 	) {
           g=group; s=server; p=ports; sd=serverdesc; sc=script;