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

20 files changed, 121 insertions, 121 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 );
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 67b9378e..8ce5b07e 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -22,7 +22,7 @@
 // include files for QT
 #include <tqdatetime.h>
 #include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
@@ -184,7 +184,7 @@ KWiFiManagerApp::slotLogESSID (TQString essid)
   if (!log_file.open (IO_WriteOnly | IO_Append))
     kdDebug () << "Logging failed!" << endl;
   TQTextStream stream (&log_file);
-  stream << TQDateTime::tqcurrentDateTime().toString ().latin1 ();
+  stream << TQDateTime::currentDateTime().toString ().latin1 ();
   stream << " Entering network: " << essid.latin1() << endl;
   log_file.close ();
 }
@@ -262,7 +262,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
     }
   else if (((str == 0) && (mode == 2)) || (!validdata))
     {
-      sstrength2.setText( TQString::tqfromLatin1("0") );
+      sstrength2.setText( TQString::fromLatin1("0") );
       ICON = strength->OOR_DOWN;
       if (led->state == true)
 	led->Off ();
@@ -286,7 +286,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
     labelfont.setStretch( TQFont::Condensed );
     labelfont.setBold( true );
     sstrength2.setFont( labelfont );
-    sstrength2.setFixedSize( sstrength2.tqsizeHint() );
+    sstrength2.setFixedSize( sstrength2.sizeHint() );
       }
     TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 );
     labeltemp.setMask( labeltemp.createHeuristicMask() );
@@ -360,10 +360,10 @@ KWiFiManagerApp::initView ()
   view = new TQWidget (this, "mainwidget");
   view->setBackgroundMode (PaletteBackground);
   setCentralWidget (view);
-  TQGridLayout *zentraltqlayout = new TQGridLayout (view);
-  zentraltqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *zentrallayout = new TQGridLayout (view);
+  zentrallayout->setMargin( KDialog::marginHint() );
   speedmeter = new Speed (view, device);
-  status = new tqStatus (view, device);
+  status = new Status (view, device);
   location = new Locator (view, device);
   strength = new Strength (view, device);
   pictogram = new Picture (view, device);
@@ -377,25 +377,25 @@ KWiFiManagerApp::initView ()
   strength->setMinimumSize (strength->mySizeHint());
   speedmeter->setMinimumHeight (60);
   status->setMinimumHeight (60);
-  zentraltqlayout->addWidget (pictogram, 0, 0);
-  zentraltqlayout->addWidget (strength, 1, 0);
-  zentraltqlayout->addWidget (speedmeter, 0, 1);
-  zentraltqlayout->addMultiCellWidget (status, 1, 2, 1, 1);
-  zentraltqlayout->addWidget (scan, 2, 0);
-  zentraltqlayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft);
+  zentrallayout->addWidget (pictogram, 0, 0);
+  zentrallayout->addWidget (strength, 1, 0);
+  zentrallayout->addWidget (speedmeter, 0, 1);
+  zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1);
+  zentrallayout->addWidget (scan, 2, 0);
+  zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft);
   connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ()));
   connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ()));
-  connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (tqrepaint ()));
-  connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (tqrepaint ()));
-  connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (tqrepaint ()));
-  connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (repaint ()));
   connect (device, TQT_SIGNAL (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString)));
-  connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (tqrepaint ()));
-  connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ()));
   connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotTXPowerChanged ()));
   connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotChangeTrayIcon ()));
-  connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (tqrepaint ()));
-  connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ()));
   connect (scan,  TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan()));
 }
 
@@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer ()
   delete statistik;
   statistik = new Statistics (device, showStatsNoise);
   statistik->setFixedSize (590, 300);
-  connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(tqrepaint()));
+  connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint()));
   statistik->show ();
 }
 
diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h
index c52969ac..6a58de44 100644
--- a/wifi/kwifimanager.h
+++ b/wifi/kwifimanager.h
@@ -39,7 +39,7 @@ class KProcess;
 #include "interface_wireless.h"
 #include "interface_dcop.h"
 class Strength;
