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

16 files changed, 149 insertions, 145 deletions

diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui
index beeda9fe..536fa9a5 100644
--- a/wifi/kcmwifi/configadvanced.ui
+++ b/wifi/kcmwifi/configadvanced.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -25,7 +25,7 @@
             </rect>
         </property>
     </widget>
-    <widget class="QLabel">
+    <widget class="TQLabel">
         <property name="name">
             <cstring>lbl_channel</cstring>
         </property>
@@ -41,7 +41,7 @@
             <string>Channel:</string>
         </property>
     </widget>
-    <widget class="QLabel">
+    <widget class="TQLabel">
         <property name="name">
             <cstring>lbl_txPower</cstring>
         </property>
@@ -70,7 +70,7 @@
             </rect>
         </property>
     </widget>
-    <widget class="QCheckBox">
+    <widget class="TQCheckBox">
         <property name="name">
             <cstring>cb_forceAP</cstring>
         </property>
@@ -96,7 +96,7 @@
         <property name="sizeType">
             <enum>Expanding</enum>
         </property>
-        <property name="sizeHint">
+        <property name="tqsizeHint">
             <size>
                 <width>40</width>
                 <height>20</height>
@@ -111,7 +111,7 @@
             </rect>
         </property>
     </spacer>
-    <widget class="QLabel">
+    <widget class="TQLabel">
         <property name="name">
             <cstring>lbl_apMAC</cstring>
         </property>
@@ -141,5 +141,5 @@
         </property>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui
index 7ef18da2..4dc4e408 100644
--- a/wifi/kcmwifi/configcrypto.ui
+++ b/wifi/kcmwifi/configcrypto.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigCrypto</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigCrypto</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <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>gb_keys</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>lb_key1</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <string>The first encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>lb_key3</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <string>The third encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>lb_key2</cstring>
                     </property>
@@ -71,7 +71,7 @@
                         <string>The second encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>lb_key4</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <string>The fourth encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>format_1</cstring>
                     </property>
@@ -101,7 +101,7 @@
                         <enum>RichText</enum>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>format_2</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="2">
+                <widget class="TQLabel" row="2" column="2">
                     <property name="name">
                         <cstring>format_3</cstring>
                     </property>
@@ -178,7 +178,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="2">
+                <widget class="TQLabel" row="3" column="2">
                     <property name="name">
                         <cstring>format_4</cstring>
                     </property>
@@ -212,7 +212,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>bg_cryptoMode</cstring>
             </property>
@@ -226,7 +226,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>rb_openMode</cstring>
                     </property>
@@ -237,7 +237,7 @@
                         <string>Makes the card accept encrypted and unencrypted packets.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>rb_restrictMode</cstring>
                     </property>
@@ -260,14 +260,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>80</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>lb_useKey</cstring>
             </property>
@@ -278,7 +278,7 @@
                 <string>Sets which of the four keys is to be used for transmitting packets.</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <item>
                 <property name="text">
                     <string>Key 1</string>
@@ -308,27 +308,27 @@
 <connections>
     <connection>
         <sender>le_key1</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey1Status(const QString&amp;)</slot>
