Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

18 files changed, 185 insertions, 185 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;