Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

78 files changed, 627 insertions, 627 deletions

diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index 1dc1f1f..a6dec27 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -53,12 +53,12 @@ FileSelectDlg::FileSelectDlg(GroupManager* gm, bool* user, bool* start, TQWidget
 		: FileSelectDlgBase(parent, name, modal, fl), m_gman(gm), m_user(user), m_start(start)
 {
 	root = 0;
-	connect(m_select_all, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAll()));
-	connect(m_select_none, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNone()));
-	connect(m_invert_selection, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection()));
-	connect(m_ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
-	connect(m_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
-	connect(m_downloadLocation, TQT_SIGNAL(textChanged (const TQString &)), this, TQT_SLOT(updateSizeLabels()));
+	connect(m_select_all, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAll()));
+	connect(m_select_none, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNone()));
+	connect(m_invert_selection, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection()));
+	connect(m_ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(m_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
+	connect(m_downloadLocation, TQ_SIGNAL(textChanged (const TQString &)), this, TQ_SLOT(updateSizeLabels()));
 	
 	m_downloadLocation->setMode(KFile::Directory);
 }
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index 79bf686..d83895b 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -46,7 +46,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
 	layout->addSpacing(gap);
 	
 	m_close = new TDEToolBarButton("window-close",0,this);
-	connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide()));
+	connect(m_close,TQ_SIGNAL(clicked()),this,TQ_SLOT(hide()));
 	layout->addWidget(m_close);
 	
 	m_filter = new TQLabel(i18n("Find:"), this);
@@ -67,9 +67,9 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
 	layout->addWidget(m_case_sensitive);
 	layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding));
 		
-	connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)),
-		this, TQT_SLOT(slotChangeFilter(const TQString&)));
-	connect(m_clear, TQT_SIGNAL(clicked()), m_filterInput, TQT_SLOT(clear()));
+	connect(m_filterInput, TQ_SIGNAL(textChanged(const TQString&)),
+		this, TQ_SLOT(slotChangeFilter(const TQString&)));
+	connect(m_clear, TQ_SIGNAL(clicked()), m_filterInput, TQ_SLOT(clear()));
 }
 
 FilterBar::~FilterBar()
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index 1bc6dcc..3e5b3ad 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -80,11 +80,11 @@ namespace kt
 	
 		current = gman->allGroup();
 		
-		connect(this,TQT_SIGNAL(clicked(TQListViewItem*)),this,TQT_SLOT(onExecuted( TQListViewItem* )));
-		connect(this,TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )),
-				this,TQT_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& )));
-		connect(this,TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)),
-				this,TQT_SLOT(onDropped( TQDropEvent*, TQListViewItem* )));	
+		connect(this,TQ_SIGNAL(clicked(TQListViewItem*)),this,TQ_SLOT(onExecuted( TQListViewItem* )));
+		connect(this,TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )),
+				this,TQ_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& )));
+		connect(this,TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)),
+				this,TQ_SLOT(onDropped( TQDropEvent*, TQListViewItem* )));	
 		
 		current_item = 0;
 		menu = 0;
@@ -136,16 +136,16 @@ namespace kt
 		menu = new TDEPopupMenu(this);
 		
 		new_group = new TDEAction(i18n("New Group"),"document-new",0,
-							 this, TQT_SLOT(addGroup()),col, "New Group");
+							 this, TQ_SLOT(addGroup()),col, "New Group");
 		
 		edit_group = new TDEAction(i18n("Edit Name"),"edit",0,
-							 this, TQT_SLOT(editGroupName()),col,"Edit Group Name");
+							 this, TQ_SLOT(editGroupName()),col,"Edit Group Name");
 		
 		remove_group = new TDEAction(i18n("Remove Group"),"remove",0,
-							 this, TQT_SLOT(removeGroup()),col,"Remove Group");
+							 this, TQ_SLOT(removeGroup()),col,"Remove Group");
 		
 		open_in_new_tab = new TDEAction(i18n("Open Tab"),"document-open",0,
-							 this ,TQT_SLOT(openView()),col,"Open Tab");
+							 this ,TQ_SLOT(openView()),col,"Open Tab");
 		
 		open_in_new_tab->plug(menu);
 		menu->insertSeparator();
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 191e6ce..b187c74 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -117,11 +117,11 @@ KTorrent::KTorrent()
 {
 	setHidden(true);
 	//setToolviewStyle(KMdi::TextAndIcon);
-	connect(this,TQT_SIGNAL(widgetChanged(TQWidget*)),this,TQT_SLOT(currentTabChanged(TQWidget*)));
+	connect(this,TQ_SIGNAL(widgetChanged(TQWidget*)),this,TQ_SLOT(currentTabChanged(TQWidget*)));
 	
 	m_view_man = new ViewManager(this);
 	m_group_view = new kt::GroupView(m_view_man,actionCollection());
-	connect(m_group_view,TQT_SIGNAL(openNewTab(kt::Group*)),this,TQT_SLOT(openView(kt::Group*)));
+	connect(m_group_view,TQ_SIGNAL(openNewTab(kt::Group*)),this,TQ_SLOT(openView(kt::Group*)));
 	
 
 	m_pref = new KTorrentPreferences(*this);
@@ -137,26 +137,26 @@ KTorrent::KTorrent()
 	TQToolButton* tb = new TQToolButton(m_activeTabWidget);
 	tb->setIconSet(SmallIcon("tab_new"));
 	tb->adjustSize();
-	connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(openDefaultView()));
+	connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(openDefaultView()));
 	m_activeTabWidget->setCornerWidget(tb, TopLeft);
 	
-	connect(m_group_view,TQT_SIGNAL(currentGroupChanged( kt::Group* )),
-			this,TQT_SLOT(groupChanged(kt::Group*)));
+	connect(m_group_view,TQ_SIGNAL(currentGroupChanged( kt::Group* )),
+			this,TQ_SLOT(groupChanged(kt::Group*)));
 	
-	connect(m_group_view,TQT_SIGNAL(groupRenamed(kt::Group*)),
-			this,TQT_SLOT(groupRenamed(kt::Group*)));
+	connect(m_group_view,TQ_SIGNAL(groupRenamed(kt::Group*)),
+			this,TQ_SLOT(groupRenamed(kt::Group*)));
 	
-	connect(m_group_view,TQT_SIGNAL(groupRemoved(kt::Group*)),
-			this,TQT_SLOT(groupRemoved(kt::Group*)));
+	connect(m_group_view,TQ_SIGNAL(groupRemoved(kt::Group*)),
+			this,TQ_SLOT(groupRemoved(kt::Group*)));
 	
-	connect(m_core,TQT_SIGNAL(torrentAdded(kt::TorrentInterface* )),
-			m_view_man,TQT_SLOT(addTorrent(kt::TorrentInterface* )));
+	connect(m_core,TQ_SIGNAL(torrentAdded(kt::TorrentInterface* )),
+			m_view_man,TQ_SLOT(addTorrent(kt::TorrentInterface* )));
 
-	connect(m_core,TQT_SIGNAL(torrentRemoved(kt::TorrentInterface* )),
-			m_view_man,TQT_SLOT(removeTorrent(kt::TorrentInterface* )));
+	connect(m_core,TQ_SIGNAL(torrentRemoved(kt::TorrentInterface* )),
+			m_view_man,TQ_SLOT(removeTorrent(kt::TorrentInterface* )));
 
-	connect(m_core, TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )),
-			m_group_view, TQT_SLOT(onTorrentRemoved( kt::TorrentInterface* )));
+	connect(m_core, TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )),
+			m_group_view, TQ_SLOT(onTorrentRemoved( kt::TorrentInterface* )));
 	
 	m_statusInfo = new KSqueezedTextLabel(this);
 	m_statusSpeed = new TQLabel(this);
@@ -191,7 +191,7 @@ KTorrent::KTorrent()
 	m_core->loadTorrents();
 	m_core->loadPlugins();
 
-	connect(&m_gui_update_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatedStats()));
+	connect(&m_gui_update_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatedStats()));
 	//Apply GUI update interval
 	int val = 500;
 	switch(Settings::guiUpdateInterval())
@@ -243,7 +243,7 @@ KTorrent::KTorrent()
 	m_statusbarAction->setChecked(!statusbar_hidden);
 
 	MaximizeLimits();
-	connect(&m_status_msg_expire,TQT_SIGNAL(timeout()),this,TQT_SLOT(statusBarMsgExpired()));
+	connect(&m_status_msg_expire,TQ_SIGNAL(timeout()),this,TQ_SLOT(statusBarMsgExpired()));
 	
 	m_view_man->updateActions();
 }
@@ -270,36 +270,36 @@ void KTorrent::openView(kt::Group* g)
 	
 	addTabPage(v,g->groupIcon(),v->caption(),m_view_man);
 	
-	connect(v,TQT_SIGNAL(currentChanged(kt::TorrentInterface* )),
-			this,TQT_SLOT(currentTorrentChanged(kt::TorrentInterface* )));
+	connect(v,TQ_SIGNAL(currentChanged(kt::TorrentInterface* )),
+			this,TQ_SLOT(currentTorrentChanged(kt::TorrentInterface* )));
 
-	connect(v,TQT_SIGNAL(wantToRemove(kt::TorrentInterface*,bool )),
-			m_core,TQT_SLOT(remove(kt::TorrentInterface*,bool )));
+	connect(v,TQ_SIGNAL(wantToRemove(kt::TorrentInterface*,bool )),
+			m_core,TQ_SLOT(remove(kt::TorrentInterface*,bool )));
 
-	connect(v->listView(),TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)),
-			this,TQT_SLOT(urlDropped(TQDropEvent*,TQListViewItem*)));
+	connect(v->listView(),TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)),
+			this,TQ_SLOT(urlDropped(TQDropEvent*,TQListViewItem*)));
 	
-	connect(v,TQT_SIGNAL(wantToStart( kt::TorrentInterface* )),
-			m_core,TQT_SLOT(start( kt::TorrentInterface* )));
+	connect(v,TQ_SIGNAL(wantToStart( kt::TorrentInterface* )),
+			m_core,TQ_SLOT(start( kt::TorrentInterface* )));
 	
-	connect(v,TQT_SIGNAL(wantToStop( kt::TorrentInterface*, bool )),
-			m_core,TQT_SLOT(stop( kt::TorrentInterface*, bool )));
+	connect(v,TQ_SIGNAL(wantToStop( kt::TorrentInterface*, bool )),
+			m_core,TQ_SLOT(stop( kt::TorrentInterface*, bool )));
 	
-	connect(v,TQT_SIGNAL(needsDataCheck( kt::TorrentInterface* )),
-			m_core,TQT_SLOT(doDataCheck( kt::TorrentInterface* )));
+	connect(v,TQ_SIGNAL(needsDataCheck( kt::TorrentInterface* )),
+			m_core,TQ_SLOT(doDataCheck( kt::TorrentInterface* )));
 	
-	connect(v,TQT_SIGNAL(updateActions( int )),
-			this,TQT_SLOT(onUpdateActions( int )));
+	connect(v,TQ_SIGNAL(updateActions( int )),
+			this,TQ_SLOT(onUpdateActions( int )));
 	
 	//connect Core queue() with queue() from KTView.
-	connect(v, TQT_SIGNAL(queue( kt::TorrentInterface* )), 
-			m_core, TQT_SLOT(queue( kt::TorrentInterface* )));
+	connect(v, TQ_SIGNAL(queue( kt::TorrentInterface* )), 
+			m_core, TQ_SLOT(queue( kt::TorrentInterface* )));
 	
-	connect(v,TQT_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)),
-			m_group_view,TQT_SLOT(updateGroupsSubMenu(TDEPopupMenu*)));
+	connect(v,TQ_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)),
+			m_group_view,TQ_SLOT(updateGroupsSubMenu(TDEPopupMenu*)));
 	
-	connect(v,TQT_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)),
-			m_group_view,TQT_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&)));
+	connect(v,TQ_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)),
+			m_group_view,TQ_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&)));
 	
 	if (m_core)
 	{
@@ -497,68 +497,68 @@ void KTorrent::currentTorrentChanged(kt::TorrentInterface* tc)
 
 void KTorrent::setupActions()
 {
-	KStdAction::openNew(this,TQT_SLOT(fileNew()),actionCollection());
-	KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection());
+	KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 	
-	KStdAction::paste(kapp,TQT_SLOT(paste()),actionCollection());
+	KStdAction::paste(kapp,TQ_SLOT(paste()),actionCollection());
 
-	m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
-	m_menubarAction = KStdAction::showMenubar(this, TQT_SLOT(optionsShowMenubar()), actionCollection()); 
+	m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
+	m_menubarAction = KStdAction::showMenubar(this, TQ_SLOT(optionsShowMenubar()), actionCollection()); 
 
-	KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-	KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+	KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+	KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
 
-	TDEAction* pref = KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+	TDEAction* pref = KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
 	m_start = new TDEAction(
-			i18n("to start", "Start"), "ktstart",0,this, TQT_SLOT(startDownload()),
+			i18n("to start", "Start"), "ktstart",0,this, TQ_SLOT(startDownload()),
 			actionCollection(), "Start");
 
 	m_stop = new TDEAction(
-			i18n("to stop", "Stop"), "ktstop",0,this, TQT_SLOT(stopDownload()),
+			i18n("to stop", "Stop"), "ktstop",0,this, TQ_SLOT(stopDownload()),
 			actionCollection(), "Stop");
 
 	m_remove = new TDEAction(
-			i18n("Remove"), "ktremove",0,this, TQT_SLOT(removeDownload()),
+			i18n("Remove"), "ktremove",0,this, TQ_SLOT(removeDownload()),
 			actionCollection(), "Remove");
 	
 	m_startall = new TDEAction(
-			i18n("to start all", "Start All"), "ktstart_all",0,this, TQT_SLOT(startAllDownloadsCurrentView()),
+			i18n("to start all", "Start All"), "ktstart_all",0,this, TQ_SLOT(startAllDownloadsCurrentView()),
 			actionCollection(), "Start all");
 	
-	m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,this, TQT_SLOT(startAllDownloads()),actionCollection());
+	m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,this, TQ_SLOT(startAllDownloads()),actionCollection());
 	
 	m_stopall = new TDEAction(
-			i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQT_SLOT(stopAllDownloadsCurrentView()),
+			i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQ_SLOT(stopAllDownloadsCurrentView()),
 			actionCollection(), "Stop all");
 	
-	m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQT_SLOT(stopAllDownloads()),actionCollection());
+	m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQ_SLOT(stopAllDownloads()),actionCollection());
 	
 	m_pasteurl = new TDEAction(
-			i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,this, TQT_SLOT(torrentPaste()),
+			i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,this, TQ_SLOT(torrentPaste()),
 			actionCollection(), "paste_url");
 	
 	m_queuemgr = new TDEAction(
 			i18n("to open Queue Manager", "Open Queue Manager..."),
-			"ktqueuemanager", 0, this, TQT_SLOT(queueManagerShow()),
+			"ktqueuemanager", 0, this, TQ_SLOT(queueManagerShow()),
 			actionCollection(), "Queue manager");
 	
 	m_queueaction = new TDEAction(
 			i18n("Enqueue/Dequeue"),
-			"player_playlist", 0, m_view_man, TQT_SLOT(queueAction()),
+			"player_playlist", 0, m_view_man, TQ_SLOT(queueAction()),
 			actionCollection(), "queue_action");
 	
 	m_ipfilter = new TDEAction(
 			i18n("IPFilter"),
-			"filter", 0, this, TQT_SLOT(showIPFilter()),
+			"filter", 0, this, TQ_SLOT(showIPFilter()),
 			actionCollection(), "ipfilter_action");
 	
 	m_datacheck = new TDEAction(
 			i18n("Check Data Integrity"),
-	TQString(),0,m_view_man,TQT_SLOT(checkDataIntegrity()),actionCollection(),"check_data");
+	TQString(),0,m_view_man,TQ_SLOT(checkDataIntegrity()),actionCollection(),"check_data");
 	