+        <slot>slotUpdateKey1tqStatus(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>le_key2</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey2Status(const QString&amp;)</slot>
+        <slot>slotUpdateKey2tqStatus(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>le_key3</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey3Status(const QString&amp;)</slot>
+        <slot>slotUpdateKey3tqStatus(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>le_key4</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey4Status(const QString&amp;)</slot>
+        <slot>slotUpdateKey4tqStatus(const TQString&amp;)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -344,18 +344,18 @@
     <include location="local" impldecl="in declaration">wificonfig.h</include>
     <include location="local" impldecl="in implementation">configcrypto.ui.h</include>
 </includes>
-<slots>
-    <slot>slotUpdateKey1Status( const QString &amp; key )</slot>
-    <slot>slotUpdateKey2Status( const QString &amp; key )</slot>
-    <slot>slotUpdateKey3Status( const QString &amp; key )</slot>
-    <slot>slotUpdateKey4Status( const QString &amp; key )</slot>
-</slots>
+<Q_SLOTS>
+    <slot>slotUpdateKey1tqStatus( const TQString &amp; key )</slot>
+    <slot>slotUpdateKey2tqStatus( const TQString &amp; key )</slot>
+    <slot>slotUpdateKey3tqStatus( const TQString &amp; key )</slot>
+    <slot>slotUpdateKey4tqStatus( const TQString &amp; key )</slot>
+</Q_SLOTS>
 <functions>
     <function specifier="non virtual">load( const IfConfig &amp; ifconfig )</function>
     <function specifier="non virtual">save( IfConfig &amp; ifconfig )</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h
index 261e3411..be561bff 100644
--- a/wifi/kcmwifi/configcrypto.ui.h
+++ b/wifi/kcmwifi/configcrypto.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
@@ -32,7 +32,7 @@ void ConfigCrypto::save( IfConfig &ifconfig )
 }
 
 
-void ConfigCrypto::slotUpdateKey1Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
@@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1Status(const TQString& key)
 	}
 }
 
-void ConfigCrypto::slotUpdateKey2Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
@@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2Status(const TQString& key)
 	}
 }
 
-void ConfigCrypto::slotUpdateKey3Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
@@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3Status(const TQString& key)
 	}
 }
 
