Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

36 files changed, 667 insertions, 667 deletions

diff --git a/src/arkollon/uninstallwizard.cpp b/src/arkollon/uninstallwizard.cpp
index 346d038..3e59fa6 100644
--- a/src/arkollon/uninstallwizard.cpp
+++ b/src/arkollon/uninstallwizard.cpp
@@ -89,9 +89,9 @@ UninstallWizard::UninstallWizard(TQWidget* parent, const char* name, bool modal,
 	icon.convertFromImage(qembed_findImage("misc"));
 	
 	externalProcess = new TQProcess(this);
-	connect(externalProcess, SIGNAL(processExited()), SLOT(processExited()));
-	connect(externalProcess, SIGNAL(readyReadStdout()), SLOT(readyReadStdout()));
-	connect(externalProcess, SIGNAL(readyReadStderr()), SLOT(readyReadStderr()));
+	connect(externalProcess, TQ_SIGNAL(processExited()), TQ_SLOT(processExited()));
+	connect(externalProcess, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(readyReadStdout()));
+	connect(externalProcess, TQ_SIGNAL(readyReadStderr()), TQ_SLOT(readyReadStderr()));
 	
 	TQFile uninstallScript("/tmp/arkollon-uninstall.sh");
 	if (uninstallScript.exists())
diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp
index f9f5d9c..bb43399 100644
--- a/src/arkollon/wizard.cpp
+++ b/src/arkollon/wizard.cpp
@@ -101,9 +101,9 @@ Wizard::Wizard(TQWidget *parent, const char *name)
 	componentList->header()->hide();
 	//progressLabel2->setMaximumSize(32767, progressLabel2->fontMetrics().height()*2);
 	externalProcess = new TQProcess(this);
-	connect(externalProcess, SIGNAL(processExited()), SLOT(processExited()));
-	connect(externalProcess, SIGNAL(readyReadStdout()), SLOT(readyReadStdout()));
-	connect(externalProcess, SIGNAL(readyReadStderr()), SLOT(readyReadStderr()));
+	connect(externalProcess, TQ_SIGNAL(processExited()), TQ_SLOT(processExited()));
+	connect(externalProcess, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(readyReadStdout()));
+	connect(externalProcess, TQ_SIGNAL(readyReadStderr()), TQ_SLOT(readyReadStderr()));
 	
 	logDialog = new LogDialog(this);
 	logDialog->hide();
@@ -112,8 +112,8 @@ Wizard::Wizard(TQWidget *parent, const char *name)
 	createActionFormats();
 	
 	kdeDirProcess = new TQProcess(this);
-	connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady()));
-	connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents()));
+	connect(kdeDirProcess, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(kdeDirReady()));
+	connect(kdeDirProcess, TQ_SIGNAL(processExited()), TQ_SLOT(getInstalledComponents()));
 	kdeDirProcess->addArgument("tde-config");
 	kdeDirProcess->addArgument("--prefix");
 	if (!kdeDirProcess->start())
@@ -185,8 +185,8 @@ void Wizard::getInstalledComponents()
 	uninstallScript.close();
 	
 	installedComponentsProcess = new TQProcess(this);
-	connect(installedComponentsProcess, SIGNAL(readyReadStdout()), SLOT(installedComponentsReady()));
-	connect(installedComponentsProcess, SIGNAL(processExited()), SLOT(setup()));
+	connect(installedComponentsProcess, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(installedComponentsReady()));
+	connect(installedComponentsProcess, TQ_SIGNAL(processExited()), TQ_SLOT(setup()));
 	installedComponentsProcess->addArgument("/bin/sh");
 	installedComponentsProcess->addArgument("/tmp/arkollon-uninstall.sh");
 	installedComponentsProcess->addArgument("--list");
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 0169e81..2c105f5 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -147,36 +147,36 @@ TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, TDEConfi
         static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
     delete list;
 
-    connect( m_usability->LongLivedPorts, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_torservers->ExitNodes, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_torservers->ExcludeNodes, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_torservers->MapAddress, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_torservers->AllowUnverifiedNodes, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_firewallsproxies->ReachableAddresses, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_filtertable->FilterRules, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_running->SOCKSPolicy, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_running->SOCKSBindAddressMany, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_running->PushAdd, SIGNAL( clicked() ), this, SLOT( enableApply() ) );
-    connect( m_running->PushAdd2, SIGNAL( clicked() ), this, SLOT( enableApply() ) );
-    connect( m_myserver->kcfg_ClientOnly, SIGNAL( toggled(bool) ), this, SLOT( showServerOpts(bool) ) );
-    connect( m_usability->TrackHostExits, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) );
-    connect( m_usability->PushAdd, SIGNAL( clicked() ), this, SLOT( enableApply() ) );
-
-    connect( m_quickconfig, SIGNAL( configChanged(const int &) ), this, SLOT( showHidePages(const int &) ) );
-    //connect( m_usability, SIGNAL(settingsChanged()), SLOT(updateButtons()) ); 
+    connect( m_usability->LongLivedPorts, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_torservers->ExitNodes, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_torservers->ExcludeNodes, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_torservers->MapAddress, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_torservers->AllowUnverifiedNodes, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_firewallsproxies->ReachableAddresses, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_filtertable->FilterRules, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_running->SOCKSPolicy, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_running->SOCKSBindAddressMany, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_running->PushAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_running->PushAdd2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_myserver->kcfg_ClientOnly, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( showServerOpts(bool) ) );
+    connect( m_usability->TrackHostExits, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableApply() ) );
+    connect( m_usability->PushAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableApply() ) );
+
+    connect( m_quickconfig, TQ_SIGNAL( configChanged(const int &) ), this, TQ_SLOT( showHidePages(const int &) ) );
+    //connect( m_usability, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateButtons()) ); 
 
     // Always apply settings when OK or Apply is pressed.
