Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

9 files changed, 84 insertions, 84 deletions

diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index 928c2b6f..db2e3545 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -539,7 +539,7 @@ TQTable* Interface_wireless_wirelessextensions::get_available_networks ()
 
     *iwlist << iwlist_bin << interface_name << "scanning";
 
-//    connect ( iwlist, TQT_SIGNAL ( readReady ( KProcIO * ) ), this, TQT_SLOT ( parseScanData ( KProcIO * ) ) );
+//    connect ( iwlist, TQ_SIGNAL ( readReady ( KProcIO * ) ), this, TQ_SLOT ( parseScanData ( KProcIO * ) ) );
 	    
    if ( !iwlist->start ( TDEProcess::Block ) )
         KMessageBox::sorry ( 0, i18n ( "Unable to perform the scan. Please make sure the executable \"iwlist\" is in your $PATH." ),
diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp
index 1b80bb13..24cc90bb 100644
--- a/wifi/kcmwifi/ifconfigpage.cpp
+++ b/wifi/kcmwifi/ifconfigpage.cpp
@@ -41,37 +41,37 @@ IfConfigPage::IfConfigPage( int configNum, TQWidget *parent, const char *name )
     : IfConfigPageBase( parent, name ),
       m_configNum( configNum )
 {
-  connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
-  connect( cb_useCrypto, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
-  connect( le_networkName, TQT_SIGNAL( textChanged( const TQString & ) ),
-                           TQT_SIGNAL( changed() ) );
-  connect( cmb_wifiMode, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
-  connect( cmb_speed, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
-  connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
-  connect( url_connectScript, TQT_SIGNAL( textChanged( const TQString & ) ),
-	   		      TQT_SIGNAL( changed() ) );
-  connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
-  connect( le_interface, TQT_SIGNAL( textChanged( const TQString & ) ),
-		         TQT_SIGNAL( changed() ) );
-
-  connect( pb_setupPower, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetupPower() ) );
-  connect( pb_setupCrypto, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetupCrypto() ) );
-
-  connect( cb_useCrypto, TQT_SIGNAL( toggled( bool ) ),
-           pb_setupCrypto, TQT_SLOT( setEnabled( bool ) ) );
-  connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ),
-           pb_setupPower, TQT_SLOT( setEnabled( bool ) ) );
-  connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ),
-           lb_connectScript, TQT_SLOT( setEnabled( bool ) ) );
-  connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ),
-           lb_connectScript, TQT_SLOT( setEnabled( bool ) ) );
-  connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ),
-           lb_connectScript, TQT_SLOT( setEnabled( bool ) ) );
-  connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ),
-           le_interface, TQT_SLOT( setDisabled( bool ) ) );
-
-  connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SLOT ( slotResetInterface( bool ) ) );
+  connect( cb_pmEnabled, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) );
+  connect( cb_useCrypto, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) );
+  connect( le_networkName, TQ_SIGNAL( textChanged( const TQString & ) ),
+                           TQ_SIGNAL( changed() ) );
+  connect( cmb_wifiMode, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) );
+  connect( cmb_speed, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) );
+  connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) );
+  connect( url_connectScript, TQ_SIGNAL( textChanged( const TQString & ) ),
+	   		      TQ_SIGNAL( changed() ) );
+  connect( cb_Autodetect, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) );
+  connect( le_interface, TQ_SIGNAL( textChanged( const TQString & ) ),
+		         TQ_SIGNAL( changed() ) );
+
+  connect( pb_setupPower, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetupPower() ) );
+  connect( pb_setupCrypto, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetupCrypto() ) );
+
+  connect( cb_useCrypto, TQ_SIGNAL( toggled( bool ) ),
+           pb_setupCrypto, TQ_SLOT( setEnabled( bool ) ) );
+  connect( cb_pmEnabled, TQ_SIGNAL( toggled( bool ) ),
+           pb_setupPower, TQ_SLOT( setEnabled( bool ) ) );
+  connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ),
+           lb_connectScript, TQ_SLOT( setEnabled( bool ) ) );
+  connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ),
+           lb_connectScript, TQ_SLOT( setEnabled( bool ) ) );
+  connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ),
+           lb_connectScript, TQ_SLOT( setEnabled( bool ) ) );
+  connect( cb_Autodetect, TQ_SIGNAL( toggled( bool ) ),
+           le_interface, TQ_SLOT( setDisabled( bool ) ) );
+
+  connect( cb_Autodetect, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SLOT ( slotResetInterface( bool ) ) );
 }
 
 void IfConfigPage::slotResetInterface( bool checked )
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index e35dae27..76393d69 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -55,7 +55,7 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
   {
     IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" );
     tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ));