-	m_find = KStdAction::find(this,TQT_SLOT(find()),actionCollection());
+	m_find = KStdAction::find(this,TQ_SLOT(find()),actionCollection());
 	
 	//Plug actions to systemtray context menu
 	m_startall_systray->plug(m_systray_icon->contextMenu());
@@ -720,7 +720,7 @@ void KTorrent::optionsConfigureToolbars()
 	saveMainWindowSettings(TDEGlobal::config());
 #endif
         KEditToolbar dlg(factory());
-        connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
+        connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig()));
         dlg.exec();
 }
 
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index 6b35c44..541bbcc 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -70,7 +70,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
 	UpdateCurrentTime();
 	
 	qman = new QueueManager();
-	connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool)));
+	connect(qman, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool)));
 	
 	
 	data_dir = Settings::tempDir();
@@ -91,7 +91,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
 		data_dir += bt::DirSeparator();
 	// 	downloads.setAutoDelete(true);
 
-	connect(&update_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+	connect(&update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
 	update_timer.start(CORE_UPDATE_INTERVAL);
 	
 	Uint16 port = Settings::port();
@@ -328,7 +328,7 @@ void KTorrentCore::load(const KURL& url)
 	else
 	{
 		TDEIO::Job* j = TDEIO::storedGet(url,false,true);
-		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinished( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinished( TDEIO::Job* )));
 	}
 }
 
@@ -395,7 +395,7 @@ void KTorrentCore::loadSilently(const KURL& url)
 	{
 		// download to a random file in tmp
 		TDEIO::Job* j = TDEIO::storedGet(url,false,true);
-		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinishedSilently( TDEIO::Job* )));
 	}
 }
 
@@ -427,7 +427,7 @@ void KTorrentCore::loadSilentlyDir(const KURL& url, const KURL& savedir)
 		// download to a random file in tmp
 		TDEIO::Job* j = TDEIO::storedGet(url,false,true);
 		custom_save_locations.insert(j,savedir); // keep track of save location
-		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinishedSilently( TDEIO::Job* )));
 	}
 }
 
@@ -1097,20 +1097,20 @@ void KTorrentCore::emitCorruptedData(kt::TorrentInterface* tc)
 
 void KTorrentCore::connectSignals(kt::TorrentInterface* tc)
 {
-	connect(tc,TQT_SIGNAL(finished(kt::TorrentInterface*)),
-			this,TQT_SLOT(torrentFinished(kt::TorrentInterface* )));
-	connect(tc, TQT_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )),
-			this, TQT_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString )));
-	connect(tc, TQT_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)),
-			this, TQT_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)));
-	connect(tc,TQT_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )),
-			this, TQT_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & )));
-	connect(tc,TQT_SIGNAL(corruptedDataFound( kt::TorrentInterface* )),
-			this, TQT_SLOT(emitCorruptedData( kt::TorrentInterface* )));
-	connect(qman, TQT_SIGNAL(queuingNotPossible(kt::TorrentInterface*)),
-			this, TQT_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* )));
-	connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)),
-			this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool)));
+	connect(tc,TQ_SIGNAL(finished(kt::TorrentInterface*)),
+			this,TQ_SLOT(torrentFinished(kt::TorrentInterface* )));
+	connect(tc, TQ_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )),
+			this, TQ_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString )));
+	connect(tc, TQ_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)),
+			this, TQ_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)));
+	connect(tc,TQ_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )),
+			this, TQ_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & )));
+	connect(tc,TQ_SIGNAL(corruptedDataFound( kt::TorrentInterface* )),
+			this, TQ_SLOT(emitCorruptedData( kt::TorrentInterface* )));
+	connect(qman, TQ_SIGNAL(queuingNotPossible(kt::TorrentInterface*)),
+			this, TQ_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* )));
+	connect(qman, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)),
+			this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool)));
 	
 }
 
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index 89af043..4d3983b 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -93,21 +93,21 @@ KTorrentView::KTorrentView(TQWidget *parent)
 	
 	setupColumns();
 	
-	connect(view,TQT_SIGNAL(executed(TQListViewItem* )),
-			this,TQT_SLOT(onExecuted(TQListViewItem* )));
+	connect(view,TQ_SIGNAL(executed(TQListViewItem* )),
+			this,TQ_SLOT(onExecuted(TQListViewItem* )));
 	
-	connect(view,TQT_SIGNAL(currentChanged(TQListViewItem* )),
-			this,TQT_SLOT(onExecuted(TQListViewItem* )));
+	connect(view,TQ_SIGNAL(currentChanged(TQListViewItem* )),
+			this,TQ_SLOT(onExecuted(TQListViewItem* )));
 	
-	connect(view,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
-			this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
+	connect(view,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
+			this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
 	
-	connect(view,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(onSelectionChanged()));
+	connect(view,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(onSelectionChanged()));
 
 	menu = new KTorrentViewMenu(this);
-	connect(menu,TQT_SIGNAL(groupItemActivated(const TQString&)),this,TQT_SLOT(gsmItemActived(const TQString&)));
+	connect(menu,TQ_SIGNAL(groupItemActivated(const TQString&)),this,TQ_SLOT(gsmItemActived(const TQString&)));
 	
-	connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(onColumnVisibilityChange( int )));
+	connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(onColumnVisibilityChange( int )));
 
 	view->setFrameShape(TQFrame::NoFrame);
 }
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp
index 2f2d42f..5dca77e 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/apps/ktorrent/ktorrentviewmenu.cpp
@@ -35,69 +35,69 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 	
 	stop_id = insertItem(
 			iload->loadIconSet("ktstop",TDEIcon::Small),i18n("to stop", "Stop"),
-			parent,TQT_SLOT(stopDownloads()));
+			parent,TQ_SLOT(stopDownloads()));
 
 	start_id = insertItem(
 			iload->loadIconSet("ktstart",TDEIcon::Small),i18n("to start", "Start"),
-			parent,TQT_SLOT(startDownloads()));
+			parent,TQ_SLOT(startDownloads()));
 
 	remove_id = insertItem(
 			iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent"),
-			parent,TQT_SLOT(removeDownloads()));
+			parent,TQ_SLOT(removeDownloads()));
 	
 	remove_all_id = insertItem(
 			iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent and Data"),
-			parent,TQT_SLOT(removeDownloadsAndData()));
+			parent,TQ_SLOT(removeDownloadsAndData()));
 	
 	queue_id = insertItem(
 			iload->loadIconSet("player_playlist",TDEIcon::Small),i18n("Enqueue/Dequeue"),
-			parent,TQT_SLOT(queueSlot()));
+			parent,TQ_SLOT(queueSlot()));
 	
 	insertSeparator();
 	
 	add_peer_id = insertItem(
 			iload->loadIconSet("add", TDEIcon::Small), i18n("Add Peers"),
-			parent, TQT_SLOT(showAddPeersWidget())); 
+			parent, TQ_SLOT(showAddPeersWidget())); 
 	
 	peer_sources_menu = new TDEPopupMenu(this);
 	peer_sources_id = insertItem(i18n("Additional Peer Sources"), peer_sources_menu);
 	peer_sources_menu->insertTitle(i18n("Torrent Peer Sources:"));
 	peer_sources_menu->setCheckable(true);
-	dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQT_SLOT(dhtSlot()));
-	ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQT_SLOT(utPexSlot()));
+	dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQ_SLOT(dhtSlot()));
+	ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQ_SLOT(utPexSlot()));
 	
 	insertSeparator();
 	
 	announce_id = insertItem(
 			iload->loadIconSet("apply",TDEIcon::Small),i18n("Manual Announce"),
-			parent,TQT_SLOT(manualAnnounce())); 
+			parent,TQ_SLOT(manualAnnounce())); 
 	
 	preview_id = insertItem(
 			iload->loadIconSet("frame_image",TDEIcon::Small),i18n("Preview"), 
-			parent, TQT_SLOT(previewFiles()));
+			parent, TQ_SLOT(previewFiles()));
 	
 	insertSeparator();
 	dirs_sub_menu = new TDEPopupMenu(this);
 	dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu);
 	outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Data Directory"), 
-											 parent, TQT_SLOT(openOutputDirectory()));
+											 parent, TQ_SLOT(openOutputDirectory()));
 	torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Temporary Directory"),
-										   parent, TQT_SLOT(openTorXDirectory()));
+										   parent, TQ_SLOT(openTorXDirectory()));
 	
-	downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQT_SLOT(setDownloadLocationSlot()));
+	downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQ_SLOT(setDownloadLocationSlot()));
 	
 	insertSeparator();
-	remove_from_group_id =  insertItem(i18n("Remove From Group"),parent, TQT_SLOT(removeFromGroup()));
+	remove_from_group_id =  insertItem(i18n("Remove From Group"),parent, TQ_SLOT(removeFromGroup()));
 	groups_sub_menu = new TDEPopupMenu(this);
 	
 	add_to_group_id = insertItem(i18n("Add to Group"),groups_sub_menu);
 	
 	insertSeparator();
-	scan_id = insertItem(i18n("Check Data Integrity"),parent, TQT_SLOT(checkDataIntegrity()));	
+	scan_id = insertItem(i18n("Check Data Integrity"),parent, TQ_SLOT(checkDataIntegrity()));	
 	
-	connect(groups_sub_menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(gsmItemActived(int)));
+	connect(groups_sub_menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(gsmItemActived(int)));
 	
-	traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQT_SLOT(speedLimits()));
+	traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQ_SLOT(speedLimits()));
 }
 
 
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 7e54e7a..4009271 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -56,9 +56,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     TQToolTip::add(this, m_realText);
 
     m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0,
-        this, TQT_SLOT(assignAccel()), this);
+        this, TQ_SLOT(assignAccel()), this);
     m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0,
-        this, TQT_SLOT(clearAccel()), this);
+        this, TQ_SLOT(clearAccel()), this);
 
     TDEConfig *config = kapp->config();
     config->setGroup("UI");
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index 5866aa3..29f59cf 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this );
-    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this );
-    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this );
+    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this );
+    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this );
+    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this );
 
     setVisible(m_visible);
 
@@ -192,8 +192,8 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
     m_bar->addButton(button);
 
     m_widgetStack->addWidget(widget);
-    connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget()));
-    connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) );
+    connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget()));
+    connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) );
 
     if (!skipActivation)
     {
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index ffab197..9134404 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -213,10 +213,10 @@ DTabWidget *DMainWindow::createTab()
     DTabWidget *tab = new DTabWidget(m_central);
     m_tabs.append(tab);
     if (tab->closeButton())
-        connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab()));
-    connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
-    connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
-        this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &)));
+        connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab()));
+    connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*)));
+    connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
+        this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &)));
     return tab;
 }
 
@@ -280,7 +280,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view,
     DDockWindow* dock = toolWindow(position);
     dock->addWidget(title, view);
     m_docks[view] = position;
-    connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
+    connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
     if (dock->isHidden())
         dock->show();
 }
diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp
index d7920bb..f1148a5 100644
--- a/apps/ktorrent/newui/dtabwidget.cpp
+++ b/apps/ktorrent/newui/dtabwidget.cpp
@@ -49,8 +49,8 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name)
         setTabReorderingEnabled(true);
     }
     
-    connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*)));
-//    connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*)));
+    connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*)));
+//    connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*)));
 }
 
 void DTabWidget::loadSettings()
diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
index ee08bdc..bbf86ba 100644
--- a/apps/ktorrent/pref.cpp
+++ b/apps/ktorrent/pref.cpp
@@ -226,12 +226,12 @@ void GeneralPrefPage::createWidget(TQWidget* parent)
 {
 	gp = new GeneralPref(parent);
 	updateData();
-	connect(gp->custom_ip_check, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(customIPChecked(bool)));
-	connect(gp->use_dht, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(dhtChecked(bool)));
-	connect(gp->use_encryption, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(useEncryptionChecked(bool)));
+	connect(gp->custom_ip_check, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(customIPChecked(bool)));
+	connect(gp->use_dht, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(dhtChecked(bool)));
+	connect(gp->use_encryption, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(useEncryptionChecked(bool)));
 }
 
 bool GeneralPrefPage::apply()
@@ -463,14 +463,14 @@ void AdvancedPrefPage::createWidget(TQWidget* parent)
 {
 	ap = new AdvancedPref(parent);
 	updateData();
-	connect(ap->no_recheck, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(noDataCheckChecked(bool)));
-	connect(ap->auto_recheck, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(autoRecheckChecked(bool)));
-	connect(ap->do_not_use_kde_proxy, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(doNotUseKDEProxyChecked(bool)));
-	connect(ap->prealloc_disabled,TQT_SIGNAL(toggled(bool)),
-			this,TQT_SLOT(preallocDisabledChecked(bool)));
+	connect(ap->no_recheck, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(noDataCheckChecked(bool)));
+	connect(ap->auto_recheck, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(autoRecheckChecked(bool)));
+	connect(ap->do_not_use_kde_proxy, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(doNotUseKDEProxyChecked(bool)));
+	connect(ap->prealloc_disabled,TQ_SIGNAL(toggled(bool)),
+			this,TQ_SLOT(preallocDisabledChecked(bool)));
 	
 	preallocDisabledChecked(ap->prealloc_disabled->isChecked());
 }
diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
index 79c06d1..69bb1ea 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/apps/ktorrent/queuedialog.cpp
@@ -105,8 +105,8 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam
 	
  	logo->setPixmap(iload->loadIcon("ktqueuemanager", TDEIcon::Desktop));
 	
-	connect(downloadList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(downloadList_currentChanged( TQListViewItem* )));
-	connect(seedList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(seedList_currentChanged( TQListViewItem* )));
+	connect(downloadList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(downloadList_currentChanged( TQListViewItem* )));
+	connect(seedList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(seedList_currentChanged( TQListViewItem* )));
 	
 	if(downloadList->firstChild())
 		downloadList->setCurrentItem(downloadList->firstChild());
diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp
index 5c9ef8a..834539d 100644
--- a/apps/ktorrent/scandialog.cpp
+++ b/apps/ktorrent/scandialog.cpp
@@ -40,8 +40,8 @@ ScanDialog::ScanDialog(KTorrentCore* core,bool auto_import,
 	: ScanDlgBase(parent,name, modal,fl),DataCheckerListener(auto_import),mutex(true),core(core)
 {
 	m_cancel->setGuiItem(KStdGuiItem::cancel());
-	connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed()));
-	connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+	connect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCancelPressed()));
+	connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
 	tc = 0;
 	silently = false;
 	restart = false;
@@ -127,8 +127,8 @@ void ScanDialog::finished()
 		{
 			// cancel now becomes a close button
 			m_cancel->setGuiItem(KStdGuiItem::close()); 
-			disconnect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed()));
-			connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+			disconnect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCancelPressed()));
+			connect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 		}
 	}
 	else
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
index fb3af47..25c5e37 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/apps/ktorrent/torrentcreatordlg.cpp
@@ -38,8 +38,8 @@ TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const
 	KComboBox* cb = m_chunk_size;
 	cb->setCurrentItem(3);
 	