-    //connect( this, SIGNAL(settingsChanged()), this,
-    //               SLOT(updateCustomSettings()) );
-    connect( this, SIGNAL(okClicked()), this,
-                   SLOT(updateCustomSettings()) );
-    connect( this, SIGNAL(applyClicked()), this,
-                   SLOT(updateCustomSettings()) );
-    connect( this, SIGNAL(updateServerButton( )), parent,
-                    SLOT(updateServerButton( )) );
-
-    connect( m_firewallsproxies, SIGNAL(uncensorSelected( bool )), parent,
-                                 SLOT(toggleServerButton( bool )) );
+    //connect( this, TQ_SIGNAL(settingsChanged()), this,
+    //               TQ_SLOT(updateCustomSettings()) );
+    connect( this, TQ_SIGNAL(okClicked()), this,
+                   TQ_SLOT(updateCustomSettings()) );
+    connect( this, TQ_SIGNAL(applyClicked()), this,
+                   TQ_SLOT(updateCustomSettings()) );
+    connect( this, TQ_SIGNAL(updateServerButton( )), parent,
+                    TQ_SLOT(updateServerButton( )) );
+
+    connect( m_firewallsproxies, TQ_SIGNAL(uncensorSelected( bool )), parent,
+                                 TQ_SLOT(toggleServerButton( bool )) );
 
     if (TorkConfig::currentTorVersion().left(3) == "0.1"){
         m_filtertable->setEnabled(false);
diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp
index cd2bafc..96b4cd5 100644
--- a/src/crashhandler.cpp
+++ b/src/crashhandler.cpp
@@ -291,8 +291,8 @@ torK::CrashHandlerWidget::CrashHandlerWidget()
 
     static_cast<TQPushButton*>(child("email"))->setDefault( true );
 
-    connect( child( "email" ), SIGNAL(clicked()), SLOT(accept()) );
-    connect( child( "close" ), SIGNAL(clicked()), SLOT(reject()) );
+    connect( child( "email" ), TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+    connect( child( "close" ), TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
     setCaption( i18n("Crash Handler") );
     setFixedSize( sizeHint() );
diff --git a/src/firewallsproxies.ui.h b/src/firewallsproxies.ui.h
index b215b39..4cee153 100644
--- a/src/firewallsproxies.ui.h
+++ b/src/firewallsproxies.ui.h
@@ -80,7 +80,7 @@ void FirewallsProxies::ReachableAddresses_contextMenuRequested( TQListViewItem *
     TQPopupMenu *menu = new TQPopupMenu( ReachableAddresses );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
     menu->popup( point );
 
 }
@@ -157,7 +157,7 @@ void FirewallsProxies::Bridge_contextMenuRequested( TQListViewItem *, const TQPo
     TQPopupMenu *menu = new TQPopupMenu( Bridge );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteBridgesEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteBridgesEntry()) );
     menu->popup( point );
 
 }
@@ -183,8 +183,8 @@ void FirewallsProxies::slotDeleteBridgesEntry( )
 void FirewallsProxies::slotGetBridges( )
 {
 
-    connect( filelist, SIGNAL( completed() ), this,
-		SLOT( parseBridges() ) );
+    connect( filelist, TQ_SIGNAL( completed() ), this,
+		TQ_SLOT( parseBridges() ) );
 
     filelist->openURL("https://bridges.torproject.org");
 }
@@ -192,8 +192,8 @@ void FirewallsProxies::slotGetBridges( )
 void FirewallsProxies::parseBridges()
 {
 
-    disconnect( filelist, SIGNAL( completed() ), this,
-	SLOT( parseBridges() ) );
+    disconnect( filelist, TQ_SIGNAL( completed() ), this,
+	TQ_SLOT( parseBridges() ) );
 
     const DOM::HTMLCollection links = filelist->htmlDocument().all();
     if (links.length() == 0){
diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h
index b91078d..df6c510 100644
--- a/src/hiddensrvs.ui.h
+++ b/src/hiddensrvs.ui.h
@@ -65,8 +65,8 @@ void MyHidden::createService_clicked()
     if (static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor()){
         HidSrvWizard wizard;
         wizard.setCaption( i18n( "Hidden Services Wizard" ));
-        connect( &wizard, SIGNAL(createService(const TQString&,const TQString&)),this->topLevelWidget()->parent(), SLOT(createService(const TQString&,const TQString& )) );
-        connect( &wizard, SIGNAL(addService(const TQString&,const TQString&,const TQString&,const TQString&,const TQString&,const TQString&)), SLOT(addService(const TQString&,const TQString&,const TQString&,const TQString&,const TQString&,const TQString&)) );
+        connect( &wizard, TQ_SIGNAL(createService(const TQString&,const TQString&)),this->topLevelWidget()->parent(), TQ_SLOT(createService(const TQString&,const TQString& )) );
+        connect( &wizard, TQ_SIGNAL(addService(const TQString&,const TQString&,const TQString&,const TQString&,const TQString&,const TQString&)), TQ_SLOT(addService(const TQString&,const TQString&,const TQString&,const TQString&,const TQString&,const TQString&)) );
         wizard.exec();
     }else{
         TQString caption = i18n("Not Connected To Tor!");
@@ -130,8 +130,8 @@ void MyHidden::startService_clicked()
                 << "-h " << servicesList->currentItem()->text(3).section(":",0,0)
                 << "-d " << servicesList->currentItem()->text(4);
 
- 	connect( thttpdproc, SIGNAL(processExited(TDEProcess *)),
- 			SLOT(thttpdprocExited(TDEProcess *)) );
+ 	connect( thttpdproc, TQ_SIGNAL(processExited(TDEProcess *)),
+ 			TQ_SLOT(thttpdprocExited(TDEProcess *)) );
 
 	thttpdproc->start(KProcIO::NotifyOnExit)    ;
 
diff --git a/src/hidsrvwizard.ui.h b/src/hidsrvwizard.ui.h
index 47d4ef0..c37aa1f 100644
--- a/src/hidsrvwizard.ui.h
+++ b/src/hidsrvwizard.ui.h
@@ -94,7 +94,7 @@ HidSrvWizard::showPage( TQWidget *w ) //virtual
         else
             emit createService(TQString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text()), TQString("%1 %2:%3").arg(NonWebPort->text()).arg(RedirectAddress->text()).arg(RedirectPort->text()));
         GatheringDetailsText->setText("Please wait while Tor attempts to create the service.");
-        TQTimer::singleShot( 3000, this, SLOT(checkServiceDetails()) );
+        TQTimer::singleShot( 3000, this, TQ_SLOT(checkServiceDetails()) );
         finishButton()->setEnabled(false);
     }
 
diff --git a/src/konqplugin/tork_plug_in.cpp b/src/konqplugin/tork_plug_in.cpp
index 6010b7d..5d32936 100644
--- a/src/konqplugin/tork_plug_in.cpp
+++ b/src/konqplugin/tork_plug_in.cpp
@@ -67,12 +67,12 @@ Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
     TDEActionMenu *menu = new TDEActionMenu( i18n("Anonymity Manager"), pix,
                                          actionCollection(), "tork_menu" );
     menu->setDelayed( false );
-    connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() ));
+    connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( showPopup() ));
 
     m_paToggleTDE=new TDEAction(i18n("Anonymize TDE"),
                                            TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               TDEIcon::Small),
                                            TDEShortcut(),
-                                           this, SLOT(toggleTDE()),
+                                           this, TQ_SLOT(toggleTDE()),
                                            actionCollection(), "tork_konqueroron" );
 
     menu->insert( m_paToggleTDE );
@@ -81,14 +81,14 @@ Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
     TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"),
                                            TDEGlobal::iconLoader()->loadIconSet("tork_firefox",                                               TDEIcon::Small),
                                            TDEShortcut(),
-                                           this, SLOT(openWithFirefox()),
+                                           this, TQ_SLOT(openWithFirefox()),
                                            actionCollection(), "tork_firefox" );
     menu->insert( m_firefox );
 
     TDEAction *m_opera=new TDEAction(i18n("Re-Open Anonymously with Opera"),
                                            TDEGlobal::iconLoader()->loadIconSet("tork_opera",                                               TDEIcon::Small),
                                            TDEShortcut(),
-                                           this, SLOT(openWithOpera()),
+                                           this, TQ_SLOT(openWithOpera()),
                                            actionCollection(), "tork_opera" );
     menu->insert( m_opera );
 
diff --git a/src/kwidgetlistbox.cpp b/src/kwidgetlistbox.cpp
index 16ef004..9249866 100644
--- a/src/kwidgetlistbox.cpp
+++ b/src/kwidgetlistbox.cpp
@@ -36,8 +36,8 @@ KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
   verticalHeader()->hide();
   setSelectionMode(TQTable::NoSelection);
   setFocusStyle(TQTable::FollowStyle);
-  connect(this, SIGNAL(currentChanged(int, int)),
-          this, SLOT(selectionChanged(int, int)));
+  connect(this, TQ_SIGNAL(currentChanged(int, int)),
+          this, TQ_SLOT(selectionChanged(int, int)));
   setHScrollBarMode(TQScrollView::AlwaysOff);
   setVScrollBarMode(TQScrollView::Auto);
 }
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 80cf232..976e328 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -73,31 +73,31 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
 	m_likeButton->setIconSet(likeIconSet);
 	m_likeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you like"));
 	m_likeButton->setAutoRaise(true);
-	connect( m_likeButton, SIGNAL(clicked()), this, SLOT(clickedLike()) );
+	connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedLike()) );
 	layout->add(m_likeButton);
 
 	m_dislikeButton = new TQToolButton(this, "likeback_dislike_tork");
 	m_dislikeButton->setIconSet(dislikeIconSet);
 	m_dislikeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you dislike"));
 	m_dislikeButton->setAutoRaise(true);
-	connect( m_dislikeButton, SIGNAL(clicked()), this, SLOT(clickedDislike()) );
+	connect( m_dislikeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedDislike()) );
 	layout->add(m_dislikeButton);
 
 	m_bugButton = new TQToolButton(this, "likeback_bug_tork");
 	m_bugButton->setIconSet(bugIconSet);
 	m_bugButton->setTextLabel("<p>" + i18n("Send application developers a comment about an improper behavior of the application"));
 	m_bugButton->setAutoRaise(true);
-	connect( m_bugButton, SIGNAL(clicked()), this, SLOT(clickedBug()) );
+	connect( m_bugButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedBug()) );
 	layout->add(m_bugButton);
 
 	m_featureButton = new TQToolButton(this, "likeback_feature_tork");
 	m_featureButton->setIconSet(featureIconSet);
 	m_featureButton->setTextLabel("<p>" + i18n("Send application developers a comment about a new feature you desire"));
 	m_featureButton->setAutoRaise(true);
-	connect( m_featureButton, SIGNAL(clicked()), this, SLOT(clickedFeature()) );
+	connect( m_featureButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedFeature()) );
 	layout->add(m_featureButton);
 
-	connect( &m_timer, SIGNAL(timeout()), this, SLOT(autoMove()) );
+	connect( &m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoMove()) );
 
 	LikeBack::Button buttons = likeBack->buttons();
 	m_likeButton->setShown(    buttons & LikeBack::Like    );
@@ -243,7 +243,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, con
 
 	// Show the bar if that's wanted by the developer or the user:
 	if (d->showBar)
-		TQTimer::singleShot( 0, d->bar, SLOT(startTimer()) );
+		TQTimer::singleShot( 0, d->bar, TQ_SLOT(startTimer()) );
 
 #if 0
 	disableBar();
@@ -378,7 +378,7 @@ TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent)
 	if (d->action == 0)
 		d->action = new TDEAction(
 			i18n("&Send a Comment to Developers"), /*icon=*/"mail-message-new", /*shortcut=*/"",
-			this, SLOT(execCommentDialog()),
+			this, TQ_SLOT(execCommentDialog()),
 			parent, "likeback_send_a_comment"
 		);
 