-void ConfigCrypto::slotUpdateKey4Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey4tqStatus(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
diff --git a/wifi/kcmwifi/configpower.ui b/wifi/kcmwifi/configpower.ui
index fa44c928..c1ec4fd7 100644
--- a/wifi/kcmwifi/configpower.ui
+++ b/wifi/kcmwifi/configpower.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigPower</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigPower</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>lb_sleepTimeout</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <string> sec</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>lb_wakeupPeriod</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <string>Sets how long the card will be online and looking for new packages before it falls asleep.</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>bg_packets</cstring>
             </property>
@@ -80,7 +80,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>bg_allPackets</cstring>
                     </property>
@@ -91,7 +91,7 @@
         	        <string>Listen to all packet types.</string>
             	    </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>rb_unicastOnly</cstring>
                     </property>
@@ -102,7 +102,7 @@
         	        <string>Listen to Unicast packets only.</string>
             	    </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>rb_multicastOnly</cstring>
                     </property>
@@ -145,12 +145,12 @@
     <include location="local" impldecl="in declaration">wificonfig.h</include>
     <include location="local" impldecl="in implementation">configpower.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>load( const IfConfig &amp; ifconfig )</slot>
     <slot>save( IfConfig &amp; ifconfig )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/wifi/kcmwifi/configpower.ui.h b/wifi/kcmwifi/configpower.ui.h
index feb0906f..2c197703 100644
--- a/wifi/kcmwifi/configpower.ui.h
+++ b/wifi/kcmwifi/configpower.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp
index 8b96b63b..01dee241 100644
--- a/wifi/kcmwifi/ifconfigpage.cpp
+++ b/wifi/kcmwifi/ifconfigpage.cpp
@@ -37,8 +37,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-IfConfigPage::IfConfigPage( int configNum, TQWidget *parent, const char *name )
-    : IfConfigPageBase( parent, name ),
+IfConfigPage::IfConfigPage( int configNum, TQWidget *tqparent, const char *name )
+    : IfConfigPageBase( tqparent, name ),
       m_configNum( configNum )
 {
   connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
@@ -120,7 +120,7 @@ void IfConfigPage::save()
   IfConfig &ifconfig = config->m_ifConfig[ m_configNum ];
 
   ifconfig.m_networkName = le_networkName->text();
-  ifconfig.m_interface = cb_Autodetect->isChecked()? TQString::null :
+  ifconfig.m_interface = cb_Autodetect->isChecked()? TQString() :
                                                      le_interface->text();
   ifconfig.m_wifiMode = ( IfConfig::WifiMode ) cmb_wifiMode->currentItem();
   ifconfig.m_speed = ( IfConfig::Speed ) cmb_speed->currentItem();
diff --git a/wifi/kcmwifi/ifconfigpage.h b/wifi/kcmwifi/ifconfigpage.h
index bb79f215..5e09e46d 100644
--- a/wifi/kcmwifi/ifconfigpage.h
+++ b/wifi/kcmwifi/ifconfigpage.h
@@ -26,9 +26,10 @@
 class IfConfigPage : public IfConfigPageBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    IfConfigPage( int configNum, TQWidget *parent, const char *name );
+    IfConfigPage( int configNum, TQWidget *tqparent, const char *name );
     ~IfConfigPage() {}
 
     void load();
diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui
index 45df9e19..51e48c22 100644
--- a/wifi/kcmwifi/ifconfigpagebase.ui
+++ b/wifi/kcmwifi/ifconfigpagebase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>IfConfigPageBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>IfConfigPageBase</cstring>
     </property>
@@ -16,15 +16,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout16</cstring>
+                <cstring>tqlayout16</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>lb_netName</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         <cstring>le_networkName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>lb_ifName</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         <string>SSID of the network to connect to. "any" means "arbitrary available network".</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>le_interface</cstring>
                     </property>
@@ -59,7 +59,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cb_Autodetect</cstring>
                     </property>
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>226</width>
                             <height>20</height>
@@ -89,15 +89,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>lb_connectScript</cstring>
                     </property>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>196</width>
                             <height>20</height>
@@ -135,15 +135,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0">
+        <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cb_pmEnabled</cstring>
                     </property>
@@ -154,7 +154,7 @@
                         <string>Enables advanced power management settings.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pb_setupPower</cstring>
                     </property>
@@ -178,7 +178,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>285</width>
                             <height>20</height>
@@ -187,15 +187,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -206,7 +206,7 @@
                         <string>Sets the connection speed. Not all cards support this.</string>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Auto</string>
@@ -286,7 +286,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>190</width>
                             <height>20</height>
@@ -295,15 +295,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>lb_opMode</cstring>
                     </property>
@@ -314,7 +314,7 @@
                         <string>Operation mode of the card. For standard infrastructure networks, "Managed" is appropriate.</string>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Ad-Hoc</string>
@@ -354,7 +354,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>413</width>
                             <height>20</height>
@@ -363,15 +363,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout14</cstring>
+                <cstring>tqlayout14</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cb_runScript</cstring>
                     </property>
@@ -392,7 +392,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>131</width>
                             <height>20</height>
@@ -401,15 +401,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="6" column="0">
+        <widget class="TQLayoutWidget" row="6" column="0">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cb_useCrypto</cstring>
                     </property>
@@ -420,7 +420,7 @@
                         <string>Enables WEP encryption.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pb_setupCrypto</cstring>
                     </property>
@@ -444,7 +444,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>396</width>
                             <height>20</height>
@@ -489,8 +489,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 743f3d2e..8251afa0 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -42,8 +42,8 @@
 typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") )
 
-KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
-    : KCModule (parent, name)
+KCMWifi::KCMWifi(TQWidget * tqparent, const char *name, const TQStringList &)
+    : KCModule (tqparent, name)
 {
   tabs = new TQTabWidget (this, "tabs");
 
@@ -54,7 +54,7 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
   for ( int i=0; i<config->m_numConfigs; ++i )
   {
     IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" );
-    tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ));
+    tabs->addTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 ));
     connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
 
     m_ifConfigPage[ i ] = ifConfigPage;
@@ -146,7 +146,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor )
   if (vendor) 
   {
     IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" );
-    tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) );
+    tabs->addTab(ifConfigPage, i18n ("Vendor %1").tqarg( m_activeVendorCount+1 ) );
     connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
     m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage;
     m_mainConfig->registerConfig( vendorBase+m_activeVendorCount );
@@ -169,7 +169,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor )
     for ( int i=config->m_numConfigs; i<config->m_numConfigs+count; i++ )
       {
         IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" );
-        tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i );
+        tabs->insertTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 ), i );
         connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
         m_ifConfigPage[ i ] = ifConfigPage; 
         m_mainConfig->registerConfig( i+1 );
