Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 415 insertions, 415 deletions

diff --git a/src/tork.cpp b/src/tork.cpp
index a59aa7f..528fe58 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -246,73 +246,73 @@ tork::tork()
     setUpnpORPort(TorkConfig::oRListenAddress());
 
     // allow the view to change the statusbar and caption
-     connect(m_view, SIGNAL(updateTrayStats(const TQString&, const TQString&,
+     connect(m_view, TQ_SIGNAL(updateTrayStats(const TQString&, const TQString&,
                                             const TQString&, const TQString&)),
-             this,   SLOT(updateTrayStats(const TQString&,const TQString&,
+             this,   TQ_SLOT(updateTrayStats(const TQString&,const TQString&,
                                           const TQString&, const TQString&)));
-     connect(m_view->m_osd, SIGNAL(requestHideMonitor()),
-             this,   SLOT(toggleTorMon2()));
-     connect(m_view->m_osd, SIGNAL(requestToggleTDE()),
-             this,   SLOT(toggleTDESetting()));
-     connect(m_view->m_osd, SIGNAL(requestChangeID()),
-             this,   SLOT(useNewIdentity()));
-
-    connect(m_view, SIGNAL(showSecurityNotice(const TQString&)),
-             this,   SLOT(showSecurityNotice(const TQString&)));
-    connect(m_view, SIGNAL(showScreamingNotice(const TQString&)),
-             this,   SLOT(showScreamingNotice(const TQString&)));
-
-    connect(m_view, SIGNAL(newIdentity()),
-             this,   SLOT(useNewIdentity()));
-    connect(m_view, SIGNAL(konqWithTor()),
-             this,   SLOT(toggleTDESettingAndLaunchKonq()));
-    connect(m_view, SIGNAL(networkList()),
-             this,   SLOT(networkList()));
-    connect(m_view, SIGNAL(hiddenServices()),
-             this,   SLOT(hiddenServices()));
-    connect(m_view, SIGNAL(mixminionHome()),
-             this,   SLOT(mixminionHome()));
-    connect(m_view, SIGNAL(showMyKonqueror()),
-             this,   SLOT(showMyKonqueror()));
-    connect(m_view, SIGNAL(showMyHiddenServices()),
-             this,   SLOT(showMyHiddenServices()));
-    connect(m_view, SIGNAL(riskySession()),
-             this,   SLOT(readEavesdropping()));
-    connect(m_view, SIGNAL(aboutTorify()),
-             this,   SLOT(aboutTorify()));
-    connect(m_view, SIGNAL(aboutTor()),
-             this,   SLOT(aboutTor()));
-    connect(m_view, SIGNAL(configurePrivoxy()),
-             this,   SLOT(configurePrivoxy()));
-    connect(m_view, SIGNAL(aboutParanoidMode()),
-             this,   SLOT(aboutParanoidMode()));
-    connect(m_view, SIGNAL(startEverything()),
-             this,   SLOT(startEverything()));
-    connect(m_view, SIGNAL(stopEverything()),
-             this,   SLOT(stopTorGracefully()));
-
-    connect(m_view, SIGNAL(toggleTorTraffic(bool)),
-             this,   SLOT(toggleTorTraffic(bool)));
-
-    connect(m_view, SIGNAL(toggleNonTorTraffic(bool)),
-             this,   SLOT(toggleNonTorTraffic(bool)));
-
-    connect(m_view, SIGNAL(processWarning(const TQString& , const TQString& )),
-             this,   SLOT(processWarning(const TQString& , const TQString& )));
-
-    connect(m_view, SIGNAL(copyOldConfig()),
-             this,   SLOT(copyOldConfig()));
-
-    connect(UPnPManager::Manager(),SIGNAL(routerDiscovered( kt::UPnPRouter* )),
-                this,SLOT(routerDiscovered( kt::UPnPRouter* )));
-    connect(UPnPManager::Manager(),SIGNAL(forwardingOK(kt::UPnPRouter*, const TQString &, bool )),
-                this,SLOT(upnpForwardingOK(kt::UPnPRouter*, const TQString & , bool)));
-    connect(UPnPManager::Manager(),SIGNAL(forwardingError(kt::UPnPRouter*, const TQString &, bool )),
-                this,SLOT(upnpForwardingError(kt::UPnPRouter*, const TQString &, bool )));
+     connect(m_view->m_osd, TQ_SIGNAL(requestHideMonitor()),
+             this,   TQ_SLOT(toggleTorMon2()));
+     connect(m_view->m_osd, TQ_SIGNAL(requestToggleTDE()),
+             this,   TQ_SLOT(toggleTDESetting()));
+     connect(m_view->m_osd, TQ_SIGNAL(requestChangeID()),
+             this,   TQ_SLOT(useNewIdentity()));
+
+    connect(m_view, TQ_SIGNAL(showSecurityNotice(const TQString&)),
+             this,   TQ_SLOT(showSecurityNotice(const TQString&)));
+    connect(m_view, TQ_SIGNAL(showScreamingNotice(const TQString&)),
+             this,   TQ_SLOT(showScreamingNotice(const TQString&)));
+
+    connect(m_view, TQ_SIGNAL(newIdentity()),
+             this,   TQ_SLOT(useNewIdentity()));
+    connect(m_view, TQ_SIGNAL(konqWithTor()),
+             this,   TQ_SLOT(toggleTDESettingAndLaunchKonq()));
+    connect(m_view, TQ_SIGNAL(networkList()),
+             this,   TQ_SLOT(networkList()));
+    connect(m_view, TQ_SIGNAL(hiddenServices()),
+             this,   TQ_SLOT(hiddenServices()));
+    connect(m_view, TQ_SIGNAL(mixminionHome()),
+             this,   TQ_SLOT(mixminionHome()));
+    connect(m_view, TQ_SIGNAL(showMyKonqueror()),
+             this,   TQ_SLOT(showMyKonqueror()));
+    connect(m_view, TQ_SIGNAL(showMyHiddenServices()),
+             this,   TQ_SLOT(showMyHiddenServices()));
+    connect(m_view, TQ_SIGNAL(riskySession()),
+             this,   TQ_SLOT(readEavesdropping()));
+    connect(m_view, TQ_SIGNAL(aboutTorify()),
+             this,   TQ_SLOT(aboutTorify()));
+    connect(m_view, TQ_SIGNAL(aboutTor()),
+             this,   TQ_SLOT(aboutTor()));
+    connect(m_view, TQ_SIGNAL(configurePrivoxy()),
+             this,   TQ_SLOT(configurePrivoxy()));
+    connect(m_view, TQ_SIGNAL(aboutParanoidMode()),
+             this,   TQ_SLOT(aboutParanoidMode()));
+    connect(m_view, TQ_SIGNAL(startEverything()),
+             this,   TQ_SLOT(startEverything()));
+    connect(m_view, TQ_SIGNAL(stopEverything()),
+             this,   TQ_SLOT(stopTorGracefully()));
+
+    connect(m_view, TQ_SIGNAL(toggleTorTraffic(bool)),
+             this,   TQ_SLOT(toggleTorTraffic(bool)));
+
+    connect(m_view, TQ_SIGNAL(toggleNonTorTraffic(bool)),
+             this,   TQ_SLOT(toggleNonTorTraffic(bool)));
+
+    connect(m_view, TQ_SIGNAL(processWarning(const TQString& , const TQString& )),
+             this,   TQ_SLOT(processWarning(const TQString& , const TQString& )));
+
+    connect(m_view, TQ_SIGNAL(copyOldConfig()),
+             this,   TQ_SLOT(copyOldConfig()));
+
+    connect(UPnPManager::Manager(),TQ_SIGNAL(routerDiscovered( kt::UPnPRouter* )),
+                this,TQ_SLOT(routerDiscovered( kt::UPnPRouter* )));
+    connect(UPnPManager::Manager(),TQ_SIGNAL(forwardingOK(kt::UPnPRouter*, const TQString &, bool )),
+                this,TQ_SLOT(upnpForwardingOK(kt::UPnPRouter*, const TQString & , bool)));
+    connect(UPnPManager::Manager(),TQ_SIGNAL(forwardingError(kt::UPnPRouter*, const TQString &, bool )),
+                this,TQ_SLOT(upnpForwardingError(kt::UPnPRouter*, const TQString &, bool )));
 
 /*    if (!TorkConfig::clientOnly() && TorkConfig::forwardPorts()){
         upnpmanager->discover();*/
-    TQTimer::singleShot( 20000, this, SLOT(checkRouterDiscovered()) );
+    TQTimer::singleShot( 20000, this, TQ_SLOT(checkRouterDiscovered()) );
 /*    }*/
 
 
@@ -501,59 +501,59 @@ void tork::setupActions()
     //Set up system tray
   	_tray = new TrayIcon(this);
 	_tray->setPixmap(KSystemTray::loadIcon("tork_pressplay"));
-	connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown()));
+	connect(_tray,TQ_SIGNAL(quitSelected()),TQ_SLOT(shuttingDown()));
 	TDEPopupMenu *conf_menu = _tray->contextMenu();
     torkConfigure = new TDEAction(i18n("&Configure TorK"), "configure", 0,
-                    this, SLOT(optionsPreferences()),actionCollection(),"configure_tor");
+                    this, TQ_SLOT(optionsPreferences()),actionCollection(),"configure_tor");
 
 	torkStart = new TDEAction(i18n("Connect To Tor"), "tork_play", 0,this,
-                            SLOT(startEverything()),actionCollection(),"start_tor");
+                            TQ_SLOT(startEverything()),actionCollection(),"start_tor");
     torkStop = new TDEAction(i18n("Disconnect From Tor"),"tork_stop", 0,this,
-                            SLOT(stopTorGracefully()),actionCollection(),"stop_tor");
+                            TQ_SLOT(stopTorGracefully()),actionCollection(),"stop_tor");
     enableKonqi = new TDEAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this,