@@ -584,7 +584,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 		return;
 	m_process = new TDEProcess();
 	*m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
-	connect( m_process, SIGNAL(processExited(TDEProcess*)), SLOT(fetchUserEmail()) );
+	connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(fetchUserEmail()) );
 	if (!m_process->start()) {
 		kdDebug() << "Couldn't start tdecmshell.." << endl;
 		delete m_process;
@@ -717,11 +717,11 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 	m_showButtons = new TQCheckBox(i18n("Show comment buttons below &window titlebars"), page);
 	m_showButtons->setChecked(m_likeBack->userWantsToShowBar());
 	pageLayout->addWidget(m_showButtons);
-	connect( m_showButtons, SIGNAL(stateChanged(int)), this, SLOT(changeButtonBarVisible()) );
+	connect( m_showButtons, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changeButtonBarVisible()) );
 
 	setButtonOK(KGuiItem(i18n("&Send Comment"), "mail-send"));
 	enableButtonOK(false);
-	connect( m_comment, SIGNAL(textChanged()), this, SLOT(commentChanged()) );
+	connect( m_comment, TQ_SIGNAL(textChanged()), this, TQ_SLOT(commentChanged()) );
 
 	setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic"));
 
@@ -729,7 +729,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 
 	TQAction *sendShortcut = new TQAction(this);
 	sendShortcut->setAccel(TQString("Ctrl+Return"));
-	connect( sendShortcut, SIGNAL(activated()), actionButton(Ok), SLOT(animateClick()) );
+	connect( sendShortcut, TQ_SIGNAL(activated()), actionButton(Ok), TQ_SLOT(animateClick()) );
 
 	setMainWidget(page);
 }
@@ -819,7 +819,7 @@ void LikeBackDialog::send()
 
 	std::cout << "http://" << m_likeBack->hostName().local8Bit() << ":" << m_likeBack->hostPort() << m_likeBack->remotePath().local8Bit() << std::endl;
 	std::cout << data.local8Bit() << std::endl;
-	connect( http, SIGNAL(requestFinished(int, bool)), this, SLOT(requestFinished(int, bool)) );
+	connect( http, TQ_SIGNAL(requestFinished(int, bool)), this, TQ_SLOT(requestFinished(int, bool)) );
 
 	TQHttpRequestHeader header("POST", m_likeBack->remotePath());
 	header.setValue("Host", m_likeBack->hostName());
diff --git a/src/maxmin.ui.h b/src/maxmin.ui.h
index 35d0d00..f335770 100644
--- a/src/maxmin.ui.h
+++ b/src/maxmin.ui.h
@@ -101,7 +101,7 @@ void MaxMin::timedBandwidthList_contextMenuRequested( TQListViewItem *, const TQ
     TQPopupMenu *menu = new TQPopupMenu( timedBandwidthList );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
     menu->popup( point );
 
 }
diff --git a/src/mixminion.ui.h b/src/mixminion.ui.h
index 5b78339..00d60d2 100644
--- a/src/mixminion.ui.h
+++ b/src/mixminion.ui.h
@@ -63,10 +63,10 @@ void MixMinionClient::send_clicked()
     *mixminionproc << "printf '" << messageBody->text() <<"' | mixminion  send -t " << toAddress->text() 
                 << " --subject '" << subject->text() << "'";
 
- 	connect( mixminionproc, SIGNAL(processExited(TDEProcess *)),
- 			SLOT(mixminionprocExited(TDEProcess *)) );
-	connect( mixminionproc, SIGNAL(readReady(KProcIO *)),
-		SLOT(receivedMixminionOutput(KProcIO *)) );
+ 	connect( mixminionproc, TQ_SIGNAL(processExited(TDEProcess *)),
+ 			TQ_SLOT(mixminionprocExited(TDEProcess *)) );
+	connect( mixminionproc, TQ_SIGNAL(readReady(KProcIO *)),
+		TQ_SLOT(receivedMixminionOutput(KProcIO *)) );
 
     progressDialog = new KProgressDialog( this, "progress_dialog", TQString::null, "Sending Anonymous Mail Message..", false );
 
@@ -78,7 +78,7 @@ void MixMinionClient::send_clicked()
     progressDialog->setMinimumDuration( 500 );
     progressDialog->show();
     TQTimer* timer = new TQTimer( this );
-    connect( timer, SIGNAL( timeout() ), this, SLOT( slotProg() ) );
+    connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProg() ) );
 
     timer->start( 200, FALSE );
 
diff --git a/src/newfirstrunwizard.ui.h b/src/newfirstrunwizard.ui.h
index 3b612b8..a62d680 100644
--- a/src/newfirstrunwizard.ui.h
+++ b/src/newfirstrunwizard.ui.h
@@ -150,8 +150,8 @@ FirstRunWizard::init()
 
 	*whichproc<<whichCommand;
 
-	connect( whichproc, SIGNAL(readReady(KProcIO * )),
-		SLOT(processWhich(KProcIO * )) );
+	connect( whichproc, TQ_SIGNAL(readReady(KProcIO * )),
+		TQ_SLOT(processWhich(KProcIO * )) );
 	whichproc->start(KProcIO::NotifyOnExit,TRUE);
 
 
@@ -481,9 +481,9 @@ void FirstRunWizard::testTor()
       delete client;
 
     client = new TorClient(host,port);
-    connect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor()));
-    connect( client, SIGNAL(authenticationFailed()),this, SLOT(cannotContactTor()));
-    connect( client, SIGNAL(authenticated()),this, SLOT(contactedTor()) );
+    connect( client, TQ_SIGNAL(fatalError()),this, TQ_SLOT(cannotContactTor()));
+    connect( client, TQ_SIGNAL(authenticationFailed()),this, TQ_SLOT(cannotContactTor()));
+    connect( client, TQ_SIGNAL(authenticated()),this, TQ_SLOT(contactedTor()) );
     client->authenticate();
 
 }
@@ -496,9 +496,9 @@ void FirstRunWizard::modifyConfs_clicked()
 void FirstRunWizard::cannotContactTor()
 {
 
-    disconnect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor()));
-    disconnect( client, SIGNAL(authenticationFailed()),this, SLOT(cannotContactTor()));
-    disconnect( client, SIGNAL(authenticated()),this, SLOT(contactedTor()) );
+    disconnect( client, TQ_SIGNAL(fatalError()),this, TQ_SLOT(cannotContactTor()));
+    disconnect( client, TQ_SIGNAL(authenticationFailed()),this, TQ_SLOT(cannotContactTor()));
+    disconnect( client, TQ_SIGNAL(authenticated()),this, TQ_SLOT(contactedTor()) );
     if (client != 0L){
         client->socketReadyRead();
         client->deleteLater();
@@ -530,8 +530,8 @@ void FirstRunWizard::cannotContactTor()
 void FirstRunWizard::contactedTor()
 {
 
-    disconnect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor()));
-    disconnect( client, SIGNAL(authenticated()),this, SLOT(contactedTor()) );
+    disconnect( client, TQ_SIGNAL(fatalError()),this, TQ_SLOT(cannotContactTor()));
+    disconnect( client, TQ_SIGNAL(authenticated()),this, TQ_SLOT(contactedTor()) );
     if (client != 0L){
         client->socketReadyRead();
         client->deleteLater();
@@ -559,7 +559,7 @@ void FirstRunWizard::contactedTor()
     testTorAgain->setEnabled(true);
     TorkConfig::setGenerateRandomPassword(true);
 //     if (!monitorRemote->isChecked())
-//         TQTimer::singleShot( 3000, this, SLOT(examineConfigFiles()) );
+//         TQTimer::singleShot( 3000, this, TQ_SLOT(examineConfigFiles()) );
 
 }
 
diff --git a/src/newstreamosd.cpp b/src/newstreamosd.cpp
index 867d762..76b4022 100644
--- a/src/newstreamosd.cpp
+++ b/src/newstreamosd.cpp
@@ -183,15 +183,15 @@ void StreamOSD::renderOSD()
 
     TQToolTip::add( this,i18n("This displays all network activity currently being handled by Tor."));
 
-     connect( hideMonitor, SIGNAL(clicked()),
-         SLOT(slotHideMonitor()) );
-     connect( toggleTDE, SIGNAL(clicked()),
-         SLOT(slotToggleTDE()) );
-     connect( changeID, SIGNAL(clicked()),
-         SLOT(slotChangeID()) );
+     connect( hideMonitor, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotHideMonitor()) );
+     connect( toggleTDE, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotToggleTDE()) );
+     connect( changeID, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotChangeID()) );
 
-//      connect( toggleTDE, SIGNAL(clicked()),
-//          SLOT(slotToggleTDE()) );
+//      connect( toggleTDE, TQ_SIGNAL(clicked()),
+//          TQ_SLOT(slotToggleTDE()) );
 
 
     infoList = new TQListView( this, "infoList" );
@@ -224,7 +224,7 @@ void StreamOSD::renderOSD()
 
     //infoList->adjustSize();
     //frame->update();