-class tqStatus;
+class Status;
 class Picture;
 class Locator;
 class Speed;
@@ -115,7 +115,7 @@ private:
   Speed *speedmeter;
   TQBoxLayout *bla;
   TQLabel *profil;
-  tqStatus *status;
+  Status *status;
   Strength *strength;
   Picture *pictogram;
   Locator *location;
diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp
index 86bb6ed7..77e20128 100644
--- a/wifi/kwireless/kwirelesswidget.cpp
+++ b/wifi/kwireless/kwirelesswidget.cpp
@@ -50,7 +50,7 @@ float DeviceInfo::quality()
 
 TQString DeviceInfo::qualityString()
 {
-    return i18n("%1%").tqarg(TQString::number(m_quality*100, 'f', 0));
+    return i18n("%1%").arg(TQString::number(m_quality*100, 'f', 0));
 }
 
 float DeviceInfo::signal()
@@ -60,7 +60,7 @@ float DeviceInfo::signal()
 
 TQString DeviceInfo::signalString()
 {
-    return i18n("%1%").tqarg(TQString::number(m_signal*100, 'f', 0));
+    return i18n("%1%").arg(TQString::number(m_signal*100, 'f', 0));
 }
 
 float DeviceInfo::noise()
@@ -70,7 +70,7 @@ float DeviceInfo::noise()
 
 TQString DeviceInfo::noiseString()
 {
-    return i18n("%1%").tqarg(TQString::number(m_noise*100, 'f', 0));
+    return i18n("%1%").arg(TQString::number(m_noise*100, 'f', 0));
 }
 
 const TQString& DeviceInfo::device()
diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp
index 02b7e217..3efdbf98 100644
--- a/wifi/kwireless/linuxwirelesswidget.cpp
+++ b/wifi/kwireless/linuxwirelesswidget.cpp
@@ -187,7 +187,7 @@ void LinuxWireLessWidget::poll()
     if(updateNeeded)
     {
         emit(updateDeviceInfo(&deviceInfo));
-        tqrepaint(false);
+        repaint(false);
     }
     if(updateToolTip)
     {
@@ -199,9 +199,9 @@ void LinuxWireLessWidget::poll()
 	    if (!text.isEmpty())
 		text.append('\n');
             text += i18n("%1: Link Quality %2, Bitrate: %3")
-				.tqarg(info->device())
-				.tqarg(info->qualityString())
-				.tqarg(info->bitrateString());
+				.arg(info->device())
+				.arg(info->qualityString())
+				.arg(info->bitrateString());
         }
         TQToolTip::add(this, text);
 
diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp
index 7c73b1c2..79fcbe89 100644
--- a/wifi/kwireless/propertytable.cpp
+++ b/wifi/kwireless/propertytable.cpp
@@ -11,7 +11,7 @@
 #include <tqcombobox.h>
 #include <tqtimer.h>
 #include <tqptrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include "propertytable.h"
diff --git a/wifi/locator.cpp b/wifi/locator.cpp
index 6bb0cd62..2ca40398 100644
--- a/wifi/locator.cpp
+++ b/wifi/locator.cpp
@@ -35,12 +35,12 @@ Locator::generateLocWidget ()
   sentence =
     new TQLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this);
   setFixedSize (TQSize
-		(sentence->tqsizeHint ().width () + 2,
-		 sentence->tqsizeHint ().height ()));
+		(sentence->sizeHint ().width () + 2,
+		 sentence->sizeHint ().height ()));
   sentence->
     setFixedSize (TQSize
-		  (sentence->tqsizeHint ().width () + 2,
-		   sentence->tqsizeHint ().height ()));
+		  (sentence->sizeHint ().width () + 2,
+		   sentence->sizeHint ().height ()));
   sentence->show ();
   widgetbild = TQPixmap::grabWidget (sentence);
   delete sentence;
diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp
index 0e2a42a8..46b3a27d 100644
--- a/wifi/networkscanning.cpp
+++ b/wifi/networkscanning.cpp
@@ -19,7 +19,7 @@
 
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqtable.h>
 