-                              SLOT(toggleTDESetting()),actionCollection(),"enable_konqi");
+                              TQ_SLOT(toggleTDESetting()),actionCollection(),"enable_konqi");
     enableTormon = new TDEAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this,
-                               SLOT(toggleTorMon()),actionCollection(),"enable_tormon");
+                               TQ_SLOT(toggleTorMon()),actionCollection(),"enable_tormon");
     browseHiddenServices = new TDEAction(i18n("Browse Hidden Services"),"tork_tor", 0,this,
-                               SLOT(hiddenServices()),actionCollection(),"hidden_services");
+                               TQ_SLOT(hiddenServices()),actionCollection(),"hidden_services");
     browseNetworkList = new TDEAction(i18n("Browse Tor Network Status"),"application-vnd.tde.info", 0,this,
-                                    SLOT(networkList()),actionCollection(),"network_list");
+                                    TQ_SLOT(networkList()),actionCollection(),"network_list");
 #ifndef LIVECD
 	torkUpdateTork = new TDEAction(i18n("Download Tork"), "tork_green", 0,this,
-                                 SLOT(updateTork()),actionCollection(),"update_tork");
+                                 TQ_SLOT(updateTork()),actionCollection(),"update_tork");
 	torkUpdateStable = new TDEAction(i18n("Download Tor (Stable Version)"), "tork_tor", 0,this,
-                                   SLOT(updateTorStable()),actionCollection(),"update_torstable");
+                                   TQ_SLOT(updateTorStable()),actionCollection(),"update_torstable");
 	torkUpdateUnstable = new TDEAction(i18n("Download Tor (Experimental Version)"), "tork_tor", 0,this,
-                              SLOT(updateTorUnstable()),actionCollection(),"update_torunstable");
+                              TQ_SLOT(updateTorUnstable()),actionCollection(),"update_torunstable");
 	torkUpdatePrivoxy = new TDEAction(i18n("Download Privoxy (Proxy)"), "proxy", 0,this,
-                                  SLOT(updatePrivoxy()),actionCollection(),"update_privoxy");
+                                  TQ_SLOT(updatePrivoxy()),actionCollection(),"update_privoxy");
 #endif
 	torkFirstRunWizard = new TDEAction(i18n("First Run Wizard"), "wizard", 0,this,
-                                     SLOT(runWizard()),actionCollection(),"firstrun_wizard");
+                                     TQ_SLOT(runWizard()),actionCollection(),"firstrun_wizard");
 	toggleTorbar = new TDEAction(i18n("Toggle Tor Bar"), "tork_tor", 0,this,
-                                     SLOT(toggleTorBar()),actionCollection(),"toggle_torbar");
+                                     TQ_SLOT(toggleTorBar()),actionCollection(),"toggle_torbar");
 
-	connect(m_view->TorkTabs,SIGNAL(currentChanged( TQWidget* )),SLOT(currentTabChanged( TQWidget* )));
+	connect(m_view->TorkTabs,TQ_SIGNAL(currentChanged( TQWidget* )),TQ_SLOT(currentTabChanged( TQWidget* )));
 
     //Servers Filter
 
     m_ServerFilterButton = new TDEActionMenu( i18n( "Servers" ), "filter", actionCollection() );
     m_ServerFilterButton->setDelayed( false );
     m_ServerFilterMenu = m_ServerFilterButton->popupMenu();
-    m_ServerFilterMenu->insertItem( i18n( "All" ), this, SLOT( filterServers( int ) ), 0, 0 );
-    m_ServerFilterMenu->insertItem( i18n( "Valid" ), this, SLOT( filterServers( int ) ), 0, 1 );
-    m_ServerFilterMenu->insertItem( i18n( "Fast" ), this, SLOT( filterServers( int ) ), 0, 2 );
-    m_ServerFilterMenu->insertItem( i18n( "Authority" ), this, SLOT( filterServers( int ) ), 0, 3 );
-    m_ServerFilterMenu->insertItem( i18n( "Named" ), this, SLOT( filterServers( int ) ), 0, 4 );
-    m_ServerFilterMenu->insertItem( i18n( "Exit" ), this, SLOT( filterServers( int ) ), 0, 5 );
-    m_ServerFilterMenu->insertItem( i18n( "Running" ), this, SLOT( filterServers( int ) ), 0, 6 );
-    m_ServerFilterMenu->insertItem( i18n( "Guard" ), this, SLOT( filterServers( int ) ), 0, 7 );
-    m_ServerFilterMenu->insertItem( i18n( "Stable" ), this, SLOT( filterServers( int ) ), 0, 8 );
+    m_ServerFilterMenu->insertItem( i18n( "All" ), this, TQ_SLOT( filterServers( int ) ), 0, 0 );
+    m_ServerFilterMenu->insertItem( i18n( "Valid" ), this, TQ_SLOT( filterServers( int ) ), 0, 1 );
+    m_ServerFilterMenu->insertItem( i18n( "Fast" ), this, TQ_SLOT( filterServers( int ) ), 0, 2 );
+    m_ServerFilterMenu->insertItem( i18n( "Authority" ), this, TQ_SLOT( filterServers( int ) ), 0, 3 );
+    m_ServerFilterMenu->insertItem( i18n( "Named" ), this, TQ_SLOT( filterServers( int ) ), 0, 4 );
+    m_ServerFilterMenu->insertItem( i18n( "Exit" ), this, TQ_SLOT( filterServers( int ) ), 0, 5 );
+    m_ServerFilterMenu->insertItem( i18n( "Running" ), this, TQ_SLOT( filterServers( int ) ), 0, 6 );
+    m_ServerFilterMenu->insertItem( i18n( "Guard" ), this, TQ_SLOT( filterServers( int ) ), 0, 7 );
+    m_ServerFilterMenu->insertItem( i18n( "Stable" ), this, TQ_SLOT( filterServers( int ) ), 0, 8 );
     m_ServerFilterMenu->insertSeparator();
     m_ServerFilterMenu->insertItem( i18n( "Show IP" ), this,
-                                    SLOT( toggleIP( int ) ), 0, 10 );
+                                    TQ_SLOT( toggleIP( int ) ), 0, 10 );
     m_ServerFilterMenu->insertSeparator();
-    m_ServerFilterMenu->insertItem( i18n( "Sort By Country" ), this, SLOT( sortByCountry( ) ), 0, 9 );
+    m_ServerFilterMenu->insertItem( i18n( "Sort By Country" ), this, TQ_SLOT( sortByCountry( ) ), 0, 9 );
 
     m_ServerFilterMenu->setItemChecked( 0, true );
 
@@ -579,7 +579,7 @@ void tork::setupActions()
     continentMapList["OC"] = m_CountryMenuOC;
     continentMapList["--"] = m_CountryMenuNN;
 
-    m_CountryMenu->insertItem( i18n( "All" ), this, SLOT( filterCountries( int ) ), 0, 251 );
+    m_CountryMenu->insertItem( i18n( "All" ), this, TQ_SLOT( filterCountries( int ) ), 0, 251 );
     m_CountryMenu->insertItem( i18n( "Europe" ), m_CountryMenuEU );
     m_CountryMenu->insertItem( i18n( "N America" ), m_CountryMenuNA );
     m_CountryMenu->insertItem( i18n( "S America" ), m_CountryMenuSA );
@@ -589,12 +589,12 @@ void tork::setupActions()
     m_CountryMenu->insertItem( i18n( "Satellite" ), m_CountryMenuNN );
     m_CountryMenu->insertItem( i18n( "Antarctica" ), m_CountryMenuAN );
 
-	connect(m_CountryMenu,SIGNAL(aboutToShow()),SLOT(populateCountryMenu( )));
+	connect(m_CountryMenu,TQ_SIGNAL(aboutToShow()),TQ_SLOT(populateCountryMenu( )));
     m_CountryMenu->setItemChecked( 251, true );
 
     m_ServerFilterMenu->insertSeparator();
     m_ServerFilterMenu->insertItem( i18n( "Text Filter" ), this, 
-                                    SLOT( toggleTextFilter( int ) ), 0, 11 );
+                                    TQ_SLOT( toggleTextFilter( int ) ), 0, 11 );
     m_view->clearButton->setHidden(true);
     m_view->serverFilter->setHidden(true);
 