-     connect( infoList, SIGNAL( contextMenuRequested(TQListViewItem*,const TQPoint&,int) ), this, SLOT( contextMenuRequested(TQListViewItem*,const TQPoint&,int) ) );
+     connect( infoList, TQ_SIGNAL( contextMenuRequested(TQListViewItem*,const TQPoint&,int) ), this, TQ_SLOT( contextMenuRequested(TQListViewItem*,const TQPoint&,int) ) );
 
 
 
@@ -288,8 +288,8 @@ void StreamOSD::renderNonTorOSD()
 
     TQToolTip::add( this,i18n("This displays all your system's network activity."));
 
-     connect( hideMonitor, SIGNAL(clicked()),
-         SLOT(slotHideMonitor()) );
+     connect( hideMonitor, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotHideMonitor()) );
 
 
     infoList = new TQListView( this, "infoList" );
@@ -515,7 +515,7 @@ void StreamOSD::contextMenuRequested( TQListViewItem *, const TQPoint &point, in
     TQPopupMenu *menu = new TQPopupMenu( infoList );
 
     menu->clear();
-    menu->insertItem( "Close Stream", this,SLOT(slotCloseStream()) );
+    menu->insertItem( "Close Stream", this,TQ_SLOT(slotCloseStream()) );
     menu->popup( point );
 
 }
diff --git a/src/paranoia.ui.h b/src/paranoia.ui.h
index 325f8de..308b8bc 100644
--- a/src/paranoia.ui.h
+++ b/src/paranoia.ui.h
@@ -97,8 +97,8 @@ void FilterTable::FilterRules_contextMenuRequested( TQListViewItem *, const TQPo
     TQPopupMenu *menu = new TQPopupMenu( FilterRules );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
-    menu->insertItem( "Toggle Entry", this,SLOT(slotToggleEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Toggle Entry", this,TQ_SLOT(slotToggleEntry()) );
 
     menu->popup( point );
 
@@ -110,8 +110,8 @@ void FilterTable::SystemFilterRules_contextMenuRequested( TQListViewItem *, cons
     TQPopupMenu *menu = new TQPopupMenu( SystemFilterRules );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteSystemEntry()) );
-    menu->insertItem( "Toggle Entry", this,SLOT(slotToggleSystemEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteSystemEntry()) );
+    menu->insertItem( "Toggle Entry", this,TQ_SLOT(slotToggleSystemEntry()) );
 
     menu->popup( point );
 
diff --git a/src/popupMessage.cpp b/src/popupMessage.cpp
index 37b9112..9b67d78 100644
--- a/src/popupMessage.cpp
+++ b/src/popupMessage.cpp
@@ -107,16 +107,16 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con
         hbox->add( new TQCheckBox( this, "showWarnings" ) );
         static_cast<TQCheckBox*>(child( "showWarnings" ))->setText(TQString("%1 in Future.").arg(m_name));
         static_cast<TQCheckBox*>(child( "showWarnings" ))->setChecked(TRUE);
-        connect( child( "showWarnings" ), SIGNAL(toggled( bool )), SLOT(toggled( bool )) );
+        connect( child( "showWarnings" ), TQ_SIGNAL(toggled( bool )), TQ_SLOT(toggled( bool )) );
     }
     hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
     hbox->add( new KPushButton( KStdGuiItem::yes(), this, "yesButton" ) );
     hbox->add( new KPushButton( KStdGuiItem::no(), this, "closeButton" ) );
     hbox->add( new KPushButton( KStdGuiItem::ok(), this, "okButton" ) );
 
-    connect( child( "yesButton" ), SIGNAL(clicked()), SLOT(yes()) );
-    connect( child( "closeButton" ), SIGNAL(clicked()), SLOT(no()) );
-    connect( child( "okButton" ), SIGNAL(clicked()), SLOT(no()) );
+    connect( child( "yesButton" ), TQ_SIGNAL(clicked()), TQ_SLOT(yes()) );
+    connect( child( "closeButton" ), TQ_SIGNAL(clicked()), TQ_SLOT(no()) );
+    connect( child( "okButton" ), TQ_SIGNAL(clicked()), TQ_SLOT(no()) );
  
 }
 
diff --git a/src/running.ui.h b/src/running.ui.h
index 90fb45b..024dd31 100644
--- a/src/running.ui.h
+++ b/src/running.ui.h
@@ -78,7 +78,7 @@ void Running::SOCKSBindAddressMany_contextMenuRequested( TQListViewItem *, const
     TQPopupMenu *menu = new TQPopupMenu( SOCKSBindAddressMany );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
     menu->popup( point );
 
 }
@@ -103,7 +103,7 @@ void Running::SOCKSPolicy_contextMenuRequested( TQListViewItem *, const TQPoint
     TQPopupMenu *menu = new TQPopupMenu( SOCKSPolicy );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeletePolicyEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeletePolicyEntry()) );
     menu->popup( point );
 
 }
diff --git a/src/server.ui.h b/src/server.ui.h
index 9f83877..365cafc 100644
--- a/src/server.ui.h
+++ b/src/server.ui.h
@@ -176,7 +176,7 @@ void MyServer::ExitPolicy_contextMenuRequested( TQListViewItem *, const TQPoint
     TQPopupMenu *menu = new TQPopupMenu( ExitPolicy );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
     menu->popup( point );
 
 }
diff --git a/src/testprivacyproxy.cpp b/src/testprivacyproxy.cpp
index 2fff495..21c23d8 100644
--- a/src/testprivacyproxy.cpp
+++ b/src/testprivacyproxy.cpp
@@ -43,14 +43,14 @@ TestPrivoxy::TestPrivoxy( )
 {
     // create the socket and connect various of its signals
     socket = new TQSocket( this );
-    connect( socket, SIGNAL(connected()),
-            SLOT(socketConnected()) );
-    connect( socket, SIGNAL(connectionClosed()),
-            SLOT(socketConnectionClosed()) );
-/*    connect( socket, SIGNAL(readyRead()),
-            SLOT(socketReadyRead()) );*/
-    connect( socket, SIGNAL(error(int)),
-            SLOT(socketError(int)) );
+    connect( socket, TQ_SIGNAL(connected()),
+            TQ_SLOT(socketConnected()) );
+    connect( socket, TQ_SIGNAL(connectionClosed()),
+            TQ_SLOT(socketConnectionClosed()) );
+/*    connect( socket, TQ_SIGNAL(readyRead()),
+            TQ_SLOT(socketReadyRead()) );*/
+    connect( socket, TQ_SIGNAL(error(int)),
+            TQ_SLOT(socketError(int)) );
 
 
 }
diff --git a/src/testprivacyproxy.h b/src/testprivacyproxy.h
index 0ae82da..86b278e 100644
--- a/src/testprivacyproxy.h
+++ b/src/testprivacyproxy.h
@@ -64,8 +64,8 @@ public slots:
         socket->close();
         if ( socket->state() == TQSocket::Closing ) {
             // We have a delayed close.
-            connect( socket, SIGNAL(delayedCloseFinished()),
-                    SLOT(socketClosed()) );
+            connect( socket, TQ_SIGNAL(delayedCloseFinished()),
+                    TQ_SLOT(socketClosed()) );
         } else {
             // The socket is closed.
             socketClosed();
diff --git a/src/torclient.cpp b/src/torclient.cpp
index c3efc5a..e2d68f1 100644
--- a/src/torclient.cpp
+++ b/src/torclient.cpp
@@ -64,14 +64,14 @@ TorClient::TorClient( const TQString &host, TQ_UINT16 port )
 {
     // create the socket and connect various of its signals
     socket = new TQSocket( this );
-    connect( socket, SIGNAL(connected()),
-            SLOT(socketConnected()) );
-    connect( socket, SIGNAL(connectionClosed()),
-            SLOT(socketConnectionClosed()) );
-    connect( socket, SIGNAL(readyRead()),
-            SLOT(socketReadyRead()) );
-    connect( socket, SIGNAL(error(int)),
-            SLOT(socketError(int)) );
+    connect( socket, TQ_SIGNAL(connected()),
+            TQ_SLOT(socketConnected()) );
+    connect( socket, TQ_SIGNAL(connectionClosed()),
+            TQ_SLOT(socketConnectionClosed()) );
+    connect( socket, TQ_SIGNAL(readyRead()),
+            TQ_SLOT(socketReadyRead()) );
+    connect( socket, TQ_SIGNAL(error(int)),
+            TQ_SLOT(socketError(int)) );
 
     // connect to the server
     //infoText->append( tr("Trying to connect to the server\n") );
diff --git a/src/torclient.h b/src/torclient.h
index d69b24e..9a3724c 100644
--- a/src/torclient.h
+++ b/src/torclient.h
@@ -172,8 +172,8 @@ private slots:
         socket->close();
         if ( socket->state() == TQSocket::Closing ) {
             // We have a delayed close.
-            connect( socket, SIGNAL(delayedCloseFinished()),
-                    SLOT(socketClosed()) );
+            connect( socket, TQ_SIGNAL(delayedCloseFinished()),
+                    TQ_SLOT(socketClosed()) );
         } else {
             // The socket is closed.
             socketClosed();
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()) );
 
 } 
 
diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp
index df9c07c..67914ed 100644
--- a/src/torkapplet/tork_mnu.cpp
+++ b/src/torkapplet/tork_mnu.cpp
@@ -116,7 +116,7 @@ void TorkMenu::initialize()
     
     insertItem( SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" ), 9,9 );
 
-    connect( this, SIGNAL( aboutToShow() ), SLOT( showPopup() ));
+    connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( showPopup() ));
 
 }
 
diff --git a/src/torkview.cpp b/src/torkview.cpp
index ce32aea..1b9c9dc 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -166,7 +166,7 @@ torkView::torkView(TQWidget *parent)
     chart->setMinimumWidth(ChartFrame->width());
     chart->setMinimumHeight(ChartFrame->height());
 
-    connect(this, SIGNAL(updateStats()), chart, SLOT(update()));
+    connect(this, TQ_SIGNAL(updateStats()), chart, TQ_SLOT(update()));
 
 
     m_osd = new StreamOSD(this, true);
@@ -568,11 +568,11 @@ void torkView::toggleAnonymizerTork(bool state)
 
     welcomeitem->setEnabled(true);
 
-    disconnect(welcomeitem->icon, SIGNAL(leftClickedURL()), this, SIGNAL(startEverything()));
-    disconnect(welcomeitem->icon, SIGNAL(leftClickedURL()), this, SIGNAL(stopEverything()));
+    disconnect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), this, TQ_SIGNAL(startEverything()));
+    disconnect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), this, TQ_SIGNAL(stopEverything()));
 
     if (state){
-        connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(stopEverything()));
+        connect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(stopEverything()));
         welcomeheaderLabel->setText(i18n("Welcome to the Tor Network!"));
         welcomeitem->setIcon("tork_stop");
         welcomeitem->setDescriptionText("<qt>"+i18n("- <b>You are %1.</b><br>"
@@ -594,7 +594,7 @@ void torkView::toggleAnonymizerTork(bool state)
         }
 
     }else{
-        connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(startEverything()));
+        connect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(startEverything()));
         welcomeitem->setIcon("tork_pressplay");
         welcomeheaderLabel->setText(i18n("Press 'Play' to get started!"));
         welcomeitem->setDescriptionText("<qt>"+i18n("- <b>Press 'Play' to connect to Tor. (You can also use the toolbar icons.)</b><br>"
@@ -1522,20 +1522,20 @@ void torkView::populateMenu()
     KURLLabel *buttonStart = new KURLLabel(welcomeitem);
     buttonStart->setPixmap(SmallIcon("application-vnd.tde.info"));
     welcomeitem->insertHitWidget(0,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTor()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTor()));
 
     buttonStart = new KURLLabel(welcomeitem);
     buttonStart->setText(i18n("What You Need To Know When Using TorK!"));
     welcomeitem->insertHitWidget(1,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTor()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTor()));
 
     paranoidmodeicon = new KURLLabel(welcomeitem);
     welcomeitem->insertHitWidget(2,paranoidmodeicon);
-    connect(paranoidmodeicon, SIGNAL(leftClickedURL()), SIGNAL(aboutParanoidMode()));
+    connect(paranoidmodeicon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutParanoidMode()));
 
     paranoidmodetext = new KURLLabel(welcomeitem);
     welcomeitem->insertHitWidget(3,paranoidmodetext);
-    connect(paranoidmodetext, SIGNAL(leftClickedURL()), SIGNAL(aboutParanoidMode()));
+    connect(paranoidmodetext, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutParanoidMode()));
 
 
     paranoidmodeicon->setPixmap(SmallIcon("tork_penguin"));
@@ -1549,10 +1549,10 @@ void torkView::populateMenu()
 
     welcomeitem->score->setCurrentItem(TorkConfig::quickConfigure());
 
-    connect(welcomeitem->score, SIGNAL(activated(int)), SLOT(changeQuickConfigure(int)));
+    connect(welcomeitem->score, TQ_SIGNAL(activated(int)), TQ_SLOT(changeQuickConfigure(int)));
 
     Anonymizer->insertItem(welcomeitem);
-    connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(startEverything()));
+    connect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(startEverything()));
 
 
     TQLabel *headerLabel;
@@ -1586,15 +1586,15 @@ void torkView::populateMenu()
         buttonStart = new KURLLabel(firefoxitem);
         buttonStart->setPixmap(SmallIcon("application-vnd.tde.info"));
         firefoxitem->insertHitWidget(0,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadTorButton()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadTorButton()));
 
         buttonStart = new KURLLabel(firefoxitem);
         buttonStart->setText(i18n("Install TorButton First (Recommended)"));
         firefoxitem->insertHitWidget(1,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadTorButton()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadTorButton()));
 
         Anonymizer->insertItem(firefoxitem);
-        connect(firefoxitem->icon, SIGNAL(leftClickedURL()), SLOT(anonymousFirefox()));
+        connect(firefoxitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(anonymousFirefox()));
     }
     //Kopete
 #endif
@@ -1627,32 +1627,32 @@ void torkView::populateMenu()
 //     mixminionitem->score->setHidden(false);
 //     mixminionitem->score->insertStringList(shellsAvailable);
 //     mixminionitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-//     connect(mixminionitem->score, SIGNAL(activated(int)),mixminionitem,
-//             SLOT(changeTerminalUrl(int)));
+//     connect(mixminionitem->score, TQ_SIGNAL(activated(int)),mixminionitem,
+//             TQ_SLOT(changeTerminalUrl(int)));
 
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setPixmap(SmallIcon("application-vnd.tde.info"));
     mixminionitem->insertHitWidget(0,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadMixminion()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadMixminion()));
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setText(i18n("Install Mixminion"));
     mixminionitem->insertHitWidget(1,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadMixminion()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadMixminion()));
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setPixmap(SmallIcon("konqueror"));
     mixminionitem->insertHitWidget(2,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(mixminionHome()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(mixminionHome()));
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setText(i18n("Visit the Mixminion Project page."));
     mixminionitem->insertHitWidget(3,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(mixminionHome()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(mixminionHome()));
 
     Anonymizer->insertItem(mixminionitem);
-    connect(mixminionitem->icon, SIGNAL(leftClickedURL()), SLOT(sendAnonymousEmail()));
+    connect(mixminionitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(sendAnonymousEmail()));
 
     konqitem=0L;
     //Konqueror
@@ -1684,25 +1684,25 @@ void torkView::populateMenu()
       buttonStart = new KURLLabel(konqitem);
       buttonStart->setPixmap(SmallIcon("configure"));
       konqitem->insertHitWidget(0,buttonStart);
-      connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(showMyKonqueror()));
+      connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(showMyKonqueror()));
 
       buttonStart = new KURLLabel(konqitem);
       buttonStart->setText(i18n("Configure Anonymous Konqueror"));
       konqitem->insertHitWidget(1,buttonStart);
-      connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(showMyKonqueror()));
+      connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(showMyKonqueror()));
 
       configurePriv = new KURLLabel(konqitem);
       configurePriv->setPixmap(SmallIcon("configure"));
       konqitem->insertHitWidget(2,configurePriv);
-      connect(configurePriv, SIGNAL(leftClickedURL()), SIGNAL(configurePrivoxy()));
+      connect(configurePriv, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(configurePrivoxy()));
 
       configurePrivText = new KURLLabel(konqitem);
       configurePrivText->setText(i18n("Configure Privoxy"));
       konqitem->insertHitWidget(3,configurePrivText);
-      connect(configurePrivText, SIGNAL(leftClickedURL()), SIGNAL(configurePrivoxy()));
+      connect(configurePrivText, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(configurePrivoxy()));
 
       Anonymizer->insertItem(konqitem);
-      connect(konqitem->icon, SIGNAL(leftClickedURL()), SIGNAL(konqWithTor()));
+      connect(konqitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(konqWithTor()));
     }
     
 #endif
@@ -1730,7 +1730,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         operaitem->icon->setURL("opera");
         Anonymizer->insertItem(operaitem);
-        connect(operaitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(anonymizedOpera(const TQString&)));
+        connect(operaitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(anonymizedOpera(const TQString&)));
     }
 #endif
 