@@ -295,8 +295,8 @@ void KCMWifi::activate()
       if ( ifconfig.m_keys[ i ].isValid( ifconfig.m_keys[ i ].key() ) > INVALID )
       {
         proc << "key"
-             << TQString( "[%1]").arg( i+1 )
-	     << TQString( "%1").arg( ifconfig.m_keys[ i ].rawKey() );
+             << TQString( "[%1]").tqarg( i+1 )
+	     << TQString( "%1").tqarg( ifconfig.m_keys[ i ].rawKey() );
       }
     }
 
@@ -308,7 +308,7 @@ void KCMWifi::activate()
       proc << "key"
            << ifconfig.cryptomodeAsString();
       proc << "key"
-           << TQString( "[%1]" ).arg( ifconfig.activeKeyId() );
+           << TQString( "[%1]" ).tqarg( ifconfig.activeKeyId() );
       proc << "key"
            << "on";
     }
@@ -334,10 +334,10 @@ void KCMWifi::activate()
   {
     proc << "power"
 	 << "period"
-         << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod );
+         << TQString( "%1" ).tqarg( ifconfig.m_wakeupPeriod );
     proc << "power"
 	 << "timeout"
-         << TQString( "%1" ).arg( ifconfig.m_sleepTimeout );
+         << TQString( "%1" ).tqarg( ifconfig.m_sleepTimeout );
     proc << ifconfig.powermodeAsString();
   }
 
diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h
index 8fcd72db..ad90a00e 100644
--- a/wifi/kcmwifi/kcmwifi.h
+++ b/wifi/kcmwifi/kcmwifi.h
@@ -33,8 +33,9 @@ class KProcIO;
 class KCMWifi : public KCModule
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-  KCMWifi (TQWidget * parent, const char *name, const TQStringList &);
+  KCMWifi (TQWidget * tqparent, const char *name, const TQStringList &);
   ~KCMWifi ();
 
   void load();
diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp
index c740df69..6989316a 100644
--- a/wifi/kcmwifi/mainconfig.cpp
+++ b/wifi/kcmwifi/mainconfig.cpp
@@ -33,13 +33,13 @@
 #include <tqcheckbox.h>
 #include <tqfile.h>
 
-MainConfig::MainConfig( TQWidget *parent, const char *name )
-    : MainConfigBase( parent, name )
+MainConfig::MainConfig( TQWidget *tqparent, const char *name )
+    : MainConfigBase( tqparent, name )
 {
   WifiConfig *config = WifiConfig::instance();
 
   for (int i=1;i<=config->m_numConfigs;i++) {
-    cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( i ) );  
+    cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( i ) );  
   }
 
 
@@ -78,12 +78,12 @@ void MainConfig::slotChangeNumConfigs( int newnumber )
   if ( config->m_numConfigs < newnumber ) // number of configs raised
   {
     int diff = newnumber - config->m_numConfigs;
-    ( (KCMWifi*)parentWidget() )->addConfigTab( diff, false );
+    ( (KCMWifi*)tqparentWidget() )->addConfigTab( diff, false );
   } 
   else // number of configs lowered
   {
     int diff = config->m_numConfigs - newnumber;
-    ( (KCMWifi*)parentWidget() )->delConfigTab( diff );
+    ( (KCMWifi*)tqparentWidget() )->delConfigTab( diff );
   } 
 }
 
@@ -91,12 +91,12 @@ void MainConfig::registerConfig( int number )
 {
   if ( number >= KCMWifi::vendorBase ) 
   {
-    cmb_presetConfig->insertItem( i18n( "Vendor %1" ).arg( number-KCMWifi::vendorBase+1 ) );
+    cmb_presetConfig->insertItem( i18n( "Vendor %1" ).tqarg( number-KCMWifi::vendorBase+1 ) );
   }
   else
   {
     WifiConfig* config = WifiConfig::instance();
-    cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( number ), number-1 );
+    cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( number ), number-1 );
   }
 }
 