@@ -119,26 +119,26 @@ NetworkScanning::switchToNetwork()
   TQString tempfilename = tempfile->name();
 
   cmdline = (TQString)"ifconfig %1 down\n";
-  cmdline = cmdline.tqarg( device->get_interface_name() );
+  cmdline = cmdline.arg( device->get_interface_name() );
   write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) );
 
   cmdline = (TQString)"iwconfig %1 essid %2 mode %3 enc %4\n";
-  cmdline = cmdline.tqarg( device->get_interface_name() );
-  cmdline = cmdline.tqarg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) );
+  cmdline = cmdline.arg( device->get_interface_name() );
+  cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) );
 
   TQString modetemp;
   if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc"; 
-  cmdline = cmdline.tqarg( modetemp );
+  cmdline = cmdline.arg( modetemp );
 
   if ( encryption != NONE ) {
-    cmdline = cmdline.tqarg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) );
+    cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) );
   } else {
-    cmdline = cmdline.tqarg("off");
+    cmdline = cmdline.arg("off");
   }
   write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) );
 
   cmdline = (TQString)"ifconfig %1 up\n";
-  cmdline = cmdline.tqarg( device->get_interface_name() );
+  cmdline = cmdline.arg( device->get_interface_name() );
   write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) );
 
   delete tempfile; // autoDeletion off, so the file remains on disk
diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp
index 7dfe88b6..15295180 100644
--- a/wifi/statistics.cpp
+++ b/wifi/statistics.cpp
@@ -102,10 +102,10 @@ Statistics::paintEvent (TQPaintEvent *)
     {
       if (showStatsNoise) {
         statpainter->setPen (red);
-        statpainter->tqdrawPolyline (datensatz2, 1);
+        statpainter->drawPolyline (datensatz2, 1);
       }
       statpainter->setPen (blue);
-      statpainter->tqdrawPolyline (datensatz, 1);
+      statpainter->drawPolyline (datensatz, 1);
     }
   delete statpainter;
 }
diff --git a/wifi/status.cpp b/wifi/status.cpp
index 0bd45b3a..4d8b5784 100644
--- a/wifi/status.cpp
+++ b/wifi/status.cpp
@@ -22,13 +22,13 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-tqStatus::tqStatus (TQWidget * parent, Interface_wireless * device)
+Status::Status (TQWidget * parent, Interface_wireless * device)
 	: TQWidget (parent, "KWiFiManager status")
 {
   this->device = device;
 }
 