@@ -1754,15 +1754,15 @@ void torkView::populateMenu()
     buttonStart = new KURLLabel(hiddenservicesitem);
     buttonStart->setPixmap(SmallIcon("konqueror"));
     hiddenservicesitem->insertHitWidget(0,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(hiddenServices()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(hiddenServices()));
 
     buttonStart = new KURLLabel(hiddenservicesitem);
     buttonStart->setText(i18n("Search Hidden Services"));
     hiddenservicesitem->insertHitWidget(1,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(hiddenServices()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(hiddenServices()));
 
     Anonymizer->insertItem(hiddenservicesitem);
-    connect(hiddenservicesitem->icon, SIGNAL(leftClickedURL()), SIGNAL(showMyHiddenServices()));
+    connect(hiddenservicesitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(showMyHiddenServices()));
 
 
     //Kopete
@@ -1787,7 +1787,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         kopeteitem->icon->setURL("kopete  --caption 'Anonymous IM Session - Launched From TorK'");
         Anonymizer->insertItem(kopeteitem);
-        connect(kopeteitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(kopeteitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Gaim
@@ -1811,7 +1811,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         gaimitem->icon->setURL("gaim");
         Anonymizer->insertItem(gaimitem);
-        connect(gaimitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(gaimitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Pidgin
@@ -1836,7 +1836,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         pidginitem->icon->setURL("pidgin");
         Anonymizer->insertItem(pidginitem);
-        connect(pidginitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(pidginitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Gaim
@@ -1862,7 +1862,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         konversationitem->icon->setURL("konversation");
         Anonymizer->insertItem(konversationitem);
-        connect(konversationitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(konversationitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //KSIRC
@@ -1888,7 +1888,7 @@ void torkView::populateMenu()
 
         ksircitem->icon->setURL("ksirc  --caption 'Anonymous IRC Shell - Launched From TorK'");
         Anonymizer->insertItem(ksircitem);
-        connect(ksircitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(ksircitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 
 #endif
@@ -1936,12 +1936,12 @@ void torkView::populateMenu()
         buttonStart = new KURLLabel(sshitem);
         buttonStart->setPixmap(SmallIcon("help"));
         sshitem->insertHitWidget(0,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTorify()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTorify()));
         
         buttonStart = new KURLLabel(sshitem);
         buttonStart->setText(i18n("How can I be sure this is working?"));
         sshitem->insertHitWidget(1,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTorify()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTorify()));
 
         sshitem->shellTitles["konsole"] = " --caption 'Anonymous SSH Shell - Launched From TorK'";
         sshitem->shellTitles["yakuake"] = " --caption 'Anonymous SSH Shell - Launched From TorK'";
@@ -1954,10 +1954,10 @@ void torkView::populateMenu()
         sshitem->score->setHidden(false);
         sshitem->score->insertStringList(shellsAvailable);
         sshitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-        connect(sshitem->score, SIGNAL(activated(int)),sshitem, SLOT(changeTerminalUrl(int)));
+        connect(sshitem->score, TQ_SIGNAL(activated(int)),sshitem, TQ_SLOT(changeTerminalUrl(int)));
 
         Anonymizer->insertItem(sshitem);
-        connect(sshitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(sshitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Telnet
@@ -1986,12 +1986,12 @@ void torkView::populateMenu()
         buttonStart = new KURLLabel(telnetitem);
         buttonStart->setPixmap(SmallIcon("help"));
         telnetitem->insertHitWidget(0,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(riskySession()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(riskySession()));
         
         buttonStart = new KURLLabel(telnetitem);
         buttonStart->setText(i18n("Why is anonymous telnet risky?"));
         telnetitem->insertHitWidget(1,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(riskySession()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(riskySession()));
 
         telnetitem->shellTitles["konsole"] = " --caption 'Anonymous Telnet Session - Launched From TorK'";
         telnetitem->shellTitles["yakuake"] = " --caption 'Anonymous Telnet Session - Launched From TorK'";
@@ -2004,10 +2004,10 @@ void torkView::populateMenu()
         telnetitem->score->setHidden(false);
         telnetitem->score->insertStringList(shellsAvailable);
         telnetitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-        connect(telnetitem->score, SIGNAL(activated(int)),telnetitem, SLOT(changeTerminalUrl(int)));
+        connect(telnetitem->score, TQ_SIGNAL(activated(int)),telnetitem, TQ_SLOT(changeTerminalUrl(int)));
 
         Anonymizer->insertItem(telnetitem);
-        connect(telnetitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(telnetitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
     //GPG
 #endif
@@ -2048,10 +2048,10 @@ void torkView::populateMenu()
         gpgitem->score->setHidden(false);
         gpgitem->score->insertStringList(hkpShellsAvailable);
         gpgitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-        connect(gpgitem->score, SIGNAL(activated(int)),gpgitem, SLOT(changeTerminalUrl(int)));
+        connect(gpgitem->score, TQ_SIGNAL(activated(int)),gpgitem, TQ_SLOT(changeTerminalUrl(int)));
 
         Anonymizer->insertItem(gpgitem);
-        connect(gpgitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(gpgitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //All Purpose Shell
@@ -2082,7 +2082,7 @@ void torkView::populateMenu()
 
 
         Anonymizer->insertItem(allpurposeitem);
-        connect(allpurposeitem->icon, SIGNAL(leftClickedURL()), SLOT(privoxiedBash()));
+        connect(allpurposeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(privoxiedBash()));
     }
 #endif
 
diff --git a/src/torkview_base.ui.h b/src/torkview_base.ui.h
index 509bdce..c550472 100644
--- a/src/torkview_base.ui.h
+++ b/src/torkview_base.ui.h
@@ -54,8 +54,8 @@ void torkview_base::init()
     serverFilter->setSearchColumns(tmp);
 
     clearButton->setIconSet(SmallIconSet("locationbar_erase"));
-    connect(clearButton, SIGNAL( clicked() ),
-                    serverFilter, SLOT(clear()) );
+    connect(clearButton, TQ_SIGNAL( clicked() ),
+                    serverFilter, TQ_SLOT(clear()) );
 
     serverList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", 
                            TDEIcon::Small),"", 24 );
@@ -145,11 +145,11 @@ void torkview_base::streamList_contextMenuRequested( TQListViewItem *, const TQP
     menu->clear();
 
     if (streamList->childCount() > 0)
-        menu->insertItem( "Close Connection", this,SLOT(slotCloseStream()) );
+        menu->insertItem( "Close Connection", this,TQ_SLOT(slotCloseStream()) );
     if (!m_LeaveStreamsUnattached)
-        menu->insertItem( "Let Me Drag Connections To Circuits Myself", this,SLOT(slotAttachStreams()) );
+        menu->insertItem( "Let Me Drag Connections To Circuits Myself", this,TQ_SLOT(slotAttachStreams()) );
     else
-        menu->insertItem( "Attach Connections To Circuits Automatically", this,SLOT(slotAttachStreams()) );
+        menu->insertItem( "Attach Connections To Circuits Automatically", this,TQ_SLOT(slotAttachStreams()) );
 
     menu->popup( point );
 
@@ -185,7 +185,7 @@ void torkview_base::circuitList_contextMenuRequested( TQListViewItem *, const TQ
     TQPopupMenu *menu = new TQPopupMenu( circuitList );
 
     menu->clear();
-    menu->insertItem( "Close Circuit", this,SLOT(slotCloseCircuit()) );
+    menu->insertItem( "Close Circuit", this,TQ_SLOT(slotCloseCircuit()) );
     menu->popup( point );
 
 }
@@ -218,21 +218,21 @@ void torkview_base::serverList_contextMenuRequested( TQListViewItem *, const TQP
     menu->clear();
     menu->insertItem( i18n("For This Session Only"), m_ThisSession );
     menu->insertItem( i18n("From Now On"), m_ThisPerm );
-    menu->insertItem( "Add to My Family", this, SLOT(slotAddToFamily()) );
+    menu->insertItem( "Add to My Family", this, TQ_SLOT(slotAddToFamily()) );
 
     m_ThisSession->insertItem( i18n("Always Use Server As An Exit"), this,
-         SLOT(slotAddSessionStrictExitNodes()) );
-    m_ThisSession->insertItem( i18n("Try To Use Server As an Exit"), this, SLOT(slotAddSessionExitNodes()) );
-    m_ThisSession->insertItem( i18n("Never Use Server At All"), this, SLOT(slotAddSessionExcludeNodes()) );
-    m_ThisSession->insertItem( i18n("Never Use Country At All"), this, SLOT(slotAddSessionExcludeCountry()) );
+         TQ_SLOT(slotAddSessionStrictExitNodes()) );
+    m_ThisSession->insertItem( i18n("Try To Use Server As an Exit"), this, TQ_SLOT(slotAddSessionExitNodes()) );
+    m_ThisSession->insertItem( i18n("Never Use Server At All"), this, TQ_SLOT(slotAddSessionExcludeNodes()) );
+    m_ThisSession->insertItem( i18n("Never Use Country At All"), this, TQ_SLOT(slotAddSessionExcludeCountry()) );
 
-    m_ThisPerm->insertItem( i18n("Always Use Server As An Exit"), this, SLOT(slotAddPermStrictExitNodes()) );
-    m_ThisPerm->insertItem( i18n("Try To Use Server As an Exit"), this, SLOT(slotAddPermExitNodes()) );
-    m_ThisPerm->insertItem( i18n("Never Use Server At All"), this,  SLOT(slotAddPermExcludeNodes()) );
-    m_ThisPerm->insertItem( i18n("Never Use Country At All"), this,  SLOT(slotAddPermExcludeCountry()) );
+    m_ThisPerm->insertItem( i18n("Always Use Server As An Exit"), this, TQ_SLOT(slotAddPermStrictExitNodes()) );
+    m_ThisPerm->insertItem( i18n("Try To Use Server As an Exit"), this, TQ_SLOT(slotAddPermExitNodes()) );
+    m_ThisPerm->insertItem( i18n("Never Use Server At All"), this,  TQ_SLOT(slotAddPermExcludeNodes()) );
+    m_ThisPerm->insertItem( i18n("Never Use Country At All"), this,  TQ_SLOT(slotAddPermExcludeCountry()) );
 
     menu->insertSeparator();
-    menu->insertItem( "Reset Session Settings", this, SLOT(slotClearNodes()) );
+    menu->insertItem( "Reset Session Settings", this, TQ_SLOT(slotClearNodes()) );
     menu->popup( point );
 
 }
@@ -566,9 +566,9 @@ void torkview_base::infoList_contextMenuRequested( TQListViewItem *, const TQPoi
     TQPopupMenu *menu = new TQPopupMenu( infoList );
 
     menu->clear();
-    menu->insertItem( SmallIconSet("copy"), "Copy", this, SLOT(copyLogLines()) );
+    menu->insertItem( SmallIconSet("copy"), "Copy", this, TQ_SLOT(copyLogLines()) );
     menu->insertSeparator();
-    menu->insertItem( "Select All", this, SLOT(selectAllLogLines()) );
+    menu->insertItem( "Select All", this, TQ_SLOT(selectAllLogLines()) );
     menu->popup( point );
 
 }
@@ -580,7 +580,7 @@ void torkview_base::TorTraffic_contextMenuRequested( TQListViewItem *, const TQP
     TQPopupMenu *menu = new TQPopupMenu( TorTraffic );
 
     menu->clear();
-    menu->insertItem( SmallIconSet("help"), "Resolve Hostname/Address", this, SLOT(queryHostName()) );
+    menu->insertItem( SmallIconSet("help"), "Resolve Hostname/Address", this, TQ_SLOT(queryHostName()) );
     menu->popup( point );
 
 }
@@ -638,7 +638,7 @@ void torkview_base::NonTorTraffic_contextMenuRequested( TQListViewItem *, const
     TQPopupMenu *menu = new TQPopupMenu( NonTorTraffic );
 
     menu->clear();
-    menu->insertItem( SmallIconSet("help"), "Resolve Hostname/Address", this, SLOT(queryHostName()) );
+    menu->insertItem( SmallIconSet("help"), "Resolve Hostname/Address", this, TQ_SLOT(queryHostName()) );
     menu->popup( point );
 
 }
diff --git a/src/torservers.ui.h b/src/torservers.ui.h
index ff20704..9a0311d 100644
--- a/src/torservers.ui.h
+++ b/src/torservers.ui.h
@@ -199,7 +199,7 @@ void TorServers::MapAddress_contextMenuRequested( TQListViewItem *, const TQPoin
     TQPopupMenu *menu = new TQPopupMenu( MapAddress );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
     menu->popup( point );
 
 }
diff --git a/src/trayhoverpopup.cpp b/src/trayhoverpopup.cpp
index 01fe070..9c2edd8 100644
--- a/src/trayhoverpopup.cpp
+++ b/src/trayhoverpopup.cpp
@@ -54,8 +54,8 @@ TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *parent, const char
 {
 	setTimeout(0);
 	setAutoDelete(false);
-	connect(&hover_timer,SIGNAL(timeout()),this,SLOT(onHoverTimeout()));
-	connect(&show_timer,SIGNAL(timeout()),this,SLOT(onShowTimeout()));
+	connect(&hover_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onHoverTimeout()));
+	connect(&show_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onShowTimeout()));
 	create();
 	setPalette(TQToolTip::palette());
 	setLineWidth(1);
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index b791671..8c17438 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -68,10 +68,10 @@ TrayIcon::TrayIcon( tork *parent, const char *name)
     setAcceptDrops( TRUE );
 	m_hover_popup = new TrayHoverPopup(m_kt_pix,this);
 
-	connect(this,SIGNAL(quitSelected()),kapp,SLOT(quit()));
+	connect(this,TQ_SIGNAL(quitSelected()),kapp,TQ_SLOT(quit()));
 	
-	connect(this->contextMenu(),SIGNAL(aboutToShow()),m_hover_popup,SLOT(contextMenuAboutToShow()));
-	connect(this->contextMenu(),SIGNAL(aboutToHide()),m_hover_popup,SLOT(contextMenuAboutToHide()));
+	connect(this->contextMenu(),TQ_SIGNAL(aboutToShow()),m_hover_popup,TQ_SLOT(contextMenuAboutToShow()));
+	connect(this->contextMenu(),TQ_SIGNAL(aboutToHide()),m_hover_popup,TQ_SLOT(contextMenuAboutToHide()));
 }
 
 TrayIcon::~TrayIcon()
@@ -185,7 +185,7 @@ SetMaxRate::SetMaxRate( tork *parent, const char *name):TDEPopupMenu(parent, nam
     m_parent = parent;
     m_rate = TorkConfig::bandwidthRate();
 	makeMenu();
-	connect(this,SIGNAL(activated(int)),this,SLOT(rateSelected(int)));
+	connect(this,TQ_SIGNAL(activated(int)),this,TQ_SLOT(rateSelected(int)));
 }
 void SetMaxRate::makeMenu()
 {
diff --git a/src/update.cpp b/src/update.cpp
index da9d628..c4a0e79 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -271,7 +271,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
 
                 *arkollonproc << command;
 
-                connect( arkollonproc, SIGNAL(processExited(TDEProcess *)), SLOT(torkInstallationExited(TDEProcess *)) );
+                connect( arkollonproc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(torkInstallationExited(TDEProcess *)) );
                 arkollonproc->start();
         }
     }
@@ -409,11 +409,11 @@ void TorkUpdate::startProgressDialog( const TQString & text )
     progressDialog->setMinimumDuration( 500 );
     progressDialog->show();
 
-    connect( progressDialog, SIGNAL( cancelClicked() ), this,
-		SLOT( updateCanceled() ) );
+    connect( progressDialog, TQ_SIGNAL( cancelClicked() ), this,
+		TQ_SLOT( updateCanceled() ) );
 
     timer = new TQTimer( this );
-    connect( timer, SIGNAL( timeout() ), this, SLOT( slotProg() ) );
+    connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProg() ) );
 
     timer->start( 200, FALSE );
 }
@@ -443,7 +443,7 @@ TorkUpdate::checkInternet() //SLOT
     m_url.setHost( "prdownloads.sourceforge.net" ); 
     if ( !m_url.port() ) m_url.setPort( 80 );
 
-    connect( &m_resolver,   SIGNAL( finished( KResolverResults ) ), SLOT( resolved( KResolverResults ) ) );
+    connect( &m_resolver,   TQ_SIGNAL( finished( KResolverResults ) ), TQ_SLOT( resolved( KResolverResults ) ) );
     connectToHost();
 }
 
@@ -457,7 +457,7 @@ TorkUpdate::connectToHost() //SLOT
 
 
 void
-TorkUpdate::resolved( KResolverResults result) // SLOT
+TorkUpdate::resolved( KResolverResults result) //SLOT
 {
     if ((!( result.error() != KResolver::NoError || result.isEmpty() )) 
        /*&& tork_box->isChecked()*/)
@@ -471,8 +471,8 @@ TorkUpdate::resolved( KResolverResults result) // SLOT
 void TorkUpdate::getLatestVersionFromSF(KURL url)
 {
 
-    connect( filelist, SIGNAL( completed() ), this,
-		SLOT( parseSFPage() ) );
+    connect( filelist, TQ_SIGNAL( completed() ), this,
+		TQ_SLOT( parseSFPage() ) );
 
     filelist->setStatusMessagesEnabled(false);
     filelist->openURL(url);
@@ -486,8 +486,8 @@ void TorkUpdate::getLatestVersionFromSFHack(KURL url)
     if (!filelist)
         filelist = new TDEHTMLPart();
 
-    connect( filelist, SIGNAL( completed() ), this,
-		SLOT( parseSFPageHack() ) );
+    connect( filelist, TQ_SIGNAL( completed() ), this,
+		TQ_SLOT( parseSFPageHack() ) );
 
     filelist->setStatusMessagesEnabled(false);
     filelist->openURL(url);
@@ -518,8 +518,8 @@ void TorkUpdate::parseSFPage()
             return;
     }
     
-    disconnect( filelist, SIGNAL( completed() ), this,
-	SLOT( parseSFPage() ) );
+    disconnect( filelist, TQ_SIGNAL( completed() ), this,
+	TQ_SLOT( parseSFPage() ) );
 
     for (unsigned int j=0; j != links.length(); j++ ){
         const DOM::Node linkNode = links.item( j );
@@ -550,8 +550,8 @@ void TorkUpdate::parseSFPageHack()
             return;
     }
     
-    disconnect( filelist, SIGNAL( completed() ), this,
-	SLOT( parseSFPageHack() ) );
+    disconnect( filelist, TQ_SIGNAL( completed() ), this,
+	TQ_SLOT( parseSFPageHack() ) );
 
     for (unsigned int j=0; j != links.length(); j++ ){
         const DOM::Node linkNode = links.item( j );
diff --git a/src/upnp/exitoperation.cpp b/src/upnp/exitoperation.cpp
index 9a996c0..3847a97 100644
--- a/src/upnp/exitoperation.cpp
+++ b/src/upnp/exitoperation.cpp
@@ -32,7 +32,7 @@ namespace kt
 
 	ExitJobOperation::ExitJobOperation(TDEIO::Job* j)
 	{
-		connect(j,SIGNAL(result(TDEIO::Job*)),this,SLOT(onResult( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onResult( TDEIO::Job* )));
 	}
 	
 	ExitJobOperation::~ExitJobOperation()
diff --git a/src/upnp/httprequest.cpp b/src/upnp/httprequest.cpp
index a6c3e71..b85eb75 100644
--- a/src/upnp/httprequest.cpp
+++ b/src/upnp/httprequest.cpp
@@ -37,11 +37,11 @@ namespace bt
 		sock->enableWrite(true);
 		sock->setTimeout(30000);
 		sock->setBlocking(false);
-		connect(sock,SIGNAL(readyRead()),this,SLOT(onReadyRead()));
-		connect(sock,SIGNAL(gotError(int)),this,SLOT(onError(int )));
-		connect(sock,SIGNAL(timedOut()),this,SLOT(onTimeout()));
-		connect(sock,SIGNAL(connected(const KResolverEntry&)),
-				this, SLOT(onConnect( const KResolverEntry& )));
+		connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead()));
+		connect(sock,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int )));
+		connect(sock,TQ_SIGNAL(timedOut()),this,TQ_SLOT(onTimeout()));
+		connect(sock,TQ_SIGNAL(connected(const KResolverEntry&)),
+				this, TQ_SLOT(onConnect( const KResolverEntry& )));
 	}
 	
 	
diff --git a/src/upnp/upnpmcastsocket.cpp b/src/upnp/upnpmcastsocket.cpp
index 56df8fa..13d19ce 100644
--- a/src/upnp/upnpmcastsocket.cpp
+++ b/src/upnp/upnpmcastsocket.cpp
@@ -49,8 +49,8 @@ namespace kt
 	UPnPMCastSocket::UPnPMCastSocket(bool verbose) : verbose(verbose)
 	{
 		routers.setAutoDelete(true);
-		TQObject::connect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead()));
-		TQObject::connect(this,SIGNAL(gotError(int)),this,SLOT(onError(int)));
+		TQObject::connect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead()));
+		TQObject::connect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int)));
 		setAddressReuseable(true);
 		setFamily(KNetwork::KResolver::IPv4Family);
 		setBlocking(true);