@@ -603,38 +603,38 @@ void tork::setupActions()
     m_LaunchMenuButton->setDelayed( false );
     m_LaunchMenu = m_LaunchMenuButton->popupMenu();
     m_LaunchMenu->insertItem( SmallIcon("tork_mail"), i18n( "Anonymous Email" ), m_view, 
-                              SLOT( sendAnonymousEmail( ) ) );
+                              TQ_SLOT( sendAnonymousEmail( ) ) );
     if (m_view->firefoxitem)
         m_LaunchMenu->insertItem( SmallIcon("tork_firefox"), i18n( "Anonymous Firefox" ), 
-                                  m_view, SLOT( anonymousFirefox( ) ) );
+                                  m_view, TQ_SLOT( anonymousFirefox( ) ) );
     if (m_view->operaitem)
         m_LaunchMenu->insertItem( SmallIcon("tork_opera"), i18n( "Anonymous Opera" ), 
-                                  m_view, SLOT( anonymousOpera( ) ));
+                                  m_view, TQ_SLOT( anonymousOpera( ) ));
     if (m_view->konversationitem)
         m_LaunchMenu->insertItem( SmallIcon("konversation"), i18n( "Anonymous Konversation" ),
-                                  this,SLOT( torkify( int )), 0, 0 );
+                                  this,TQ_SLOT( torkify( int )), 0, 0 );
     if (m_view->kopeteitem)
         m_LaunchMenu->insertItem( SmallIcon("kopete"), i18n( "Anonymous Kopete" ),
-                                  this,SLOT( torkify( int )), 0, 1 );
+                                  this,TQ_SLOT( torkify( int )), 0, 1 );
     if (m_view->gaimitem)
         m_LaunchMenu->insertItem( SmallIcon("gaim"), i18n( "Anonymous Gaim" ),
-                                  this,SLOT( torkify( int )), 0, 2 );
+                                  this,TQ_SLOT( torkify( int )), 0, 2 );
     if (m_view->pidginitem)
         m_LaunchMenu->insertItem( SmallIcon("pidgin"), i18n( "Anonymous Pidgin" ),
-                                  this,SLOT( torkify( int )), 0, 3 );
+                                  this,TQ_SLOT( torkify( int )), 0, 3 );
     if (m_view->sshitem)
         m_LaunchMenu->insertItem( SmallIcon("tork_konsolessh"), i18n( "Anonymous SSH/Telnet" ),
-                                  this,SLOT( torkify( int )), 0, 4 );
+                                  this,TQ_SLOT( torkify( int )), 0, 4 );
 
     // Log Filter
     m_LogFilterButton = new TDEActionMenu( i18n( "Tor Log" ), "filter", actionCollection() );
     m_LogFilterButton->setDelayed( false );
     m_LogFilterMenu = m_LogFilterButton->popupMenu();
-    m_LogFilterMenu->insertItem( i18n( "All" ), this, SLOT( filterLog( int ) ), 0, 0 );
-    m_LogFilterMenu->insertItem( i18n( "NOTICE" ), this, SLOT( filterLog( int ) ), 0, 1 );
-    m_LogFilterMenu->insertItem( i18n( "WARNING" ), this, SLOT( filterLog( int ) ), 0, 2 );
-    m_LogFilterMenu->insertItem( i18n( "ERROR" ), this, SLOT( filterLog( int ) ), 0, 3 );
-    m_LogFilterMenu->insertItem( i18n( "DEBUG" ), this, SLOT( filterLog( int ) ), 0, 4 );
+    m_LogFilterMenu->insertItem( i18n( "All" ), this, TQ_SLOT( filterLog( int ) ), 0, 0 );
+    m_LogFilterMenu->insertItem( i18n( "NOTICE" ), this, TQ_SLOT( filterLog( int ) ), 0, 1 );
+    m_LogFilterMenu->insertItem( i18n( "WARNING" ), this, TQ_SLOT( filterLog( int ) ), 0, 2 );
+    m_LogFilterMenu->insertItem( i18n( "ERROR" ), this, TQ_SLOT( filterLog( int ) ), 0, 3 );
+    m_LogFilterMenu->insertItem( i18n( "DEBUG" ), this, TQ_SLOT( filterLog( int ) ), 0, 4 );
     m_LogFilterMenu->setItemChecked( 0, true );
 
     // Traffic Filter
@@ -647,48 +647,48 @@ void tork::setupActions()
     m_TrafficFilterMenu->insertItem( i18n( "Tor Traffic" ), m_TorTrafficFilterMenu );
     m_TrafficFilterMenu->insertItem( i18n( "Non-Tor Traffic" ), m_NonTorTrafficFilterMenu );
  
-    m_TorTrafficFilterMenu->insertItem( i18n( "All" ), this, SLOT( filterTorTraffic( int ) ), 0, 0 );
+    m_TorTrafficFilterMenu->insertItem( i18n( "All" ), this, TQ_SLOT( filterTorTraffic( int ) ), 0, 0 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("konqueror"), i18n( "Http" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 1 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 1 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("tork_konqueror_https"),i18n( "Https" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 2 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 2 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("tork_mail"),i18n( "Mail Receive" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 3 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 3 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("tork_mail"),i18n( "Mail Send" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 4 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 4 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("tork_konsolessh"),i18n( "SSH" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 5 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 5 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("tork_konsole"),i18n( "Telnet" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 6 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 6 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("konqueror"),i18n( "FTP" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 7 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 7 );
     m_TorTrafficFilterMenu->insertItem( SmallIcon("network"),i18n( "DNS" ), this, 
-                                        SLOT( filterTorTraffic( int ) ), 0, 8 );
+                                        TQ_SLOT( filterTorTraffic( int ) ), 0, 8 );
     m_TorTrafficFilterMenu->setItemChecked( 0, true );
 
     m_NonTorTrafficFilterMenu->insertItem( i18n( "All" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 0 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 0 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("konqueror"), i18n( "Http" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 1 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 1 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("tork_konqueror_https"),i18n( "Https" ), this,
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 2 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 2 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("tork_mail"),i18n( "Mail Receive" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 3 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 3 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("tork_mail"),i18n( "Mail Send" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 4 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 4 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("tork_konsolessh"),i18n( "SSH" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 5 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 5 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("tork_konsole"),i18n( "Telnet" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 6 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 6 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("konqueror"),i18n( "FTP" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 7 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 7 );
     m_NonTorTrafficFilterMenu->insertItem( SmallIcon("network"),i18n( "DNS" ), this, 
-                                        SLOT( filterNonTorTraffic( int ) ), 0, 8 );
+                                        TQ_SLOT( filterNonTorTraffic( int ) ), 0, 8 );
     m_NonTorTrafficFilterMenu->setItemChecked( 0, true );
 
 
     m_IdentityButton = new TDEAction(i18n("Change Identity"),"tork_identity", 0,this,
-                                   SLOT(useNewIdentity()),actionCollection());
+                                   TQ_SLOT(useNewIdentity()),actionCollection());
 
     //Pseudonymity Buttons
 
@@ -714,7 +714,7 @@ void tork::setupActions()
     continentMap["OC"] = m_PseudoMenuOC;
     continentMap["--"] = m_PseudoMenuNN;
 
-    m_PseudoMenu->insertItem( i18n( "Anonymous" ), this, SLOT( applyPseudonymity( int ) ), 0, 999 );
+    m_PseudoMenu->insertItem( i18n( "Anonymous" ), this, TQ_SLOT( applyPseudonymity( int ) ), 0, 999 );
     m_PseudoMenu->insertItem( i18n( "Europe" ), m_PseudoMenuEU );
     m_PseudoMenu->insertItem( i18n( "N America" ), m_PseudoMenuNA );
     m_PseudoMenu->insertItem( i18n( "S America" ), m_PseudoMenuSA );
@@ -724,25 +724,25 @@ void tork::setupActions()
     m_PseudoMenu->insertItem( i18n( "Satellite" ), m_PseudoMenuNN );
     m_PseudoMenu->insertItem( i18n( "Antarctica" ), m_PseudoMenuAN );
 
-	connect(m_PseudoMenu,SIGNAL(aboutToShow()),SLOT(populatePseudoMenu( )));
+	connect(m_PseudoMenu,TQ_SIGNAL(aboutToShow()),TQ_SLOT(populatePseudoMenu( )));
     m_PseudoMenu->setItemChecked(999,true);
 
     // Server Button
     m_ServerButton = new TDEActionMenu( i18n( "Run Server" ), "server", actionCollection() );
     m_ServerButton->setDelayed( false );
     m_ServerButtonMenu = m_ServerButton->popupMenu();
-    m_ServerButtonMenu->insertItem( i18n( "None" ), this, SLOT( configureServer( int ) ), 0, 0 );
+    m_ServerButtonMenu->insertItem( i18n( "None" ), this, TQ_SLOT( configureServer( int ) ), 0, 0 );
     m_ServerButtonMenu->insertItem( i18n( "To Exit Tor Traffic" ), this, 
-                                    SLOT( configureServer( int ) ), 0, 1 );
+                                    TQ_SLOT( configureServer( int ) ), 0, 1 );
     m_ServerButtonMenu->insertItem( i18n( "To Relay Tor Traffic" ), this, 
-                                    SLOT( configureServer( int ) ), 0, 2 );
+                                    TQ_SLOT( configureServer( int ) ), 0, 2 );
     m_ServerButtonMenu->insertItem( i18n( "To Defeat Censorship Of Tor" ), this, 
-                                    SLOT( configureServer( int ) ), 0, 3 );
+                                    TQ_SLOT( configureServer( int ) ), 0, 3 );
     m_ServerButtonMenu->insertSeparator();
     m_ServerButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("configure", TDEIcon::Small),
-                        i18n( "Configure Server" ), this, SLOT( configureServer( int ) ), 0, 4 );
+                        i18n( "Configure Server" ), this, TQ_SLOT( configureServer( int ) ), 0, 4 );
     m_ServerButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("tork_agent", TDEIcon::Small),
-                        i18n( "Manage Hidden Services" ), this, SLOT( configureServer( int ) ), 0, 5 );
+                        i18n( "Manage Hidden Services" ), this, TQ_SLOT( configureServer( int ) ), 0, 5 );
 
     m_ServerButtonMenu->setItemChecked( 0, true );
 
@@ -753,39 +753,39 @@ void tork::setupActions()
     m_SecurityButton->setDelayed( false );
     m_SecurityButtonMenu = m_SecurityButton->popupMenu();
     m_SecurityButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("tork_penguin", TDEIcon::Small),
-                                   i18n( "None" ), this, SLOT( configureSecurity( int ) ), 0, 0 );
+                                   i18n( "None" ), this, TQ_SLOT( configureSecurity( int ) ), 0, 0 );
     m_SecurityButtonMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("tork_agent", TDEIcon::Small),
-                            i18n( "DNS FailSafe" ), this, SLOT( configureSecurity( int ) ), 0, 1 );
+                            i18n( "DNS FailSafe" ), this, TQ_SLOT( configureSecurity( int ) ), 0, 1 );
     m_SecurityButtonMenu->insertItem(  TDEGlobal::iconLoader()->loadIconSet("gv", TDEIcon::Small),
-                          i18n( "System FailSafe" ),this, SLOT( configureSecurity( int ) ), 0, 2 );
+                          i18n( "System FailSafe" ),this, TQ_SLOT( configureSecurity( int ) ), 0, 2 );
     m_SecurityButtonMenu->insertSeparator();
     m_SecurityButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("configure",
-         TDEIcon::Small),i18n( "Configure FailSafe" ), this, SLOT( configureSecurity( int ) ), 0, 3 );
+         TDEIcon::Small),i18n( "Configure FailSafe" ), this, TQ_SLOT( configureSecurity( int ) ), 0, 3 );
     m_SecurityButtonMenu->setItemChecked( 0, true );
 
     m_UnCensorButton = new TDEAction(i18n("Un-Censor"),"tork_uncensor", 0,this,
-                                   SLOT(showFirewallEvasion()),actionCollection());
+                                   TQ_SLOT(showFirewallEvasion()),actionCollection());
 
 	torkTip = new TDEAction(i18n("Tip of the Day"), "idea", 0,this,
-                          SLOT(showTip()),actionCollection(),"help_show_tip");
+                          TQ_SLOT(showTip()),actionCollection(),"help_show_tip");
 
     //set up all other actions
 