diff --git a/wifi/kcmwifi/mainconfig.h b/wifi/kcmwifi/mainconfig.h
index edc09560..d485b524 100644
--- a/wifi/kcmwifi/mainconfig.h
+++ b/wifi/kcmwifi/mainconfig.h
@@ -28,9 +28,10 @@ class KProcIO;
 class MainConfig : public MainConfigBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    MainConfig( TQWidget *parent, const char *name=0 );
+    MainConfig( TQWidget *tqparent, const char *name=0 );
     ~MainConfig() {}
 
     void load();
diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui
index f7ecef24..b47161ee 100644
--- a/wifi/kcmwifi/mainconfigbase.ui
+++ b/wifi/kcmwifi/mainconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MainConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="geometry">
         <rect>
             <x>0</x>
@@ -16,7 +16,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>grpGeneralSettings</cstring>
             </property>
@@ -48,14 +48,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>146</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>lb_numConfig</cstring>
                     </property>
@@ -96,7 +96,7 @@
                         <number>10</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>lb_config</cstring>
                     </property>
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -134,14 +134,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>66</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>cb_usePreset</cstring>
                     </property>
@@ -156,7 +156,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp
index e415c276..01936667 100644
--- a/wifi/kcmwifi/vendorconfig.cpp
+++ b/wifi/kcmwifi/vendorconfig.cpp
@@ -89,7 +89,7 @@ VendorConfig::initSuSE_92plus (  )
 	      TQString var = buffer.section ( '=', 0, 0 );
 	      TQString value = buffer.section ( '=', 1, 1 );
 	      value = value.mid ( 1, value.length (  ) - 3 );