-bool tqStatus::generateStatsWidget ()
+bool Status::generateStatsWidget ()
 {
   double
     freq = 0.;
@@ -69,79 +69,79 @@ bool tqStatus::generateStatsWidget ()
     {
       if (freq / 1000000. > 5690.)
         {
-          temp3 = temp3.tqarg(140);
+          temp3 = temp3.arg(140);
         }
       else if (freq / 1000000. > 5670.)
         {
-          temp3 = temp3.tqarg(136);
+          temp3 = temp3.arg(136);
         }
       else if (freq / 1000000. > 5650.)
         {
-          temp3 = temp3.tqarg(132);
+          temp3 = temp3.arg(132);
         }
       else if (freq / 1000000. > 5630.)
         {
-          temp3 = temp3.tqarg(128);
+          temp3 = temp3.arg(128);
         }
       else if (freq / 1000000. > 5610.)
         {
-          temp3 = temp3.tqarg(124);
+          temp3 = temp3.arg(124);
         }
       else if (freq / 1000000. > 5590.)
         {
-          temp3 = temp3.tqarg(120);
+          temp3 = temp3.arg(120);
         }
       else if (freq / 1000000. > 5570.)
         {
-          temp3 = temp3.tqarg(116);
+          temp3 = temp3.arg(116);
         }
       else if (freq / 1000000. > 5550.)
         {
-          temp3 = temp3.tqarg(112);
+          temp3 = temp3.arg(112);
         }
       else if (freq / 1000000. > 5530.)
         {
-          temp3 = temp3.tqarg(108);
+          temp3 = temp3.arg(108);
         }
       else if (freq / 1000000. > 5510.)
         {
-          temp3 = temp3.tqarg(104);
+          temp3 = temp3.arg(104);
         }
       else if (freq / 1000000. > 5490.)
         {
-          temp3 = temp3.tqarg(100);
+          temp3 = temp3.arg(100);
         }
       else if (freq / 1000000. > 5310.)
         {
-          temp3 = temp3.tqarg(64);
+          temp3 = temp3.arg(64);
         }
       else if (freq / 1000000. > 5290.)
         {
-          temp3 = temp3.tqarg(60);
+          temp3 = temp3.arg(60);
         }
       else if (freq / 1000000. > 5270.)
         {
-          temp3 = temp3.tqarg(56);
+          temp3 = temp3.arg(56);
         }
       else if (freq / 1000000. > 5250.)
         {
-          temp3 = temp3.tqarg(52);
+          temp3 = temp3.arg(52);
         }
       else if (freq / 1000000. > 5230.)
         {
-          temp3 = temp3.tqarg(48);
+          temp3 = temp3.arg(48);
         }
       else if (freq / 1000000. > 5210.)
         {
-          temp3 = temp3.tqarg(44);
+          temp3 = temp3.arg(44);
         }
       else if (freq / 1000000. > 5190.)
         {
-          temp3 = temp3.tqarg(40);
+          temp3 = temp3.arg(40);
         }
       else if (freq / 1000000. > 5170.)
         {
-          temp3 = temp3.tqarg(36);
+          temp3 = temp3.arg(36);
         }
       else if (freq / 1000000. > 2474.)
 	{
@@ -361,10 +361,10 @@ bool tqStatus::generateStatsWidget ()
 	else
 	  enc = new TQLabel (i18n ("active"), content);
     }
-  // content->setFixedSize (content->tqsizeHint ());
-  content->setMinimumSize(content->tqsizeHint());
+  // content->setFixedSize (content->sizeHint ());
+  content->setMinimumSize(content->sizeHint());
   if ( content->minimumWidth() < 280 ) content->setMinimumWidth( 280 );
-  setFixedSize (content->tqminimumSize());
+  setFixedSize (content->minimumSize());
   content->show ();
   widgetbild = TQPixmap::grabWidget (content);
   delete
@@ -373,7 +373,7 @@ bool tqStatus::generateStatsWidget ()
 }
 
 void
-tqStatus::paintEvent (TQPaintEvent *)
+Status::paintEvent (TQPaintEvent *)
 {
   TQPainter *paintArea = new TQPainter (this);
   generateStatsWidget ();
diff --git a/wifi/status.h b/wifi/status.h
index dfdfd81d..59efff87 100644
--- a/wifi/status.h
+++ b/wifi/status.h
@@ -26,10 +26,10 @@
 
 class Interface_wireless;
 
-class tqStatus:public TQWidget
+class Status:public TQWidget
 {
 public:
-  tqStatus (TQWidget * parent, Interface_wireless * device);
+  Status (TQWidget * parent, Interface_wireless * device);
 private:
   void paintEvent (TQPaintEvent *);
   bool generateStatsWidget ();
diff --git a/wifi/strength.cpp b/wifi/strength.cpp
index e33a6155..a448cfdb 100644
--- a/wifi/strength.cpp
+++ b/wifi/strength.cpp
@@ -63,7 +63,7 @@ TQSize Strength::mySizeHint ()
   // up to now: this is the height required to get a decent logo display
   // now determine height of TQLabels to calculate the extra needed height
   TQLabel heightTest( "ABC", 0 );
-  temp->setHeight( temp->height() + 2 * heightTest.tqsizeHint().height() + 10 );
+  temp->setHeight( temp->height() + 2 * heightTest.sizeHint().height() + 10 );
   return *temp;
 }
 
@@ -149,7 +149,7 @@ Strength::updateInfo (TQPaintEvent *)
   else if (((strength == 0) && (mode == 2)) || (!validdata))
     {
       sstrength1 = i18n("OUT OF RANGE");
-      sstrength2 = TQString::tqfromLatin1("0");
+      sstrength2 = TQString::fromLatin1("0");
       strengthpainter->drawPixmap (50, 10, *OOR_DOWN);
     }
   else