-    connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
+    connect(ifConfigPage, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) );
 
     m_ifConfigPage[ i ] = ifConfigPage;
   }
@@ -65,8 +65,8 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
   top->addWidget( m_mainConfig );
   top->addStretch();
 
-  connect(m_mainConfig, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
-  connect(m_mainConfig, TQT_SIGNAL(activateClicked()), TQT_SLOT(slotActivate()));
+  connect(m_mainConfig, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) );
+  connect(m_mainConfig, TQ_SIGNAL(activateClicked()), TQ_SLOT(slotActivate()));
 
   if ( geteuid() != 0 )
   {
@@ -147,7 +147,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor )
   {
     IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" );
     tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) );
-    connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
+    connect(ifConfigPage, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) );
     m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage;
     m_mainConfig->registerConfig( vendorBase+m_activeVendorCount );
     m_activeVendorCount++;
@@ -170,7 +170,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor )
       {
         IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" );
         tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i );
-        connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
+        connect(ifConfigPage, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) );
         m_ifConfigPage[ i ] = ifConfigPage; 
         m_mainConfig->registerConfig( i+1 );
         retval = ifConfigPage;
diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp
index 7ebb401b..f77292a3 100644
--- a/wifi/kcmwifi/mainconfig.cpp
+++ b/wifi/kcmwifi/mainconfig.cpp
@@ -43,12 +43,12 @@ MainConfig::MainConfig( TQWidget *parent, const char *name )
   }
 
 
-  connect( cb_usePreset, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
-  connect( cmb_presetConfig, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
-  connect( sb_numConfigs, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) );
+  connect( cb_usePreset, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) );
+  connect( cmb_presetConfig, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) );
+  connect( sb_numConfigs, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) );
 
-  connect( pb_activate, TQT_SIGNAL( clicked() ), TQT_SIGNAL( activateClicked() ) );
-  connect( sb_numConfigs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotChangeNumConfigs( int ) ) );
+  connect( pb_activate, TQ_SIGNAL( clicked() ), TQ_SIGNAL( activateClicked() ) );
+  connect( sb_numConfigs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotChangeNumConfigs( int ) ) );
 
 }
 
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 6dccea02..33fa1c88 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -268,8 +268,8 @@ TQString WifiConfig::autoDetectInterface()
       KProcIO test;
       test << "iwconfig";
       test << *it;
-      connect( &test, TQT_SIGNAL( readReady( KProcIO * ) ),
-               this, TQT_SLOT( slotTestInterface( KProcIO * ) ) );
+      connect( &test, TQ_SIGNAL( readReady( KProcIO * ) ),
+               this, TQ_SLOT( slotTestInterface( KProcIO * ) ) );
       test.start ( TDEProcess::Block );
     }
   }
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 8a7a4d0d..830b2738 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -103,13 +103,13 @@ DCOPObject("dcop_interface"), TDEMainWindow (0, name), device(0), m_shuttingDown
 #endif
 
   counter = new TQTimer (this);
-  connect (counter, TQT_SIGNAL (timeout ()), device, TQT_SLOT (poll_device_info()));
+  connect (counter, TQ_SIGNAL (timeout ()), device, TQ_SLOT (poll_device_info()));
   counter->start (1000);
 
   tricorder_trigger = new TQTimer ();