-	      kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
+	      kdDebug (  ) << "Variable " << var << " tqcontains " << value << ".\n";
 	      // evaluate the meaningful lines
 	      if ( var == "WIRELESS_ESSID" )
 		{
@@ -182,16 +182,16 @@ is incremented _after_ successful setup of each given config. */
 // lines look like wireless-defaultkey bla, so split it into wireless-defaultkey and bla
       TQString var = buffer.section ( ' ', 0, 0 );
       TQString value = buffer.section ( ' ', 1, 1 );
-      kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
+      kdDebug (  ) << "Variable " << var << " tqcontains " << value << ".\n";
 // evaluate the meaningful lines
-      if ( var.startsWith ( "wireless", false ) )
+      if ( var.tqstartsWith ( "wireless", false ) )
 	{
 	  if ( var.endsWith ( "essid" ) )
 	    {
 	      newtab->le_networkName->setText ( value );
 	    }
 
-	  else if ( var.endsWith ( "mode" ) && !var.contains ( "key" ) )
+	  else if ( var.endsWith ( "mode" ) && !var.tqcontains ( "key" ) )
 
 	    {
 	      newtab->cmb_wifiMode->setCurrentItem ( IfConfig::convertToWifiModeFromString ( value ) );
@@ -203,15 +203,15 @@ is incremented _after_ successful setup of each given config. */
 	      newtab->cmb_speed->setCurrentItem ( IfConfig::convertToSpeedFromString ( value ) );
 	    }
 
-	  else if ( var.contains ( "key" ) )
+	  else if ( var.tqcontains ( "key" ) )
 	    {
 // Could be any of key, key1, key2, ..., or defaultkey
-	      if ( var.contains ( "default" ) )
+	      if ( var.tqcontains ( "default" ) )
 		{
 		  crypto->cmb_activeKey->setCurrentItem ( value.toInt (  ) );
 		}
 
-	      else if ( var.contains ( "mode" ) )
+	      else if ( var.tqcontains ( "mode" ) )
 		{
 		  if ( value == "shared" || value == "sharedkey" || value == "restricted" )
 		    {
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 1cd6b3f2..1f3087ba 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -119,7 +119,7 @@ void IfConfig::load( KConfig *config, int i )
 {
   TQString entry;
 
-  TQString group = TQString( "Configuration %1" ).arg( i+1 );
+  TQString group = TQString( "Configuration %1" ).tqarg( i+1 );
   config->setGroup( group );
 
   m_networkName = config->readEntry( "NetworkName" );
@@ -150,7 +150,7 @@ void IfConfig::load( KConfig *config, int i )
 
 void IfConfig::save( KConfig *config, int i )
 {
-  TQString group = TQString( "Configuration %1" ).arg( i+1 );
+  TQString group = TQString( "Configuration %1" ).tqarg( i+1 );
   config->setGroup( group );
 
   config->writeEntry( "NetworkName", m_networkName );
@@ -246,9 +246,9 @@ TQString WifiConfig::autoDetectInterface()
   while ( !procFile.atEnd() )
   {
     procFile.readLine( line, 9999 );
-    if ( line.find( ":" ) > 0 )
+    if ( line.tqfind( ":" ) > 0 )
     {
-      line.truncate ( line.find( ":" ) );
+      line.truncate ( line.tqfind( ":" ) );
       list.append( line.stripWhiteSpace() );
     }
   }
@@ -264,7 +264,7 @@ TQString WifiConfig::autoDetectInterface()
 
   for ( TQStringList::Iterator it = list.begin (); it != list.end (); ++it )
   {
-    if ( ((*it).contains("wifi"))==0 ) { // if the name is wifiX, ignore
+    if ( ((*it).tqcontains("wifi"))==0 ) { // if the name is wifiX, ignore
       KProcIO test;
       test << "iwconfig";
       test << *it;
@@ -288,9 +288,9 @@ void WifiConfig::slotTestInterface( KProcIO *proc )
 {
   TQString output;
   proc->readln( output );
-  if ( output.find ( "no wireless extensions" ) == -1 )
+  if ( output.tqfind ( "no wireless extensions" ) == -1 )
   {
-    output.truncate( output.find ( " " ) );
+    output.truncate( output.tqfind ( " " ) );
     m_detectedInterface = output.stripWhiteSpace();
     printf("[kcontrol wificonfig] Wireless extensions not available on specified interface\n\r");
   }
@@ -328,7 +328,7 @@ Key IfConfig::activeKey()
 
 IfConfig::Speed IfConfig::convertToSpeedFromString( const TQString &s )
 {
-  return ( IfConfig::Speed )speedList.findIndex( s );
+  return ( IfConfig::Speed )speedList.tqfindIndex( s );
 }
 
 void IfConfig::speedFromString( const TQString &s )
@@ -338,7 +338,7 @@ void IfConfig::speedFromString( const TQString &s )
 
 IfConfig::WifiMode IfConfig::convertToWifiModeFromString( const TQString &s )
 {
-  return ( IfConfig::WifiMode )wifiModeList.findIndex( s );
+  return ( IfConfig::WifiMode )wifiModeList.tqfindIndex( s );
 }
 
 void IfConfig::wifimodeFromString( const TQString &s )
@@ -348,7 +348,7 @@ void IfConfig::wifimodeFromString( const TQString &s )
 
 IfConfig::CryptoMode IfConfig::convertToCryptoModeFromString( const TQString &s )
 {
-  return ( IfConfig::CryptoMode )cryptoModeList.findIndex( s );
+  return ( IfConfig::CryptoMode )cryptoModeList.tqfindIndex( s );
 }
 
 void IfConfig::cryptomodeFromString( const TQString &s )
@@ -358,7 +358,7 @@ void IfConfig::cryptomodeFromString( const TQString &s )
 
 IfConfig::PowerMode IfConfig::convertToPowerModeFromString( const TQString &s )
 {
-  return ( IfConfig::PowerMode )powerModeList.findIndex( s );
+  return ( IfConfig::PowerMode )powerModeList.tqfindIndex( s );
 }
 
 void IfConfig::powermodeFromString( const TQString &s )
diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h
index b78e32f6..25b8b88a 100644
--- a/wifi/kcmwifi/wificonfig.h
+++ b/wifi/kcmwifi/wificonfig.h
@@ -96,9 +96,10 @@ class IfConfig
     int m_wakeupPeriod;
 };
 
-class WifiConfig : QObject
+class WifiConfig : TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     static WifiConfig *instance();
     TQString autoDetectInterface();