-	connect(m_create_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCreate()));
-	connect(m_cancel_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(m_create_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCreate()));
+	connect(m_cancel_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	
 	m_nodes->setHidden(true);
 	
diff --git a/apps/ktorrent/trayhoverpopup.cpp b/apps/ktorrent/trayhoverpopup.cpp
index 5cce261..b325184 100644
--- a/apps/ktorrent/trayhoverpopup.cpp
+++ b/apps/ktorrent/trayhoverpopup.cpp
@@ -33,8 +33,8 @@ TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *parent, const char
 {
 	setTimeout(0);
 	setAutoDelete(false);
-	connect(&hover_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onHoverTimeout()));
-	connect(&show_timer,TQT_SIGNAL(timeout()),this,TQT_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/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index ab4f2b2..884db94 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -49,26 +49,26 @@ TrayIcon::TrayIcon( KTorrentCore* tc, TQWidget *parent, const char *name)
 	
 	m_hover_popup = new TrayHoverPopup(m_kt_pix,this);
 
-	connect(this,TQT_SIGNAL(quitSelected()),kapp,TQT_SLOT(quit()));
-	connect(m_core, TQT_SIGNAL(finished(kt::TorrentInterface* )),
-	        this, TQT_SLOT(finished(kt::TorrentInterface* )));
-	connect(m_core,TQT_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )),
-	        this,TQT_SLOT(torrentStoppedByError(kt::TorrentInterface*, TQString )));
-	connect(m_core,TQT_SIGNAL(maxShareRatioReached( kt::TorrentInterface* )),
-			this,TQT_SLOT(maxShareRatioReached( kt::TorrentInterface* )));
-	connect(m_core,TQT_SIGNAL(maxSeedTimeReached(kt::TorrentInterface*)),
-			this, TQT_SLOT(maxSeedTimeReached(kt::TorrentInterface*)));
-	connect(m_core,TQT_SIGNAL(corruptedData( kt::TorrentInterface* )),
-			this,TQT_SLOT(corruptedData( kt::TorrentInterface* )));
-	connect(m_core, TQT_SIGNAL(queuingNotPossible( kt::TorrentInterface* )),
-			this, TQT_SLOT(queuingNotPossible( kt::TorrentInterface* )));
-	connect(m_core,TQT_SIGNAL(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)),
-			this,TQT_SLOT(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)));
-	connect(m_core, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)),
-			this, TQT_SLOT(lowDiskSpace(kt::TorrentInterface*, bool)));
+	connect(this,TQ_SIGNAL(quitSelected()),kapp,TQ_SLOT(quit()));
+	connect(m_core, TQ_SIGNAL(finished(kt::TorrentInterface* )),
+	        this, TQ_SLOT(finished(kt::TorrentInterface* )));
+	connect(m_core,TQ_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )),
+	        this,TQ_SLOT(torrentStoppedByError(kt::TorrentInterface*, TQString )));
+	connect(m_core,TQ_SIGNAL(maxShareRatioReached( kt::TorrentInterface* )),
+			this,TQ_SLOT(maxShareRatioReached( kt::TorrentInterface* )));
+	connect(m_core,TQ_SIGNAL(maxSeedTimeReached(kt::TorrentInterface*)),
+			this, TQ_SLOT(maxSeedTimeReached(kt::TorrentInterface*)));
+	connect(m_core,TQ_SIGNAL(corruptedData( kt::TorrentInterface* )),
+			this,TQ_SLOT(corruptedData( kt::TorrentInterface* )));
+	connect(m_core, TQ_SIGNAL(queuingNotPossible( kt::TorrentInterface* )),
+			this, TQ_SLOT(queuingNotPossible( kt::TorrentInterface* )));
+	connect(m_core,TQ_SIGNAL(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)),
+			this,TQ_SLOT(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)));
+	connect(m_core, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)),
+			this, TQ_SLOT(lowDiskSpace(kt::TorrentInterface*, bool)));
 	
-	connect(this->contextMenu(),TQT_SIGNAL(aboutToShow()),m_hover_popup,TQT_SLOT(contextMenuAboutToShow()));
-	connect(this->contextMenu(),TQT_SIGNAL(aboutToHide()),m_hover_popup,TQT_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()
@@ -287,7 +287,7 @@ SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *parent, const char *n
 	m_core = tc;
 	type=t;
 	makeMenu();
-	connect(this,TQT_SIGNAL(activated (int)),this,TQT_SLOT(rateSelected(int )));
+	connect(this,TQ_SIGNAL(activated (int)),this,TQ_SLOT(rateSelected(int )));
 }
 void SetMaxRate::makeMenu()
 {
diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp
index f38c419..d85f08a 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/apps/ktupnptest/upnptestapp.cpp
@@ -33,11 +33,11 @@ UPnPTestApp::UPnPTestApp(TQWidget *parent, const char *name)
 		: TDEMainWindow(parent, name)
 {
 	sock = new UPnPMCastSocket(true);
-	connect(sock,TQT_SIGNAL(discovered( UPnPRouter* )),this,TQT_SLOT(discovered( UPnPRouter* )));
+	connect(sock,TQ_SIGNAL(discovered( UPnPRouter* )),this,TQ_SLOT(discovered( UPnPRouter* )));
 	mwnd = new MainWidget(this);
 	setCentralWidget(mwnd);
-	connect(mwnd->test_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onTestBtn()));
-	connect(mwnd->close_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCloseBtn()));
+	connect(mwnd->test_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onTestBtn()));
+	connect(mwnd->close_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCloseBtn()));
 	bt::Log & lg = bt::Globals::instance().getLog(0);
 	lg.addMonitor(this);
 	Out() << "UPnPTestApp started up !" << endl;
diff --git a/libktorrent/interfaces/exitoperation.cpp b/libktorrent/interfaces/exitoperation.cpp
index fd9883f..7d1867e 100644
--- a/libktorrent/interfaces/exitoperation.cpp
+++ b/libktorrent/interfaces/exitoperation.cpp
@@ -31,7 +31,7 @@ namespace kt
 
 	ExitJobOperation::ExitJobOperation(TDEIO::Job* j)
 	{
-		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onResult( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onResult( TDEIO::Job* )));
 	}
 	
 	ExitJobOperation::~ExitJobOperation()
diff --git a/libktorrent/kademlia/dht.cpp b/libktorrent/kademlia/dht.cpp
index 95bcccb..ff14340 100644
--- a/libktorrent/kademlia/dht.cpp
+++ b/libktorrent/kademlia/dht.cpp
@@ -46,7 +46,7 @@ namespace dht
 
 	DHT::DHT() : node(0),srv(0),db(0),tman(0)
 	{
-		connect(&update_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+		connect(&update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
 	}
 
 
diff --git a/libktorrent/kademlia/dhttrackerbackend.cpp b/libktorrent/kademlia/dhttrackerbackend.cpp
index f266744..024abd7 100644
--- a/libktorrent/kademlia/dhttrackerbackend.cpp
+++ b/libktorrent/kademlia/dhttrackerbackend.cpp
@@ -37,9 +37,9 @@ namespace dht
 	DHTTrackerBackend::DHTTrackerBackend(DHTBase & dh_table,kt::TorrentInterface* tor) 
 		: dh_table(dh_table),curr_task(0),tor(tor)
 	{
-		connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout()));
-		connect(&dh_table,TQT_SIGNAL(started()),this,TQT_SLOT(manualUpdate()));
-		connect(&dh_table,TQT_SIGNAL(stopped()),this,TQT_SLOT(dhtStopped()));
+		connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout()));
+		connect(&dh_table,TQ_SIGNAL(started()),this,TQ_SLOT(manualUpdate()));
+		connect(&dh_table,TQ_SIGNAL(stopped()),this,TQ_SLOT(dhtStopped()));
 		started = false;
 	}
 
@@ -98,8 +98,8 @@ namespace dht
 				const kt::DHTNode & n = tor->getDHTNode(i);
 				curr_task->addDHTNode(n.ip,n.port);
 			}
-			connect(curr_task,TQT_SIGNAL(dataReady( Task* )),this,TQT_SLOT(onDataReady( Task* )));
-			connect(curr_task,TQT_SIGNAL(finished( Task* )),this,TQT_SLOT(onFinished( Task* )));
+			connect(curr_task,TQ_SIGNAL(dataReady( Task* )),this,TQ_SLOT(onDataReady( Task* )));
+			connect(curr_task,TQ_SIGNAL(finished( Task* )),this,TQ_SLOT(onFinished( Task* )));
 
 			return true;
 		}
diff --git a/libktorrent/kademlia/kbucket.cpp b/libktorrent/kademlia/kbucket.cpp
index e331a51..f8d77c2 100644
--- a/libktorrent/kademlia/kbucket.cpp
+++ b/libktorrent/kademlia/kbucket.cpp
@@ -345,8 +345,8 @@ namespace dht
 		refresh_task = t;
 		if (refresh_task)
 		{
-			connect(refresh_task,TQT_SIGNAL(finished( Task* )),
-					this,TQT_SLOT(onFinished( Task* )));
+			connect(refresh_task,TQ_SIGNAL(finished( Task* )),
+					this,TQ_SLOT(onFinished( Task* )));
 		}
 	}
 	
diff --git a/libktorrent/kademlia/rpccall.cpp b/libktorrent/kademlia/rpccall.cpp
index 9ed926a..17a15de 100644
--- a/libktorrent/kademlia/rpccall.cpp
+++ b/libktorrent/kademlia/rpccall.cpp
@@ -33,7 +33,7 @@ namespace dht
 
 	RPCCall::RPCCall(RPCServer* rpc,MsgBase* msg,bool queued) : msg(msg),rpc(rpc),queued(queued)
 	{
-		connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout()));
+		connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout()));
 		if (!queued)
 			timer.start(30*1000,true);
 	}
@@ -71,8 +71,8 @@ namespace dht
 	
 	void RPCCall::addListener(RPCCallListener* cl)
 	{
-		connect(this,TQT_SIGNAL(onCallResponse( RPCCall*, MsgBase* )),cl,TQT_SLOT(onResponse( RPCCall*, MsgBase* )));
-		connect(this,TQT_SIGNAL(onCallTimeout( RPCCall* )),cl,TQT_SLOT(onTimeout( RPCCall* )));
+		connect(this,TQ_SIGNAL(onCallResponse( RPCCall*, MsgBase* )),cl,TQ_SLOT(onResponse( RPCCall*, MsgBase* )));
+		connect(this,TQ_SIGNAL(onCallTimeout( RPCCall* )),cl,TQ_SLOT(onTimeout( RPCCall* )));
 	}
 
 }
diff --git a/libktorrent/kademlia/rpcserver.cpp b/libktorrent/kademlia/rpcserver.cpp
index 571d4d8..960a2d8 100644
--- a/libktorrent/kademlia/rpcserver.cpp
+++ b/libktorrent/kademlia/rpcserver.cpp
@@ -72,7 +72,7 @@ namespace dht
 			bt::Globals::instance().getPortList().addNewPort(port,net::UDP,true);
 		}
 		sock->setBlocking(false);
-		connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(readPacket()));
+		connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(readPacket()));
 	}
 		
 	void RPCServer::stop()
diff --git a/libktorrent/kademlia/task.cpp b/libktorrent/kademlia/task.cpp
index 96e37b4..8dcb521 100644
--- a/libktorrent/kademlia/task.cpp
+++ b/libktorrent/kademlia/task.cpp
@@ -117,7 +117,7 @@ namespace dht
 	
 	void Task::addDHTNode(const TQString & ip,bt::Uint16 port)
 	{
-		KResolver::resolveAsync(this,TQT_SLOT(onResolverResults(KResolverResults )),
+		KResolver::resolveAsync(this,TQ_SLOT(onResolverResults(KResolverResults )),
 								ip,TQString::number(port));
 	}
 	
diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
index 1518943..b488271 100644
--- a/libktorrent/labelview.cpp
+++ b/libktorrent/labelview.cpp
@@ -165,8 +165,8 @@ namespace kt
 		items.push_back(item);
 		item->setOdd(items.size() % 2 == 1);
 		
-		connect(item, TQT_SIGNAL(clicked(LabelViewItem*)),
-				this, TQT_SLOT(onItemClicked(LabelViewItem*)));
+		connect(item, TQ_SIGNAL(clicked(LabelViewItem*)),
+				this, TQ_SLOT(onItemClicked(LabelViewItem*)));
 	}
 	
 	void LabelView::removeItem(LabelViewItem* item)
@@ -176,8 +176,8 @@ namespace kt
 		{
 			item_box->remove(item);
 			items.erase(i);
-			disconnect(item, TQT_SIGNAL(clicked(LabelViewItem*)),
-					this, TQT_SLOT(onItemClicked(LabelViewItem*)));
+			disconnect(item, TQ_SIGNAL(clicked(LabelViewItem*)),
+					this, TQ_SLOT(onItemClicked(LabelViewItem*)));
 			
 			// check for selected being equal to item
 			if (item == selected)
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
index 872c8c1..a426ca4 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/libktorrent/pluginmanagerprefpage.cpp
@@ -78,12 +78,12 @@ namespace kt
 	{
 		pmw = new PluginManagerWidget(parent);
 
-		connect(pmw->load_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onLoad()));
-		connect(pmw->unload_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUnload()));
-		connect(pmw->load_all_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onLoadAll()));
-		connect(pmw->unload_all_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUnloadAll()));
+		connect(pmw->load_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onLoad()));
+		connect(pmw->unload_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUnload()));
+		connect(pmw->load_all_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onLoadAll()));
+		connect(pmw->unload_all_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUnloadAll()));
 		LabelView* lv = pmw->plugin_view;
-		connect(lv,TQT_SIGNAL(currentChanged(LabelViewItem * )),this,TQT_SLOT(onCurrentChanged( LabelViewItem* )));
+		connect(lv,TQ_SIGNAL(currentChanged(LabelViewItem * )),this,TQ_SLOT(onCurrentChanged( LabelViewItem* )));
 	}
 	
 	void PluginManagerPrefPage::updatePluginList()
diff --git a/libktorrent/torrent/authenticatebase.cpp b/libktorrent/torrent/authenticatebase.cpp
index c00e87f..51d3f26 100644
--- a/libktorrent/torrent/authenticatebase.cpp
+++ b/libktorrent/torrent/authenticatebase.cpp
@@ -32,7 +32,7 @@ namespace bt
 
 	AuthenticateBase::AuthenticateBase(mse::StreamSocket*  s) : sock(s),finished(false),local(false)
 	{
-		connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout()));
+		connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout()));
 		timer.start(20000,true);
 		memset(handshake,0x00,68);
 		bytes_of_handshake_recieved = 0;
diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp
index 76638ce..6f21fcf 100644
--- a/libktorrent/torrent/chunkdownload.cpp
+++ b/libktorrent/torrent/chunkdownload.cpp
@@ -155,8 +155,8 @@ namespace bt
 		{
 			PeerDownloader* pd = pdown.at(i);
 			pd->release();
-			disconnect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& )));
-			disconnect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& )));
+			disconnect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& )));
+			disconnect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& )));
 		}
 		dstatus.clear();
 		pdown.clear();
@@ -171,8 +171,8 @@ namespace bt
 		pdown.append(pd);
 		dstatus.insert(pd->getPeer()->getID(),new DownloadStatus());
 		sendRequests(pd);
-		connect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& )));
-		connect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& )));
+		connect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& )));
+		connect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& )));
 		return true;
 	}
 	