-    KStdAction::quit(kapp, SLOT(quit()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
 
     setStandardToolBarMenuEnabled(true); 
-    m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()),
+    m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()),
                                                   actionCollection());
 
-    KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection());
-    KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection());
+    KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     createGUI();
 
     m_ModeButton = new TDEAction(i18n("More Options"),"add", 0,this,
-                               SLOT(switchMode()),actionCollection());
+                               TQ_SLOT(switchMode()),actionCollection());
 
     //Set Up Advanced Toolbar
     toolBar("MoreToolBar")->setIconText( TDEToolBar::IconTextRight, false );
@@ -877,7 +877,7 @@ void tork::populateCountryMenu()
              TQString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") :
              SmallIcon(TQString("tork_%1").arg(GeoIP_country_code[(*it)]).lower()),
              GeoIP_country_name[(*it)], 
-             this, SLOT( filterCountries( int ) ), 0, (*it) );
+             this, TQ_SLOT( filterCountries( int ) ), 0, (*it) );
     }
 
 }
@@ -901,7 +901,7 @@ void tork::populatePseudoMenu()
              TQString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") :
              SmallIcon(TQString("tork_%1").arg(GeoIP_country_code[(*it)]).lower()),
              GeoIP_country_name[(*it)], 
-             this, SLOT( applyPseudonymity( int ) ), 0, (*it) );
+             this, TQ_SLOT( applyPseudonymity( int ) ), 0, (*it) );
     }
 
 }
@@ -971,7 +971,7 @@ void tork::populateSubNetMenu()
 
     if ( !m_IPFilterMenu->findItem( 0 ) ){
         subnetType[0] = "All";
-        m_IPFilterMenu->insertItem( "All", this, SLOT( filterSubnets( int ) ), 0, 0);
+        m_IPFilterMenu->insertItem( "All", this, TQ_SLOT( filterSubnets( int ) ), 0, 0);
     }
 
     TQStringList tmplist = m_view->subnet16List();
@@ -986,7 +986,7 @@ void tork::populateSubNetMenu()
         if ( m_IPFilterMenu->findItem( index ) )
             continue;
         subnetType[index] = (*it);
-        m_IPFilterMenu->insertItem( (*it)+"*", this, SLOT( filterSubnets( int ) ), 0, index );
+        m_IPFilterMenu->insertItem( (*it)+"*", this, TQ_SLOT( filterSubnets( int ) ), 0, index );
     }
 
 }
@@ -1164,8 +1164,8 @@ tork::configureServer( int id )  //SLOT
         ServerWizard wizard;
         wizard.setCaption( i18n( "Server Assistant" ));
         wizard.setServerType(id);
-        connect( &wizard, SIGNAL(setUpServer(int)),this,
-            SLOT(configureServer(int )) );
+        connect( &wizard, TQ_SIGNAL(setUpServer(int)),this,
+            TQ_SLOT(configureServer(int )) );
 
         wizard.exec();
         return;
@@ -1279,10 +1279,10 @@ tork::configureSecurity( int id )  //SLOT
     filterproc->setUseShell(TRUE);
     TQString filterCommand= TQString("tdesu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c "
                                     "'%3'").arg(filterRequest).arg(iconstring).arg(cmd);
-	connect( filterproc, SIGNAL(readReady(KProcIO * )),
-		SLOT(processFilter(KProcIO * )) );
-	connect( filterproc, SIGNAL(processExited(TDEProcess *)),
-			SLOT(filterExited()) );
+	connect( filterproc, TQ_SIGNAL(readReady(KProcIO * )),
+		TQ_SLOT(processFilter(KProcIO * )) );
+	connect( filterproc, TQ_SIGNAL(processExited(TDEProcess *)),
+			TQ_SLOT(filterExited()) );
 
     *filterproc<<filterCommand;
     filterproc->start(KProcIO::NotifyOnExit,TRUE);
@@ -1702,7 +1702,7 @@ void tork::optionsConfigureToolbars()
         saveMainWindowSettings(TDEGlobal::config());
     #endif
     KEditToolbar dlg(factory());
-    connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(newToolbarConfig()));
+    connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig()));
     dlg.exec();
 }
 
@@ -1942,10 +1942,10 @@ void tork::startTor()
 
     *childproc << TorkConfig::torLocation() << " -f " + torConfFile;
 
-	connect( childproc, SIGNAL(processExited(TDEProcess *)),
-			SLOT(childExited()) );
-	connect( childproc, SIGNAL(readReady(KProcIO *)),
-		SLOT(receivedOutput(KProcIO *)) );
+	connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)),
+			TQ_SLOT(childExited()) );
+	connect( childproc, TQ_SIGNAL(readReady(KProcIO *)),
+		TQ_SLOT(receivedOutput(KProcIO *)) );
 
 	childproc->start(KProcIO::NotifyOnExit)    ;
 
@@ -2057,137 +2057,137 @@ void tork::stopController()
     m_view->resetBWHistory();
     m_view->updateChart();
 
