Rename a number of old tq methods that are no longer tq specific

9 files changed, 46 insertions, 46 deletions

diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui
index 3eda59d7..1e54d280 100644
--- a/wifi/kcmwifi/configadvanced.ui
+++ b/wifi/kcmwifi/configadvanced.ui
@@ -96,7 +96,7 @@
         <property name="sizeType">
             <enum>Expanding</enum>
         </property>
-        <property name="tqsizeHint">
+        <property name="sizeHint">
             <size>
                 <width>40</width>
                 <height>20</height>
diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui
index 76736675..41cfdf33 100644
--- a/wifi/kcmwifi/configcrypto.ui
+++ b/wifi/kcmwifi/configcrypto.ui
@@ -260,7 +260,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>20</height>
@@ -310,25 +310,25 @@
         <sender>le_key1</sender>
         <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey1tqStatus(const TQString&amp;)</slot>
+        <slot>slotUpdateKey1Status(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>le_key2</sender>
         <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey2tqStatus(const TQString&amp;)</slot>
+        <slot>slotUpdateKey2Status(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>le_key3</sender>
         <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey3tqStatus(const TQString&amp;)</slot>
+        <slot>slotUpdateKey3Status(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>le_key4</sender>
         <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ConfigCrypto</receiver>
-        <slot>slotUpdateKey4tqStatus(const TQString&amp;)</slot>
+        <slot>slotUpdateKey4Status(const TQString&amp;)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -345,10 +345,10 @@
     <include location="local" impldecl="in implementation">configcrypto.ui.h</include>
 </includes>
 <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>
+    <slot>slotUpdateKey1Status( const TQString &amp; key )</slot>
+    <slot>slotUpdateKey2Status( const TQString &amp; key )</slot>
+    <slot>slotUpdateKey3Status( const TQString &amp; key )</slot>
+    <slot>slotUpdateKey4Status( const TQString &amp; key )</slot>
 </Q_SLOTS>
 <functions>
     <function specifier="non virtual">load( const IfConfig &amp; ifconfig )</function>
diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h
index be561bff..acb98974 100644
--- a/wifi/kcmwifi/configcrypto.ui.h
+++ b/wifi/kcmwifi/configcrypto.ui.h
@@ -32,7 +32,7 @@ void ConfigCrypto::save( IfConfig &ifconfig )
 }
 
 
-void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key)
+void ConfigCrypto::slotUpdateKey1Status(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
@@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key)
 	}
 }
 
-void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key)
+void ConfigCrypto::slotUpdateKey2Status(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
@@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key)
 	}
 }
 
-void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key)
+void ConfigCrypto::slotUpdateKey3Status(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
@@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key)
 	}
 }
 
-void ConfigCrypto::slotUpdateKey4tqStatus(const TQString& key)
+void ConfigCrypto::slotUpdateKey4Status(const TQString& key)
 {
     KeyStates status = ::Key::isValid( key );
     switch (status) {
diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui
index 089284aa..f5aedf41 100644
--- a/wifi/kcmwifi/ifconfigpagebase.ui
+++ b/wifi/kcmwifi/ifconfigpagebase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>226</width>
                             <height>20</height>
@@ -91,7 +91,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>196</width>
                             <height>20</height>
@@ -137,7 +137,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -178,7 +178,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>285</width>
                             <height>20</height>
@@ -189,7 +189,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -286,7 +286,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>190</width>
                             <height>20</height>
@@ -297,7 +297,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -354,7 +354,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>413</width>
                             <height>20</height>
@@ -365,7 +365,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -392,7 +392,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>131</width>
                             <height>20</height>
@@ -403,7 +403,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="6" column="0">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -444,7 +444,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>396</width>
                             <height>20</height>
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 36ca0daf..ddc81408 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -18,7 +18,7 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -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").tqarg( i+1 ));
+    tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( 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").tqarg( m_activeVendorCount+1 ) );
+    tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( 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").tqarg( i+1 ), i );
+        tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( 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]").tqarg( i+1 )
-	     << TQString( "%1").tqarg( ifconfig.m_keys[ i ].rawKey() );
+             << TQString( "[%1]").arg( i+1 )
+	     << TQString( "%1").arg( ifconfig.m_keys[ i ].rawKey() );
       }
     }
 
@@ -308,7 +308,7 @@ void KCMWifi::activate()
       proc << "key"
            << ifconfig.cryptomodeAsString();
       proc << "key"
-           << TQString( "[%1]" ).tqarg( ifconfig.activeKeyId() );
+           << TQString( "[%1]" ).arg( ifconfig.activeKeyId() );
       proc << "key"
            << "on";
     }
@@ -334,10 +334,10 @@ void KCMWifi::activate()
   {
     proc << "power"
 	 << "period"
-         << TQString( "%1" ).tqarg( ifconfig.m_wakeupPeriod );
+         << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod );
     proc << "power"
 	 << "timeout"
-         << TQString( "%1" ).tqarg( ifconfig.m_sleepTimeout );
+         << TQString( "%1" ).arg( ifconfig.m_sleepTimeout );
     proc << ifconfig.powermodeAsString();
   }
 
diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp
index ca2a666d..c740df69 100644
--- a/wifi/kcmwifi/mainconfig.cpp
+++ b/wifi/kcmwifi/mainconfig.cpp
@@ -39,7 +39,7 @@ MainConfig::MainConfig( TQWidget *parent, const char *name )
   WifiConfig *config = WifiConfig::instance();
 
   for (int i=1;i<=config->m_numConfigs;i++) {
-    cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( i ) );  
+    cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( i ) );  
   }
 
 
@@ -91,12 +91,12 @@ void MainConfig::registerConfig( int number )
 {
   if ( number >= KCMWifi::vendorBase ) 
   {
-    cmb_presetConfig->insertItem( i18n( "Vendor %1" ).tqarg( number-KCMWifi::vendorBase+1 ) );
+    cmb_presetConfig->insertItem( i18n( "Vendor %1" ).arg( number-KCMWifi::vendorBase+1 ) );
   }
   else
   {
     WifiConfig* config = WifiConfig::instance();
-    cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( number ), number-1 );
+    cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( number ), number-1 );
   }
 }
 
diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui
index 77e168c1..5fcb1dab 100644
--- a/wifi/kcmwifi/mainconfigbase.ui
+++ b/wifi/kcmwifi/mainconfigbase.ui
@@ -48,7 +48,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>146</width>
                             <height>20</height>
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -134,7 +134,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>66</width>
                             <height>20</height>
diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp
index 395cbc58..e415c276 100644
--- a/wifi/kcmwifi/vendorconfig.cpp
+++ b/wifi/kcmwifi/vendorconfig.cpp
@@ -184,7 +184,7 @@ is incremented _after_ successful setup of each given config. */
       TQString value = buffer.section ( ' ', 1, 1 );
       kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
 // evaluate the meaningful lines
-      if ( var.tqstartsWith ( "wireless", false ) )
+      if ( var.startsWith ( "wireless", false ) )
 	{
 	  if ( var.endsWith ( "essid" ) )
 	    {
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index bce6afd9..1cd6b3f2 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" ).tqarg( i+1 );
+  TQString group = TQString( "Configuration %1" ).arg( 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" ).tqarg( i+1 );
+  TQString group = TQString( "Configuration %1" ).arg( i+1 );
   config->setGroup( group );
 
   config->writeEntry( "NetworkName", m_networkName );