@@ -305,8 +305,8 @@ namespace bt
 
 		dstatus.erase(pd->getPeer()->getID());
 		pdown.remove(pd);
-		disconnect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& )));
-		disconnect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& )));
+		disconnect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& )));
+		disconnect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& )));
 	}
 	
 	
diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp
index 67359ba..fe40850 100644
--- a/libktorrent/torrent/chunkmanager.cpp
+++ b/libktorrent/torrent/chunkmanager.cpp
@@ -79,8 +79,8 @@ namespace bt
 		for (Uint32 i = 0;i < tor.getNumFiles();i++)
 		{
 			TorrentFile & tf = tor.getFile(i);
-			connect(&tf,TQT_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )),
-					 this,TQT_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority )));
+			connect(&tf,TQ_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )),
+					 this,TQ_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority )));
 			
 			if (tf.getPriority() != NORMAL_PRIORITY)
 			{
@@ -232,8 +232,8 @@ namespace bt
 			for (Uint32 i = 0;i < tor.getNumFiles();i++)
 			{
 				TorrentFile & tf = tor.getFile(i);
-				connect(&tf,TQT_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )),
-						this,TQT_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority )));
+				connect(&tf,TQ_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )),
+						this,TQ_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority )));
 				
 				if (tf.getPriority() != NORMAL_PRIORITY)
 				{
diff --git a/libktorrent/torrent/downloader.cpp b/libktorrent/torrent/downloader.cpp
index 582fa7e..dc00927 100644
--- a/libktorrent/torrent/downloader.cpp
+++ b/libktorrent/torrent/downloader.cpp
@@ -52,8 +52,8 @@ namespace bt
 		unnecessary_data = 0;
 	
 		current_chunks.setAutoDelete(true);
-		connect(&pman,TQT_SIGNAL(newPeer(Peer* )),this,TQT_SLOT(onNewPeer(Peer* )));
-		connect(&pman,TQT_SIGNAL(peerKilled(Peer* )),this,TQT_SLOT(onPeerKilled(Peer*)));
+		connect(&pman,TQ_SIGNAL(newPeer(Peer* )),this,TQ_SLOT(onNewPeer(Peer* )));
+		connect(&pman,TQ_SIGNAL(peerKilled(Peer* )),this,TQ_SLOT(onPeerKilled(Peer*)));
 	}
 
 
@@ -360,8 +360,8 @@ namespace bt
 	void Downloader::onNewPeer(Peer* peer)
 	{		
 		PeerDownloader* pd = peer->getPeerDownloader();
-		connect(pd,TQT_SIGNAL(downloaded(const Piece& )),
-				this,TQT_SLOT(pieceRecieved(const Piece& )));
+		connect(pd,TQ_SIGNAL(downloaded(const Piece& )),
+				this,TQ_SLOT(pieceRecieved(const Piece& )));
 	}
 
 	void Downloader::onPeerKilled(Peer* peer)
diff --git a/libktorrent/torrent/httptracker.cpp b/libktorrent/torrent/httptracker.cpp
index 2367ca0..c6dd983 100644
--- a/libktorrent/torrent/httptracker.cpp
+++ b/libktorrent/torrent/httptracker.cpp
@@ -124,7 +124,7 @@ namespace bt
 		j->setMetaData(md);
 		TDEIO::Scheduler::scheduleJob(j);
 		
-		connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onScrapeResult( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onScrapeResult( TDEIO::Job* )));
 	}
 	
 	void HTTPTracker::onScrapeResult(TDEIO::Job* j)
@@ -188,7 +188,7 @@ namespace bt
 		if (!url.isValid())
 		{
 			requestPending();
-			TQTimer::singleShot(500,this,TQT_SLOT(emitInvalidURLFailure()));
+			TQTimer::singleShot(500,this,TQ_SLOT(emitInvalidURLFailure()));
 			return;
 		}
 
@@ -453,7 +453,7 @@ namespace bt
 		j->setMetaData(md);
 		TDEIO::Scheduler::scheduleJob(j);
 		
-		connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onAnnounceResult( TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onAnnounceResult( TDEIO::Job* )));
 		
 		active_job = j;
 		requestPending();
diff --git a/libktorrent/torrent/movedatafilesjob.cpp b/libktorrent/torrent/movedatafilesjob.cpp
index 7fc3fa6..7db1472 100644
--- a/libktorrent/torrent/movedatafilesjob.cpp
+++ b/libktorrent/torrent/movedatafilesjob.cpp
@@ -81,8 +81,8 @@ namespace bt
 		active_src = i.key();
 		active_dst = i.data();
 		Out(SYS_GEN|LOG_DEBUG) << "Moving " << active_src << " -> " << active_dst << endl;
-		connect(active_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onJobDone(TDEIO::Job*)));
-		connect(active_job,TQT_SIGNAL(canceled(TDEIO::Job*)),this,TQT_SLOT(onCanceled(TDEIO::Job*)));
+		connect(active_job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onJobDone(TDEIO::Job*)));
+		connect(active_job,TQ_SIGNAL(canceled(TDEIO::Job*)),this,TQ_SLOT(onCanceled(TDEIO::Job*)));
 		todo.erase(i);
 	}
 	
@@ -95,8 +95,8 @@ namespace bt
 		}
 		TQMap<TQString,TQString>::iterator i = success.begin();	
 		active_job = TDEIO::move(KURL::fromPathOrURL(i.data()),KURL::fromPathOrURL(i.key()),false);
-		connect(active_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onJobDone(TDEIO::Job*)));
-		connect(active_job,TQT_SIGNAL(canceled(TDEIO::Job*)),this,TQT_SLOT(onCanceled(TDEIO::Job*)));
+		connect(active_job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onJobDone(TDEIO::Job*)));
+		connect(active_job,TQ_SIGNAL(canceled(TDEIO::Job*)),this,TQ_SLOT(onCanceled(TDEIO::Job*)));
 		success.erase(i);
 	}
 }
diff --git a/libktorrent/torrent/peerdownloader.cpp b/libktorrent/torrent/peerdownloader.cpp
index 6f0738f..4909c5a 100644
--- a/libktorrent/torrent/peerdownloader.cpp
+++ b/libktorrent/torrent/peerdownloader.cpp
@@ -70,8 +70,8 @@ namespace bt
 
 	PeerDownloader::PeerDownloader(Peer* peer,Uint32 chunk_size) : peer(peer),grabbed(0),chunk_size(chunk_size / MAX_PIECE_LEN)
 	{
-		connect(peer,TQT_SIGNAL(piece(const Piece& )),this,TQT_SLOT(piece(const Piece& )));
-		connect(peer,TQT_SIGNAL(destroyed()),this,TQT_SLOT(peerDestroyed()));
+		connect(peer,TQ_SIGNAL(piece(const Piece& )),this,TQ_SLOT(piece(const Piece& )));
+		connect(peer,TQ_SIGNAL(destroyed()),this,TQ_SLOT(peerDestroyed()));
 		nearly_done = false;
 		max_wait_queue_size = 25;
 	}
diff --git a/libktorrent/torrent/peermanager.cpp b/libktorrent/torrent/peermanager.cpp
index 3f542c8..ee0cd38 100644
--- a/libktorrent/torrent/peermanager.cpp
+++ b/libktorrent/torrent/peermanager.cpp
@@ -239,7 +239,7 @@ namespace bt
 				if (auth->isLocal())
 					st->setLocal(true);
 				
-				connect(this,TQT_SIGNAL(stopped()),st,TQT_SLOT(onPeerManagerDestroyed()));
+				connect(this,TQ_SIGNAL(stopped()),st,TQ_SLOT(onPeerManagerDestroyed()));
 				AuthenticationMonitor::instance().add(st);
 				num_pending++;
 				total_connections++;
@@ -259,11 +259,11 @@ namespace bt
 	{
 		Peer* peer = new Peer(sock,peer_id,tor.getNumChunks(),tor.getChunkSize(),support,local);
 		
-		connect(peer,TQT_SIGNAL(haveChunk(Peer*, Uint32 )),this,TQT_SLOT(onHave(Peer*, Uint32 )));
-		connect(peer,TQT_SIGNAL(bitSetRecieved(const BitSet& )),
-				this,TQT_SLOT(onBitSetRecieved(const BitSet& )));
-		connect(peer,TQT_SIGNAL(rerunChoker()),this,TQT_SLOT(onRerunChoker()));
-		connect(peer,TQT_SIGNAL(pex( const TQByteArray& )),this,TQT_SLOT(pex( const TQByteArray& )));
+		connect(peer,TQ_SIGNAL(haveChunk(Peer*, Uint32 )),this,TQ_SLOT(onHave(Peer*, Uint32 )));
+		connect(peer,TQ_SIGNAL(bitSetRecieved(const BitSet& )),
+				this,TQ_SLOT(onBitSetRecieved(const BitSet& )));
+		connect(peer,TQ_SIGNAL(rerunChoker()),this,TQ_SLOT(onRerunChoker()));
+		connect(peer,TQ_SIGNAL(pex( const TQByteArray& )),this,TQ_SLOT(pex( const TQByteArray& )));
 		
 		peer_list.append(peer);
 		peer_map.insert(peer->getID(),peer);
@@ -356,7 +356,7 @@ namespace bt
 				if (pp.local)
 					auth->setLocal(true);
 				
-				connect(this,TQT_SIGNAL(stopped()),auth,TQT_SLOT(onPeerManagerDestroyed()));
+				connect(this,TQ_SIGNAL(stopped()),auth,TQ_SLOT(onPeerManagerDestroyed()));
 				
 				AuthenticationMonitor::instance().add(auth);
 				num_pending++;
diff --git a/libktorrent/torrent/peersourcemanager.cpp b/libktorrent/torrent/peersourcemanager.cpp
index a48ccb0..c85c144 100644
--- a/libktorrent/torrent/peersourcemanager.cpp
+++ b/libktorrent/torrent/peersourcemanager.cpp
@@ -65,7 +65,7 @@ namespace bt
 		//load custom trackers
 		loadCustomURLs();
 				
-		connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateCurrentManually()));
+		connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateCurrentManually()));
 	}
 	
 	PeerSourceManager::~PeerSourceManager()
@@ -85,21 +85,21 @@ namespace bt
 	void PeerSourceManager::addTracker(Tracker* trk)
 	{
 		trackers.insert(trk->trackerURL(),trk);
-		connect(trk,TQT_SIGNAL(peersReady( kt::PeerSource* )),
-				 pman,TQT_SLOT(peerSourceReady( kt::PeerSource* )));
+		connect(trk,TQ_SIGNAL(peersReady( kt::PeerSource* )),
+				 pman,TQ_SLOT(peerSourceReady( kt::PeerSource* )));
 	}
 		
 	void PeerSourceManager::addPeerSource(kt::PeerSource* ps)
 	{
 		additional.append(ps);
-		connect(ps,TQT_SIGNAL(peersReady( kt::PeerSource* )),
-						 pman,TQT_SLOT(peerSourceReady( kt::PeerSource* )));
+		connect(ps,TQ_SIGNAL(peersReady( kt::PeerSource* )),
+						 pman,TQ_SLOT(peerSourceReady( kt::PeerSource* )));
 	}
 	
 	void PeerSourceManager::removePeerSource(kt::PeerSource* ps)
 	{
-		disconnect(ps,TQT_SIGNAL(peersReady( kt::PeerSource* )),
-				pman,TQT_SLOT(peerSourceReady( kt::PeerSource* )));
+		disconnect(ps,TQ_SIGNAL(peersReady( kt::PeerSource* )),
+				pman,TQ_SLOT(peerSourceReady( kt::PeerSource* )));
 		additional.remove(ps);
 	}
 
@@ -477,10 +477,10 @@ namespace bt
 	
 		if (curr)
 		{
-			disconnect(curr,TQT_SIGNAL(requestFailed( const TQString& )),
-					   this,TQT_SLOT(onTrackerError( const TQString& )));
-			disconnect(curr,TQT_SIGNAL(requestOK()),this,TQT_SLOT(onTrackerOK()));
-			disconnect(curr,TQT_SIGNAL(requestPending()),this,TQT_SLOT(onTrackerRequestPending()));
+			disconnect(curr,TQ_SIGNAL(requestFailed( const TQString& )),
+					   this,TQ_SLOT(onTrackerError( const TQString& )));
+			disconnect(curr,TQ_SIGNAL(requestOK()),this,TQ_SLOT(onTrackerOK()));
+			disconnect(curr,TQ_SIGNAL(requestPending()),this,TQ_SLOT(onTrackerRequestPending()));
 			curr = 0;
 		}
 		
@@ -488,14 +488,14 @@ namespace bt
 		if (curr)
 		{
 			Out(SYS_TRK|LOG_NOTICE) << "Switching to tracker " << trk->trackerURL() << endl;
-			TQObject::connect(curr,TQT_SIGNAL(requestFailed( const TQString& )),
-					this,TQT_SLOT(onTrackerError( const TQString& )));
+			TQObject::connect(curr,TQ_SIGNAL(requestFailed( const TQString& )),
+					this,TQ_SLOT(onTrackerError( const TQString& )));
 			
-			TQObject::connect(curr,TQT_SIGNAL(requestOK()),
-					this,TQT_SLOT(onTrackerOK()));
+			TQObject::connect(curr,TQ_SIGNAL(requestOK()),
+					this,TQ_SLOT(onTrackerOK()));
 			
-			TQObject::connect(curr,TQT_SIGNAL(requestPending()),
-					this,TQT_SLOT(onTrackerRequestPending()));
+			TQObject::connect(curr,TQ_SIGNAL(requestPending()),
+					this,TQ_SLOT(onTrackerRequestPending()));
 		}
 	}
 	
diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp
index bc04f9f..e4d063c 100644
--- a/libktorrent/torrent/queuemanager.cpp
+++ b/libktorrent/torrent/queuemanager.cpp
@@ -61,8 +61,8 @@ namespace bt
 		downloads.append(tc);
 		downloads.sort();
 		
-		connect(tc, TQT_SIGNAL(diskSpaceLow(kt::TorrentInterface*, bool)), this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool)));
-		connect(tc, TQT_SIGNAL(torrentStopped(kt::TorrentInterface*)), this, TQT_SLOT(torrentStopped(kt::TorrentInterface*)));
+		connect(tc, TQ_SIGNAL(diskSpaceLow(kt::TorrentInterface*, bool)), this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool)));
+		connect(tc, TQ_SIGNAL(torrentStopped(kt::TorrentInterface*)), this, TQ_SLOT(torrentStopped(kt::TorrentInterface*)));
 	}
 
 	void QueueManager::remove(kt::TorrentInterface* tc)
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
index 14ff2c6..9771e80 100644
--- a/libktorrent/torrent/torrentcontrol.cpp
+++ b/libktorrent/torrent/torrentcontrol.cpp
@@ -613,8 +613,8 @@ namespace bt
 		pman = new PeerManager(*tor);
 		//Out() << "Tracker url " << url << " " << url.protocol() << " " << url.prettyURL() << endl;
 		psman = new PeerSourceManager(this,pman);
-		connect(psman,TQT_SIGNAL(statusChanged( const TQString& )),
-				this,TQT_SLOT(trackerStatusChanged( const TQString& )));
+		connect(psman,TQ_SIGNAL(statusChanged( const TQString& )),
+				this,TQ_SLOT(trackerStatusChanged( const TQString& )));
 
 
 		// Create chunkmanager, load the index file if it exists