@@ -69,8 +69,8 @@ namespace kt
 	UPnPMCastSocket::~UPnPMCastSocket()
 	{
 		leaveUPnPMCastGroup();
-		TQObject::disconnect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead()));
-		TQObject::disconnect(this,SIGNAL(gotError(int)),this,SLOT(onError(int)));
+		TQObject::disconnect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead()));
+		TQObject::disconnect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int)));
 	}
 	
 	void UPnPMCastSocket::discover()
@@ -144,8 +144,8 @@ namespace kt
 		UPnPRouter* r = parseResponse(p.data());
 		if (r)
 		{
-			TQObject::connect(r,SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),
-					this,SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
+			TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),
+					this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
 			
 			// download it's xml file
 			r->downloadXMLFile();
@@ -271,7 +271,7 @@ namespace kt
 			{
 				UPnPRouter* r = new UPnPRouter(server,location);
 				// download it's xml file
-				TQObject::connect(r,SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
+				TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
 				r->downloadXMLFile();
 			}
 		}
diff --git a/src/upnp/upnprouter.cpp b/src/upnp/upnprouter.cpp
index 242dbe6..cdf0f2d 100644
--- a/src/upnp/upnprouter.cpp
+++ b/src/upnp/upnprouter.cpp
@@ -174,7 +174,7 @@ namespace kt
 	{
 		// downlaod XML description into a temporary file in /tmp
 		TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false);