-    disconnect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor()));
-    disconnect( client, SIGNAL(torConnectionClosed()), this, SLOT(torClosedConnection()) );
-    disconnect( client, SIGNAL(streamStatusUpdate(const TQString &, const TQString &,
+    disconnect( client, TQ_SIGNAL(fatalError()),this, TQ_SLOT(cannotContactTor()));
+    disconnect( client, TQ_SIGNAL(torConnectionClosed()), this, TQ_SLOT(torClosedConnection()) );
+    disconnect( client, TQ_SIGNAL(streamStatusUpdate(const TQString &, const TQString &,
         const TQString &, const TQString &, const TQString &)),
-        m_view,SLOT(streamStatusUpdated(const TQString &, const TQString &,
+        m_view,TQ_SLOT(streamStatusUpdated(const TQString &, const TQString &,
         const TQString &, const TQString &, const TQString &)) );
-    disconnect( client, SIGNAL(ORStatusUpdate(const TQString &, const TQString &)),
-        m_view,SLOT(ORStatusUpdated(const TQString &, const TQString &)) );
-    disconnect( client, SIGNAL(guardStatusUpdate(const TQString &, const TQString &)),
-        m_view,SLOT(guardStatusUpdated(const TQString &, const TQString &)) );
-    disconnect( client, SIGNAL(circuitStatusUpdate(const TQString &, const TQString &, 
+    disconnect( client, TQ_SIGNAL(ORStatusUpdate(const TQString &, const TQString &)),
+        m_view,TQ_SLOT(ORStatusUpdated(const TQString &, const TQString &)) );
+    disconnect( client, TQ_SIGNAL(guardStatusUpdate(const TQString &, const TQString &)),
+        m_view,TQ_SLOT(guardStatusUpdated(const TQString &, const TQString &)) );
+    disconnect( client, TQ_SIGNAL(circuitStatusUpdate(const TQString &, const TQString &, 
                                const TQString &, const TQString &)),
-        m_view,SLOT(circuitStatusUpdated(const TQString &, const TQString &, 
+        m_view,TQ_SLOT(circuitStatusUpdated(const TQString &, const TQString &, 
                                const TQString &, const TQString &)) );
-    disconnect( client, SIGNAL(infoUpdate(const TQString &,const TQString &, const TQString &)),
-        this,SLOT(infoUpdated(const TQString &,const TQString &, const TQString &)) );
-    disconnect( client, SIGNAL(bwUpdate(const TQString &,const TQString &)),
-        m_view,SLOT(bwUpdated(const TQString &,const TQString &)) );
-    disconnect( client, SIGNAL(streamBwUpdate(const TQString &,const TQString &,const TQString &)),
-        m_view,SLOT(streamBwUpdated(const TQString &,const TQString &,const TQString &)) );
-
-    disconnect( client, SIGNAL(updateActiveServers(const TQStringList &)),
-        m_view,SLOT(activeServersUpdated(const TQStringList &)) );
-    disconnect( client, SIGNAL(updateServerStatus(const TQString &,const TQString &,
+    disconnect( client, TQ_SIGNAL(infoUpdate(const TQString &,const TQString &, const TQString &)),
+        this,TQ_SLOT(infoUpdated(const TQString &,const TQString &, const TQString &)) );
+    disconnect( client, TQ_SIGNAL(bwUpdate(const TQString &,const TQString &)),
+        m_view,TQ_SLOT(bwUpdated(const TQString &,const TQString &)) );
+    disconnect( client, TQ_SIGNAL(streamBwUpdate(const TQString &,const TQString &,const TQString &)),
+        m_view,TQ_SLOT(streamBwUpdated(const TQString &,const TQString &,const TQString &)) );
+
+    disconnect( client, TQ_SIGNAL(updateActiveServers(const TQStringList &)),
+        m_view,TQ_SLOT(activeServersUpdated(const TQStringList &)) );
+    disconnect( client, TQ_SIGNAL(updateServerStatus(const TQString &,const TQString &,
                                const TQString &,const TQString &)),
-        m_view,SLOT(serverStatusUpdated(const TQString &,const TQString &,
+        m_view,TQ_SLOT(serverStatusUpdated(const TQString &,const TQString &,
                                const TQString &,const TQString &)) );
 
-    disconnect( client, SIGNAL(setTorCaption(const TQString &)),
-        this,SLOT(setTorCaption(const TQString &)) );
+    disconnect( client, TQ_SIGNAL(setTorCaption(const TQString &)),
+        this,TQ_SLOT(setTorCaption(const TQString &)) );
 
 
-    disconnect(m_view->circuitList, SIGNAL(attach(const TQString &,const TQString &)),
-            client, SLOT(attemptAttach(const TQString &,const TQString & )) );
-    disconnect(m_view->circuitList, SIGNAL(extendCircuit(const TQString &, const TQString &, bool)),
-            client, SLOT(attemptExtendCircuit(const TQString &, const TQString &, bool)) );
-    disconnect(m_view->circuitList, SIGNAL(createCircuit(const TQString &, bool)),
-            client, SLOT(attemptCreateCircuit(const TQString &, bool)) );
+    disconnect(m_view->circuitList, TQ_SIGNAL(attach(const TQString &,const TQString &)),
+            client, TQ_SLOT(attemptAttach(const TQString &,const TQString & )) );
+    disconnect(m_view->circuitList, TQ_SIGNAL(extendCircuit(const TQString &, const TQString &, bool)),
+            client, TQ_SLOT(attemptExtendCircuit(const TQString &, const TQString &, bool)) );
+    disconnect(m_view->circuitList, TQ_SIGNAL(createCircuit(const TQString &, bool)),
+            client, TQ_SLOT(attemptCreateCircuit(const TQString &, bool)) );
 
 
-	disconnect( m_view->serverList, SIGNAL(mouseButtonPressed (int, TQListViewItem *,
-              const TQPoint &, int)), this, SLOT(slotOnItem ( int, TQListViewItem *,
+	disconnect( m_view->serverList, TQ_SIGNAL(mouseButtonPressed (int, TQListViewItem *,
+              const TQPoint &, int)), this, TQ_SLOT(slotOnItem ( int, TQListViewItem *,
               const TQPoint &, int )));
-	disconnect( m_view->ORList, SIGNAL(pressed ( TQListViewItem * )), this,
-		SLOT(slotOnORItem ( TQListViewItem * )));
-
-
-    disconnect(m_view->m_osd, SIGNAL(closeStream(const TQString &)),
-            client, SLOT(attemptCloseStream(const TQString & )) );
-    disconnect(m_view, SIGNAL(closeStream(const TQString &)),
-            client, SLOT(attemptCloseStream(const TQString & )) );
-    disconnect(m_view, SIGNAL(attachStreams(bool)),
-            client, SLOT(attemptAttachStreams( bool )) );
-
-    disconnect(m_view, SIGNAL(closeCircuit(const TQString &)),
-            client, SLOT(attemptCloseCircuit(const TQString & )) );
-    disconnect(m_view, SIGNAL(closeAllCircuits( TQListView* &)),
-            client, SLOT(closeAllCircuits( TQListView* & )) );
-
-    disconnect(client, SIGNAL(displayError(const TQString &, const TQString &)),
-            m_view, SLOT(displayError(const TQString &,const TQString & )) );
-    disconnect(client, SIGNAL(displayServer(const TQString &, const TQString &)),
-            m_view, SLOT(displayServer(const TQString &,const TQString & )) );
-
-    disconnect(client, SIGNAL(whatImDoing(const TQString &)),
-            this, SLOT(sayWhatImDoing(const TQString & )) );
-    disconnect(client, SIGNAL(copyOldConfig()),
-            this, SLOT(copyOldConfig()) );
-
-    disconnect(client, SIGNAL(shouldIApplySettings()),
-            this, SLOT(shouldIApplySettings()) );
-
-    disconnect(client, SIGNAL(makeTorkStoppable()),
-            this, SLOT(makeTorkStoppable()) );
-
-     disconnect(m_view->streamList, SIGNAL(attach(const TQString &,const TQString &)),
-             client, SLOT(attemptAttach(const TQString &,const TQString & )) );
-
-    disconnect(client, SIGNAL(warnNoServerInfo()),
-            this, SLOT(warnNoServerInfo()) );
-
-    disconnect(client, SIGNAL(needAlphaVersion()),
-            this, SLOT(needAlphaVersion()) );
-
-    disconnect(client, SIGNAL(connectedToTor()),
-            client, SLOT(authenticate()) );
-
-    disconnect(m_view, SIGNAL(updateExcludeNodes()),
-            client, SLOT(updateExcludeNodes()) );
-    disconnect(m_view, SIGNAL(updateEntryNodes()),
-            client, SLOT(updateEntryNodes()) );
-    disconnect(m_view, SIGNAL(updateExitNodes()),
-            client, SLOT(updateExitNodes()) );
-    disconnect(m_view, SIGNAL(clearNodes()),
-            client, SLOT(clearNodes()) );
-    disconnect(m_view, SIGNAL(updateStrictExitNodes(bool)),
-            client, SLOT(strictExitNodes(bool)) );
-    disconnect(m_view, SIGNAL(safeLogging(bool)),
-            client, SLOT(safeLogging(bool)) );
-
-    disconnect( m_view, SIGNAL(signalCheckTorNet()),
-             client, SLOT( slotCheckTorNet() ) );
-    disconnect( m_view, SIGNAL(signalCheckGuards()),
-             client, SLOT( slotCheckGuards() ) );
-    disconnect( m_view, SIGNAL(signalCheckBWSettings()),
-            this, SLOT( checkBandwidthSettings() ) );
-
-    disconnect(client, SIGNAL(processWarning(const TQString& , const TQString& )),
-             this,   SLOT(processWarning(const TQString& , const TQString& )));
-    disconnect(client, SIGNAL(processQuestion(const TQString& , const TQString& )),
-             this,   SLOT(processQuestion(const TQString& , const TQString& )));
-
-    disconnect(client, SIGNAL(updateTrayIcon(const TQString&)),
-             this,   SLOT(updateTrayIcon(const TQString&)));
-
-    disconnect( client, SIGNAL(showServerBW(const TQString&)),
-            m_view, SLOT( showServerBW(const TQString&) ) );
-
-    disconnect( m_view, SIGNAL(resolveAddress(const TQString&)),
-            client, SLOT( resolveAddress(const TQString&) ) );
-
-    disconnect( client, SIGNAL(resolvedAddress(const TQString&)),
-            m_view, SLOT( resolvedAddress(const TQString&) ) );
+	disconnect( m_view->ORList, TQ_SIGNAL(pressed ( TQListViewItem * )), this,
+		TQ_SLOT(slotOnORItem ( TQListViewItem * )));
+
+
+    disconnect(m_view->m_osd, TQ_SIGNAL(closeStream(const TQString &)),
+            client, TQ_SLOT(attemptCloseStream(const TQString & )) );
+    disconnect(m_view, TQ_SIGNAL(closeStream(const TQString &)),
+            client, TQ_SLOT(attemptCloseStream(const TQString & )) );
+    disconnect(m_view, TQ_SIGNAL(attachStreams(bool)),
+            client, TQ_SLOT(attemptAttachStreams( bool )) );
+
+    disconnect(m_view, TQ_SIGNAL(closeCircuit(const TQString &)),
+            client, TQ_SLOT(attemptCloseCircuit(const TQString & )) );
+    disconnect(m_view, TQ_SIGNAL(closeAllCircuits( TQListView* &)),
+            client, TQ_SLOT(closeAllCircuits( TQListView* & )) );
+
+    disconnect(client, TQ_SIGNAL(displayError(const TQString &, const TQString &)),
+            m_view, TQ_SLOT(displayError(const TQString &,const TQString & )) );
+    disconnect(client, TQ_SIGNAL(displayServer(const TQString &, const TQString &)),
+            m_view, TQ_SLOT(displayServer(const TQString &,const TQString & )) );
+
+    disconnect(client, TQ_SIGNAL(whatImDoing(const TQString &)),
+            this, TQ_SLOT(sayWhatImDoing(const TQString & )) );
+    disconnect(client, TQ_SIGNAL(copyOldConfig()),
+            this, TQ_SLOT(copyOldConfig()) );
+
+    disconnect(client, TQ_SIGNAL(shouldIApplySettings()),
+            this, TQ_SLOT(shouldIApplySettings()) );
+
+    disconnect(client, TQ_SIGNAL(makeTorkStoppable()),
+            this, TQ_SLOT(makeTorkStoppable()) );
+
+     disconnect(m_view->streamList, TQ_SIGNAL(attach(const TQString &,const TQString &)),
+             client, TQ_SLOT(attemptAttach(const TQString &,const TQString & )) );
+
+    disconnect(client, TQ_SIGNAL(warnNoServerInfo()),
+            this, TQ_SLOT(warnNoServerInfo()) );
+
+    disconnect(client, TQ_SIGNAL(needAlphaVersion()),
+            this, TQ_SLOT(needAlphaVersion()) );
+
+    disconnect(client, TQ_SIGNAL(connectedToTor()),
+            client, TQ_SLOT(authenticate()) );
+
+    disconnect(m_view, TQ_SIGNAL(updateExcludeNodes()),
+            client, TQ_SLOT(updateExcludeNodes()) );
+    disconnect(m_view, TQ_SIGNAL(updateEntryNodes()),
+            client, TQ_SLOT(updateEntryNodes()) );
+    disconnect(m_view, TQ_SIGNAL(updateExitNodes()),
+            client, TQ_SLOT(updateExitNodes()) );
+    disconnect(m_view, TQ_SIGNAL(clearNodes()),
+            client, TQ_SLOT(clearNodes()) );
+    disconnect(m_view, TQ_SIGNAL(updateStrictExitNodes(bool)),
+            client, TQ_SLOT(strictExitNodes(bool)) );
+    disconnect(m_view, TQ_SIGNAL(safeLogging(bool)),
+            client, TQ_SLOT(safeLogging(bool)) );
+
+    disconnect( m_view, TQ_SIGNAL(signalCheckTorNet()),
+             client, TQ_SLOT( slotCheckTorNet() ) );
+    disconnect( m_view, TQ_SIGNAL(signalCheckGuards()),
+             client, TQ_SLOT( slotCheckGuards() ) );
+    disconnect( m_view, TQ_SIGNAL(signalCheckBWSettings()),
+            this, TQ_SLOT( checkBandwidthSettings() ) );
+
+    disconnect(client, TQ_SIGNAL(processWarning(const TQString& , const TQString& )),
+             this,   TQ_SLOT(processWarning(const TQString& , const TQString& )));
+    disconnect(client, TQ_SIGNAL(processQuestion(const TQString& , const TQString& )),
+             this,   TQ_SLOT(processQuestion(const TQString& , const TQString& )));
+
+    disconnect(client, TQ_SIGNAL(updateTrayIcon(const TQString&)),
+             this,   TQ_SLOT(updateTrayIcon(const TQString&)));
+
+    disconnect( client, TQ_SIGNAL(showServerBW(const TQString&)),
+            m_view, TQ_SLOT( showServerBW(const TQString&) ) );
+
+    disconnect( m_view, TQ_SIGNAL(resolveAddress(const TQString&)),
+            client, TQ_SLOT( resolveAddress(const TQString&) ) );
+
+    disconnect( client, TQ_SIGNAL(resolvedAddress(const TQString&)),
+            m_view, TQ_SLOT( resolvedAddress(const TQString&) ) );
 
     if (bwtimer != 0L){
-        disconnect( bwtimer, SIGNAL( timeout() ), m_view, SLOT( reportBW() ) );
+        disconnect( bwtimer, TQ_SIGNAL( timeout() ), m_view, TQ_SLOT( reportBW() ) );
         delete bwtimer;
         bwtimer = 0L;
     }
     if (bwLimitTimer != 0L){
-        disconnect( bwLimitTimer, SIGNAL( timeout() ), this, SLOT( checkBandwidthSettings() ) );
+        disconnect( bwLimitTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( checkBandwidthSettings() ) );
         delete bwLimitTimer;
         bwLimitTimer = 0L;
     }
@@ -2577,8 +2577,8 @@ TQString tork::doHashPassword()
 
 	*hashproc<<hashCommand;
 
-	connect( hashproc, SIGNAL(readReady(KProcIO * )),
-		SLOT(processHashProc(KProcIO * )) );
+	connect( hashproc, TQ_SIGNAL(readReady(KProcIO * )),
+		TQ_SLOT(processHashProc(KProcIO * )) );
 	hashproc->start(KProcIO::NotifyOnExit,TRUE);
 
     while (hashproc->isRunning() && m_hashedpassword.isEmpty())
@@ -2636,8 +2636,8 @@ void tork::privoxyExited()
         died = true;
 
     if (privoxyproc != 0L){
-        disconnect( privoxyproc, SIGNAL(processExited(TDEProcess *)),
- 			this,SLOT(privoxyExited()) );
+        disconnect( privoxyproc, TQ_SIGNAL(processExited(TDEProcess *)),
+ 			this,TQ_SLOT(privoxyExited()) );
         delete privoxyproc;
         privoxyproc = 0L;
     }
@@ -2701,9 +2701,9 @@ void tork::checkForSystemManagedPrivoxy()
 
     if (privoxytest == 0L) {
       privoxytest = new TestPrivoxy();
-      connect( privoxytest, SIGNAL(fatalError()),this, SLOT(cannotContactPrivoxy()));
-      connect( privoxytest, SIGNAL(connectedToPrivacyProxy()),
-              this, SLOT(privacyProxyPassed()) );
+      connect( privoxytest, TQ_SIGNAL(fatalError()),this, TQ_SLOT(cannotContactPrivoxy()));
+      connect( privoxytest, TQ_SIGNAL(connectedToPrivacyProxy()),
+              this, TQ_SLOT(privacyProxyPassed()) );
     }
     privoxytest->connectTo(host,port);
 
@@ -2734,7 +2734,7 @@ void tork::startPrivoxy()
 {
 
     stillStarting = true;
-    TQTimer::singleShot( 20000, this, SLOT(startingPeriodOver()) );
+    TQTimer::singleShot( 20000, this, TQ_SLOT(startingPeriodOver()) );
 
     if (TorkConfig::systemProxy()) {
         checkForSystemManagedPrivoxy();
@@ -2748,8 +2748,8 @@ void tork::startPrivoxy()
     }
 
     if (privoxyproc != 0L){
-        disconnect( privoxyproc, SIGNAL(processExited(TDEProcess *)),
- 			this,SLOT(privoxyExited()) );
+        disconnect( privoxyproc, TQ_SIGNAL(processExited(TDEProcess *)),
+ 			this,TQ_SLOT(privoxyExited()) );
         delete privoxyproc;
         privoxyproc = 0L;
     }
@@ -2772,8 +2772,8 @@ void tork::startPrivoxy()
     *privoxyproc << TorkConfig::privoxyLocation() <<  " --user " << getenv("USER") 
                  << " --no-daemon --pidfile " << privoxypid << " " << privoxyConfFile;
 
- 	connect( privoxyproc, SIGNAL(processExited(TDEProcess *)),
- 			SLOT(privoxyExited()) );
+ 	connect( privoxyproc, TQ_SIGNAL(processExited(TDEProcess *)),
+ 			TQ_SLOT(privoxyExited()) );
 
 	privoxyproc->start(KProcIO::NotifyOnExit)    ;
 
@@ -2850,130 +2850,130 @@ void tork::startController()
     client = new TorClient(host,port);
     setCaption(torCaption);
 
-    connect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor()));
-    connect( client, SIGNAL(torConnectionClosed()), SLOT(torClosedConnection()) );
-    connect( client, SIGNAL(streamStatusUpdate(const TQString &, const TQString &,
+    connect( client, TQ_SIGNAL(fatalError()),this, TQ_SLOT(cannotContactTor()));
+    connect( client, TQ_SIGNAL(torConnectionClosed()), TQ_SLOT(torClosedConnection()) );
+    connect( client, TQ_SIGNAL(streamStatusUpdate(const TQString &, const TQString &,
         const TQString &, const TQString &, const TQString &)),
-        m_view,SLOT(streamStatusUpdated(const TQString &, const TQString &,
+        m_view,TQ_SLOT(streamStatusUpdated(const TQString &, const TQString &,
         const TQString &, const TQString &, const TQString &)) );
-    connect( client, SIGNAL(ORStatusUpdate(const TQString &, const TQString &)),
-        m_view,SLOT(ORStatusUpdated(const TQString &, const TQString &)) );
-    connect( client, SIGNAL(guardStatusUpdate(const TQString &, const TQString &)),
-        m_view,SLOT(guardStatusUpdated(const TQString &, const TQString &)) );
-    connect( client, SIGNAL(circuitStatusUpdate(const TQString &, const TQString &, 
+    connect( client, TQ_SIGNAL(ORStatusUpdate(const TQString &, const TQString &)),
+        m_view,TQ_SLOT(ORStatusUpdated(const TQString &, const TQString &)) );
+    connect( client, TQ_SIGNAL(guardStatusUpdate(const TQString &, const TQString &)),
+        m_view,TQ_SLOT(guardStatusUpdated(const TQString &, const TQString &)) );
+    connect( client, TQ_SIGNAL(circuitStatusUpdate(const TQString &, const TQString &, 
                             const TQString &, const TQString &)),
-        m_view,SLOT(circuitStatusUpdated(const TQString &, const TQString &, 
+        m_view,TQ_SLOT(circuitStatusUpdated(const TQString &, const TQString &, 
                             const TQString &, const TQString &)) );
-    connect( client, SIGNAL(infoUpdate(const TQString &,const TQString &, const TQString &)),
-        this,SLOT(infoUpdated(const TQString &,const TQString &, const TQString &)) );
-    connect( client, SIGNAL(bwUpdate(const TQString &,const TQString &)),
-        m_view,SLOT(bwUpdated(const TQString &,const TQString &)) );
-    connect( client, SIGNAL(streamBwUpdate(const TQString &,const TQString &,const TQString &)),
-        m_view,SLOT(streamBwUpdated(const TQString &,const TQString &,const TQString &)) );
-
-    connect( client, SIGNAL(updateActiveServers(const TQStringList &)),
-        m_view,SLOT(activeServersUpdated(const TQStringList &)) );
-    connect( client, SIGNAL(updateServerStatus(const TQString &,const TQString &,
+    connect( client, TQ_SIGNAL(infoUpdate(const TQString &,const TQString &, const TQString &)),
+        this,TQ_SLOT(infoUpdated(const TQString &,const TQString &, const TQString &)) );
+    connect( client, TQ_SIGNAL(bwUpdate(const TQString &,const TQString &)),
+        m_view,TQ_SLOT(bwUpdated(const TQString &,const TQString &)) );
+    connect( client, TQ_SIGNAL(streamBwUpdate(const TQString &,const TQString &,const TQString &)),
+        m_view,TQ_SLOT(streamBwUpdated(const TQString &,const TQString &,const TQString &)) );
+
+    connect( client, TQ_SIGNAL(updateActiveServers(const TQStringList &)),
+        m_view,TQ_SLOT(activeServersUpdated(const TQStringList &)) );
+    connect( client, TQ_SIGNAL(updateServerStatus(const TQString &,const TQString &,
                            const TQString &,const TQString &)),
-             m_view,SLOT(serverStatusUpdated(const TQString &,const TQString &,
+             m_view,TQ_SLOT(serverStatusUpdated(const TQString &,const TQString &,
                          const TQString &,const TQString &)) );
 
-    connect( client, SIGNAL(setTorCaption(const TQString &)),
-        this,SLOT(setTorCaption(const TQString &)) );
+    connect( client, TQ_SIGNAL(setTorCaption(const TQString &)),
+        this,TQ_SLOT(setTorCaption(const TQString &)) );
 
 
-    connect(m_view->circuitList, SIGNAL(attach(const TQString &,const TQString &)),
-            client, SLOT(attemptAttach(const TQString &,const TQString & )) );
-    connect(m_view->circuitList, SIGNAL(extendCircuit(const TQString &, const TQString &, bool)),
-            client, SLOT(attemptExtendCircuit(const TQString &, const TQString &, bool)) );
-    connect(m_view->circuitList, SIGNAL(createCircuit(const TQString &, bool)),
-            client, SLOT(attemptCreateCircuit(const TQString &, bool)) );
+    connect(m_view->circuitList, TQ_SIGNAL(attach(const TQString &,const TQString &)),
+            client, TQ_SLOT(attemptAttach(const TQString &,const TQString & )) );
+    connect(m_view->circuitList, TQ_SIGNAL(extendCircuit(const TQString &, const TQString &, bool)),
+            client, TQ_SLOT(attemptExtendCircuit(const TQString &, const TQString &, bool)) );
+    connect(m_view->circuitList, TQ_SIGNAL(createCircuit(const TQString &, bool)),
+            client, TQ_SLOT(attemptCreateCircuit(const TQString &, bool)) );
 
-	connect( m_view->serverList, SIGNAL(mouseButtonPressed ( int, TQListViewItem * , 
+	connect( m_view->serverList, TQ_SIGNAL(mouseButtonPressed ( int, TQListViewItem * , 
                                         const TQPoint &, int )),
-		    SLOT(slotOnItem ( int, TQListViewItem * , const TQPoint &, int )));
-	connect( m_view->ORList, SIGNAL(pressed ( TQListViewItem * )),
-		SLOT(slotOnORItem ( TQListViewItem * )));
-
-
-    connect(m_view->m_osd, SIGNAL(closeStream(const TQString &)),
-            client, SLOT(attemptCloseStream(const TQString & )) );
-    connect(m_view, SIGNAL(closeStream(const TQString &)),
-            client, SLOT(attemptCloseStream(const TQString & )) );
-    connect(m_view, SIGNAL(attachStreams(bool)),
-            client, SLOT(attemptAttachStreams( bool )) );
-
-    connect(m_view, SIGNAL(closeCircuit(const TQString &)),
-            client, SLOT(attemptCloseCircuit(const TQString & )) );
-    connect(m_view, SIGNAL(closeAllCircuits( TQListView* &)),
-            client, SLOT(closeAllCircuits( TQListView* & )) );
-
-    connect(client, SIGNAL(displayError(const TQString &, const TQString &)),
-            m_view, SLOT(displayError(const TQString &,const TQString & )) );
-    connect(client, SIGNAL(displayServer(const TQString &, const TQString &)),
-            m_view, SLOT(displayServer(const TQString &,const TQString & )) );
-
-    connect(client, SIGNAL(whatImDoing(const TQString &)),
-            this, SLOT(sayWhatImDoing(const TQString & )) );
-    connect(client, SIGNAL(copyOldConfig()),
-            this, SLOT(copyOldConfig()) );
-
-    connect(client, SIGNAL(shouldIApplySettings()),
-            this, SLOT(shouldIApplySettings()) );
-
-    connect(client, SIGNAL(makeTorkStoppable()),
-            this, SLOT(makeTorkStoppable()) );
-
-     connect(m_view->streamList, SIGNAL(attach(const TQString &,const TQString &)),
-             client, SLOT(attemptAttach(const TQString &,const TQString & )) );
-
-    connect(client, SIGNAL(warnNoServerInfo()),
-            this, SLOT(warnNoServerInfo()) );
-
-    connect(client, SIGNAL(needAlphaVersion()),
-            this, SLOT(needAlphaVersion()) );
-
-    connect(client, SIGNAL(connectedToTor()),
-            client, SLOT(authenticate()) );
-
-    connect(m_view, SIGNAL(updateExcludeNodes()),
-            client, SLOT(updateExcludeNodes()) );
-    connect(m_view, SIGNAL(updateEntryNodes()),
-            client, SLOT(updateEntryNodes()) );
-    connect(m_view, SIGNAL(updateExitNodes()),
-            client, SLOT(updateExitNodes()) );
-    connect(m_view, SIGNAL(clearNodes()),
-            client, SLOT(clearNodes()) );
-    connect(m_view, SIGNAL(updateStrictExitNodes(bool)),
-            client, SLOT(strictExitNodes(bool)) );
-    connect(m_view, SIGNAL(safeLogging(bool)),
-            client, SLOT(safeLogging(bool)) );
-
-    connect( m_view, SIGNAL(signalCheckTorNet()),
-             client, SLOT( slotCheckTorNet() ) );
-    connect( m_view, SIGNAL(signalCheckGuards()),
-             client, SLOT( slotCheckGuards() ) );
-    connect( m_view, SIGNAL(signalCheckBWSettings()),
-            this, SLOT( checkBandwidthSettings() ) );
-
-    connect(client, SIGNAL(processWarning(const TQString& , const TQString& )),
-             this,   SLOT(processWarning(const TQString& , const TQString& )));
-    connect(client, SIGNAL(processQuestion(const TQString& , const TQString& )),
-             this,   SLOT(processQuestion(const TQString& , const TQString& )));
-
-    connect(client, SIGNAL(updateTrayIcon(const TQString&)),
-             this,   SLOT(updateTrayIcon(const TQString&)));
-
-    connect( client, SIGNAL(showServerBW(const TQString&)),
-            m_view, SLOT( showServerBW(const TQString&) ) );
-
-    connect( m_view, SIGNAL(resolveAddress(const TQString&)),
-            client, SLOT( resolveAddress(const TQString&) ) );
-
-    connect( client, SIGNAL(resolvedAddress(const TQString&)),
-            m_view, SLOT( resolvedAddress(const TQString&) ) );
-
-    TQTimer::singleShot( 10000, this, SLOT(isControllerWorking()) );
+		    TQ_SLOT(slotOnItem ( int, TQListViewItem * , const TQPoint &, int )));
+	connect( m_view->ORList, TQ_SIGNAL(pressed ( TQListViewItem * )),
+		TQ_SLOT(slotOnORItem ( TQListViewItem * )));
+
+
+    connect(m_view->m_osd, TQ_SIGNAL(closeStream(const TQString &)),
+            client, TQ_SLOT(attemptCloseStream(const TQString & )) );
+    connect(m_view, TQ_SIGNAL(closeStream(const TQString &)),
+            client, TQ_SLOT(attemptCloseStream(const TQString & )) );
+    connect(m_view, TQ_SIGNAL(attachStreams(bool)),
+            client, TQ_SLOT(attemptAttachStreams( bool )) );
+
+    connect(m_view, TQ_SIGNAL(closeCircuit(const TQString &)),
+            client, TQ_SLOT(attemptCloseCircuit(const TQString & )) );
+    connect(m_view, TQ_SIGNAL(closeAllCircuits( TQListView* &)),
+            client, TQ_SLOT(closeAllCircuits( TQListView* & )) );
+
+    connect(client, TQ_SIGNAL(displayError(const TQString &, const TQString &)),
+            m_view, TQ_SLOT(displayError(const TQString &,const TQString & )) );
+    connect(client, TQ_SIGNAL(displayServer(const TQString &, const TQString &)),
+            m_view, TQ_SLOT(displayServer(const TQString &,const TQString & )) );
+
+    connect(client, TQ_SIGNAL(whatImDoing(const TQString &)),
+            this, TQ_SLOT(sayWhatImDoing(const TQString & )) );
+    connect(client, TQ_SIGNAL(copyOldConfig()),
+            this, TQ_SLOT(copyOldConfig()) );
+
+    connect(client, TQ_SIGNAL(shouldIApplySettings()),
+            this, TQ_SLOT(shouldIApplySettings()) );
+
+    connect(client, TQ_SIGNAL(makeTorkStoppable()),
+            this, TQ_SLOT(makeTorkStoppable()) );
+
+     connect(m_view->streamList, TQ_SIGNAL(attach(const TQString &,const TQString &)),
+             client, TQ_SLOT(attemptAttach(const TQString &,const TQString & )) );
+
+    connect(client, TQ_SIGNAL(warnNoServerInfo()),
+            this, TQ_SLOT(warnNoServerInfo()) );
+
+    connect(client, TQ_SIGNAL(needAlphaVersion()),
+            this, TQ_SLOT(needAlphaVersion()) );
+
+    connect(client, TQ_SIGNAL(connectedToTor()),
+            client, TQ_SLOT(authenticate()) );
+
+    connect(m_view, TQ_SIGNAL(updateExcludeNodes()),
+            client, TQ_SLOT(updateExcludeNodes()) );
+    connect(m_view, TQ_SIGNAL(updateEntryNodes()),
+            client, TQ_SLOT(updateEntryNodes()) );
+    connect(m_view, TQ_SIGNAL(updateExitNodes()),
+            client, TQ_SLOT(updateExitNodes()) );
+    connect(m_view, TQ_SIGNAL(clearNodes()),
+            client, TQ_SLOT(clearNodes()) );
+    connect(m_view, TQ_SIGNAL(updateStrictExitNodes(bool)),
+            client, TQ_SLOT(strictExitNodes(bool)) );
+    connect(m_view, TQ_SIGNAL(safeLogging(bool)),
+            client, TQ_SLOT(safeLogging(bool)) );
+
+    connect( m_view, TQ_SIGNAL(signalCheckTorNet()),
+             client, TQ_SLOT( slotCheckTorNet() ) );
+    connect( m_view, TQ_SIGNAL(signalCheckGuards()),
+             client, TQ_SLOT( slotCheckGuards() ) );
+    connect( m_view, TQ_SIGNAL(signalCheckBWSettings()),
+            this, TQ_SLOT( checkBandwidthSettings() ) );
+
+    connect(client, TQ_SIGNAL(processWarning(const TQString& , const TQString& )),
+             this,   TQ_SLOT(processWarning(const TQString& , const TQString& )));
+    connect(client, TQ_SIGNAL(processQuestion(const TQString& , const TQString& )),
+             this,   TQ_SLOT(processQuestion(const TQString& , const TQString& )));
+
+    connect(client, TQ_SIGNAL(updateTrayIcon(const TQString&)),
+             this,   TQ_SLOT(updateTrayIcon(const TQString&)));
+
+    connect( client, TQ_SIGNAL(showServerBW(const TQString&)),
+            m_view, TQ_SLOT( showServerBW(const TQString&) ) );
+
+    connect( m_view, TQ_SIGNAL(resolveAddress(const TQString&)),
+            client, TQ_SLOT( resolveAddress(const TQString&) ) );
+
+    connect( client, TQ_SIGNAL(resolvedAddress(const TQString&)),
+            m_view, TQ_SLOT( resolvedAddress(const TQString&) ) );
+
+    TQTimer::singleShot( 10000, this, TQ_SLOT(isControllerWorking()) );
 
     torkStart->setEnabled(false);
     m_view->welcomeitem->setEnabled(false);
@@ -3046,7 +3046,7 @@ void tork::receivedOutput(KProcIO *)
 
 	while ((childproc) && ((pos = (childproc->readln(item2,true))) != -1)) {
             if ((pos = (item2.find("Opening Control listener on"))) != -1){
-                TQTimer::singleShot( 200, this, SLOT(startController()) );
+                TQTimer::singleShot( 200, this, TQ_SLOT(startController()) );
             }
             int i;
             for (i = 0; _tork_messages[i].logmessage; ++i) {
@@ -3117,7 +3117,7 @@ void tork::infoUpdated(const TQString &type, const TQString &summary, const TQSt
             if (waitingForServers){
                 if (summary.contains("now have enough directory information")){
                     waitingForServers = false;
-                    //TQTimer::singleShot(20000, client, SLOT(slotCheckTorNet()) );
+                    //TQTimer::singleShot(20000, client, TQ_SLOT(slotCheckTorNet()) );
                     if (client != 0L)
                         client->slotCheckTorNet();
                 }
@@ -3196,8 +3196,8 @@ void tork::copyCookie()
 void tork::shouldIApplySettings()
 {
 
-    disconnect(client, SIGNAL(shouldIApplySettings()),
-            this, SLOT(shouldIApplySettings()) );
+    disconnect(client, TQ_SIGNAL(shouldIApplySettings()),
+            this, TQ_SLOT(shouldIApplySettings()) );
 
     switch (TorkConfig::quickConfigure()) {
         case 0 : 
@@ -3610,10 +3610,10 @@ void tork::showWarning( display_status_t &msg, const TQString &headline,const TQ
     text += TQString( "<br>" ) + i18n( "<b>This means: </b> %1" ).arg(thismeans);
     text += TQString( "<br>" );
 
-        //connect(m_tooltip, SIGNAL(yesClicked()),this, SLOT(serverHelp()));
+        //connect(m_tooltip, TQ_SIGNAL(yesClicked()),this, TQ_SLOT(serverHelp()));
 
-    connect(m_tooltip, SIGNAL(noClicked( )), SLOT(noClicked( )));
-    connect(m_tooltip, SIGNAL(Closed( )), SLOT(popUpClosed( )));
+    connect(m_tooltip, TQ_SIGNAL(noClicked( )), TQ_SLOT(noClicked( )));
+    connect(m_tooltip, TQ_SIGNAL(Closed( )), TQ_SLOT(popUpClosed( )));
 
     m_tooltip->showOkButton( true );
     m_tooltip->showCounter( true );
@@ -3673,9 +3673,9 @@ void tork::askQuestion(display_status_t &msg, const TQString &headline,const TQS
     text += TQString( "<br>" ) + i18n( "%1" ).arg(question);
 
     //damn. functions pointers can't be used in slots. i don't have the heart to unroll it atm.
-    connect(m_tooltip, SIGNAL(yesClicked( )), SLOT(slotHandle( )));
-    connect(m_tooltip, SIGNAL(noClicked( )), SLOT(noClicked( )));
-    connect(m_tooltip, SIGNAL(Closed( )), SLOT(popUpClosed( )));
+    connect(m_tooltip, TQ_SIGNAL(yesClicked( )), TQ_SLOT(slotHandle( )));
+    connect(m_tooltip, TQ_SIGNAL(noClicked( )), TQ_SLOT(noClicked( )));
+    connect(m_tooltip, TQ_SIGNAL(Closed( )), TQ_SLOT(popUpClosed( )));
 
 
     m_tooltip->showBothButton( true );
@@ -3905,7 +3905,7 @@ void tork::isControllerWorking( )
     if (!client->isControllerWorking()){
 
         processQuestion( "jdsklajdkslajdskla", i18n("TorK can't communicate with Tor on the controller port %1. Do you have something limiting/blocking traffic on that port?").arg(TorkConfig::controlPort()) );
-        TQTimer::singleShot( 10000, this, SLOT(isControllerWorking()) );
+        TQTimer::singleShot( 10000, this, TQ_SLOT(isControllerWorking()) );
 
     }
 
@@ -3953,10 +3953,10 @@ void tork::startNetStat()
 
     *netstatproc << netstatcmd;
 
-	connect( netstatproc, SIGNAL(processExited(TDEProcess *)),
-			SLOT(netStatExited()) );
-	connect( netstatproc, SIGNAL(readReady(KProcIO *)),
-		SLOT(receivedNetStatOutput(KProcIO *)) );
+	connect( netstatproc, TQ_SIGNAL(processExited(TDEProcess *)),
+			TQ_SLOT(netStatExited()) );
+	connect( netstatproc, TQ_SIGNAL(readReady(KProcIO *)),
+		TQ_SLOT(receivedNetStatOutput(KProcIO *)) );
 
 	netstatproc->start(KProcIO::NotifyOnExit)    ;
 
@@ -4046,7 +4046,7 @@ void tork::receivedNetStatOutput(KProcIO *)
 
             if ((foreignAddress.contains(":domain")) || (foreignAddress.contains(":53 "))){
                 m_program = program;
-                TQTimer::singleShot( 3000, this, SLOT(torUsedAfterDNSRequest()) );
+                TQTimer::singleShot( 3000, this, TQ_SLOT(torUsedAfterDNSRequest()) );
             }
 
             item2 = "";
@@ -4169,7 +4169,7 @@ void tork::useNewIdentity()
 
     if (client != 0L){
         recentNewIdentityRequest = true;
-        TQTimer::singleShot( 20000, this, SLOT(allowNewIdentityRequests()) );
+        TQTimer::singleShot( 20000, this, TQ_SLOT(allowNewIdentityRequests()) );
 
         client->newIdentity();
 
@@ -4340,8 +4340,8 @@ void tork::resetTor()
     TQString whichCommand= "tdesu -c 'killall -s HUP tor'";
     *catproc<<whichCommand;
     catproc->start(KProcIO::NotifyOnExit,TRUE);
-	connect( catproc, SIGNAL(processExited(TDEProcess *)),
-			SLOT(resetExited()) );
+	connect( catproc, TQ_SIGNAL(processExited(TDEProcess *)),
+			TQ_SLOT(resetExited()) );
 
 }