@@ -626,7 +626,7 @@ namespace bt
 		
 		// store the outputdir into the output_path variable, so others can access it	
 		
-		connect(cman,TQT_SIGNAL(updateStats()),this,TQT_SLOT(updateStats()));
+		connect(cman,TQ_SIGNAL(updateStats()),this,TQ_SLOT(updateStats()));
 		if (bt::Exists(datadir + "index"))
 			cman->loadIndexFile();
 
@@ -634,17 +634,17 @@ namespace bt
 
 		// create downloader,uploader and choker
 		down = new Downloader(*tor,*pman,*cman);
-		connect(down,TQT_SIGNAL(ioError(const TQString& )),
-				this,TQT_SLOT(onIOError(const TQString& )));
+		connect(down,TQ_SIGNAL(ioError(const TQString& )),
+				this,TQ_SLOT(onIOError(const TQString& )));
 		up = new Uploader(*cman,*pman);
 		choke = new Choker(*pman,*cman);
 
 
-		connect(pman,TQT_SIGNAL(newPeer(Peer* )),this,TQT_SLOT(onNewPeer(Peer* )));
-		connect(pman,TQT_SIGNAL(peerKilled(Peer* )),this,TQT_SLOT(onPeerRemoved(Peer* )));
-		connect(cman,TQT_SIGNAL(excluded(Uint32, Uint32 )),down,TQT_SLOT(onExcluded(Uint32, Uint32 )));
-		connect(cman,TQT_SIGNAL(included( Uint32, Uint32 )),down,TQT_SLOT(onIncluded( Uint32, Uint32 )));
-		connect(cman,TQT_SIGNAL(corrupted( Uint32 )),this,TQT_SLOT(corrupted( Uint32 )));
+		connect(pman,TQ_SIGNAL(newPeer(Peer* )),this,TQ_SLOT(onNewPeer(Peer* )));
+		connect(pman,TQ_SIGNAL(peerKilled(Peer* )),this,TQ_SLOT(onPeerRemoved(Peer* )));
+		connect(cman,TQ_SIGNAL(excluded(Uint32, Uint32 )),down,TQ_SLOT(onExcluded(Uint32, Uint32 )));
+		connect(cman,TQ_SIGNAL(included( Uint32, Uint32 )),down,TQ_SLOT(onIncluded( Uint32, Uint32 )));
+		connect(cman,TQ_SIGNAL(corrupted( Uint32 )),this,TQ_SLOT(corrupted( Uint32 )));
 	}
 	
 	void TorrentControl::initInternal(QueueManager* qman,
@@ -731,8 +731,8 @@ namespace bt
 
 	void TorrentControl::onNewPeer(Peer* p)
 	{
-		connect(p,TQT_SIGNAL(gotPortPacket( const TQString&, Uint16 )),
-				this,TQT_SLOT(onPortPacket( const TQString&, Uint16 )));
+		connect(p,TQ_SIGNAL(gotPortPacket( const TQString&, Uint16 )),
+				this,TQ_SLOT(onPortPacket( const TQString&, Uint16 )));
 		
 		if (p->getStats().fast_extensions)
 		{
@@ -772,8 +772,8 @@ namespace bt
 
 	void TorrentControl::onPeerRemoved(Peer* p)
 	{
-		disconnect(p,TQT_SIGNAL(gotPortPacket( const TQString&, Uint16 )),
-				this,TQT_SLOT(onPortPacket( const TQString&, Uint16 )));
+		disconnect(p,TQ_SIGNAL(gotPortPacket( const TQString&, Uint16 )),
+				this,TQ_SLOT(onPortPacket( const TQString&, Uint16 )));
 		if (tmon)
 			tmon->peerRemoved(p);
 	}
@@ -855,7 +855,7 @@ namespace bt
 				move_data_files_destination_path = nd;
 				if (j)
 				{
-					connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveDataFilesJobDone(TDEIO::Job*)));
+					connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveDataFilesJobDone(TDEIO::Job*)));
 					return true;
 				}
 				else
diff --git a/libktorrent/torrent/tracker.cpp b/libktorrent/torrent/tracker.cpp
index 4878a16..4848765 100644
--- a/libktorrent/torrent/tracker.cpp
+++ b/libktorrent/torrent/tracker.cpp
@@ -84,8 +84,8 @@ namespace bt
 	
 	void Tracker::timedDelete(int ms)
 	{
-		TQTimer::singleShot(ms,this,TQT_SLOT(deleteLater()));
-		connect(this,TQT_SIGNAL(stopDone()),this,TQT_SLOT(deleteLater()));
+		TQTimer::singleShot(ms,this,TQ_SLOT(deleteLater()));
+		connect(this,TQ_SIGNAL(stopDone()),this,TQ_SLOT(deleteLater()));
 	}
 	
 }
diff --git a/libktorrent/torrent/udptracker.cpp b/libktorrent/torrent/udptracker.cpp
index 6f8a4e0..89f58b8 100644
--- a/libktorrent/torrent/udptracker.cpp
+++ b/libktorrent/torrent/udptracker.cpp
@@ -51,15 +51,15 @@ namespace bt
 		transaction_id = 0;
 		interval = 0;
 		
-		connect(&conn_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onConnTimeout()));
-		connect(socket,TQT_SIGNAL(announceRecieved(Int32, const TQByteArray &)),
-				this,TQT_SLOT(announceRecieved(Int32, const TQByteArray& )));
-		connect(socket,TQT_SIGNAL(connectRecieved(Int32, Int64 )),
-				this,TQT_SLOT(connectRecieved(Int32, Int64 )));
-		connect(socket,TQT_SIGNAL(error(Int32, const TQString& )),
-				this,TQT_SLOT(onError(Int32, const TQString& )));
+		connect(&conn_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onConnTimeout()));
+		connect(socket,TQ_SIGNAL(announceRecieved(Int32, const TQByteArray &)),
+				this,TQ_SLOT(announceRecieved(Int32, const TQByteArray& )));
+		connect(socket,TQ_SIGNAL(connectRecieved(Int32, Int64 )),
+				this,TQ_SLOT(connectRecieved(Int32, Int64 )));
+		connect(socket,TQ_SIGNAL(error(Int32, const TQString& )),
+				this,TQ_SLOT(onError(Int32, const TQString& )));
 		
-		KResolver::resolveAsync(this,TQT_SLOT(onResolverResults(KResolverResults )),
+		KResolver::resolveAsync(this,TQ_SLOT(onResolverResults(KResolverResults )),
 									   url.host(),TQString::number(url.port()));
 	}
 
diff --git a/libktorrent/torrent/udptrackersocket.cpp b/libktorrent/torrent/udptrackersocket.cpp
index 6df3cdf..eb8dc8b 100644
--- a/libktorrent/torrent/udptrackersocket.cpp
+++ b/libktorrent/torrent/udptrackersocket.cpp
@@ -42,7 +42,7 @@ namespace bt
 	{
 		sock = new KNetwork::KDatagramSocket(this);
 		sock->setAddressReuseable(true);
-		connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(dataReceived()));
+		connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(dataReceived()));
 		int i = 0;
 		if (port == 0)
 			port = 4444;
diff --git a/libktorrent/util/autorotatelogjob.cpp b/libktorrent/util/autorotatelogjob.cpp
index dd1424b..30752a4 100644
--- a/libktorrent/util/autorotatelogjob.cpp
+++ b/libktorrent/util/autorotatelogjob.cpp
@@ -51,7 +51,7 @@ namespace bt
 			if (bt::Exists(prev)) // if file exists start the move job
 			{
 				TDEIO::Job* sj = TDEIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false);
-				connect(sj,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveJobDone(TDEIO::Job* )));	
+				connect(sj,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveJobDone(TDEIO::Job* )));	
 				return;
 			}
 			else
@@ -65,7 +65,7 @@ namespace bt
 				// move current log to 1 and zip it
 			bt::Move(file,file + "-1",true);
 			TDEIO::Job* sj = TDEIO::file_move(KURL::fromPathOrURL(file),KURL::fromPathOrURL(file + "-1"),-1,true,false,false);
-			connect(sj,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveJobDone(TDEIO::Job* )));
+			connect(sj,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveJobDone(TDEIO::Job* )));
 		}
 		else
 		{
diff --git a/libktorrent/util/httprequest.cpp b/libktorrent/util/httprequest.cpp
index 4c869a5..ff40e4c 100644
--- a/libktorrent/util/httprequest.cpp
+++ b/libktorrent/util/httprequest.cpp
@@ -34,11 +34,11 @@ namespace bt
 		sock->enableWrite(true);
 		sock->setTimeout(30000);
 		sock->setBlocking(false);
-		connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead()));
-		connect(sock,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int )));
-		connect(sock,TQT_SIGNAL(timedOut()),this,TQT_SLOT(onTimeout()));
-		connect(sock,TQT_SIGNAL(connected(const KResolverEntry&)),
-				this, TQT_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/libktorrent/util/waitjob.cpp b/libktorrent/util/waitjob.cpp
index e04369e..d236b6d 100644
--- a/libktorrent/util/waitjob.cpp
+++ b/libktorrent/util/waitjob.cpp
@@ -27,7 +27,7 @@ namespace bt
 
 	WaitJob::WaitJob(Uint32 millis) : TDEIO::Job(false)
 	{
-		connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timerDone()));
+		connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(timerDone()));
 		timer.start(millis,true);
 	}
 
@@ -51,8 +51,8 @@ namespace bt
 	void WaitJob::addExitOperation(kt::ExitOperation* op)
 	{
 		exit_ops.append(op);
-		connect(op,TQT_SIGNAL(operationFinished( kt::ExitOperation* )),
-				this,TQT_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/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
index c7bd470..63436fb 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/plugins/infowidget/fileview.cpp
@@ -69,13 +69,13 @@ namespace kt
 		context_menu->setItemEnabled(dnd_keep_id, false);
 		context_menu->setItemEnabled(dnd_throw_away_id, false);
 
-		connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
-				this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
-		connect(context_menu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( contextItem ( int ) ) );
-		connect(this,TQT_SIGNAL(doubleClicked( TQListViewItem*, const TQPoint&, int )),
-				this,TQT_SLOT(onDoubleClicked(TQListViewItem*, const TQPoint&, int)));
+		connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
+				this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
+		connect(context_menu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( contextItem ( int ) ) );
+		connect(this,TQ_SIGNAL(doubleClicked( TQListViewItem*, const TQPoint&, int )),
+				this,TQ_SLOT(onDoubleClicked(TQListViewItem*, const TQPoint&, int)));
 		
-		connect(&fill_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( fillTreePartial() ) );
+		connect(&fill_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( fillTreePartial() ) );
 
 		setEnabled(false);
 		
@@ -108,8 +108,8 @@ namespace kt
 			multi_root->updatePercentageInformation();
 			multi_root->updatePreviewInformation(curr_tc);
 			fill_timer.stop();
-			connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )),
-				this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* )));
+			connect(curr_tc,TQ_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )),
+				this,TQ_SLOT(refreshFileTree( kt::TorrentInterface* )));
 		}
 		else
 			fill_timer.start(0,true);
@@ -141,8 +141,8 @@ namespace kt
 	
 			item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(TDEIcon::Small));
 			setEnabled(true);
-			connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )),
-				this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* )));
+			connect(curr_tc,TQ_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )),
+				this,TQ_SLOT(refreshFileTree( kt::TorrentInterface* )));
 		}
 	}
 
diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp
index ed435ed..d463d9a 100644
--- a/plugins/infowidget/floatspinbox.cpp
+++ b/plugins/infowidget/floatspinbox.cpp
@@ -41,7 +41,7 @@ kt::FloatSpinBox::FloatSpinBox(
 {
 	TQSpinBox::setValue(0);
 	setStep( 0.25f );
-	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
+	connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int )));
 	setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) ));
 	editor()->setAlignment(TQt::AlignRight);
 }
@@ -61,7 +61,7 @@ kt::FloatSpinBox::FloatSpinBox(
 {
 	TQSpinBox::setValue(0);
 	setStep( 0.25 );
-	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
+	connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int )));
 	setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) ));
 }
 
@@ -85,7 +85,7 @@ kt::FloatSpinBox::FloatSpinBox(
 	TQSpinBox::setValue(0);
 	setValue(0.0f);
 	setStep( step );
-	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
+	connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int )));
 	setValidator( new LocaleFloatValidator( this ));
 
 }
diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp
index 506efdb..00df391 100644
--- a/plugins/infowidget/infowidgetplugin.cpp
+++ b/plugins/infowidget/infowidgetplugin.cpp
@@ -216,8 +216,8 @@ namespace kt
 			tracker_view->changeTC(const_cast<kt::TorrentInterface*>(getGUI()->getCurrentTorrent()));
 			// seeing that a merge of the trackers might happen after a torrent has been loaded
 			// we need to update the tracker_view 
-			connect(getCore(),TQT_SIGNAL(loadingFinished(const KURL&, bool, bool)),
-					tracker_view,TQT_SLOT(onLoadingFinished(const KURL&, bool, bool)));
+			connect(getCore(),TQ_SIGNAL(loadingFinished(const KURL&, bool, bool)),
+					tracker_view,TQ_SLOT(onLoadingFinished(const KURL&, bool, bool)));
 		}
 		else if (!show && tracker_view)
 		{
diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp
index effe20a..d641fe5 100644
--- a/plugins/infowidget/iwfiletreeitem.cpp
+++ b/plugins/infowidget/iwfiletreeitem.cpp
@@ -37,8 +37,8 @@ namespace kt
 		: FileTreeItem(item,name,file)
 	{
 		perc_complete = 0.0;
-		connect(&file,TQT_SIGNAL(downloadPercentageChanged( float )),this,TQT_SLOT(onPercentageUpdated( float )));
-		connect(&file,TQT_SIGNAL(previewAvailable( bool )),this,TQT_SLOT(onPreviewAvailable( bool )));
+		connect(&file,TQ_SIGNAL(downloadPercentageChanged( float )),this,TQ_SLOT(onPercentageUpdated( float )));
+		connect(&file,TQ_SIGNAL(previewAvailable( bool )),this,TQ_SLOT(onPreviewAvailable( bool )));
 	}
 	
 	IWFileTreeItem::~IWFileTreeItem()
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index f3b346f..8551c5d 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -249,9 +249,9 @@ namespace kt
 		kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", TDEIcon::NoGroup), i18n("to kick", "Kick peer"));
 		ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup), i18n("to ban", "Ban peer"));
 		
-		connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
-				this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
-		connect(menu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( contextItem ( int ) ) );
+		connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
+				this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
+		connect(menu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( contextItem ( int ) ) );
 		setFrameShape(TQFrame::NoFrame);
 	}
 	
diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp
index a4eab2c..b87487f 100644
--- a/plugins/infowidget/statustab.cpp
+++ b/plugins/infowidget/statustab.cpp
@@ -46,15 +46,15 @@ namespace kt
 		maxRatio->setMinValue(0.0f);
 		maxRatio->setMaxValue(100.0f);
 		maxRatio->setStep(0.1f);
-		connect(maxRatio, TQT_SIGNAL(valueHasChanged()), this, TQT_SLOT(maxRatioReturnPressed()));
-		connect(useLimit, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useLimitToggled(bool) ) );
+		connect(maxRatio, TQ_SIGNAL(valueHasChanged()), this, TQ_SLOT(maxRatioReturnPressed()));
+		connect(useLimit, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useLimitToggled(bool) ) );
 		
 		maxTime->setMinValue(0.0f);
 		maxTime->setMaxValue(10000000.0f);
 		maxTime->setStep(0.05f);
 		maxTime->setSpecialValueText(i18n("No limit"));