-  connect (tricorder_trigger, TQT_SIGNAL (timeout ()), this,
-	   TQT_SLOT (tricorder_beep ()));
-  connect (trayicon, TQT_SIGNAL (quitSelected ()), this, TQT_SLOT (slotFileQuit ()));
+  connect (tricorder_trigger, TQ_SIGNAL (timeout ()), this,
+	   TQ_SLOT (tricorder_beep ()));
+  connect (trayicon, TQ_SIGNAL (quitSelected ()), this, TQ_SLOT (slotFileQuit ()));
   slotToggleTric(); //set to value saved by TDEConfig
 
   setAutoSaveSettings();
@@ -305,43 +305,43 @@ KWiFiManagerApp::initActions ()
   if (config->hasGroup("General"))
 	config->setGroup("General");
   fileDisableRadio = new TDEToggleAction (i18n ("&Disable Radio"), 0, this,
-		     TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio");
+		     TQ_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio");
   fileDisableRadio->setChecked( false );
 
   settingsUseAlternateCalc =
     new TDEToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, this,
-		       TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation");
+		       TQ_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation");
 
   settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") );
   slotToggleStrengthCalc();  //set to value saved by TDEConfig
 
   settingsShowStatsNoise =
     new TDEToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, this,
-		       TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise");
+		       TQ_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise");
 
   settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") );
   slotShowStatsNoise();  //set to value saved by TDEConfig
 
   settingsShowStrengthNumber = new TDEToggleAction (i18n ("&Show Strength Number in System Tray"), 0, this,
-                       TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
+                       TQ_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
   settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") );
   slotToggleShowStrengthNumber (); //set to value saved by TDEConfig
 
-  KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), actionCollection ());
+  KStdAction::quit (this, TQ_SLOT (slotFileQuit ()), actionCollection ());
 
   new TDEAction (i18n ("Configuration &Editor..."), 0, this,
-	       TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor");
+	       TQ_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor");
   new TDEAction (i18n ("Connection &Statistics"), 0, this,
-			       TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics");
+			       TQ_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics");
   settingsAcousticScanning = new TDEToggleAction (i18n ("&Acoustic Scanning"), 0, this,
-			    TQT_SLOT (slotToggleTric ()),
+			    TQ_SLOT (slotToggleTric ()),
 			    actionCollection (), "acoustic_scanning");
   settingsAcousticScanning->setChecked( config->readBoolEntry("acousticScanning") );
 #ifdef WITHOUT_ARTS
   settingsAcousticScanning->setEnabled( false);
 #endif
   settingsStayInSystrayOnClose = new TDEToggleAction (i18n ("Stay in System &Tray on Close"), 0, this,
-						    TQT_SLOT (slotToggleStayInSystray()),
+						    TQ_SLOT (slotToggleStayInSystray()),
 						    actionCollection (), "stay_in_systray_on_close");
   settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") );
   createGUI();
@@ -383,20 +383,20 @@ KWiFiManagerApp::initView ()
   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 (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 (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 (repaint ()));
-  connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ()));
-  connect (scan,  TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan()));
+  connect (device, TQ_SIGNAL (interfaceChanged ()), this, TQ_SLOT (slotChangeWindowCaption ()));
+  connect (device, TQ_SIGNAL (strengthChanged ()), this, TQ_SLOT (slotChangeTrayIcon ()));
+  connect (device, TQ_SIGNAL (strengthChanged ()), strength, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (statusChanged ()), status, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (speedChanged ()), speedmeter, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (modeChanged ()), pictogram, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (essidChanged (TQString)), this, TQ_SLOT (slotLogESSID (TQString)));
+  connect (device, TQ_SIGNAL (essidChanged (TQString)), location, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (statusChanged ()), location, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (txPowerChanged ()), this, TQ_SLOT (slotTXPowerChanged ()));
+  connect (device, TQ_SIGNAL (txPowerChanged ()), this, TQ_SLOT (slotChangeTrayIcon ()));
+  connect (device, TQ_SIGNAL (txPowerChanged ()), pictogram, TQ_SLOT (repaint ()));
+  connect (device, TQ_SIGNAL (txPowerChanged ()), strength, TQ_SLOT (repaint ()));
+  connect (scan,  TQ_SIGNAL (clicked()), this, TQ_SLOT (slotNetworkScan()));
 }
 
 void