-		connect(job,SIGNAL(result(TDEIO::Job *)),this,SLOT(downloadFinished( TDEIO::Job* )));
+		connect(job,TQ_SIGNAL(result(TDEIO::Job *)),this,TQ_SLOT(downloadFinished( TDEIO::Job* )));
 	}
 	
 	void UPnPRouter::debugPrintData()
@@ -390,12 +390,12 @@ namespace kt
 
 		
 		HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose, fwd);
-		connect(r,SIGNAL(replyError(bt::HTTPRequest* ,const TQString& ,bool)),
-				this,SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ,bool)));
-		connect(r,SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& ,bool)),
-				this,SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ,bool)));
-		connect(r,SIGNAL(error(bt::HTTPRequest*, bool )),
-				this,SLOT(onError(bt::HTTPRequest*, bool )));
+		connect(r,TQ_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& ,bool)),
+				this,TQ_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ,bool)));
+		connect(r,TQ_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& ,bool)),
+				this,TQ_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ,bool)));
+		connect(r,TQ_SIGNAL(error(bt::HTTPRequest*, bool )),
+				this,TQ_SLOT(onError(bt::HTTPRequest*, bool )));
 		r->start();
 		if (!at_exit)
 			active_reqs.append(r);
@@ -471,7 +471,7 @@ namespace bt
 
 	WaitJob::WaitJob(Uint32 millis) : TDEIO::Job(false)
 	{
-		connect(&timer,SIGNAL(timeout()),this,SLOT(timerDone()));
+		connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(timerDone()));
 		timer.start(millis,true);
 	}
 
@@ -495,8 +495,8 @@ namespace bt
 	void WaitJob::addExitOperation(kt::ExitOperation* op)
 	{
 		exit_ops.append(op);
-		connect(op,SIGNAL(operationFinished( kt::ExitOperation* )),
-				this,SLOT(operationFinished( kt::ExitOperation* )));
+		connect(op,TQ_SIGNAL(operationFinished( kt::ExitOperation* )),
+				this,TQ_SLOT(operationFinished( kt::ExitOperation* )));
 	}
 	
 	void WaitJob::operationFinished(kt::ExitOperation* op)
diff --git a/src/upnpmanager.cpp b/src/upnpmanager.cpp
index 8c95f15..1a84782 100644
--- a/src/upnpmanager.cpp
+++ b/src/upnpmanager.cpp
@@ -44,8 +44,8 @@ UPnPManager* UPnPManager::manager = 0;
                  : TQWidget(parent, name)
 	{
 		sock = new UPnPMCastSocket();
-        connect(sock,SIGNAL(discovered( kt::UPnPRouter* )),
-                this,SLOT(discovered( kt::UPnPRouter* )));
+        connect(sock,TQ_SIGNAL(discovered( kt::UPnPRouter* )),
+                this,TQ_SLOT(discovered( kt::UPnPRouter* )));
         discover();
 	}
 	
@@ -84,15 +84,15 @@ UPnPManager* UPnPManager::manager = 0;
 		TQValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin();
 		while (r != discoveredRouters.end())
 		{
-            disconnect((*r),SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
-                this,SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
-            disconnect((*r),SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
-                this,SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
-
-            connect((*r),SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
-                    this,SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
-            connect((*r),SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
-                    this,SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
+            disconnect((*r),TQ_SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
+                this,TQ_SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
+            disconnect((*r),TQ_SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
+                this,TQ_SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
+
+            connect((*r),TQ_SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
+                    this,TQ_SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
+            connect((*r),TQ_SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )),
+                    this,TQ_SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )));
 
             for (net::ForwardPortList::ConstIterator i = forwardPorts.begin();
                  i != forwardPorts.end();i++)
diff --git a/src/usability.ui.h b/src/usability.ui.h
index 97d8d75..453ff7c 100644
--- a/src/usability.ui.h
+++ b/src/usability.ui.h
@@ -79,7 +79,7 @@ void Usability::TrackHostExits_contextMenuRequested( TQListViewItem *, const TQP
     TQPopupMenu *menu = new TQPopupMenu( TrackHostExits );
 
     menu->clear();
-    menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) );
+    menu->insertItem( "Delete Entry", this,TQ_SLOT(slotDeleteEntry()) );
     menu->popup( point );
 
 }