-		connect(useTimeLimit,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(useTimeLimitToggled(bool)));
-		connect(maxTime,TQT_SIGNAL(valueHasChanged()), this, TQT_SLOT(timeValueChanged()));
+		connect(useTimeLimit,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(useTimeLimitToggled(bool)));
+		connect(maxTime,TQ_SIGNAL(valueHasChanged()), this, TQ_SLOT(timeValueChanged()));
 		
 		int h = (int)ceil(fontMetrics().height()*1.25);
 		m_chunk_bar->setFixedHeight(h);
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index 6f517be..f570012 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -52,8 +52,8 @@ namespace kt
 		r = m_data_url;
 		r->setMode(KFile::File|KFile::Directory|KFile::LocalOnly);
 	
-		connect(m_import_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onImport()));
-		connect(m_cancel_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+		connect(m_import_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onImport()));
+		connect(m_cancel_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 		m_progress->setEnabled(false);
 	}
 	
@@ -226,7 +226,7 @@ namespace kt
 		{
 			// download the torrent file
 			TDEIO::StoredTransferJob* j = TDEIO::storedGet(tor_url);
-			connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onTorrentGetReult(TDEIO::Job*)));
+			connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onTorrentGetReult(TDEIO::Job*)));
 		}
 		else
 		{
diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/plugins/partfileimport/partfileimportplugin.cpp
index 148cf4f..ab05633 100644
--- a/plugins/partfileimport/partfileimportplugin.cpp
+++ b/plugins/partfileimport/partfileimportplugin.cpp
@@ -54,7 +54,7 @@ namespace kt
 	void PartFileImportPlugin::load()
 	{
 		import_action = new TDEAction(i18n("Import existing download" ), 0, this,
-									 TQT_SLOT(onImport()), actionCollection(), "partfileimport" );
+									 TQ_SLOT(onImport()), actionCollection(), "partfileimport" );
 	}
 
 	void PartFileImportPlugin::unload()
diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp
index 174a105..65aaf53 100644
--- a/plugins/rssfeed/rss/image.cpp
+++ b/plugins/rssfeed/rss/image.cpp
@@ -112,9 +112,9 @@ void Image::getPixmap()
 	d->pixmapBuffer->open(IO_WriteOnly);
 
 	d->job = TDEIO::get(d->url, false, false);
-	connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-	connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
+	connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	        this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *)));
 }
 
 void Image::slotData(TDEIO::Job *, const TQByteArray &data)
diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
index 09450a2..ea20d84 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/plugins/rssfeed/rss/loader.cpp
@@ -83,13 +83,13 @@ void FileRetriever::retrieveData(const KURL &url)
    d->job = TDEIO::get(u, !m_useCache, false);
 
    
-   TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
+   TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout()));
    
-   connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-   connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-   connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
-                TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
+   connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+   connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+   connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+                TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
 }
 
 void FileRetriever::slotTimeout()
@@ -179,10 +179,10 @@ void OutputRetriever::retrieveData(const KURL &url)
    d->buffer->open(IO_WriteOnly);
 
    d->process = new KShellProcess();
-   connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)),
-                       TQT_SLOT(slotExited(TDEProcess *)));
-   connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                       TQT_SLOT(slotOutput(TDEProcess *, char *, int)));
+   connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)),
+                       TQ_SLOT(slotExited(TDEProcess *)));
+   connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                       TQ_SLOT(slotOutput(TDEProcess *, char *, int)));
    *d->process << url.path();
    d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }
@@ -240,7 +240,7 @@ Loader *Loader::create()
 Loader *Loader::create(TQObject *object, const char *slot)
 {
    Loader *loader = create();
-   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+   connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
            object, slot);
    return loader;
 }
@@ -262,8 +262,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever)
    d->url=url;
    d->retriever = retriever;
 
-   connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)),
-           this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool)));
+   connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)),
+           this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool)));
 
    d->retriever->retrieveData(url);
 }
diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
index 6727e24..7d2dbc0 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/plugins/rssfeed/rss/loader.h
@@ -209,8 +209,8 @@ namespace RSS
 	 *
 	 * \code
 	 * Loader *loader = Loader::create();
-	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
+	 * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
+	 *         this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status)));
 	 * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
 	 * \endcode
 	 *
diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp
index bef989c..4515cf7 100644
--- a/plugins/rssfeed/rss/testlibrss.cpp
+++ b/plugins/rssfeed/rss/testlibrss.cpp
@@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] =
 void Tester::test( const TQString &url )
 {
 	Loader *loader = Loader::create();
-	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
+	connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+	         this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
 	loader->loadFrom( url, new FileRetriever );
 }
 
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index 5b45a4c..2e8d14b 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -48,8 +48,8 @@ namespace kt
 		feedLoading = false;
 		loadArticles();
 		
-		connect(&refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( refreshFeed() ) );
-		connect(this, TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT( saveArticles() ) );
+		connect(&refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( refreshFeed() ) );
+		connect(this, TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT( saveArticles() ) );
 		
 		startFeed();
 	}
@@ -261,8 +261,8 @@ namespace kt
 		feedLoading = true;
 		cleanArticles();
 		Loader * feedLoader = Loader::create();
-		connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-			this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
+		connect( feedLoader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+			this, TQ_SLOT( feedLoaded( Loader *, Document, Status ) ) );
 		feedLoader->loadFrom( m_feedUrl, new FileRetriever );
 	}
 	
@@ -313,8 +313,8 @@ namespace kt
 			tqDebug( "There was and error loading the feed\n");
 		}
 		
-		disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-			this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
+		disconnect( feedLoader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+			this, TQ_SLOT( feedLoaded( Loader *, Document, Status ) ) );
 		feedLoader->deleteLater();
 
 	}
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 8addd09..a1ebebf 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -94,37 +94,37 @@ namespace kt
 		loadFilterList();
 		
 		//connect the buttons
-		connect(newFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewFeed() ) );
-		connect(deleteFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedFeed() ) );
+		connect(newFeed, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewFeed() ) );
+		connect(deleteFeed, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedFeed() ) );
 		
-		connect(newAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewAcceptFilter() ) );
-		connect(deleteAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedAcceptFilter() ) );
+		connect(newAcceptFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewAcceptFilter() ) );
+		connect(deleteAcceptFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedAcceptFilter() ) );
 		
-		connect(newRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRejectFilter() ) );
-		connect(deleteRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedRejectFilter() ) );
+		connect(newRejectFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewRejectFilter() ) );
+		connect(deleteRejectFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedRejectFilter() ) );
 		
 		//connect the changing of the active feed
-		connect(feedlist, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveFeed()) );
+		connect(feedlist, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveFeed()) );
 		
 		//connect the changing of the url to enable the refresh button
-		connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedFeedUrl()) );
+		connect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedFeedUrl()) );
 		
 		//connect the changing of the filters
-		connect(acceptFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveAcceptFilter()) );
-		connect(rejectFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveRejectFilter()) );
+		connect(acceptFilterList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveAcceptFilter()) );
+		connect(rejectFilterList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveRejectFilter()) );
 		
 		//connect the selection and downloading of articles
-		connect(feedArticles, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedArticleSelection()) );
-		connect(downloadArticle, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedArticles()) );
+		connect(feedArticles, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedArticleSelection()) );
+		connect(downloadArticle, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadSelectedArticles()) );
 		
 		//connect the selection, downloading and deletion of matches
-		connect(filterMatches, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedMatchSelection()) );
-		connect(downloadFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedMatches()) );
-		connect(deleteFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedMatches()) );
+		connect(filterMatches, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedMatchSelection()) );
+		connect(downloadFilterMatch, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadSelectedMatches()) );
+		connect(deleteFilterMatch, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedMatches()) );
 		
 		//connect the test text update to the slot
-		connect(testText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(testTextChanged()) );
-		connect(testTestText, TQT_SIGNAL(clicked()), this, TQT_SLOT(testFilter()) );
+		connect(testText, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(testTextChanged()) );
+		connect(testTestText, TQ_SIGNAL(clicked()), this, TQ_SLOT(testFilter()) );
 		
 		changedActiveFeed();
 		changedActiveAcceptFilter();
@@ -159,65 +159,65 @@ namespace kt
 	void RssFeedManager::connectFeed(int index)
 	{
 	
-		connect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) );
-		connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) );
+		connect(feedTitle, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setTitle(const TQString &) ) );
+		connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFeedTitle(const TQString &) ) );
 		
 		//url
-		connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) );
-		connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) );
+		connect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setFeedUrl(const TQString&) ) );
+		connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQ_SLOT(setKURL(const KURL&) ) );
 		
 		//articleAge
-		connect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) );
-		connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) );
+		connect(feedArticleAge, TQ_SIGNAL(valueChanged(int)), feeds.at(index), TQ_SLOT(setArticleAge(int) ) );
+		connect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQ_SLOT(setValue(int) ) );
 		
 		//active
-		connect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) );
-		connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) );
+		connect(feedActive, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setActive(bool) ) );
+		connect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), feedActive, TQ_SLOT(setChecked(bool) ) );
 		
 		//autoRefresh
-		connect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) );
-		connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) );
+		connect(feedAutoRefresh, TQ_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQ_SLOT(setAutoRefresh(const TQTime&) ) );
+		connect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQ_SLOT(setTime(const TQTime&) ) );
 	
 		//ignoreTTL
-		connect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) );
-		connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) );
+		connect(feedIgnoreTTL, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setIgnoreTTL(bool) ) );
+		connect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQ_SLOT(setChecked(bool) ) );
 		
 		//articles
-		connect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) );
+		connect(feeds.at(index), TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT(updateArticles(const RssArticle::List&) ) );
 		
 		//connect the refresh button
-		connect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) );
+		connect(refreshFeed, TQ_SIGNAL(clicked()), feeds.at(index), TQ_SLOT(refreshFeed()) );
 	}
 	
 	void RssFeedManager::disconnectFeed(int index)
 	{
-		disconnect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) );
-		disconnect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) );
+		disconnect(feedTitle, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setTitle(const TQString &) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFeedTitle(const TQString &) ) );
 		
 		//url
-		disconnect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) );
-		disconnect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) );
+		disconnect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setFeedUrl(const TQString&) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQ_SLOT(setKURL(const KURL&) ) );
 		
 		//articleAge
-		disconnect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) );
-		disconnect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) );
+		disconnect(feedArticleAge, TQ_SIGNAL(valueChanged(int)), feeds.at(index), TQ_SLOT(setArticleAge(int) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQ_SLOT(setValue(int) ) );
 		
 		//active
-		disconnect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) );
-		disconnect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) );
+		disconnect(feedActive, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setActive(bool) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), feedActive, TQ_SLOT(setChecked(bool) ) );
 		
 		//autoRefresh
-		disconnect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) );
-		disconnect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) );
+		disconnect(feedAutoRefresh, TQ_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQ_SLOT(setAutoRefresh(const TQTime&) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQ_SLOT(setTime(const TQTime&) ) );
 	
 		//ignoreTTL
-		disconnect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) );
-		disconnect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) );
+		disconnect(feedIgnoreTTL, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setIgnoreTTL(bool) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQ_SLOT(setChecked(bool) ) );
 		
 		//articles
-		disconnect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) );
+		disconnect(feeds.at(index), TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT(updateArticles(const RssArticle::List&) ) );
 		
-		disconnect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) );
+		disconnect(refreshFeed, TQ_SIGNAL(clicked()), feeds.at(index), TQ_SLOT(refreshFeed()) );
 	}
 	
 	void RssFeedManager::connectFilter(int index, bool acceptFilter)
@@ -225,69 +225,69 @@ namespace kt
 		if (acceptFilter)
 		{
 		//title
-		connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) );
+		connect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) );
 		//active
-		connect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) );
+		connect(filterActive, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setActive(bool) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) );
 		//regExps
-		connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) );
+		connect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) );
 		//series
-		connect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) );
+		connect(filterSeries, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSeries(bool) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) );
 		//sansEpisode
-		connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) );
+		connect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) );
 		//minSeason
-		connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) );
+		connect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinSeason(int) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) );
 		//minEpisode
-		connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) );
+		connect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinEpisode(int) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) );
 		//maxSeason
-		connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) );
+		connect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxSeason(int) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) );
 		//maxEpisode
-		connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) );
-		connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) );
+		connect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) );
 		//matches
-		connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) );
 		
-		connect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) );
+		connect(processFilter, TQ_SIGNAL(clicked()), acceptFilters.at(index), TQ_SIGNAL(rescanFilter()) );
 
 		}
 		else
 		{
 		//title
-		connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) );
+		connect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) );
 		//active
-		connect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) );
+		connect(filterActive, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setActive(bool) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) );
 		//regExps
-		connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) );
+		connect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) );
 		//series
-		connect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) );
+		connect(filterSeries, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSeries(bool) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) );
 		//sansEpisode
-		connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) );
+		connect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) );
 		//minSeason
-		connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) );
+		connect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinSeason(int) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) );
 		//minEpisode
-		connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) );
+		connect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinEpisode(int) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) );
 		//maxSeason
-		connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) );
+		connect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxSeason(int) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) );
 		//maxEpisode
-		connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) );
-		connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) );
+		connect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) );
 		//matches
-		connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) );
 		
-		connect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) );
+		connect(processFilter, TQ_SIGNAL(clicked()), rejectFilters.at(index), TQ_SIGNAL(rescanFilter()) );
 		
 		}
 	}
@@ -297,68 +297,68 @@ namespace kt
 		if (acceptFilter)
 		{
 		//title
-		disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) );
+		disconnect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) );
 		//active
-		disconnect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) );
+		disconnect(filterActive, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setActive(bool) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) );
 		//regExps
-		disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) );
+		disconnect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) );
 		//series
-		disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) );
+		disconnect(filterSeries, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSeries(bool) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) );
 		//sansEpisode
-		disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) );
+		disconnect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) );
 		//minSeason
-		disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinSeason(int) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) );
 		//minEpisode
-		disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinEpisode(int) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) );
 		//maxSeason
-		disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxSeason(int) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) );
 		//maxEpisode
-		disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) );
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) );
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) );
 		//matches
-		disconnect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); 
+		disconnect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); 
 		
-		disconnect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) );
+		disconnect(processFilter, TQ_SIGNAL(clicked()), acceptFilters.at(index), TQ_SIGNAL(rescanFilter()) );
 		}
 		else
 		{
 		//title
-		disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) );
+		disconnect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) );
 		//active
-		disconnect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) );
+		disconnect(filterActive, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setActive(bool) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) );
 		//regExps
-		disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) );
+		disconnect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) );
 		//series
-		disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) );
+		disconnect(filterSeries, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSeries(bool) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) );
 		//sansEpisode
-		disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) );
+		disconnect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) );
 		//minSeason
-		disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinSeason(int) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) );
 		//minEpisode
-		disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinEpisode(int) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) );
 		//maxSeason
-		disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxSeason(int) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) );
 		//maxEpisode
-		disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) );
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) );
+		disconnect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) );
 		//matches
-		disconnect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) );
+		disconnect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) );
 		
-		disconnect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) );
+		disconnect(processFilter, TQ_SIGNAL(clicked()), rejectFilters.at(index), TQ_SIGNAL(rescanFilter()) );
 		
 		}
 	}