@@ -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(repaint()));
+  connect(device,TQ_SIGNAL(statsUpdated()),statistik,TQ_SLOT(repaint()));
   statistik->show ();
 }
 
@@ -460,7 +460,7 @@ KWiFiManagerApp::slotDisableRadio ()
   //*disablePower << "tdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff;
 
   *disablePower << "tdesu" << "iwconfig" << interface << "txpower" << onOrOff;
-  connect( disablePower, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) );
+  connect( disablePower, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotDisablePowerProcessExited()) );
   disablePower->start(TDEProcess::NotifyOnExit);
 }
 
diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp
index ada6cabb..182a3ca6 100644
--- a/wifi/kwireless/kwirelesswidget.cpp
+++ b/wifi/kwireless/kwirelesswidget.cpp
@@ -150,7 +150,7 @@ KWireLessWidget::KWireLessWidget(TQWidget *parent, const char* name)
     {   // this way, only the poll() method of the first instance will
         // ever be called (intended behaviour):
         timer = new TQTimer(this);
-        connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(poll()));
+        connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(poll()));
         // single shot, will be restartet at the end of poll ()
         timer->start(100, true);
     }
@@ -186,8 +186,8 @@ void KWireLessWidget::mousePressEvent(TQMouseEvent *e)
     if( e->button() == TQt::LeftButton)
     {
         PropertiesDialog dialog(this);
-        connect(this, TQT_SIGNAL(updateDeviceInfo(TQPtrList<DeviceInfo> *)),
-                &dialog, TQT_SLOT(update(TQPtrList<DeviceInfo> *)));
+        connect(this, TQ_SIGNAL(updateDeviceInfo(TQPtrList<DeviceInfo> *)),
+                &dialog, TQ_SLOT(update(TQPtrList<DeviceInfo> *)));
         dialog.exec();
     }
 }
diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp
index fb32d938..afbd8115 100644
--- a/wifi/kwireless/propertytable.cpp
+++ b/wifi/kwireless/propertytable.cpp
@@ -43,10 +43,10 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, const char *name)
     table->table->setReadOnly(true);
     adjustSize();
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+    connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
     timer->start(3000, false);
-    connect(table->cbDeviceSelector, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(selected(int)));
+    connect(table->cbDeviceSelector, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(selected(int)));
 }
 
 void PropertiesDialog::update(TQPtrList<DeviceInfo> *_info)
diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp
index 08fb28b8..7503aa28 100644
--- a/wifi/networkscanning.cpp
+++ b/wifi/networkscanning.cpp
@@ -53,7 +53,7 @@ NetworkScanning::networkScan ()
       }
 
       networks->setSelectionMode(TQTable::SingleRow);
-      connect(networks,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(checkWEP()));
+      connect(networks,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(checkWEP()));
 
       this->setCaption( i18n( "Scan Results" ) );
 
@@ -66,10 +66,10 @@ NetworkScanning::networkScan ()
       networks->setLeftMargin( 0 );
       networks->verticalHeader()->hide();
 
-      connect ( close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( hide() ) );
-      connect ( switchNet, TQT_SIGNAL( clicked() ), this, TQT_SLOT( switchToNetwork() ) );
-      connect ( networks, TQT_SIGNAL( currentChanged(int,int)), this, TQT_SLOT( checkSettings(int,int)));
-      connect ( networks, TQT_SIGNAL( valueChanged(int,int)), this, TQT_SLOT( checkSettings(int,int)));
+      connect ( close, TQ_SIGNAL( clicked() ), this, TQ_SLOT( hide() ) );
+      connect ( switchNet, TQ_SIGNAL( clicked() ), this, TQ_SLOT( switchToNetwork() ) );
+      connect ( networks, TQ_SIGNAL( currentChanged(int,int)), this, TQ_SLOT( checkSettings(int,int)));
+      connect ( networks, TQ_SIGNAL( valueChanged(int,int)), this, TQ_SLOT( checkSettings(int,int)));
 
       networkSelectionLayout->addMultiCellWidget( networks, 0, 0, 0, 2 );
       networkSelectionLayout->addWidget( switchNet, 1, 0 );