@@ -375,27 +375,27 @@ namespace kt
 		feedlist->setCurrentItem(index);
 		
 		//update the feed list
-		connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateFeedList()) );
+		connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateFeedList()) );
 		
 		//clear the articles list when the url is changed
-		connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(clearArticles() ) );
+		connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), this, TQ_SLOT(clearArticles() ) );
 		
 		//connect the scanArticle signal to the scanArticle slot
-		connect(feeds.at(index), TQT_SIGNAL(scanRssArticle(RssArticle)), this, TQT_SLOT(scanArticle(RssArticle) ) );
+		connect(feeds.at(index), TQ_SIGNAL(scanRssArticle(RssArticle)), this, TQ_SLOT(scanArticle(RssArticle) ) );
 		
 		//connect all the fields to the save slot
 		//title
-		connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFeedList() ) );
+		connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFeedList() ) );
 		//url
-		connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(saveFeedList() ) );
+		connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), this, TQ_SLOT(saveFeedList() ) );
 		//articleAge
-		connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), this, TQT_SLOT(saveFeedList() ) );
+		connect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), this, TQ_SLOT(saveFeedList() ) );
 		//active
-		connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), this, TQT_SLOT(saveFeedList() ) );
+		connect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), this, TQ_SLOT(saveFeedList() ) );
 		//autoRefresh
-		connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQT_SLOT(saveFeedList() ) );
+		connect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQ_SLOT(saveFeedList() ) );
 		//ignoreTTL
-		connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), this, TQT_SLOT(saveFeedList() ) );
+		connect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), this, TQ_SLOT(saveFeedList() ) );
 	
 	}
 	
@@ -410,52 +410,52 @@ namespace kt
 		acceptFilterList->insertItem(acceptFilters.at(index)->title());
 		acceptFilterList->setCurrentItem(index);
 		
-		connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateAcceptFilterList()) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateAcceptFilterList()) );
 		
 		//connect all the fields to the save slot
 		//title
-		connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFilterList() ) );
 		//active
-		connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(saveFilterList() ) );
 		//regexps
-		connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(saveFilterList() ) );
 		//series
-		connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(saveFilterList() ) );
 		//sansEpisode
-		connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(saveFilterList() ) );
 		//minSeason
-		connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//minEpisode
-		connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//maxSeason
-		connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//maxEpiosde
-		connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//matches
-		connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQ_SLOT(saveFilterList() ) );
 		
 		//connect the rescan signal to the rescan slot
-		connect(acceptFilters.at(index), TQT_SIGNAL(rescanFilter()), this, TQT_SLOT(rescanFilter()) );
+		connect(acceptFilters.at(index), TQ_SIGNAL(rescanFilter()), this, TQ_SLOT(rescanFilter()) );
 		
 // 		//connect all except the matchesChanged to the rescanFilter slot
 // 		//title
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(rescanFilter() ) );
 // 		//active
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(rescanFilter() ) );
 // 		//regexps
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(rescanFilter() ) );
 // 		//series
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(rescanFilter() ) );
 // 		//sansEpisode
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(rescanFilter() ) );
 // 		//minSeason
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(rescanFilter() ) );
 // 		//minEpisode
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(rescanFilter() ) );
 // 		//maxSeason
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(rescanFilter() ) );
 // 		//maxEpiosde
-// 		connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) );
+// 		connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(rescanFilter() ) );
 
 	}
 	
@@ -470,29 +470,29 @@ namespace kt
 		rejectFilterList->insertItem(rejectFilters.at(index)->title());
 		rejectFilterList->setCurrentItem(index);
 		
-		connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateRejectFilterList()) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateRejectFilterList()) );
 		
 		//connect all the fields to the save slot
 		//title
-		connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFilterList() ) );
 		//active
-		connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(saveFilterList() ) );
 		//regexps
-		connect(rejectFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(saveFilterList() ) );
 		//series
-		connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(saveFilterList() ) );
 		//sansEpisode
-		connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(saveFilterList() ) );
 		//minSeason
-		connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//minEpisode
-		connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//maxSeason
-		connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//maxEpiosde
-		connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) );
 		//matches
-		connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) );
+		connect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQ_SLOT(saveFilterList() ) );
 
 	}
 	
@@ -773,7 +773,7 @@ namespace kt
 				curDownload = new RssLinkDownloader(m_core, feedArticles->text(j, 2));
 				for (int i=0; i<feeds.count(); i++)
 					{
-					connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) );
+					connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) );
 					}
 			}
 		}
@@ -1232,7 +1232,7 @@ namespace kt
 				RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), filter);
 				for (int i=0; i<feeds.count(); i++)
 					{
-					connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) );
+					connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) );
 					}
 			}
 		}
@@ -1245,7 +1245,7 @@ namespace kt
 				RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), acceptFilters.at(i));
 				for (int i=0; i<feeds.count(); i++)
 					{
-					connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) );
+					connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) );
 					}
 				}
 			}
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index ee357d6..92bb90d 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -43,14 +43,14 @@ namespace kt
 			{
 				// no valid URL, so just display an error message
 				KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
-				TQTimer::singleShot(50,this,TQT_SLOT(suicide()));
+				TQTimer::singleShot(50,this,TQ_SLOT(suicide()));
 			}
 			else
 			{
 				//first let's download the link so we can process it to check for the actual torrent
 				curLink = curSubLink = link;
 				curFile = TDEIO::storedGet(link,false,false);
-				connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* )));
+				connect(curFile, TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(processLink( TDEIO::Job* )));
 			}
 		}
 	
@@ -189,7 +189,7 @@ namespace kt
 			curSubLink = subLinks.first();
 			subLinks.pop_front();
 			curFile = TDEIO::storedGet(curSubLink,false,false);
-			connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* )));
+			connect(curFile, TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(processLink( TDEIO::Job* )));
 			}
 		}
 	
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index dfceba0..135aea2 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -58,9 +58,9 @@ namespace kt
 
 		m_dir->setShowingDotFiles(true);
 
-		connect(m_dir, TQT_SIGNAL(newItems( const KFileItemList& )), this, TQT_SLOT(onNewItems( const KFileItemList& )));
-		connect(m_core, TQT_SIGNAL(loadingFinished( const KURL&, bool, bool )), this, TQT_SLOT(onLoadingFinished( const KURL&, bool, bool )));
-		connect(&m_incomplePollingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onIncompletePollingTimeout()));
+		connect(m_dir, TQ_SIGNAL(newItems( const KFileItemList& )), this, TQ_SLOT(onNewItems( const KFileItemList& )));
+		connect(m_core, TQ_SIGNAL(loadingFinished( const KURL&, bool, bool )), this, TQ_SLOT(onLoadingFinished( const KURL&, bool, bool )));
+		connect(&m_incomplePollingTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onIncompletePollingTimeout()));
 	}
 
 
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
index 38ab296..2c342f4 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/plugins/scheduler/bwsprefpagewidget.cpp
@@ -93,16 +93,16 @@ namespace kt
 			pix52->setPixmap(TQPixmap(locate("data", TQString("ktorrent/icons/cell-a-0004.png"))));
 		}
 
-		connect(radio1, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio2, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio3, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio4, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio5, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio12, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio22, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio32, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio42, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
-		connect(radio52, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int)));
+		connect(radio1, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio2, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio3, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio4, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio5, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio12, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio22, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio32, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio42, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
+		connect(radio52, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int)));
 
 		//pre-check default categories (say 1 for left and 0 for right)
 		radio2->setChecked(true);
diff --git a/plugins/scheduler/bwswidget.cpp b/plugins/scheduler/bwswidget.cpp
index da37f06..4423458 100644
--- a/plugins/scheduler/bwswidget.cpp
+++ b/plugins/scheduler/bwswidget.cpp
@@ -101,8 +101,8 @@ namespace kt
 		setHScrollBarMode(TQTable::AlwaysOff);
 		setVScrollBarMode(TQTable::AlwaysOff);
 
-		connect(this, TQT_SIGNAL(currentChanged( int, int )), this, TQT_SLOT(cellSelectionChanged( int, int )));
-		connect(this, TQT_SIGNAL(pressed(int, int, int, const TQPoint&)), this, TQT_SLOT(cellMouseDown(int, int, int, const TQPoint& )));
+		connect(this, TQ_SIGNAL(currentChanged( int, int )), this, TQ_SLOT(cellSelectionChanged( int, int )));
+		connect(this, TQ_SIGNAL(pressed(int, int, int, const TQPoint&)), this, TQ_SLOT(cellMouseDown(int, int, int, const TQPoint& )));
 	}
 
 	BWSWidget::~BWSWidget()
diff --git a/plugins/scheduler/schedulerplugin.cpp b/plugins/scheduler/schedulerplugin.cpp
index d0b8f68..e0a71e7 100644
--- a/plugins/scheduler/schedulerplugin.cpp
+++ b/plugins/scheduler/schedulerplugin.cpp
@@ -60,7 +60,7 @@ namespace kt
 	{
 		setXMLFile("ktschedulerpluginui.rc");
 		bws_action = 0;
-		connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer_triggered()));
+		connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer_triggered()));
 	}
 
 
@@ -95,7 +95,7 @@ namespace kt
 		
 // 		updateEnabledBWS();
 		bws_action = new TDEAction(i18n("Open Bandwidth Scheduler" ), "clock", 0, this,
-								 TQT_SLOT(openBWS()), actionCollection(), "bwscheduler" );
+								 TQ_SLOT(openBWS()), actionCollection(), "bwscheduler" );
 	}
 
 	void SchedulerPlugin::unload()
@@ -135,7 +135,7 @@ namespace kt
 		if(SchedulerPluginSettings::enableBWS())
 		{
 			bws_action = new TDEAction(i18n("Open Bandwidth Scheduler" ), "clock", 0, this,
-									 TQT_SLOT(openBWS()), actionCollection(), "bwscheduler" );
+									 TQ_SLOT(openBWS()), actionCollection(), "bwscheduler" );
 		}
 		else
 		{
diff --git a/plugins/scheduler/schedulerprefpagewidget.cpp b/plugins/scheduler/schedulerprefpagewidget.cpp
index 65d600b..156f46f 100644
--- a/plugins/scheduler/schedulerprefpagewidget.cpp
+++ b/plugins/scheduler/schedulerprefpagewidget.cpp
@@ -61,7 +61,7 @@ namespace kt
 		/* force trigger since the schedule has changed but after KTorrent::apply()
 		* Used TQTimer with fixed interval - not very nice solution... */
 		if(useBS->isChecked())
-			TQTimer::singleShot(1000, this, TQT_SLOT(scheduler_trigger()));
+			TQTimer::singleShot(1000, this, TQ_SLOT(scheduler_trigger()));
 		
 		BWScheduler::instance().setEnabled(use_bws);
 	}
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
index 2c57aeb..1f3a50d 100644
--- a/plugins/search/htmlpart.cpp
+++ b/plugins/search/htmlpart.cpp
@@ -45,8 +45,8 @@ namespace kt
 		setPluginsEnabled(false);
 		setStatusMessagesEnabled(false);
 		KParts::BrowserExtension* ext = this->browserExtension();
-		connect(ext,TQT_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)),
-				this,TQT_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& )));
+		connect(ext,TQ_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)),
+				this,TQ_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& )));
 	
 		ext->enableAction("copy",true);
 		ext->enableAction("paste",true);
@@ -75,11 +75,11 @@ namespace kt
 		}
 		
 		TDEIO::TransferJob* j = TDEIO::get(u,false,false);
-		connect(j,TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)),
-				this,TQT_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& )));
-		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(jobDone(TDEIO::Job* )));
-		connect(j,TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString &)),
-				this,TQT_SLOT(mimetype(TDEIO::Job*, const TQString& )));
+		connect(j,TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray &)),
+				this,TQ_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& )));
+		connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(jobDone(TDEIO::Job* )));
+		connect(j,TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString &)),
+				this,TQ_SLOT(mimetype(TDEIO::Job*, const TQString& )));
 	
 		active_job = j;
 		curr_data.resize(0);
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index a45e474..ebf53e6 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -65,8 +65,8 @@ namespace kt
 		engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
 		TDEToolBar* tb = getGUI()->addToolBar("search");
 		tab = new SearchTab(tb);
-		connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )),
-				this,TQT_SLOT(search( const TQString&, int, bool )));
+		connect(tab,TQ_SIGNAL(search( const TQString&, int, bool )),
+				this,TQ_SLOT(search( const TQString&, int, bool )));
 		 
 		pref = new SearchPrefPage(this);
 		getGUI()->addPrefPage(pref);
@@ -118,7 +118,7 @@ namespace kt
 		SearchWidget* search = new SearchWidget(this);
 		getGUI()->addTabPage(search,iload->loadIconSet("viewmag", TDEIcon::Small),text,this);
 		
-		TDEAction* copy_act = KStdAction::copy(search,TQT_SLOT(copy()),actionCollection());
+		TDEAction* copy_act = KStdAction::copy(search,TQ_SLOT(copy()),actionCollection());
 		copy_act->plug(search->rightClickMenu(),0);
 		searches.append(search);
 		
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index cc9e6d3..68bb613 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -60,12 +60,12 @@ namespace kt
 		TQToolTip::add(m_infoLabel,info);
 		TQToolTip::add(m_engine_name,info);
 		
-		connect(btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked()));
-		connect(btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeClicked()));
-		connect(btn_add_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDefaultClicked()));
-		connect(btnRemoveAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllClicked()));
+		connect(btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked()));
+		connect(btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeClicked()));
+		connect(btn_add_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDefaultClicked()));
+		connect(btnRemoveAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllClicked()));
 		
-		connect(useCustomBrowser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(customToggled( bool )));
+		connect(useCustomBrowser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(customToggled( bool )));
 		
 		useCustomBrowser->setChecked(SearchPluginSettings::useCustomBrowser());
 		useDefaultBrowser->setChecked(SearchPluginSettings::useDefaultBrowser());
diff --git a/plugins/search/searchtab.cpp b/plugins/search/searchtab.cpp
index c752bc5..dc68dc4 100644
--- a/plugins/search/searchtab.cpp
+++ b/plugins/search/searchtab.cpp
@@ -51,10 +51,10 @@ namespace kt
 		m_clear_button->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
 		m_clear_button->setEnabled(false);
 
-		connect(m_search_new_tab,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchNewTabPressed()));
-		connect(m_search_text,TQT_SIGNAL(returnPressed(const TQString&)),this,TQT_SLOT(searchBoxReturn( const TQString& )));
-		connect(m_search_text,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged( const TQString& )));
-		connect(m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearButtonPressed()));
+		connect(m_search_new_tab,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchNewTabPressed()));
+		connect(m_search_text,TQ_SIGNAL(returnPressed(const TQString&)),this,TQ_SLOT(searchBoxReturn( const TQString& )));
+		connect(m_search_text,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(textChanged( const TQString& )));
+		connect(m_clear_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearButtonPressed()));
 		m_search_text->setMaxCount(20);
 		m_search_new_tab->setEnabled(false);
 		m_search_text->setInsertionPolicy(TQComboBox::NoInsertion);
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index 128ceeb..fc43870 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -69,18 +69,18 @@ namespace kt
 		back_id = right_click_menu->insertItem(
                         TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
                         ? "forward" : "back",TDEIcon::Small),
-				i18n("Back"),html_part,TQT_SLOT(back()));
+				i18n("Back"),html_part,TQ_SLOT(back()));
 		right_click_menu->insertItem(
 				TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small),
-				i18n("Reload"),html_part,TQT_SLOT(reload()));
+				i18n("Reload"),html_part,TQ_SLOT(reload()));
 	
 		right_click_menu->setItemEnabled(back_id,false);
 		sbar->m_back->setEnabled(false);
-		connect(sbar->m_search_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchPressed()));
-		connect(sbar->m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearPressed()));
-		connect(sbar->m_search_text,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchPressed()));
-		connect(sbar->m_back,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(back()));
-		connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload()));
+		connect(sbar->m_search_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchPressed()));
+		connect(sbar->m_clear_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearPressed()));
+		connect(sbar->m_search_text,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(searchPressed()));
+		connect(sbar->m_back,TQ_SIGNAL(clicked()),html_part,TQ_SLOT(back()));
+		connect(sbar->m_reload,TQ_SIGNAL(clicked()),html_part,TQ_SLOT(reload()));
 	
 		sbar->m_clear_button->setIconSet(
 				TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
@@ -92,22 +92,22 @@ namespace kt
 				TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small));
 		
 		
-		connect(html_part,TQT_SIGNAL(backAvailable(bool )),
-				this,TQT_SLOT(onBackAvailable(bool )));
-		connect(html_part,TQT_SIGNAL(onURL(const TQString& )),
-				this,TQT_SLOT(onURLHover(const TQString& )));
-		connect(html_part,TQT_SIGNAL(openTorrent(const KURL& )),
-				this,TQT_SLOT(onOpenTorrent(const KURL& )));
-		connect(html_part,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )),
-				this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& )));
-		connect(html_part,TQT_SIGNAL(searchFinished()),this,TQT_SLOT(onFinished()));
-		connect(html_part,TQT_SIGNAL(saveTorrent(const KURL& )),
-				this,TQT_SLOT(onSaveTorrent(const KURL& )));
+		connect(html_part,TQ_SIGNAL(backAvailable(bool )),
+				this,TQ_SLOT(onBackAvailable(bool )));
+		connect(html_part,TQ_SIGNAL(onURL(const TQString& )),
+				this,TQ_SLOT(onURLHover(const TQString& )));
+		connect(html_part,TQ_SIGNAL(openTorrent(const KURL& )),
+				this,TQ_SLOT(onOpenTorrent(const KURL& )));
+		connect(html_part,TQ_SIGNAL(popupMenu(const TQString&, const TQPoint& )),
+				this,TQ_SLOT(showPopupMenu(const TQString&, const TQPoint& )));
+		connect(html_part,TQ_SIGNAL(searchFinished()),this,TQ_SLOT(onFinished()));
+		connect(html_part,TQ_SIGNAL(saveTorrent(const KURL& )),
+				this,TQ_SLOT(onSaveTorrent(const KURL& )));
 	
 		KParts::PartManager* pman = html_part->partManager();
-		connect(pman,TQT_SIGNAL(partAdded(KParts::Part*)),this,TQT_SLOT(onFrameAdded(KParts::Part* )));
+		connect(pman,TQ_SIGNAL(partAdded(KParts::Part*)),this,TQ_SLOT(onFrameAdded(KParts::Part* )));
 		
-		connect(html_part->browserExtension(),TQT_SIGNAL(loadingProgress(int)),this,TQT_SLOT(loadingProgress(int)));
+		connect(html_part->browserExtension(),TQ_SIGNAL(loadingProgress(int)),this,TQ_SLOT(loadingProgress(int)));
 		prog = 0;
 	}
 	
@@ -143,8 +143,8 @@ namespace kt
 		TDEHTMLPart* frame = dynamic_cast<TDEHTMLPart*>(p);
 		if (frame)
 		{
-			connect(frame,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )),
-					this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& )));
+			connect(frame,TQ_SIGNAL(popupMenu(const TQString&, const TQPoint& )),
+					this,TQ_SLOT(showPopupMenu(const TQString&, const TQPoint& )));
 		}
 	}
 	
diff --git a/plugins/stats/statsplugin.cpp b/plugins/stats/statsplugin.cpp
index 2980cb3..6693ebd 100644
--- a/plugins/stats/statsplugin.cpp
+++ b/plugins/stats/statsplugin.cpp
@@ -51,13 +51,13 @@ void StatsPlugin::load()
 	pmPrefsUi = new StatsPluginPrefs();
 	pmUpdTmr = new TQTimer(this);
 	
-	connect(pmUpdTmr, TQT_SIGNAL(timeout () ), this, TQT_SLOT(UpdateData()));
-	connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(RestartTimer()));
-	connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(TogglePeersSpdCht()));
-	connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleLchInSwmDrawing()));
-	connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleSdrInSwmDrawing()));
-	connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMsmtsCounts()));
-	connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMaxMode()));
+	connect(pmUpdTmr, TQ_SIGNAL(timeout () ), this, TQ_SLOT(UpdateData()));
+	connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(RestartTimer()));
+	connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(TogglePeersSpdCht()));
+	connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleLchInSwmDrawing()));
+	connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleSdrInSwmDrawing()));
+	connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMsmtsCounts()));
+	connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMaxMode()));
 	
 	TogglePeersSpdCht();
 	ChangeMaxMode();
@@ -76,13 +76,13 @@ void StatsPlugin::unload()
 	getGUI() -> removeToolWidget(pmUiCon);
 	getGUI() -> removePrefPage(pmPrefsUi);
 	
-	disconnect(pmUpdTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(UpdateData()));
-	disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(RestartTimer()));
-	disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(TogglePeersSpdCht()));
-	disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleLchInSwmDrawing()));
-	disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleSdrInSwmDrawing()));
-	disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMsmtsCounts()));
-	disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMaxMode()));
+	disconnect(pmUpdTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(UpdateData()));
+	disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(RestartTimer()));
+	disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(TogglePeersSpdCht()));
+	disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleLchInSwmDrawing()));
+	disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleSdrInSwmDrawing()));
+	disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMsmtsCounts()));
+	disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMaxMode()));
 	
 	delete pmUiSpd;
 	delete pmUiCon;
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp
index 0172ed2..91c9dd9 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/plugins/upnp/upnpmcastsocket.cpp
@@ -47,8 +47,8 @@ namespace kt
 	UPnPMCastSocket::UPnPMCastSocket(bool verbose) : verbose(verbose)
 	{
 		routers.setAutoDelete(true);
-		TQObject::connect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead()));
-		TQObject::connect(this,TQT_SIGNAL(gotError(int)),this,TQT_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);
@@ -67,8 +67,8 @@ namespace kt
 	UPnPMCastSocket::~UPnPMCastSocket()
 	{
 		leaveUPnPMCastGroup();
-		TQObject::disconnect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead()));
-		TQObject::disconnect(this,TQT_SIGNAL(gotError(int)),this,TQT_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()
@@ -142,8 +142,8 @@ namespace kt
 		UPnPRouter* r = parseResponse(p.data());
 		if (r)
 		{
-			TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),
-					this,TQT_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();
@@ -269,7 +269,7 @@ namespace kt
 			{
 				UPnPRouter* r = new UPnPRouter(server,location);
 				// download it's xml file
-				TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
+				TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
 				r->downloadXMLFile();
 			}
 		}
diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp
index 1d3a6da..067cbef 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/plugins/upnp/upnpprefpage.cpp
@@ -46,8 +46,8 @@ namespace kt
 	void UPnPPrefPage::createWidget(TQWidget* parent)
 	{
 		widget = new UPnPPrefWidget(parent);
-		TQObject::connect(sock,TQT_SIGNAL(discovered(UPnPRouter* )),widget,TQT_SLOT(addDevice(UPnPRouter* )));
-		TQObject::connect(widget,TQT_SIGNAL(rescan()),sock,TQT_SLOT(discover()));
+		TQObject::connect(sock,TQ_SIGNAL(discovered(UPnPRouter* )),widget,TQ_SLOT(addDevice(UPnPRouter* )));
+		TQObject::connect(widget,TQ_SIGNAL(rescan()),sock,TQ_SLOT(discover()));
 	}
 
 	void UPnPPrefPage::deleteWidget()
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index ab84a2e..dd61a3c 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -41,9 +41,9 @@ namespace kt
 			: UPnPWidget(parent,name,fl)
 	{
 		def_router = 0;
-		connect(m_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onForwardBtnClicked()));
-		connect(m_undo_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUndoForwardBtnClicked()));
-		connect(m_rescan,TQT_SIGNAL(clicked()),this,TQT_SLOT(onRescanClicked()));
+		connect(m_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onForwardBtnClicked()));
+		connect(m_undo_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUndoForwardBtnClicked()));
+		connect(m_rescan,TQ_SIGNAL(clicked()),this,TQ_SLOT(onRescanClicked()));
 		bt::Globals::instance().getPortList().setListener(this);
 	}
 	
@@ -72,7 +72,7 @@ namespace kt
 	
 	void UPnPPrefWidget::addDevice(UPnPRouter* r)
 	{
-		connect(r,TQT_SIGNAL(updateGUI()),this,TQT_SLOT(updatePortMappings()));
+		connect(r,TQ_SIGNAL(updateGUI()),this,TQ_SLOT(updatePortMappings()));
 		TDEListViewItem* item = new TDEListViewItem(m_device_list,r->getDescription().friendlyName);
 		item->setMultiLinesEnabled(true);
 		itemmap[item] = r;
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index 0e18e92..ee0a5c3 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -171,7 +171,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,TQT_SIGNAL(result(TDEIO::Job *)),this,TQT_SLOT(downloadFinished( TDEIO::Job* )));
+		connect(job,TQ_SIGNAL(result(TDEIO::Job *)),this,TQ_SLOT(downloadFinished( TDEIO::Job* )));
 	}
 	
 	void UPnPRouter::debugPrintData()
@@ -339,12 +339,12 @@ namespace kt
 
 		
 		HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose);
-		connect(r,TQT_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )),
-				this,TQT_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& )));
-		connect(r,TQT_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )),
-				this,TQT_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& )));
-		connect(r,TQT_SIGNAL(error(bt::HTTPRequest*, bool )),
-				this,TQT_SLOT(onError(bt::HTTPRequest*, bool )));
+		connect(r,TQ_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )),
+				this,TQ_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& )));
+		connect(r,TQ_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )),
+				this,TQ_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& )));
+		connect(r,TQ_SIGNAL(error(bt::HTTPRequest*, bool )),
+				this,TQ_SLOT(onError(bt::HTTPRequest*, bool )));
 		r->start();
 		if (!at_exit)
 			active_reqs.append(r);
diff --git a/plugins/webinterface/httpclienthandler.cpp b/plugins/webinterface/httpclienthandler.cpp
index cba0372..bc2a4f6 100644
--- a/plugins/webinterface/httpclienthandler.cpp
+++ b/plugins/webinterface/httpclienthandler.cpp
@@ -212,7 +212,7 @@ namespace kt
 		else
 		{
 			php_response_hdr = hdr;
-			connect(php,TQT_SIGNAL(finished()),this,TQT_SLOT(onPHPFinished()));
+			connect(php,TQ_SIGNAL(finished()),this,TQ_SLOT(onPHPFinished()));
 			state = PROCESSING_PHP;
 		}
 	}
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index f7f9600..292ecc8 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -75,9 +75,9 @@ namespace kt
 		TQSocket* socket = new TQSocket(this);
 		socket->setSocket(s);
 	
-		connect(socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketReadyToRead()));
-		connect(socket, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(slotConnectionClosed()));
-		connect(socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed()));
+		connect(socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketReadyToRead()));
+		connect(socket, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(slotConnectionClosed()));
+		connect(socket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotConnectionClosed()));
 	
 		HttpClientHandler* handler = new HttpClientHandler(this,socket);
 		clients.insert(socket,handler);
@@ -381,7 +381,7 @@ namespace kt
 			{
 				// first send back login page
 				redirectToLoginPage(hdlr);
-				TQTimer::singleShot(1000,kapp,TQT_SLOT(quit()));
+				TQTimer::singleShot(1000,kapp,TQ_SLOT(quit()));
 			}
 			else if (redirect)
 			{
diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp
index b8315ba..6586f7e 100644
--- a/plugins/webinterface/php_handler.cpp
+++ b/plugins/webinterface/php_handler.cpp
@@ -37,8 +37,8 @@ namespace kt
 
 	PhpHandler::PhpHandler(const TQString & php_exe,PhpInterface *php) : TQProcess(php_exe),php_i(php)
 	{
-		connect(this,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(onReadyReadStdout()));
-		connect(this,TQT_SIGNAL(processExited()),this,TQT_SLOT(onExited()));
+		connect(this,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(onReadyReadStdout()));
+		connect(this,TQ_SIGNAL(processExited()),this,TQ_SLOT(onExited()));
 	}
 	
 	PhpHandler::~PhpHandler()
diff --git a/plugins/zeroconf/zeroconfplugin.cpp b/plugins/zeroconf/zeroconfplugin.cpp
index d7e68d5..6307bdd 100644
--- a/plugins/zeroconf/zeroconfplugin.cpp
+++ b/plugins/zeroconf/zeroconfplugin.cpp
@@ -50,10 +50,10 @@ namespace kt
 	void ZeroConfPlugin::load()
 	{
 		CoreInterface* core = getCore();
-		connect(core,TQT_SIGNAL(torrentAdded( kt::TorrentInterface* )),
-				this,TQT_SLOT(torrentAdded( kt::TorrentInterface* )));
-		connect(core,TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )),
-				this,TQT_SLOT(torrentRemoved( kt::TorrentInterface* )));
+		connect(core,TQ_SIGNAL(torrentAdded( kt::TorrentInterface* )),
+				this,TQ_SLOT(torrentAdded( kt::TorrentInterface* )));
+		connect(core,TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )),
+				this,TQ_SLOT(torrentRemoved( kt::TorrentInterface* )));
 		
 		// go over existing torrents and add them
 		bt::QueueManager* qman = core->getQueueManager();
@@ -66,10 +66,10 @@ namespace kt
 	void ZeroConfPlugin::unload()
 	{
 		CoreInterface* core = getCore();
-		disconnect(core,TQT_SIGNAL(torrentAdded( kt::TorrentInterface* )),
-				   this,TQT_SLOT(torrentAdded( kt::TorrentInterface* )));
-		disconnect(core,TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )),
-				   this,TQT_SLOT(torrentRemoved( kt::TorrentInterface*)));
+		disconnect(core,TQ_SIGNAL(torrentAdded( kt::TorrentInterface* )),
+				   this,TQ_SLOT(torrentAdded( kt::TorrentInterface* )));
+		disconnect(core,TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )),
+				   this,TQ_SLOT(torrentRemoved( kt::TorrentInterface*)));
 		
 		bt::PtrMap<kt::TorrentInterface*,AvahiService>::iterator i = services.begin();
 		while (i != services.end())
@@ -93,8 +93,8 @@ namespace kt
 		tc->addPeerSource(av);
 		Out(SYS_ZCO|LOG_NOTICE) << "ZeroConf service added for " 
 				<< tc->getStats().torrent_name << endl;
-		connect(av,TQT_SIGNAL(serviceDestroyed( AvahiService* )),
-				this,TQT_SLOT(avahiServiceDestroyed( AvahiService* )));
+		connect(av,TQ_SIGNAL(serviceDestroyed( AvahiService* )),
+				this,TQ_SLOT(avahiServiceDestroyed( AvahiService* )));
 	}