Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

93 files changed, 706 insertions, 706 deletions

diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
index 52651e26..540a7fb3 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/aboutdialog.cpp
@@ -144,7 +144,7 @@ KviAboutDialog::KviAboutDialog()
 	addTab(w,__tr2qs_ctx("License","about"));
 
 
-	connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(closeButtonPressed()));
+	connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(closeButtonPressed()));
 }
 
 KviAboutDialog::~KviAboutDialog()
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index c0b0e7bc..608a90e5 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -185,7 +185,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	gl->addWidget(m_pSmallIconEdit,2,1);
 	m_pSmallIconButton = new TQToolButton(tab);
 	m_pSmallIconButton->setMinimumSize(TQSize(20,20));
-	connect(m_pSmallIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseSmallIcon()));
+	connect(m_pSmallIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseSmallIcon()));
 	gl->addWidget(m_pSmallIconButton,2,2);
 	TQString s= __tr2qs("The small icon associated to this action.<br>" \
 				"It will appear at least in the popup menus when this action is inserted.<br>" \
@@ -200,7 +200,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	m_pBigIconButton = new TQToolButton(tab);
 	m_pBigIconButton->setMinimumSize(TQSize(48,48));
 	m_pBigIconButton->setUsesBigPixmap(true);
-	connect(m_pBigIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseBigIcon()));
+	connect(m_pBigIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseBigIcon()));
 	gl->addMultiCellWidget(m_pBigIconButton,3,4,2,3);
 	s = __tr2qs("The big icon associated to this action.<br>" \
 				"It will appear at least in the toolbar buttons when this action is inserted.<br>" \
@@ -234,7 +234,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 
 
 	m_pNeedsContextCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Context"),tab);
-	connect(m_pNeedsContextCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(needsContextCheckToggled(bool)));
+	connect(m_pNeedsContextCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(needsContextCheckToggled(bool)));
 	TQToolTip::add(m_pNeedsContextCheck,__tr2qs("Check this option if this action should be enabled only when " \
 						"the active window belongs to an irc context"));
 	gl->addMultiCellWidget(m_pNeedsContextCheck,0,0,0,3);
@@ -244,7 +244,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	gl->addWidget(l,1,0);
 
 	m_pNeedsConnectionCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Connection"),tab);
-	connect(m_pNeedsConnectionCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(needsConnectionCheckToggled(bool)));
+	connect(m_pNeedsConnectionCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(needsConnectionCheckToggled(bool)));
 	TQToolTip::add(m_pNeedsConnectionCheck,__tr2qs("Check this option if this action should be enabled only when " \
 						"the active window has an active IRC connection"));
 	gl->addMultiCellWidget(m_pNeedsConnectionCheck,1,1,1,3);
@@ -259,7 +259,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	gl->addMultiCellWidget(m_pEnableAtLoginCheck,2,2,2,3);
 
 	m_pSpecificWindowsCheck = new KviStyledCheckBox(__tr2qs("Enable Only in Specified Windows"),tab);
-	connect(m_pSpecificWindowsCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(specificWindowsCheckToggled(bool)));
+	connect(m_pSpecificWindowsCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(specificWindowsCheckToggled(bool)));
 	TQToolTip::add(m_pSpecificWindowsCheck,__tr2qs("Check this option if this action should be enabled only when " \
 						"the active window is of a specified type"));
 	gl->addMultiCellWidget(m_pSpecificWindowsCheck,3,3,0,3);
@@ -267,7 +267,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	m_pWindowConsoleCheck = new KviStyledCheckBox(__tr2qs("Enable in Console Windows"),tab);
 	TQToolTip::add(m_pWindowConsoleCheck,__tr2qs("Check this option if this action should be enabled only when " \
 						"the active window is a console"));
-	connect(m_pWindowConsoleCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
+	connect(m_pWindowConsoleCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
 	gl->addMultiCellWidget(m_pWindowConsoleCheck,4,4,1,3);
 
 	m_pConsoleOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
@@ -278,7 +278,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	m_pWindowChannelCheck = new KviStyledCheckBox(__tr2qs("Enable in Channel Windows"),tab);
 	TQToolTip::add(m_pWindowChannelCheck,__tr2qs("Check this option if this action should be enabled only when " \
 						"the active window is a channel"));
-	connect(m_pWindowChannelCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
+	connect(m_pWindowChannelCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
 	gl->addMultiCellWidget(m_pWindowChannelCheck,6,6,1,3);
 
 	m_pChannelOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
@@ -289,7 +289,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed
 	m_pWindowQueryCheck = new KviStyledCheckBox(__tr2qs("Enable in Query Windows"),tab);
 	TQToolTip::add(m_pWindowQueryCheck,__tr2qs("Check this option if this action should be enabled only when " \
 						"the active window is a query"));
-	connect(m_pWindowQueryCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
+	connect(m_pWindowQueryCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
 	gl->addMultiCellWidget(m_pWindowQueryCheck,8,8,1,3);
 
 	m_pQueryOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab);
@@ -660,17 +660,17 @@ KviActionEditor::KviActionEditor(TQWidget * par)
 	//m_pListView->setMultiSelection(false);
 	m_pListView->setShowSortIndicator(true);
 	m_pListView->setFocusPolicy(TQWidget::StrongFocus);
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentChanged(KviTalListViewItem *)));
 
 
 	m_pNewActionButton = new TQPushButton(__tr2qs("New Action"),box);
-	connect(m_pNewActionButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newAction()));
+	connect(m_pNewActionButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newAction()));
 
 	m_pDeleteActionsButton = new TQPushButton(__tr2qs("Delete Actions"),box);
-	connect(m_pDeleteActionsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteActions()));
+	connect(m_pDeleteActionsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteActions()));
 
 	m_pExportActionsButton = new TQPushButton(__tr2qs("Export Actions..."),box);
-	connect(m_pExportActionsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportActions()));
+	connect(m_pExportActionsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportActions()));
 
 	box->setSpacing(1);
 
@@ -917,19 +917,19 @@ KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm)
 
 	TQPushButton * btn = new TQPushButton(__tr2qs("OK"),m_pBase);
 	btn->setMinimumWidth(80);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new TQPushButton(__tr2qs("Apply"),m_pBase);
 	btn->setMinimumWidth(80);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new TQPushButton(__tr2qs("Cancel"),m_pBase);
 	btn->setMinimumWidth(80);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index f89d9bfe..a19022a2 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -188,17 +188,17 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p)
 	g->addMultiCellWidget(m_pListView,0,10,1,1);
 
 	m_pConfigureButton = new TQPushButton(__tr2qs("Configure"),this);
-	connect(m_pConfigureButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(configureScript()));
+	connect(m_pConfigureButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(configureScript()));
 	g->addWidget(m_pConfigureButton,0,2);
 
 	m_pHelpButton = new TQPushButton(__tr2qs("Show Help"),this);
-	connect(m_pHelpButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showScriptHelp()));
+	connect(m_pHelpButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showScriptHelp()));
 	g->addWidget(m_pHelpButton,1,2);
 
 	g->addRowSpacing(2,40);
 
 	m_pUninstallButton = new TQPushButton(__tr2qs("Uninstall"),this);
-	connect(m_pUninstallButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(uninstallScript()));
+	connect(m_pUninstallButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(uninstallScript()));
 	g->addWidget(m_pUninstallButton,3,2);
 
 	g->addRowSpacing(4,15);
@@ -210,15 +210,15 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p)
 	g->addRowSpacing(6,15);
 
 	m_pInstallButton = new TQPushButton(__tr2qs("Install Addon..."),this);
-	connect(m_pInstallButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(installScript()));
+	connect(m_pInstallButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(installScript()));
 	g->addWidget(m_pInstallButton,7,2);
 
 	m_pGetScriptsButton = new TQPushButton(__tr2qs("More Addons..."),this);
-	connect(m_pGetScriptsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreScripts()));
+	connect(m_pGetScriptsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(getMoreScripts()));
 	g->addWidget(m_pGetScriptsButton,8,2);
 
 	TQPushButton * b = new TQPushButton(__tr2qs("Close"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeClicked()));
 	g->addWidget(b,10,2);
 
 	g->setRowStretch(9,1);
@@ -227,7 +227,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p)
 	fillListView();
 
 	currentChanged(0);
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentChanged(KviTalListViewItem *)));
 	//currentToolBarChanged();
 
 	if(g_rectManagementDialogGeometry.y() < 5)
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index e609fef9..8ebd9f22 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -226,13 +226,13 @@ KviAliasEditor::KviAliasEditor(TQWidget * par)
 	m_pNameLabel = new TQLabel(__tr2qs("No item selected"),hbox);
 	m_pRenameButton = new TQPushButton(__tr2qs("Rename"),hbox);
 	m_pRenameButton->setEnabled(false);
-	connect(m_pRenameButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameItem()));
+	connect(m_pRenameButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameItem()));
 	hbox->setStretchFactor(m_pNameLabel,2);
 	TQToolTip::add(m_pRenameButton,__tr2qs("Edit the alias or namespace name"));
 	m_pEditor = KviScriptEditor::createInstance(box);
 	m_pEditor->setFocus();
-	connect(m_pEditor,TQT_SIGNAL(find(const TQString &)),this,TQT_SLOT(slotFindWord(const TQString &)));
-	connect(m_pEditor,TQT_SIGNAL(replaceAll(const TQString &,const TQString &)),this,TQT_SLOT(slotReplaceAll(const TQString &,const TQString &)));
+	connect(m_pEditor,TQ_SIGNAL(find(const TQString &)),this,TQ_SLOT(slotFindWord(const TQString &)));
+	connect(m_pEditor,TQ_SIGNAL(replaceAll(const TQString &,const TQString &)),this,TQ_SLOT(slotReplaceAll(const TQString &,const TQString &)));
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
@@ -380,9 +380,9 @@ void KviAliasEditor::oneTimeSetup()
 		++it;
 	}
 		
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 }
 
 bool KviAliasEditor::hasSelectedItems(KviTalListViewItem * it)
@@ -417,12 +417,12 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)),
 			__tr2qs("Add Alias"),
-			this,TQT_SLOT(newAlias()));
+			this,TQ_SLOT(newAlias()));
 
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)),
 			__tr2qs("Add Namespace"),
-			this,TQT_SLOT(newNamespace()));
+			this,TQ_SLOT(newNamespace()));
 	
 
 	bool bHasItems = m_pListView->firstChild() != 0;
@@ -433,7 +433,7 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	id = m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
 			__tr2qs("Remove Selected"),
-			this,TQT_SLOT(removeSelectedItems()));
+			this,TQ_SLOT(removeSelectedItems()));
 	m_pContextPopup->setItemEnabled(id,bHasSelected);
 
 
@@ -442,20 +442,20 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 			__tr2qs("Export Selected..."),
-			this,TQT_SLOT(exportSelected()));
+			this,TQ_SLOT(exportSelected()));
 	m_pContextPopup->setItemEnabled(id,bHasSelected);
 
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 			__tr2qs("Export Selected in singles files..."),
-			this,TQT_SLOT(exportSelectedSepFiles()));
+			this,TQ_SLOT(exportSelectedSepFiles()));
 
 	m_pContextPopup->setItemEnabled(id,bHasSelected);
 
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 			__tr2qs("Export All..."),
-			this,TQT_SLOT(exportAll()));
+			this,TQ_SLOT(exportAll()));
 	m_pContextPopup->setItemEnabled(id,bHasItems);
 
 	m_pContextPopup->insertSeparator();
@@ -463,13 +463,13 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),
 			__tr2qs("Find In Aliases..."),
-			this,TQT_SLOT(slotFind()));
+			this,TQ_SLOT(slotFind()));
 	m_pContextPopup->setItemEnabled(id,bHasItems);
 
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)),
 			__tr2qs("Collapse All Namespaces"),
-			this,TQT_SLOT(slotCollapseNamespaces()));
+			this,TQ_SLOT(slotCollapseNamespaces()));
 
 	m_pContextPopup->setItemEnabled(id,bHasItems);
 
@@ -1332,17 +1332,17 @@ KviAliasEditorWindow::KviAliasEditorWindow(KviFrame * lpFrm)
 	TQGridLayout * g = new TQGridLayout(m_pBase,1,4,4,4);
 
 	TQPushButton * btn = new TQPushButton(__tr2qs("&OK"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new TQPushButton(__tr2qs("&Apply"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new TQPushButton(__tr2qs("Cancel"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 0ed81a51..57b51f01 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -88,17 +88,17 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(TQWidget * par,cons
 	g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
 
 	TQPushButton * b = new TQPushButton(__tr2qs("&Browse..."),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFileClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
 	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
 	b = new TQPushButton(__tr2qs("&OK"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 
 	b = new TQPushButton(__tr2qs("Cancel"),h);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	
 	g->setRowStretch(0,1);
 	g->setColStretch(0,1);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 8c5e71e0..57c31930 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -66,8 +66,8 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name)
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
 	g->addMultiCellWidget(m_pListView,0,0,0,1);
-	connect(m_pListView,TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(itemClicked(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(clicked(KviTalListViewItem *)),this,TQ_SLOT(itemClicked(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *)));
 
 
 	m_pGroupBox = new KviTalGroupBox(2,TQt::Horizontal,__tr2qs("Channel" ),this);
@@ -76,8 +76,8 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name)
 	TQLabel * l = new TQLabel(szMsg,m_pGroupBox);
 
 	m_pChannelEdit = new TQLineEdit(m_pGroupBox); 
-	connect(m_pChannelEdit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(editReturnPressed()));
-	connect(m_pChannelEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(editTextChanged(const TQString &)));
+	connect(m_pChannelEdit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(editReturnPressed()));
+	connect(m_pChannelEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(editTextChanged(const TQString &)));
 
 	szMsg = __tr2qs("Password");
 	szMsg.append(":");
@@ -92,7 +92,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name)
 	m_pJoinButton = new TQPushButton(__tr2qs("&Join"),this);
 	// Join on return pressed
 	m_pJoinButton->setDefault(true);
-	connect(m_pJoinButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(joinClicked()));
+	connect(m_pJoinButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(joinClicked()));
 
 	g->addMultiCellWidget(m_pJoinButton,2,2,0,1,AlignHCenter);
 
@@ -103,7 +103,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name)
 
 
 	TQPushButton * cancelButton = new TQPushButton(__tr2qs("Close"),this);
-	connect(cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(cancelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 
 	g->addWidget(cancelButton,3,1);
 
@@ -112,9 +112,9 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name)
 	hb->setSpacing(4);
 	
 	TQPushButton * namesButton = new TQPushButton("/names", hb);
-	connect(namesButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(namesClicked()));
+	connect(namesButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(namesClicked()));
 	TQPushButton * whoButton = new TQPushButton("/who", hb);
-	connect(whoButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(whoClicked()));
+	connect(whoButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(whoClicked()));
 
 	g->addWidget(hb,2,0);
 */
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index 3cc9d851..eb58a9a7 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -54,7 +54,7 @@ KviCodeTester::KviCodeTester(TQWidget * par)
 	g->addMultiCellWidget(m_pEditor,0,0,0,3);
 	m_pExecuteButton = new TQPushButton(__tr2qs("&Execute"),this);
 	g->addWidget(m_pExecuteButton,1,3);
-	connect(m_pExecuteButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(execute()));
+	connect(m_pExecuteButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(execute()));
 
 	m_pModeLabel = new TQLabel(__tr("Params:"),this);
 	g->addWidget(m_pModeLabel,1,1);
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index cfbc01ba..a766f932 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -291,10 +291,10 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,caption);
 
 		m_pBoxList->append(box);
-		connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(executeChat(KviDccBox *,KviDccDescriptor *)));
-		connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(executeChat(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -345,10 +345,10 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc)
 
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc"));
 		m_pBoxList->append(box);
-		connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *)));
-		connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -416,10 +416,10 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
 
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc"));
 		m_pBoxList->append(box);
-		connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *)));
-		connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -544,10 +544,10 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
 
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,title);
 		m_pBoxList->append(box);
-		connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *)));
-		connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *)));
+		connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
+				this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -685,12 +685,12 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
 
 			KviDccRenameBox * box = new KviDccRenameBox(this,dcc,tmp,bDisableResume);
 			m_pBoxList->append(box);
-			connect(box,TQT_SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)),
-					this,TQT_SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *)));
-			connect(box,TQT_SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)),
-					this,TQT_SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *)));
-			connect(box,TQT_SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)),
-					this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+			connect(box,TQ_SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)),
+					this,TQ_SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *)));
+			connect(box,TQ_SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)),
+					this,TQ_SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *)));
+			connect(box,TQ_SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)),
+					this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
 			box->show();
 			return;
 		} else {
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 4acb85ce..d9ccd025 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -68,8 +68,8 @@ KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * na
 //	setFocusHandler(m_pInput,this);
 
 	m_pMarshal = new KviDccMarshal(this);
-	connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int)));
-	connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected()));
+	connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int)));
+	connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected()));
 
 
 	if(!(m_pDescriptor->bActive))
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 252f789c..70e928e9 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1409,7 +1409,7 @@ KviCanvasItemPropertiesWidget::KviCanvasItemPropertiesWidget(TQWidget * par)
 	setSorting(false);
 	setLeftMargin(0);
 	verticalHeader()->hide();
-	connect(this,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(cellEdited(int,int)));
+	connect(this,TQ_SIGNAL(valueChanged(int,int)),this,TQ_SLOT(cellEdited(int,int)));
 }
 
 KviCanvasItemPropertiesWidget::~KviCanvasItemPropertiesWidget()
@@ -1506,24 +1506,24 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par)
 	l.append(20);
 	m_pSplitter->setSizes(l);
 
-	connect(m_pPropertiesWidget,TQT_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQT_SLOT(propertyChanged(const TQString &,const TQVariant &)));
+	connect(m_pPropertiesWidget,TQ_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQ_SLOT(propertyChanged(const TQString &,const TQVariant &)));
 
 	KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar);
 	KviTalPopupMenu * shapes = new KviTalPopupMenu(add);
 	KviTalPopupMenu * polygons = new KviTalPopupMenu(add);
 	KviTalPopupMenu * items = new KviTalPopupMenu(add);
-	shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine()));
-	shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle()));
-	shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse()));
-	shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie()));
-	shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord()));
-
-	items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQT_SLOT(insertRichText()));
-
-	polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonTriangle()));
-	polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonRectangle()));
-	polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonPentagon()));
-	polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonHexagon()));
+	shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQ_SLOT(insertLine()));
+	shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQ_SLOT(insertRectangle()));
+	shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQ_SLOT(insertEllipse()));
+	shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQ_SLOT(insertPie()));
+	shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQ_SLOT(insertChord()));
+
+	items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQ_SLOT(insertRichText()));
+
+	polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonTriangle()));
+	polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonRectangle()));
+	polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonPentagon()));
+	polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonHexagon()));
 
 	add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes);
 	add->insertItem(__tr2qs_ctx("&Item","dcc"),items);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 67f5647f..9ad8ded4 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -100,7 +100,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 
 	m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter");
 	m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
-	connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked()));
+	connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked()));
 	m_pInput    = new KviInput(this);
 
 	//setFocusHandler(m_pInput,this);
@@ -110,12 +110,12 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 	if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))m_pIrcView->startLogging();
 
 	m_pMarshal = new KviDccMarshal(this);
-	connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int)));
-	connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected()));
-	connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress()));
+	connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int)));
+	connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected()));
+	connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress()));
 #ifdef COMPILE_SSL_SUPPORT
-	connect(m_pMarshal,TQT_SIGNAL(startingSSLHandshake()),this,TQT_SLOT(startingSSLHandshake()));
-	connect(m_pMarshal,TQT_SIGNAL(sslError(const char *)),this,TQT_SLOT(sslError(const char *)));
+	connect(m_pMarshal,TQ_SIGNAL(startingSSLHandshake()),this,TQ_SLOT(startingSSLHandshake()));
+	connect(m_pMarshal,TQ_SIGNAL(sslError(const char *)),this,TQ_SLOT(sslError(const char *)));
 #endif
 
 	m_pSlaveThread = 0;
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index 01d4a3b4..9f4e3967 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -62,9 +62,9 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 	btn->setDefault(true);
 	//btn->setFocus();
 	hb->addWidget(btn);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(acceptClicked()));
 	btn = new TQPushButton(__tr2qs_ctx("&Reject","dcc"),this);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(rejectClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(rejectClicked()));
 	hb->addWidget(btn);
 
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)));
@@ -122,20 +122,20 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 
 	TQPushButton * btn = new TQPushButton(__tr2qs_ctx("&Rename","dcc"),this);
 	hb->addWidget(btn);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameClicked()));
 
 	btn = new TQPushButton(__tr2qs_ctx("Over&write","dcc"),this);
 	hb->addWidget(btn);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(overwriteClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(overwriteClicked()));
 
 	btn = new TQPushButton(__tr2qs_ctx("Re&sume","dcc"),this);
 	hb->addWidget(btn);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(resumeClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(resumeClicked()));
 	if(bDisableResume)btn->setEnabled(false);
 
 	btn = new TQPushButton(__tr2qs_ctx("Cancel","dcc"),this);
 	hb->addWidget(btn);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setDefault(true);
 	//btn->setFocus();
 
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 0a386eec..ba920ec7 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -123,7 +123,7 @@ int KviDccMarshal::dccListen(const TQString &ip,const TQString &port,bool bUseTi
 
 	if(m_pTimeoutTimer)delete m_pTimeoutTimer;
 	m_pTimeoutTimer = new TQTimer();
-	connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doListen()));
+	connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doListen()));
 	m_pTimeoutTimer->start(100,true);
 
 	return KviError_success;
@@ -277,7 +277,7 @@ void KviDccMarshal::doListen()
 
 	// and setup the READ notifier...
 	m_pSn = new TQSocketNotifier(m_fd,TQSocketNotifier::Read);
-	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(snActivated(int)));
+	TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(snActivated(int)));
 	m_pSn->setEnabled(true);
 
 	// set the timer
@@ -287,7 +287,7 @@ void KviDccMarshal::doListen()
 	if(m_bUseTimeout)
 	{
 		m_pTimeoutTimer = new TQTimer();
-		connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut()));
+		connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut()));
 		m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
 	}
 	// and wait for connect
@@ -312,7 +312,7 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout
 
 	if(m_pTimeoutTimer)delete m_pTimeoutTimer;
 	m_pTimeoutTimer = new TQTimer();
-	connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doConnect()));
+	connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doConnect()));
 	m_pTimeoutTimer->start(100,true);
 
 	return KviError_success;
@@ -415,7 +415,7 @@ void KviDccMarshal::doConnect()
 
 	// and setup the WRITE notifier...
 	m_pSn = new TQSocketNotifier(m_fd,TQSocketNotifier::Write);
-	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(snActivated(int)));
+	TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(snActivated(int)));
 	m_pSn->setEnabled(true);
 
 	// set the timer
@@ -425,7 +425,7 @@ void KviDccMarshal::doConnect()
 	if(m_bUseTimeout)
 	{
 		m_pTimeoutTimer = new TQTimer();
-		connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut()));
+		connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut()));
 		m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
 	}
 
@@ -587,12 +587,12 @@ void KviDccMarshal::doSSLHandshake(int)
 		break;
 		case KviSSL::WantRead:
 			m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read);
-			TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int)));
+			TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int)));
 			m_pSn->setEnabled(true);
 		break;
 		case KviSSL::WantWrite:
 			m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Write);
-			TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int)));
+			TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int)));
 			m_pSn->setEnabled(true);
 		break;
 		case KviSSL::RemoteEndClosedConnection:
@@ -607,7 +607,7 @@ void KviDccMarshal::doSSLHandshake(int)
 			{
 				// can recover ? (EAGAIN , EINTR ?)
 				m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Write);
-				TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int)));
+				TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int)));
 				m_pSn->setEnabled(true);
 				return;
 			} else {
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 385bd695..05236d95 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -736,12 +736,12 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
 
 	m_pMarshal = new KviDccMarshal(this);
 
-	connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int)));
-	connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected()));
-	connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress()));
+	connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int)));
+	connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected()));
+	connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress()));
 #ifdef COMPILE_SSL_SUPPORT
-	connect(m_pMarshal,TQT_SIGNAL(startingSSLHandshake()),this,TQT_SLOT(startingSSLHandshake()));
-	connect(m_pMarshal,TQT_SIGNAL(sslError(const char *)),this,TQT_SLOT(sslError(const char *)));
+	connect(m_pMarshal,TQ_SIGNAL(startingSSLHandshake()),this,TQ_SLOT(startingSSLHandshake()));
+	connect(m_pMarshal,TQ_SIGNAL(sslError(const char *)),this,TQ_SLOT(sslError(const char *)));
 #endif
 
 	m_szDccType = dcc->bIsTdcc ? (dcc->bRecvFile ? "TRECV" : "TSEND") : (dcc->bRecvFile ? "RECV" : "SEND");
@@ -851,7 +851,7 @@ void KviDccFileTransfer::startConnection()
 
 		if(m_pResumeTimer)delete m_pResumeTimer;
 		m_pResumeTimer = new TQTimer(this);
-		connect(m_pResumeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(resumeTimedOut()));
+		connect(m_pResumeTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(resumeTimedOut()));
 		m_pResumeTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
 	} else {
 		listenOrConnect();
@@ -933,15 +933,15 @@ void KviDccFileTransfer::abort()
 
 void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
 {
-	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,TQT_SLOT(configureBandwidth()));
+	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,TQ_SLOT(configureBandwidth()));
 	m->insertSeparator();
-	m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,TQT_SLOT(retryDCC()));
-	m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,TQT_SLOT(retryTDCC()));
-	m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,TQT_SLOT(retryRevDCC()));
+	m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,TQ_SLOT(retryDCC()));
+	m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,TQ_SLOT(retryTDCC()));
+	m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,TQ_SLOT(retryRevDCC()));
 	/* FIX ME credo che il problema sia che se riavvio un trasferimento, a sua volta gia'
 		   avviato, questo non ha irc contex, perche' la finestra "in cui e' nato"e' sta
 	   quella della dcc. Conservarsi l'id della finestra? */
-	int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,TQT_SLOT(abort()));
+	int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,TQ_SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
 }
 
@@ -949,7 +949,7 @@ void KviDccFileTransfer::configureBandwidth()
 {
 	if(m_pBandwidthDialog)return;
 	m_pBandwidthDialog = new KviDccFileTransferBandwidthDialog(g_pFrame,this);
-	connect(m_pBandwidthDialog,TQT_SIGNAL(destroyed()),this,TQT_SLOT(bandwidthDialogDestroyed()));
+	connect(m_pBandwidthDialog,TQ_SIGNAL(destroyed()),this,TQ_SLOT(bandwidthDialogDestroyed()));
 	m_pBandwidthDialog->setModal(true);
 	m_pBandwidthDialog->show();
 }
@@ -1842,7 +1842,7 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget *
 
 	m_pLimitBox = new TQSpinBox(0,MAX_DCC_BANDWIDTH_LIMIT-1,1,this);
 	m_pLimitBox->setEnabled((iVal >= 0) && (iVal < MAX_DCC_BANDWIDTH_LIMIT));
-	connect(m_pEnableLimitCheck,TQT_SIGNAL(toggled(bool)),m_pLimitBox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableLimitCheck,TQ_SIGNAL(toggled(bool)),m_pLimitBox,TQ_SLOT(setEnabled(bool)));
 	g->addMultiCellWidget(m_pLimitBox,0,0,1,2);
 
 	szText = " ";
@@ -1851,12 +1851,12 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget *
 	m_pLimitBox->setValue(iVal < MAX_DCC_BANDWIDTH_LIMIT ? iVal : 0);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("OK","dcc"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,2,2);
 
 	pb = new TQPushButton(__tr2qs_ctx("Cancel","dcc"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,2,1);
 
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 6b5267b6..be674ab8 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -686,7 +686,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	setMixerVolume(m_pVolumeSlider->value());
 	m_pVolumeSlider->setMaximumWidth(16);
 	m_pVolumeSlider->setMaximumHeight(2*m_pPlayingLabel->height());
-	connect(m_pVolumeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMixerVolume(int)));
+	connect(m_pVolumeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMixerVolume(int)));
 
 	m_pTalkButton = new TQToolButton(m_pHBox);
 	m_pTalkButton->setEnabled(false);
@@ -697,7 +697,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pTalkButton->setIconSet(iset);
 	m_pTalkButton->setUsesBigPixmap(true);
 
-	connect(m_pTalkButton,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(startOrStopTalking(bool)));
+	connect(m_pTalkButton,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(startOrStopTalking(bool)));
 
 	m_pHBox->setStretchFactor(vbox,1);
 	m_pHBox->setMargin(2);
@@ -706,9 +706,9 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	//setFocusHandler(m_pIrcView,this);
 
 	m_pMarshal = new KviDccMarshal(this);
-	connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int)));
-	connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected()));
-	connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress()));
+	connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int)));
+	connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected()));
+	connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress()));
 
 	m_pUpdateTimer = new TQTimer();
 
@@ -923,7 +923,7 @@ void KviDccVoice::connected()
 	}
 	updateCaption();
 
-	connect(m_pUpdateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateInfo()));
+	connect(m_pUpdateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateInfo()));
 	m_pUpdateTimer->start(1000);
 
 	KviDccVoiceThreadOptions * opt = new KviDccVoiceThreadOptions;
@@ -940,7 +940,7 @@ void KviDccVoice::connected()
 	opt->iSampleRate = m_pDescriptor->iSampleRate;
 
 	m_pSlaveThread = new KviDccVoiceThread(this,m_pMarshal->releaseSocket(),opt);
-	connect(m_pUpdateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateInfo()));
+	connect(m_pUpdateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateInfo()));
 	m_pSlaveThread->start();
 
 	m_pTalkButton->setEnabled(true);
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index fdc61a0c..ec482051 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -260,7 +260,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 		}
 		TQPushButton * pb1 = new TQPushButton(szB,box);
 		if(bDef)pb1->setDefault(true);
-		connect(pb1,TQT_SIGNAL(clicked()),this,TQT_SLOT(b0Clicked()));
+		connect(pb1,TQ_SIGNAL(clicked()),this,TQ_SLOT(b0Clicked()));
 	}
 
 	if(!szButton1.isEmpty())
@@ -279,7 +279,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 		}
 		TQPushButton * pb2 = new TQPushButton(szB,box);
 		if(bDef)pb2->setDefault(true);
-		connect(pb2,TQT_SIGNAL(clicked()),this,TQT_SLOT(b1Clicked()));
+		connect(pb2,TQ_SIGNAL(clicked()),this,TQ_SLOT(b1Clicked()));
 	}
 
 	if(!szButton2.isEmpty())
@@ -298,7 +298,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 		}
 		TQPushButton * pb3 = new TQPushButton(szB,box);
 		if(bDef)pb3->setDefault(true);
-		connect(pb3,TQT_SIGNAL(clicked()),this,TQT_SLOT(b2Clicked()));
+		connect(pb3,TQ_SIGNAL(clicked()),this,TQ_SLOT(b2Clicked()));
 	}
 
 }
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 534e6535..bf7baaeb 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -110,7 +110,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
 	m_iOther    = 0;
 	
 	m_pFlashingTimer = new TQTimer(this,"flashing_timer");
-	connect( m_pFlashingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flashingTimerShot()) );
+	connect( m_pFlashingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flashingTimerShot()) );
 	m_bFlashed=0;
 	g_pDockWidgetList->append(this);
 	m_pFrm = frm;
@@ -130,7 +130,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
 
 
 	m_pTip = new KviDynamicToolTip(this,"dock_tooltip");
-	connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &)));
+	connect(m_pTip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &)));
 	
 	m_pAwayPopup = new KviTalPopupMenu(this);
 	
@@ -147,18 +147,18 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
 	m_iAwayMenuId = m_pContextPopup->insertItem ( __tr2qs("Away"), m_pAwayPopup);
 	m_pContextPopup->changeItem(m_iAwayMenuId,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),__tr2qs("Away"));
 	
-	int id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS)),__tr2qs("&Configure KVIrc..."),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
+	int id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS)),__tr2qs("&Configure KVIrc..."),m_pFrm,TQ_SLOT(executeInternalCommand(int)));
 	m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_OPTIONS_DIALOG);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("&About KVIrc"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("&About KVIrc"),m_pFrm,TQ_SLOT(executeInternalCommand(int)));
 	m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC);
 	m_pContextPopup->insertSeparator();
-	m_iToggleFrame = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW)),TQString(""),this,TQT_SLOT(toggleParentFrame()));
+	m_iToggleFrame = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW)),TQString(""),this,TQ_SLOT(toggleParentFrame()));
 	m_pContextPopup->insertSeparator();
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQ_SLOT(executeInternalCommand(int)));
 	m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQ_SLOT(quit()));
 	m_pContextPopup->setAccel(__tr2qs("Ctrl+Q"),id);
-	connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup()));
+	connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(fillContextPopup()));
 }
 
 
@@ -417,10 +417,10 @@ void KviDockWidget::fillContextPopup()
 		m_pContextPopup->setItemVisible(m_iAwayMenuId,true);
 		m_pAwayPopup->clear();
 		
-		int iAllAway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on all"),this,TQT_SLOT(doAway(int)));
+		int iAllAway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on all"),this,TQ_SLOT(doAway(int)));
 		m_pAwayPopup->setItemParameter(iAllAway,-1);
 		
-		int iAllUnaway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on all"),this,TQT_SLOT(doAway(int)));
+		int iAllUnaway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on all"),this,TQ_SLOT(doAway(int)));
 		m_pAwayPopup->setItemParameter(iAllUnaway,-2);
 		
 		int iSeparator=m_pAwayPopup->insertSeparator();
@@ -439,10 +439,10 @@ void KviDockWidget::fillContextPopup()
 					int id;
 					if(pConsole->connection()->userInfo()->isAway())
 					{
-						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
+						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQ_SLOT(doAway(int)));
 						bAllUnaway=0;
 					} else {
-						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
+						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQ_SLOT(doAway(int)));
 						bAllAway=0;
 					}
 					m_pAwayPopup->setItemParameter(id,pConsole->ircContextId());
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 258db5fb..6ae4740d 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -181,11 +181,11 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(TQWidget *
 	
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","editor"),this);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	g->addWidget(b,2,1);
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","editor"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	g->addWidget(b,2,2);
 
 
@@ -225,7 +225,7 @@ KviScriptEditorWidget::KviScriptEditorWidget(TQWidget * pParent)
 	updateOptions();
 	m_szFind="";
 	completelistbox=new KviCompletionBox(this);
-	connect (completelistbox,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(slotComplete(const TQString &)));
+	connect (completelistbox,TQ_SIGNAL(selected(const TQString &)),this,TQ_SLOT(slotComplete(const TQString &)));
 }
 
 KviScriptEditorWidget::~KviScriptEditorWidget()
@@ -236,8 +236,8 @@ KviScriptEditorWidget::~KviScriptEditorWidget()
 TQPopupMenu * KviScriptEditorWidget::createPopupMenu( const TQPoint& pos )
 {
 	TQPopupMenu *pop=KviTalTextEdit::createPopupMenu(pos);
-	pop->insertItem(__tr2qs("Context sensitive help"),this,TQT_SLOT(slotHelp()),TQt::CTRL+TQt::Key_H);
-	pop->insertItem(__tr2qs("&Replace"),this,TQT_SLOT(slotReplace()),TQt::CTRL+TQt::Key_R);
+	pop->insertItem(__tr2qs("Context sensitive help"),this,TQ_SLOT(slotHelp()),TQt::CTRL+TQt::Key_H);
+	pop->insertItem(__tr2qs("&Replace"),this,TQ_SLOT(slotReplace()),TQt::CTRL+TQt::Key_R);
 	return pop;
 }
 
@@ -250,9 +250,9 @@ void KviScriptEditorWidget::slotFind()
 void KviScriptEditorWidget::slotReplace()
 {
 	KviScriptEditorReplaceDialog *dialog=new KviScriptEditorReplaceDialog(this,tr("Find & Replace"));
-	connect (dialog,TQT_SIGNAL(replaceAll(const TQString &,const TQString &)),m_pParent,TQT_SLOT(slotReplaceAll(const TQString &,const TQString &)));
-	connect (dialog,TQT_SIGNAL(initFind()),m_pParent,TQT_SLOT(slotInitFind()));
-	connect (dialog,TQT_SIGNAL(nextFind(const TQString &)),m_pParent,TQT_SLOT(slotNextFind(const TQString &)));
+	connect (dialog,TQ_SIGNAL(replaceAll(const TQString &,const TQString &)),m_pParent,TQ_SLOT(slotReplaceAll(const TQString &,const TQString &)));
+	connect (dialog,TQ_SIGNAL(initFind()),m_pParent,TQ_SLOT(slotInitFind()));
+	connect (dialog,TQ_SIGNAL(nextFind(const TQString &)),m_pParent,TQ_SLOT(slotNextFind(const TQString &)));
 	if(dialog->exec()){};
 
 }
@@ -840,10 +840,10 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(TQWidget * par)
 	g->addWidget(b,1,0);
 
 	KviTalPopupMenu * pop = new KviTalPopupMenu(b);
-	pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,TQT_SLOT(loadFromFile()));
-	pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,TQT_SLOT(saveToFile()));
+	pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,TQ_SLOT(loadFromFile()));
+	pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,TQ_SLOT(saveToFile()));
 	pop->insertSeparator();
-	pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,TQT_SLOT(configureColors()));
+	pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,TQ_SLOT(configureColors()));
 	b->setPopup(pop);
 	b->setPopupDelay(1);
 
@@ -859,11 +859,11 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(TQWidget * par)
 	m_pRowColLabel->setMinimumWidth(80);
 	g->addWidget(m_pRowColLabel,1,3);
 
-	connect(m_pFindLineedit,TQT_SIGNAL(returnPressed()),m_pEditor,TQT_SLOT(slotFind()));
-	connect(m_pFindLineedit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotFind()));
-	connect(m_pEditor,TQT_SIGNAL(keyPressed()),this,TQT_SLOT(updateRowColLabel()));
-	connect(m_pEditor,TQT_SIGNAL(textChanged()),this,TQT_SLOT(updateRowColLabel()));
-	connect(m_pEditor,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(updateRowColLabel()));
+	connect(m_pFindLineedit,TQ_SIGNAL(returnPressed()),m_pEditor,TQ_SLOT(slotFind()));
+	connect(m_pFindLineedit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(slotFind()));
+	connect(m_pEditor,TQ_SIGNAL(keyPressed()),this,TQ_SLOT(updateRowColLabel()));
+	connect(m_pEditor,TQ_SIGNAL(textChanged()),this,TQ_SLOT(updateRowColLabel()));
+	connect(m_pEditor,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(updateRowColLabel()));
 	m_lastCursorPos = TQPoint(-1,-1);
 }
 
@@ -1143,10 +1143,10 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
     clearWState( WState_Polished );
 	setTabOrder(m_pFindlineedit,m_pReplacelineedit);
 	// signals and slots connections
-	connect( replacebutton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReplace() ) );
-	connect( findNext, TQT_SIGNAL( clicked() ),this,TQT_SLOT( slotNextFind()));
-	connect( cancelbutton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
-	connect( m_pFindlineedit, TQT_SIGNAL( textChanged(const TQString &)), this, TQT_SLOT( textChanged(const TQString &)));
+	connect( replacebutton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReplace() ) );
+	connect( findNext, TQ_SIGNAL( clicked() ),this,TQ_SLOT( slotNextFind()));
+	connect( cancelbutton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+	connect( m_pFindlineedit, TQ_SIGNAL( textChanged(const TQString &)), this, TQ_SLOT( textChanged(const TQString &)));
 
 }
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index efa75538..06d6e3e2 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -83,7 +83,7 @@ KviEventEditor::KviEventEditor(TQWidget * par)
 	m_pListView->setRootIsDecorated(true);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&Export All To..."),boxi);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportAllEvents()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportAllEvents()));
 
 	KviTalVBox * box = new KviTalVBox(spl);
 	m_pNameEditor = new TQLineEdit(box);
@@ -129,9 +129,9 @@ void KviEventEditor::oneTimeSetup()
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(selectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(selectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 }
 
 void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col)
@@ -147,27 +147,27 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 			if(!(((KviEventHandlerListViewItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
-					__tr2qs("&Enable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled()));
+					__tr2qs("&Enable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled()));
 			else
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)),
-					__tr2qs("&Disable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled()));
+					__tr2qs("&Disable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled()));
 
 			//m_pContextPopup->setItemChecked(id,((KviEventHandlerListViewItem *)it)->m_bEnabled);
 
 			m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
 					__tr2qs("Re&move Handler"),
-					this,TQT_SLOT(removeCurrentHandler()));
+					this,TQ_SLOT(removeCurrentHandler()));
 			m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 					__tr2qs("&Export Handler To..."),
-					this,TQT_SLOT(exportCurrentHandler()));
+					this,TQ_SLOT(exportCurrentHandler()));
 		} else {
 			m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
 				__tr2qs("&New Handler"),
-				this,TQT_SLOT(addHandlerForCurrentEvent()));
+				this,TQ_SLOT(addHandlerForCurrentEvent()));
 		}
 
 		m_pContextPopup->popup(pnt);
@@ -430,17 +430,17 @@ KviEventEditorWindow::KviEventEditorWindow(KviFrame * lpFrm)
 	TQGridLayout * g = new TQGridLayout(m_pBase,1,4,4,4);
 
 	TQPushButton * btn = new TQPushButton(__tr2qs("&OK"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new TQPushButton(__tr2qs("&Apply"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new TQPushButton(__tr2qs("Cancel"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 8c2950c3..7d780984 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -147,7 +147,7 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pMemPixmap = new TQPixmap(1,1);
 
 	m_pTimer = new TQTimer(this);
-	connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat()));
+	connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat()));
 
 	m_pInput   = new KviInput(this,0);
 
@@ -162,13 +162,13 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pListView->addColumn(__tr2qs_ctx("Progress","filetransferwindow"),350);
 
 	KviDynamicToolTip * tp = new KviDynamicToolTip(m_pListView->viewport());
-	connect(tp,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &)));
+	connect(tp,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &)));
 
 	//m_pListView->setFocusPolicy(NoFocus);
 	//m_pListView->viewport()->setFocusPolicy(NoFocus);
 
-	//connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-	// this,TQT_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int)));
+	//connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+	// this,TQ_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int)));
 
 	TQFontMetrics fm(font());
 	m_iLineSpacing = fm.lineSpacing();
@@ -176,12 +176,12 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
 	m_pListView->installEventFilter(this);
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(doubleClicked(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(doubleClicked(KviTalListViewItem *,const TQPoint &,int)));
 	fillTransferView();
 
-	connect(KviFileTransferManager::instance(),TQT_SIGNAL(transferRegistered(KviFileTransfer *)),this,TQT_SLOT(transferRegistered(KviFileTransfer *)));
-	connect(KviFileTransferManager::instance(),TQT_SIGNAL(transferUnregistering(KviFileTransfer *)),this,TQT_SLOT(transferUnregistering(KviFileTransfer *)));
+	connect(KviFileTransferManager::instance(),TQ_SIGNAL(transferRegistered(KviFileTransfer *)),this,TQ_SLOT(transferRegistered(KviFileTransfer *)));
+	connect(KviFileTransferManager::instance(),TQ_SIGNAL(transferUnregistering(KviFileTransfer *)),this,TQ_SLOT(transferUnregistering(KviFileTransfer *)));
 
 	KviFileTransferManager::instance()->setTransferWindow(this);
 
@@ -282,7 +282,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
 	if(!m_pOpenFilePopup)
 	{
 		m_pOpenFilePopup= new KviTalPopupMenu(this);
-		connect(m_pOpenFilePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(openFilePopupActivated(int)));
+		connect(m_pOpenFilePopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(openFilePopupActivated(int)));
 	}
 
 	m_pContextPopup->clear();
@@ -327,7 +327,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
 				TQString mimetype = KMimeType::findByPath(szFile)->name();
 				KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
 
-				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQT_SLOT(openLocalFile()));
+				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQ_SLOT(openLocalFile()));
 				m_pLocalFilePopup->setItemParameter(id,-1);
 
 				m_pOpenFilePopup->clear();
@@ -345,32 +345,32 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
 
 				m_pOpenFilePopup->insertSeparator();
 
-				id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQT_SLOT(openLocalFileWith()));
+				id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQ_SLOT(openLocalFileWith()));
 				m_pOpenFilePopup->setItemParameter(id,-1);
 
 				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),m_pOpenFilePopup);
 				m_pLocalFilePopup->insertSeparator();
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder()));
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQ_SLOT(openLocalFileFolder()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,TQ_SLOT(openLocalFileTerminal()));
 				m_pLocalFilePopup->insertSeparator();
 #endif //COMPILE_TDE_SUPPORT
 
 //-| Grifisx & Noldor |-
 #ifdef COMPILE_ON_WINDOWS
-				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQT_SLOT(openLocalFile()));
+				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQ_SLOT(openLocalFile()));
 				m_pLocalFilePopup->setItemParameter(id,-1);
 				m_pOpenFilePopup->insertSeparator();
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),this,TQT_SLOT(openLocalFileWith()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),this,TQ_SLOT(openLocalFileWith()));
 				m_pLocalFilePopup->insertSeparator();
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder()));
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQ_SLOT(openLocalFileFolder()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,TQ_SLOT(openLocalFileTerminal()));
 				m_pLocalFilePopup->insertSeparator();
 #endif //COMPILE_ON_WINDOWS
 // G&N end
 
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,TQT_SLOT(copyLocalFileToClipboard()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,TQ_SLOT(copyLocalFileToClipboard()));
 
-				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Delete file","filetransferwindow"),this,TQT_SLOT(deleteLocalFile()));
+				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Delete file","filetransferwindow"),this,TQ_SLOT(deleteLocalFile()));
 				m_pLocalFilePopup->setItemEnabled(id,i->transfer()->terminated());
 				m_pContextPopup->insertItem(__tr2qs_ctx("Local &File","filetransferwindow"),m_pLocalFilePopup);
 
@@ -395,14 +395,14 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
 		item = (KviFileTransferItem *)item->nextSibling();
 	}
 
-	id = m_pContextPopup->insertItem(__tr2qs_ctx("&Clear Terminated","filetransferwindow"),this,TQT_SLOT(clearTerminated()));
+	id = m_pContextPopup->insertItem(__tr2qs_ctx("&Clear Terminated","filetransferwindow"),this,TQ_SLOT(clearTerminated()));
 	m_pContextPopup->setItemEnabled(id,bHaveTerminated);
 
 	bool bAreTransfersActive = false;
 	if(m_pListView->childCount() >= 1)
 		bAreTransfersActive = true;
 
-	id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear &All","filetransferwindow"),this,TQT_SLOT(clearAll()));
+	id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear &All","filetransferwindow"),this,TQ_SLOT(clearAll()));
 	m_pContextPopup->setItemEnabled(id,bAreTransfersActive);
 
 	m_pContextPopup->popup(pnt);
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 1de90892..098a51be 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -57,18 +57,18 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 
 	m_pBtnIndex = new KviStyledToolButton(m_pToolBar);
 	m_pBtnIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX));
-	connect(m_pBtnIndex,TQT_SIGNAL(clicked()),this,TQT_SLOT(showIndex()));
+	connect(m_pBtnIndex,TQ_SIGNAL(clicked()),this,TQ_SLOT(showIndex()));
 	//m_pBtnIndex->setUsesBigPixmap(true);
 
 	m_pBtnBackward = new KviStyledToolButton(m_pToolBar);
 	m_pBtnBackward->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK));
-	connect(m_pBtnBackward,TQT_SIGNAL(clicked()),m_pTextBrowser,TQT_SLOT(backward()));
+	connect(m_pBtnBackward,TQ_SIGNAL(clicked()),m_pTextBrowser,TQ_SLOT(backward()));
 	m_pBtnBackward->setEnabled(false);
 	//m_pBtnBackward->setUsesBigPixmap(true);
 
 	m_pBtnForward = new KviStyledToolButton(m_pToolBar);
 	m_pBtnForward->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD));
-	connect(m_pBtnForward,TQT_SIGNAL(clicked()),m_pTextBrowser,TQT_SLOT(forward()));
+	connect(m_pBtnForward,TQ_SIGNAL(clicked()),m_pTextBrowser,TQ_SLOT(forward()));
 	m_pBtnForward->setEnabled(false);
 	//m_pBtnForward->setUsesBigPixmap(true);
 	
@@ -78,13 +78,13 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	{
 		TQToolButton * b = new KviStyledToolButton(m_pToolBar);
 		b->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPCLOSE));
-		connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(doClose()));
+		connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(doClose()));
 		//b->setUsesBigPixmap(true);
 	}
 
 	m_pToolBar->setStretchFactor(pSpacer,1);
-	connect(m_pTextBrowser,TQT_SIGNAL(backwardAvailable(bool)),m_pBtnBackward,TQT_SLOT(setEnabled(bool)));
-	connect(m_pTextBrowser,TQT_SIGNAL(forwardAvailable(bool)),m_pBtnForward,TQT_SLOT(setEnabled(bool)));
+	connect(m_pTextBrowser,TQ_SIGNAL(backwardAvailable(bool)),m_pBtnBackward,TQ_SLOT(setEnabled(bool)));
+	connect(m_pTextBrowser,TQ_SIGNAL(forwardAvailable(bool)),m_pBtnForward,TQ_SLOT(setEnabled(bool)));
 
 	m_pTextBrowser->viewport()->installEventFilter(this);
 
@@ -113,7 +113,7 @@ void KviHelpWidget::doClose()
 	// hack needed to workaround "TQToolBar::emulateButtonClicked()"
 	// that refers to the "this" pointer after this slot has been
 	// called (from the "too-small-toolbar-for-all-items-popup")
-	TQTimer::singleShot(0,this,TQT_SLOT(suicide()));
+	TQTimer::singleShot(0,this,TQ_SLOT(suicide()));
 }
 
 void KviHelpWidget::suicide()
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 3a815244..56f8663a 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -62,7 +62,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 			g_pDocIndex->readDict();
 		} else {
 			TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 );
-			connect(g_pDocIndex,TQT_SIGNAL(indexingProgress(int)), pProgressDialog, TQT_SLOT(setProgress(int)) );
+			connect(g_pDocIndex,TQ_SIGNAL(indexingProgress(int)), pProgressDialog, TQ_SLOT(setProgress(int)) );
 			g_pDocIndex->makeIndex();
 			g_pDocIndex->writeDict();
 			g_pDocIndex->writeDocumentList();
@@ -84,33 +84,33 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	
 	KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab);
 	m_pIndexSearch = new TQLineEdit(pSearchBox);
-	connect( m_pIndexSearch, TQT_SIGNAL( textChanged(const TQString&) ),
-	     this, TQT_SLOT( searchInIndex(const TQString&) ) );
-	connect( m_pIndexSearch, TQT_SIGNAL( returnPressed() ),
-	     this, TQT_SLOT( showIndexTopic() ) );
+	connect( m_pIndexSearch, TQ_SIGNAL( textChanged(const TQString&) ),
+	     this, TQ_SLOT( searchInIndex(const TQString&) ) );
+	connect( m_pIndexSearch, TQ_SIGNAL( returnPressed() ),
+	     this, TQ_SLOT( showIndexTopic() ) );
 	
 	KviStyledToolButton* pBtnRefreshIndex = new KviStyledToolButton(pSearchBox);
 	pBtnRefreshIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_REFRESH_IMAGE_NAME));
-	connect(pBtnRefreshIndex,TQT_SIGNAL(clicked()),this,TQT_SLOT(refreshIndex()));
+	connect(pBtnRefreshIndex,TQ_SIGNAL(clicked()),this,TQ_SLOT(refreshIndex()));
 	TQToolTip::add( pBtnRefreshIndex, __tr2qs("Refresh index") );
 	
 	m_pIndexListBox = new KviTalListBox(m_pIndexTab);
 	TQStringList docList=g_pDocIndex->titlesList();
 	m_pIndexListBox->insertStringList(docList);
-	connect(m_pIndexListBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(indexSelected ( int )));
+	connect(m_pIndexListBox,TQ_SIGNAL(selected(int)),this,TQ_SLOT(indexSelected ( int )));
 	m_pIndexListBox->sort();
 	
 	m_pSearchTab  = new KviTalVBox(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs("Search"));
 	
 	m_pTermsEdit = new TQLineEdit(m_pSearchTab);
-/*	connect( m_pTermsEdit, TQT_SIGNAL( textChanged(const TQString&) ),
-	     this, TQT_SLOT( searchInIndex(const TQString&) ) );*/
-	connect( m_pTermsEdit, TQT_SIGNAL( returnPressed() ),
-	     this, TQT_SLOT( startSearch() ) );
+/*	connect( m_pTermsEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+	     this, TQ_SLOT( searchInIndex(const TQString&) ) );*/
+	connect( m_pTermsEdit, TQ_SIGNAL( returnPressed() ),
+	     this, TQ_SLOT( startSearch() ) );
 	     
 	m_pResultBox = new KviTalListBox(m_pSearchTab);
-	connect(m_pResultBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(searchSelected ( int )));
+	connect(m_pResultBox,TQ_SIGNAL(selected(int)),this,TQ_SLOT(searchSelected ( int )));
 	
 	KviValueList<int> li;
 	li.append(width()-80);
@@ -145,7 +145,7 @@ void KviHelpWindow::refreshIndex()
 {
 	m_pIndexListBox->clear();
 	TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 );
-	connect(g_pDocIndex,TQT_SIGNAL(indexingProgress(int)), pProgressDialog, TQT_SLOT(setProgress(int)) );
+	connect(g_pDocIndex,TQ_SIGNAL(indexingProgress(int)), pProgressDialog, TQ_SLOT(setProgress(int)) );
 	g_pDocIndex->makeIndex();
 	g_pDocIndex->writeDict();
 	g_pDocIndex->writeDocumentList();
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 19d7a77c..1596d4ed 100644
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -39,8 +39,8 @@ Index::Index( const TQString &dp, const TQString &hp )
 {
     alreadyHaveDocList = FALSE;
     lastWindowClosed = FALSE;
-    connect( tqApp, TQT_SIGNAL( lastWindowClosed() ),
-	     this, TQT_SLOT( setLastWinClosed() ) );
+    connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
+	     this, TQ_SLOT( setLastWinClosed() ) );
 }
 
 
@@ -53,8 +53,8 @@ Index::Index( const TQStringList &dl, const TQString &hp )
     docList = dl;
     alreadyHaveDocList = TRUE;
     lastWindowClosed = FALSE;
-    connect( tqApp, TQT_SIGNAL( lastWindowClosed() ),
-	     this, TQT_SLOT( setLastWinClosed() ) );
+    connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
+	     this, TQ_SLOT( setLastWinClosed() ) );
 }
 
 
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 48a8ee37..c9ee4ff1 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -58,14 +58,14 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 
 	m_pHttpRequest = new KviHttpRequest();
 
-	connect(m_pHttpRequest,TQT_SIGNAL(status(const TQString &)),this,TQT_SLOT(statusMessage(const TQString &)));
-	connect(m_pHttpRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(transferTerminated(bool)));
-	connect(m_pHttpRequest,TQT_SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,TQT_SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *)));
-	connect(m_pHttpRequest,TQT_SIGNAL(resolvingHost(const TQString &)),this,TQT_SLOT(resolvingHost(const TQString &)));
-	connect(m_pHttpRequest,TQT_SIGNAL(requestSent(const TQStringList &)),this,TQT_SLOT(requestSent(const TQStringList &)));
-	connect(m_pHttpRequest,TQT_SIGNAL(contactingHost(const TQString &)),this,TQT_SLOT(contactingHost(const TQString &)));
-	connect(m_pHttpRequest,TQT_SIGNAL(receivedResponse(const TQString &)),this,TQT_SLOT(receivedResponse(const TQString &)));
-	connect(m_pHttpRequest,TQT_SIGNAL(connectionEstabilished()),this,TQT_SLOT(connectionEstabilished()));
+	connect(m_pHttpRequest,TQ_SIGNAL(status(const TQString &)),this,TQ_SLOT(statusMessage(const TQString &)));
+	connect(m_pHttpRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(transferTerminated(bool)));
+	connect(m_pHttpRequest,TQ_SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,TQ_SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *)));
+	connect(m_pHttpRequest,TQ_SIGNAL(resolvingHost(const TQString &)),this,TQ_SLOT(resolvingHost(const TQString &)));
+	connect(m_pHttpRequest,TQ_SIGNAL(requestSent(const TQStringList &)),this,TQ_SLOT(requestSent(const TQStringList &)));
+	connect(m_pHttpRequest,TQ_SIGNAL(contactingHost(const TQString &)),this,TQ_SLOT(contactingHost(const TQString &)));
+	connect(m_pHttpRequest,TQ_SIGNAL(receivedResponse(const TQString &)),this,TQ_SLOT(receivedResponse(const TQString &)));
+	connect(m_pHttpRequest,TQ_SIGNAL(connectionEstabilished()),this,TQ_SLOT(connectionEstabilished()));
 	
 	m_eGeneralStatus = Initializing;
 	m_szStatusString = __tr2qs_ctx("Initializing","http");
@@ -104,7 +104,7 @@ void KviHttpFileTransfer::abort()
 
 void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
 {
-	int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,TQT_SLOT(abort()));
+	int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,TQ_SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
 }
 
@@ -457,7 +457,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 	{
 		if(m_pAutoCleanTimer)delete m_pAutoCleanTimer;
 		m_pAutoCleanTimer = new TQTimer();
-		connect(m_pAutoCleanTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(autoClean()));
+		connect(m_pAutoCleanTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(autoClean()));
 		m_pAutoCleanTimer->start(100,true);
 	}
 }
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 2a991dee..3bc5d0f7 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -53,15 +53,15 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pRequestButton = new TQToolButton(box,"request_button");
 	m_pRequestButton->setUsesBigPixmap(false);
 	m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS)));
-	connect(m_pRequestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(requestLinks()));
+	connect(m_pRequestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(requestLinks()));
 	TQToolTip::add(m_pRequestButton,__tr2qs("Request Links"));
 
 	TQLabel * l = new TQLabel(box,"");
 	box->setStretchFactor(l,1);
 	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
 
-	connect(lpConsole->context(),TQT_SIGNAL(stateChanged()),
-		this,TQT_SLOT(connectionStateChange()));
+	connect(lpConsole->context(),TQ_SIGNAL(stateChanged()),
+		this,TQ_SLOT(connectionStateChange()));
 
 	m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter");
 	m_pVertSplitter = new TQSplitter(TQt::Vertical,m_pSplitter,"vsplitter");
@@ -72,8 +72,8 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pListView->addColumn(__tr2qs("Description"));
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setAllColumnsShowFocus(true);
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-			this,TQT_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+			this,TQ_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
@@ -81,7 +81,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pLinkList->setAutoDelete(true);
 
 	m_pHostPopup = new KviTalPopupMenu();
-	connect(m_pHostPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(hostPopupClicked(int)));
+	connect(m_pHostPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(hostPopupClicked(int)));
 
 	connectionStateChange();
 
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 9b40b912..b43eef29 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -179,22 +179,22 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	KviTalHBox * box = new KviTalHBox(m_pTopSplitter);
 	m_pOpenButton = new KviStyledToolButton(box);
 	m_pOpenButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
-	connect(m_pOpenButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importList()));	
+	connect(m_pOpenButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importList()));	
 
 	m_pSaveButton = new KviStyledToolButton(box);
 	m_pSaveButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)));
-	connect(m_pSaveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportList()));	
+	connect(m_pSaveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportList()));	
 
 	m_pRequestButton = new KviStyledToolButton(box,"request_button");
 	m_pRequestButton->setUsesBigPixmap(false);
 	m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST)));
-	connect(m_pRequestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(requestList()));	
+	connect(m_pRequestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(requestList()));	
 	TQToolTip::add(m_pRequestButton,__tr2qs("Request List"));
 	
 	m_pStopListDownloadButton = new KviStyledToolButton(box,"stoplistdownload_button");
 	m_pStopListDownloadButton->setUsesBigPixmap(false);
 	m_pStopListDownloadButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM)));
-	connect(m_pStopListDownloadButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(stoplistdownload()));
+	connect(m_pStopListDownloadButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(stoplistdownload()));
 	TQToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download"));
 
 	m_pParamsEdit = new TQLineEdit(box);
@@ -215,14 +215,14 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pListView->setColumnWidthMode(3,KviTalListView::Maximum);
 	m_pListView->setSorting(100);
 	
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
 	m_pConsole->ircContext()->setListWindowPointer(this);
 
-	connect(m_pConsole->context(),TQT_SIGNAL(stateChanged()),
-		this,TQT_SLOT(connectionStateChange()));
+	connect(m_pConsole->context(),TQ_SIGNAL(stateChanged()),
+		this,TQ_SLOT(connectionStateChange()));
 
 	connectionStateChange();
 	
@@ -443,7 +443,7 @@ void KviListWindow::processData(KviIrcMessage *msg)
 	if(!m_pFlushTimer)
 	{
 		m_pFlushTimer = new TQTimer(this);
-		connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(flush()));
+		connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(flush()));
 		m_pFlushTimer->start(1000);
 		m_pRequestButton->setEnabled(false);
 	}
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index a5845b8a..2b15ac1d 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -76,8 +76,8 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	m_pListView->setMultiSelection(false);
 	m_pListView->setShowSortIndicator(true);
 	m_pListView->setRootIsDecorated(true);
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemSelected(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int )),this,TQT_SLOT(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int )));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(itemSelected(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int )),this,TQ_SLOT(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int )));
 	
 	m_pSearchTab  = new TQWidget(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
@@ -110,13 +110,13 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 
 	l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
 	m_pFileNameMask = new TQLineEdit(m_pSearchTab);
-	connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
+	connect(m_pFileNameMask,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(applyFilter()));
 	layout->addWidget(l,6,0);
 	layout->addWidget(m_pFileNameMask,6,1);
 
 	l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
 	m_pContentsMask = new TQLineEdit(m_pSearchTab);
-	connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
+	connect(m_pContentsMask,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(applyFilter()));
 	layout->addWidget(l,7,0);
 	layout->addWidget(m_pContentsMask,7,1);
 
@@ -125,7 +125,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	m_pFromDateEdit->setDate(TQDate::currentDate());
 	layout->addWidget(m_pEnableFromFilter,8,0);
 	layout->addWidget(m_pFromDateEdit,8,1);
-	connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableFromFilter,TQ_SIGNAL(toggled(bool)),m_pFromDateEdit,TQ_SLOT(setEnabled(bool)));
 	m_pFromDateEdit->setEnabled(false);
 
 	m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
@@ -133,11 +133,11 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	m_pToDateEdit->setDate(TQDate::currentDate());
 	layout->addWidget(m_pEnableToFilter,9,0);
 	layout->addWidget(m_pToDateEdit,9,1);
-	connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableToFilter,TQ_SIGNAL(toggled(bool)),m_pToDateEdit,TQ_SLOT(setEnabled(bool)));
 	m_pToDateEdit->setEnabled(false);
 
 	TQPushButton *pb = new TQPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyFilter()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyFilter()));
 	layout->addWidget(pb,10,1);
 
 	TQWidget *w = new TQWidget(m_pSearchTab);
@@ -159,7 +159,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	KviAccel *a = new KviAccel( this );
         a->connectItem( a->insertItem(TQt::Key_F+TQt::CTRL),
                         m_pIrcView,
-                        TQT_SLOT(toggleToolWidget()) );
+                        TQ_SLOT(toggleToolWidget()) );
 }
 
 
@@ -360,7 +360,7 @@ void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const TQ
 	if(!it) return;
 	if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
 	KviTalPopupMenu* popup = new KviTalPopupMenu(this);
-	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,TQT_SLOT(deleteCurrent()));
+	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,TQ_SLOT(deleteCurrent()));
 	popup->exec( TQCursor::pos() );
 }
 
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index e1066237..96b74cf1 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -182,7 +182,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe
 	setNextEnabled(vb,false);
 	setFinishEnabled(vb,true);
 
-	connect(this,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(pageSelected(const TQString &)));
+	connect(this,TQ_SIGNAL(selected(const TQString &)),this,TQ_SLOT(pageSelected(const TQString &)));
 }
 
 KviRemoteMircServerImportWizard::~KviRemoteMircServerImportWizard()
@@ -218,8 +218,8 @@ void KviRemoteMircServerImportWizard::start()
 	if(m_pRequest)delete m_pRequest;
 
 	m_pRequest = new KviHttpRequest();
-	connect(m_pRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(getListTerminated(bool)));
-	connect(m_pRequest,TQT_SIGNAL(status(const TQString &)),this,TQT_SLOT(getListMessage(const TQString &)));
+	connect(m_pRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(getListTerminated(bool)));
+	connect(m_pRequest,TQ_SIGNAL(status(const TQString &)),this,TQ_SLOT(getListMessage(const TQString &)));
 
 	g_pApp->getTmpFileName(m_szTmpFileName,"servers.ini");
 	if(!m_pRequest->get(KviUrl(url),KviHttpRequest::StoreToFile,m_szTmpFileName))
diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp
index 0917aec7..cd62b125 100644
--- a/src/modules/my/idle.cpp
+++ b/src/modules/my/idle.cpp
@@ -45,7 +45,7 @@ Idle::Idle()
 	if(platform)
 		++platform_ref;
 
-	connect(&d->checkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doCheck()));
+	connect(&d->checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doCheck()));
 }
 
 Idle::~Idle()
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 634af964..3e2f7d15 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -128,7 +128,7 @@ KviNotifierWindow::KviNotifierWindow()
 	m_pLineEdit->setGeometry(0,0,0,0);
 	m_pLineEdit->hide();
 	m_pLineEdit->installEventFilter(this);
-	connect(m_pLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(returnPressed()));
+	connect(m_pLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(returnPressed()));
 
 	szFamily = cfg.readEntry("InputFontFamily","Arial");
 	m_pLineEdit->setFont(TQFont(szFamily,cfg.readIntEntry("InputFontSize",9)));
@@ -174,7 +174,7 @@ KviNotifierWindow::KviNotifierWindow()
 	TQFontMetrics titleFontMetrics(*m_pTitleFont);
 	m_pWndBorder->centerTitle(titleFontMetrics.height());
 	
-	connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages()));
+	connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages()));
 }
 
 KviNotifierWindow::~KviNotifierWindow()
@@ -326,7 +326,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 			if(bDoAnimate)
 			{
 				m_pShowHideTimer = new TQTimer();
-				connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat()));
+				connect(m_pShowHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat()));
 				m_dOpacity = OPACITY_STEP;
 				m_eState = Showing;
 				m_bCrashShowWorkAround=true;
@@ -455,7 +455,7 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
 		} else {
 			//tqDebug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
 			m_pShowHideTimer = new TQTimer();
-			connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat()));
+			connect(m_pShowHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat()));
 			m_dOpacity = 1.0 - OPACITY_STEP;
 			m_eState = Hiding;
 			update();		
@@ -493,7 +493,7 @@ void KviNotifierWindow::startBlinking()
 	if(!KVI_OPTION_BOOL(KviOption_boolDisableNotifierFlashing))
 	{
 		m_pBlinkTimer = new TQTimer();
-		connect(m_pBlinkTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(blink()));
+		connect(m_pBlinkTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(blink()));
 		m_iBlinkCount = 0;
 		m_pBlinkTimer->start(m_iBlinkTimeout);
 	}
@@ -509,11 +509,11 @@ void KviNotifierWindow::startAutoHideTimer()
 	int nSecs = m_tAutoHideAt - m_tStartedAt;
 	if(nSecs < 5)nSecs = 5;
 	m_pAutoHideTimer = new TQTimer();
-	connect(m_pAutoHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(autoHide()));
+	connect(m_pAutoHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(autoHide()));
 	m_pAutoHideTimer->start(nSecs * 1000);
 	
 	m_pProgressTimer= new TQTimer();
-	connect(m_pProgressTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(progressUpdate()));
+	connect(m_pProgressTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(progressUpdate()));
 	m_pProgressTimer->start(60);
 }
 
@@ -927,7 +927,7 @@ void KviNotifierWindow::keyReleaseEvent(TQKeyEvent * e)
 void KviNotifierWindow::delayedRaise(KviWindow * pWnd)
 {
 	m_pWindowToRaise = pWnd;
-	TQTimer::singleShot(0,this,TQT_SLOT(delayedRaiseSlot()));
+	TQTimer::singleShot(0,this,TQ_SLOT(delayedRaiseSlot()));
 }
 
 void KviNotifierWindow::delayedRaiseSlot()
@@ -1128,7 +1128,7 @@ void KviNotifierWindow::contextPopup(const TQPoint &pos)
 	if(!m_pContextPopup)
 	{
 		m_pContextPopup = new TQPopupMenu(this);
-		connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup()));
+		connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(fillContextPopup()));
 		m_pDisablePopup = new TQPopupMenu(this);
 	}
 
@@ -1139,17 +1139,17 @@ void KviNotifierWindow::fillContextPopup()
 {
 	m_pContextPopup->clear();
 
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,TQT_SLOT(hideNow()));
+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,TQ_SLOT(hideNow()));
 	m_pContextPopup->insertSeparator();
 	m_pDisablePopup->clear();
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,TQT_SLOT(disableFor1Minute()));
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,TQT_SLOT(disableFor5Minutes()));
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,TQT_SLOT(disableFor15Minutes()));
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQT_SLOT(disableFor30Minutes()));
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQT_SLOT(disableFor60Minutes()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,TQ_SLOT(disableFor1Minute()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,TQ_SLOT(disableFor5Minutes()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,TQ_SLOT(disableFor15Minutes()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQ_SLOT(disableFor30Minutes()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQ_SLOT(disableFor60Minutes()));
 	m_pDisablePopup->insertSeparator();
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted()));
-	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQ_SLOT(disableUntilKVIrcRestarted()));
+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQ_SLOT(disablePermanently()));
 
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup);
 }
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 9e024d5b..faf10ba6 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -64,8 +64,8 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, TQString label)
 	
 	if(pWnd)
 	{
-		connect(pWnd,TQT_SIGNAL(windowNameChanged()),this,TQT_SLOT(labelChanged()));
-		connect(pWnd,TQT_SIGNAL(destroyed()),this,TQT_SLOT(closeMe()));
+		connect(pWnd,TQ_SIGNAL(windowNameChanged()),this,TQ_SLOT(labelChanged()));
+		connect(pWnd,TQ_SIGNAL(destroyed()),this,TQ_SLOT(closeMe()));
 	}
 }
 
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 2af3b0c6..db4ee3e5 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -58,7 +58,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button)
 bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQPushButton(parentScriptWidget(),name()),true);
-	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+	connect(widget(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
 	return true;
 }
 
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 4975c30f..2be2e3fe 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -80,8 +80,8 @@ bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi
 {
 	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), name());
 	setObject(cb, true);
-	connect(cb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
-	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+	connect(cb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggled(bool)));
+	connect(widget(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
 	return true;
 }
 
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 197c7c02..baf15336 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox)
 bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQComboBox(parentScriptWidget(), name()), true);
-	connect (((TQComboBox *)widget()),TQT_SIGNAL(activated( int )),this,TQT_SLOT(slotActivated( int )));
+	connect (((TQComboBox *)widget()),TQ_SIGNAL(activated( int )),this,TQ_SLOT(slotActivated( int )));
 	return true;
 }
 
@@ -246,9 +246,9 @@ bool KviKvsObject_combobox::functionsetEditable(KviKvsObjectFunctionCall *c)
 	if(widget())
 	{
 		((TQComboBox *)widget())->setEditable(bFlag);
-		if (bFlag) connect (((TQComboBox *)widget())->lineEdit(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & )));
+		if (bFlag) connect (((TQComboBox *)widget())->lineEdit(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & )));
 		else
-		disconnect (((TQComboBox *)widget())->lineEdit(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & )));
+		disconnect (((TQComboBox *)widget())->lineEdit(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & )));
 	}
 
 	return true;
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 2a39996c..e6f4037a 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -218,9 +218,9 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
 bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
 	setObject(new TQLineEdit(parentScriptWidget(),getName()),true);
-	connect(widget(),TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotreturnPressed()));
-	connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus()));
-	connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & )));
+	connect(widget(),TQ_SIGNAL(returnPressed()),this,TQ_SLOT(slotreturnPressed()));
+	connect(widget(),TQ_SIGNAL(lostFocus()),this,TQ_SLOT(slotlostFocus()));
+	connect(widget(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & )));
 	return true;
 }
 
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index 84afcd69..5b2301b5 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -151,10 +151,10 @@ bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 {
 	KviTalListBox * b = new KviTalListBox(parentScriptWidget());
 	b->setSelectionMode(KviTalListBox::Single);
-	connect(b,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
-	connect(b,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(currentItemChanged(KviTalListBoxItem *)));
+	connect(b,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged()));
+	connect(b,TQ_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQ_SLOT(currentItemChanged(KviTalListBoxItem *)));
 	
-	connect(b,TQT_SIGNAL(onItem(KviTalListBoxItem *)),this,TQT_SLOT(onItem(KviTalListBoxItem *)));
+	connect(b,TQ_SIGNAL(onItem(KviTalListBoxItem *)),this,TQ_SLOT(onItem(KviTalListBoxItem *)));
 
 	setObject(b,true);;
 	return true;
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index ea15b09f..c23abd5f 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -213,17 +213,17 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
 bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new KviKvsMdmListView(parentScriptWidget(),name(),this),true);
-	connect(widget(),TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(slotClicked(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged()));
-	connect(widget(),TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(slotCurrentChanged(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(returnPressed(KviTalListViewItem *)),this,TQT_SLOT(slotReturnPressed(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(spacePressed(KviTalListViewItem *)),this,TQT_SLOT(slotSpacePressed(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(onItem(KviTalListViewItem *)),this,TQT_SLOT(slotOnItem(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(expanded(KviTalListViewItem *)),this,TQT_SLOT(slotItemExpanded(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(collapsed(KviTalListViewItem *)),this,TQT_SLOT(slotItemCollapsed(KviTalListViewItem *)));
-	connect(widget(),TQT_SIGNAL(rightButtonClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotRightButtonClicked(KviTalListViewItem *,const TQPoint &,int)));
-	connect(widget(),TQT_SIGNAL(itemRenamed(KviTalListViewItem *,int,const TQString &)),this,TQT_SLOT(slotItemRenamed(KviTalListViewItem *,int,const TQString &)));
+	connect(widget(),TQ_SIGNAL(clicked(KviTalListViewItem *)),this,TQ_SLOT(slotClicked(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(slotSelectionChanged(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotMultipleSelectionChanged()));
+	connect(widget(),TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(slotCurrentChanged(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(returnPressed(KviTalListViewItem *)),this,TQ_SLOT(slotReturnPressed(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(spacePressed(KviTalListViewItem *)),this,TQ_SLOT(slotSpacePressed(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(onItem(KviTalListViewItem *)),this,TQ_SLOT(slotOnItem(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(expanded(KviTalListViewItem *)),this,TQ_SLOT(slotItemExpanded(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(collapsed(KviTalListViewItem *)),this,TQ_SLOT(slotItemCollapsed(KviTalListViewItem *)));
+	connect(widget(),TQ_SIGNAL(rightButtonClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotRightButtonClicked(KviTalListViewItem *,const TQPoint &,int)));
+	connect(widget(),TQ_SIGNAL(itemRenamed(KviTalListViewItem *,int,const TQString &)),this,TQ_SLOT(slotItemRenamed(KviTalListViewItem *,int,const TQString &)));
 	return true;
 }
 
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 341706d8..3627b9e2 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -792,7 +792,7 @@ void KviKvsObject_painter::attachDevice(KviKvsObject * o,TQPaintDevice * p)
 	// it is emitted BEFORE the real TQPaintDevice is deleted, so we can eventually
 	// call m_pPainter->end() in time
 
-	TQObject::connect(m_pDeviceObject,TQT_SIGNAL(aboutToDie()),this,TQT_SLOT(detachDevice()));
+	TQObject::connect(m_pDeviceObject,TQ_SIGNAL(aboutToDie()),this,TQ_SLOT(detachDevice()));
 	m_pPainter->begin(p);
 }
 
@@ -800,7 +800,7 @@ void KviKvsObject_painter::detachDevice()
 {
 	if(!m_pDeviceObject)return;
 	if(!m_pPainter)return;
-	disconnect(m_pDeviceObject,TQT_SIGNAL(aboutToDie()),this,TQT_SLOT(detachDevice()));
+	disconnect(m_pDeviceObject,TQ_SIGNAL(aboutToDie()),this,TQ_SLOT(detachDevice()));
 	m_pPainter->end();
 	m_pDeviceObject = 0;
 }
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index b600841c..3c4cc759 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -185,8 +185,8 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
 bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new KviTalPopupMenu(parentScriptWidget(), name()), true);
-	connect(widget(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotactivated(int)));
-	connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int)));
+	connect(widget(),TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotactivated(int)));
+	connect(widget(),TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slothighlighted(int)));
 	return true;
 }
 
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 9b92ac2f..256c8212 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -181,8 +181,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object")
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_process,KviKvsObject)
 
 	m_pProcess = new TQProcess();
-	connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(slotReadStdout()));
-	connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(slotReadStderr()));
+	connect(m_pProcess,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(slotReadStdout()));
+	connect(m_pProcess,TQ_SIGNAL(readyReadStderr()),this,TQ_SLOT(slotReadStderr()));
 
 KVSO_END_CONSTRUCTOR(KviKvsObject_process)
 
@@ -261,7 +261,7 @@ bool KviKvsObject_process::functionclosekill(KviKvsObjectFunctionCall *c)
 	//I try to  to terminate the process the nice way....
 	m_pProcess->tryTerminate();
 	//If the process is still running after 5 seconds, I'll terminate the process in the hard way.
-	TQTimer::singleShot( 5000, m_pProcess, TQT_SLOT( kill() ) );
+	TQTimer::singleShot( 5000, m_pProcess, TQ_SLOT( kill() ) );
 	return true;
 }
 bool KviKvsObject_process::functionkill(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index a7114f8a..85bc9ec5 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -83,7 +83,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
 bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQRadioButton(parentScriptWidget(),name()),true);
-	connect(widget(),TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
+	connect(widget(),TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggled(bool)));
 	return true;
 }
 bool KviKvsObject_radiobutton::functionSetText(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 08e56170..a55a2593 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -131,7 +131,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider)
 bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQSlider(parentScriptWidget(), name()), true);
-	connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
+	connect(widget(),TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(valueChanged(int)));
 	return true;
 }
 
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 841a1f0f..5f30bbd0 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -72,7 +72,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip
 	m_bIpV6 = false;
 	m_uLocalPort = 0;
 	m_secondarySock = KVI_INVALID_SOCKET;
-	connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tryFlush()));
+	connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tryFlush()));
 }
 
 KviScriptSocketObject::~KviScriptSocketObject()
@@ -413,7 +413,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
 	m_bIpV6 = false;
 	m_uLocalPort = 0;
 	m_secondarySock = KVI_INVALID_SOCKET;
-	connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tryFlush()));
+	connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tryFlush()));
 KVSO_END_CONSTRUCTOR(KviKvsObject_socket)
 
 KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket)
@@ -767,7 +767,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 
 	// and setup the READ notifier...
 	m_pSn = new TQSocketNotifier(m_sock,TQSocketNotifier::Read);
-	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(incomingConnection(int)));
+	TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(incomingConnection(int)));
 	m_pSn->setEnabled(true);
 
 	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING;
@@ -849,7 +849,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const
 	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
 
 	m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
-	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int)));
+	TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readNotifierFired(int)));
 	m_pSn->setEnabled(true);
 }
 
@@ -857,7 +857,7 @@ void KviKvsObject_socket::delayedConnect()
 {
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	m_pDelayTimer = new TQTimer();
-	connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doConnect()));
+	connect(m_pDelayTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doConnect()));
 	m_pDelayTimer->start(0,true);
 }
 
@@ -951,11 +951,11 @@ tqDebug ("Socket created");
 	}
 	tqDebug ("Socket connected");
 	m_pDelayTimer = new TQTimer();
-	connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectTimeout()));
+	connect(m_pDelayTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectTimeout()));
 	m_pDelayTimer->start(m_uConnectTimeout,true);
 
 	m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write);
-	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(writeNotifierFired(int)));
+	TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(writeNotifierFired(int)));
 	m_pSn->setEnabled(true);
 }
 
@@ -973,7 +973,7 @@ void KviKvsObject_socket::delayedLookupRemoteIp()
 {
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	m_pDelayTimer = new TQTimer();
-	connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(lookupRemoteIp()));
+	connect(m_pDelayTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(lookupRemoteIp()));
 	m_pDelayTimer->start(0,true);
 }
 
@@ -984,7 +984,7 @@ void KviKvsObject_socket::lookupRemoteIp()
 	m_pDelayTimer = 0;
 	if(m_pDns)delete m_pDns;
 	m_pDns = new KviDns();
-	connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(lookupDone(KviDns *)));
+	connect(m_pDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(lookupDone(KviDns *)));
 	if(!m_pDns->lookup(m_szRemoteIp,KviDns::Any))
 	{
 		unsigned int uOldConnectionId = m_uConnectionId;
@@ -1052,7 +1052,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
 		// Succesfully connected
 		// create the correct read notifier now...
 		m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
-		TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int)));
+		TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readNotifierFired(int)));
 		m_pSn->setEnabled(true);
 
 #ifdef COMPILE_IPV6_SUPPORT
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 09fc4efd..5f06c78e 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -133,7 +133,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox)
 bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQSpinBox(parentScriptWidget(), name()), true);
-	connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
+	connect(widget(),TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(valueChanged(int)));
 	return true;
 }
 
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index e6c748ff..5196573f 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -183,7 +183,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
 bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQTabWidget(parentScriptWidget(), name()), true);
-	connect(widget(),TQT_SIGNAL(currentChanged(int)),this,TQT_SLOT(slotcurrentChanged(int)));
+	connect(widget(),TQ_SIGNAL(currentChanged(int)),this,TQ_SLOT(slotcurrentChanged(int)));
 	return true;
 }
 bool KviKvsObject_tabwidget::functionaddTab(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index c6154667..9e21a32d 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -84,7 +84,7 @@ bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVarian
 {
 	TQTextBrowser * tb = new TQTextBrowser(parentScriptWidget(), name());
 	setObject(tb, true);
-	connect(tb,TQT_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQT_SLOT(anchorClicked(const TQString &,const TQString &)));
+	connect(tb,TQ_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQ_SLOT(anchorClicked(const TQString &,const TQString &)));
 	return true;
 }
 
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index e4d7ecf8..f7fc1f4e 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton)
 bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	setObject(new TQToolButton(parentScriptWidget(), name()), true);
-	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+	connect(widget(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
 	return true;
 }
 
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 87cba0a2..496a24d7 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -344,8 +344,8 @@ KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_w
 :KviTalWizard(par)
 {
 	m_pParentScript=parent;
-	connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked()));
-	connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked()));
+	connect (this->backButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotBackClicked()));
+	connect (this->nextButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextClicked()));
 }
 void KviKvsMdmWizard::accept()
 {
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index badaf18b..fd5dbd1c 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -59,13 +59,13 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	//b->setMinimumWidth(m_pCancel->sizeHint().width());
 	g->addWidget(b,1,1);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
 	m_pCancel = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	g->addWidget(m_pCancel,1,2);
-	connect(m_pCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(m_pCancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	m_pCancel->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index f446277d..4dd17505 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -192,19 +192,19 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 	m_pListView->header()->hide();
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setSorting(-1);
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
 
 	KviTalHBox * hbox = new KviTalHBox(vbox);
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
 	m_pSearchLineEdit = new TQLineEdit(hbox);
-	connect(m_pSearchLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchClicked()));
+	connect(m_pSearchLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(searchClicked()));
 	m_pSearchButton = new KviStyledToolButton(hbox);
 	m_pSearchButton->setUsesBigPixmap(false);
 	m_pSearchButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)));
-	connect(m_pSearchButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchClicked()));
-	connect(m_pSearchLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(searchLineEditTextChanged(const TQString &)));
+	connect(m_pSearchButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchClicked()));
+	connect(m_pSearchLineEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(searchLineEditTextChanged(const TQString &)));
 
 #ifdef COMPILE_INFO_TIPS
 	TQString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \
@@ -240,14 +240,14 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this,"btnok");
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	//b->setMinimumWidth(whatIsThisWidth);
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,2);	
 
 	b = new TQPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply");
 	KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options"));
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,3);
 
@@ -255,7 +255,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	b->setDefault(true);
 	//b->setMinimumWidth(whatIsThisWidth);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g1->addWidget(b,1,4);
 
@@ -280,7 +280,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 	}
 
 	KviAccel *a = new KviAccel( this );
-        a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) );
+        a->connectItem( a->insertItem(TQt::Key_Escape), this,TQ_SLOT(close()) );
 	
 }
 
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index d08b7a2a..0e326d9f 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -3462,7 +3462,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 			{
 				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
-					disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+					disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
@@ -3502,7 +3502,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		e->pWidget = e->createProc(par);
 		g_iOptionWidgetInstances++;
-		connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+		connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 	}
 	if(e->pWidget->parent() != par)
 	{
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 2ba98233..ea27a764 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -228,7 +228,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	{
 		if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click...
 		{
-			TQObject::connect(g_pSplashScreen,TQT_SIGNAL(destroyed()),wc,TQT_SLOT(show()));
+			TQObject::connect(g_pSplashScreen,TQ_SIGNAL(destroyed()),wc,TQ_SLOT(show()));
 			return true;
 		}
 	}
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index ac4926b5..5c0cbb78 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -310,7 +310,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 			{
 				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
-					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
+					disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
@@ -350,7 +350,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		e->pWidget = e->createProc(par);
 		g_iOptionWidgetInstances++;
-		connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
+		connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 	}
 	if(e->pWidget->parent() != par)
 	{
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 026dcdd9..972cdc68 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -38,9 +38,9 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
 	m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg);
-	connect(m_b1,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool)));
+	connect(m_b1,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(reenableStuff(bool)));
 	m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice);
-	connect(m_b2,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool)));
+	connect(m_b2,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(reenableStuff(bool)));
 
 	m_b3 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Silent anti-spam (no warnings)","options"),KviOption_boolSilentAntiSpam);
 	m_sl = addStringListSelector(0,2,0,2,__tr2qs_ctx("Words considered spam:","options"),KviOption_stringlistSpamWords);
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 7b578bda..aaa8d319 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -48,18 +48,18 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent
 	addBoolSelector(g,__tr2qs_ctx("Do not scale avatar if it is less than required size","options"),KviOption_boolDoNotStretchAvatars);
 	
 	KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintAvatarScaleWidth,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	//2nd
 	g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options"));
 	b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad);
 	
 	u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	// 2st Box
 	KviTalGroupBox *gs = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Request CTCP","options"));
@@ -78,7 +78,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent
 			"will be automatically requested.<br>" \
 			"A reasonable value might be 102400 bytes (100 K).</center>","options"));
 #endif
-	connect(bs,TQT_SIGNAL(toggled(bool)),us,TQT_SLOT(setEnabled(bool)));
+	connect(bs,TQ_SIGNAL(toggled(bool)),us,TQ_SLOT(setEnabled(bool)));
 
 	bs = addBoolSelector(gs,__tr2qs_ctx("Automatically accept incoming avatars","options"),KviOption_boolAutoAcceptIncomingAvatars);
 #ifdef COMPILE_INFO_TIPS
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 2b6610ae..f8d7cb37 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -42,11 +42,11 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent)
 
 	KviTalGroupBox *g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Away Nickname","options"));
 	m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway);	
-	connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool)));
+	connect(m_pEnableAwayNick,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCustomAwayText(bool)));
 	
 	m_pEnableCustomAwayNick = addBoolSelector(g,__tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)","options"),KviOption_boolAutoGeneratedAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway));
-	connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,TQT_SLOT(setEnabled(bool)));
-	connect(m_pEnableCustomAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool)));
+	connect(m_pEnableAwayNick,TQ_SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,TQ_SLOT(setEnabled(bool)));
+	connect(m_pEnableCustomAwayNick,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCustomAwayText(bool)));
 	
 	// m_p <-- stands for pointer
 	// m_sz <-- stands for a string :)
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 577529ac..f65a52dd 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -89,13 +89,13 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
 	KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Maximum attempts (0: unlimited):","options"),
 			KviOption_uintMaxAutoReconnectAttempts,0,100,5,
 			KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(gbox,__tr2qs_ctx("Delay between attempts:","options"),
 			KviOption_uintAutoReconnectDelay,0,86400,5,
 			KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect));
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 sec</b><br>Maximum value: <b>86400 sec</b></center>","options"));
 #endif
@@ -126,20 +126,20 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent)
 		&(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true);
 	KviFileSelector * f = addFileSelector(gbox,__tr2qs_ctx("Certificate location:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePath)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate));
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool)));
 	KviPasswordSelector * p = new KviPasswordSelector(gbox,__tr2qs_ctx("Certificate password:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate));
-	connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),p,TQ_SLOT(setEnabled(bool)));
 
 	gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Private Key","options"));
 	b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"),
 		&(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true);
 	f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey));
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool)));
 	p = addPasswordSelector(gbox,__tr2qs_ctx("Private key password:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey));
-	connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),p,TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,2,0,2);
 #else
 	createLayout(1,1);
@@ -174,17 +174,17 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>10000 usec</b><br>Maximum value: <b>10000000 usec</b></center>","options"));
 #endif
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	g = addGroupBox(0,3,0,3,2,TQt::Horizontal,__tr2qs_ctx("Network Interfaces","options"));
 	
 	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress);
 	KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_IPV6_SUPPORT
 	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress);
 	s = addStringSelector(g,"",KviOption_stringIpV6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 #endif //!COMPILE_IPV6_SUPPORT
 
 	addRowSpacer(0,4,0,4);
@@ -208,10 +208,10 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
 	createLayout(6,1);
 
 	m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService);
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableIpv4InIpv6(bool)));
 
 	KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Output verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool)));
 
 	addLabel(gbox,__tr2qs_ctx("Output identd messages to:","options"));
 
@@ -235,30 +235,30 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
 	gbox = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	
 	KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect);
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool)));
 
 	KviStringSelector * s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"),
 		KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	
 	KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"),
 		KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool)));
 
 	gbox = addGroupBox(0,3,0,3,1,TQt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"),
 		KviOption_boolIdentdEnableIpV6,
 		KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 #ifdef COMPILE_IPV6_SUPPORT
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),m_pEnableIpv6,TQT_SLOT(setEnabled(bool)));
-	connect(m_pEnableIpv6,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),m_pEnableIpv6,TQ_SLOT(setEnabled(bool)));
+	connect(m_pEnableIpv6,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableIpv4InIpv6(bool)));
 #else
 	m_pEnableIpv6->setEnabled(false);
 #endif
 	m_pIpv4InIpv6 = addBoolSelector(gbox,__tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace","options"),
 		KviOption_boolIdentdIpV6ContainsIpV4,
 		KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool)));
 
 	addLabel(0,4,0,4,
 #ifdef COMPILE_ON_WINDOWS
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 99a47f47..56cdf0c1 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -85,13 +85,13 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidge
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 requests</b><br>Maximum value: <b>10000 requests</b></center>","options"));
 #endif
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u = addUIntSelector(1,1,1,1,__tr2qs_ctx("within:","options"),KviOption_uintCtcpFloodCheckInterval,1,3600,6,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection));
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>1 sec</b><br>Maximum value: <b>3600 sec</b></center>","options"));
 #endif
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	KviTalGroupBox * g = addGroupBox(0,2,1,2,2,TQt::Horizontal,__tr2qs_ctx("Ignored Requests","options"));
 	addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing);
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 6e1e447f..263c4f11 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -89,7 +89,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 		"If you set it to <b>0.0.0.0</b>, KVIrc will try to use the first available IPv4 interface</center>","options"));
 #endif
 
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
  	b = addBoolSelector(g,__tr2qs_ctx("Use user-defined port range","options"),KviOption_boolUserDefinedPortRange);
 
@@ -100,10 +100,10 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 	KviTalHBox * hb = new KviTalHBox(g);
 	hb->setSpacing(4);
 	KviUIntSelector * u = addUIntSelector(hb,__tr2qs_ctx("Lowest port:","options"),KviOption_uintDccMinPort,1,65535,5000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(hb,__tr2qs_ctx("Highest port:","options"),KviOption_uintDccMaxPort,1,65535,30000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Send a fixed address in requests","options"),KviOption_boolDccSendFakeAddressByDefault);
 
@@ -113,7 +113,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 #endif
 
 	s = addStringSelector(g,__tr2qs_ctx("Send address/interface:","options"),KviOption_stringDefaultDccFakeAddress,KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(s,__tr2qs_ctx("<center>This is the fixed address that will be sent with all DCC requests if you enable the option above.</center>","options"));
@@ -122,7 +122,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 	KviBoolSelector * b2;
 	b2 = addBoolSelector(g,__tr2qs_ctx("Guess address from IRC server if unroutable","options"),
 									KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable,!KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
-	connect(b,TQT_SIGNAL(toggled(bool)),b2,TQT_SLOT(setNotEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),b2,TQ_SLOT(setNotEnabled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
@@ -139,7 +139,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 				"It's an ugly hack - use it only if nothing else works.</center>","options"));
 #endif
 									
-	connect(b2,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
+	connect(b2,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool)));
 
 	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),
 									KviOption_boolNotifyFailedDccHandshakes);
@@ -219,8 +219,8 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent
 
 	KviBoolSelector * b1 = addBoolSelector(0,3,0,3,__tr2qs_ctx("Always open transfer window as minimized","options"),KviOption_boolCreateMinimizedDccSend);
 
-	connect(b1,TQT_SIGNAL(toggled(bool)),b3,TQT_SLOT(setNotEnabled(bool)));
-	connect(b2,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b3,TQ_SLOT(setNotEnabled(bool)));
+	connect(b2,TQ_SIGNAL(toggled(bool)),b4,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,4,0,4);
 }
@@ -265,13 +265,13 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed);
 	KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	
 	hb = new KviTalHBox(g);
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed);
 	u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 
 	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
@@ -302,7 +302,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare
 #endif // COMPILE_INFO_TIPS
 
 	u = addUIntSelector(hb,"",KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u->setSuffix(__tr2qs_ctx(" msec","options"));
 	
 #ifdef COMPILE_INFO_TIPS
@@ -352,7 +352,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent)
 
 	KviBoolSelector * b1 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat);
 
-	connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setNotEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);
 }
@@ -371,7 +371,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(TQWidget *p):KviOptionsWidget
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice);
 
 	b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice));
-	connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setNotEnabled(bool)));
 
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Force half-duplex mode on sound device","options"), KviOption_boolDccVoiceForceHalfDuplex);
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Volume slider controls PCM, not Master","options"), KviOption_boolDccVoiceVolumeSliderControlsPCM);
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 52e5a64f..2016fa80 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -51,9 +51,9 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * parent)
 
 	connect(
 		addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable word highlighting","options"),KviOption_boolUseWordHighlighting),
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addStringListSelector(0,1,0,1,__tr2qs_ctx("Words to highlight:","options"),KviOption_stringlistHighlightWords,KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	addStringSelector(0,2,0,2,__tr2qs_ctx("Word splitters:","options"),KviOption_stringWordSplitters);
 	// This can be used even without Word highlighting
 	b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick);
@@ -101,8 +101,8 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b5, __tr2qs_ctx("<center>If this option is enabled, the taskbar will also alert for messages which are shown in queries.</center>","options"));
 #endif
-	connect(b3,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool)));
-	connect(b3,TQT_SIGNAL(toggled(bool)),b5,TQT_SLOT(setEnabled(bool)));
+	connect(b3,TQ_SIGNAL(toggled(bool)),b4,TQ_SLOT(setEnabled(bool)));
+	connect(b3,TQ_SIGNAL(toggled(bool)),b5,TQ_SLOT(setEnabled(bool)));
 
 	KviBoolSelector * b6 = addBoolSelector(g,__tr2qs_ctx("Use custom alert level","options"),KviOption_boolHighlightOnlyAtCostumHighlightLevel);
 #ifdef COMPILE_INFO_TIPS
@@ -113,7 +113,7 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b6, __tr2qs_ctx("<center>This option sets the minimum alert level for the taskbar.</center>","options"));
 #endif
-	connect(b6,TQT_SIGNAL(toggled(bool)),b7,TQT_SLOT(setEnabled(bool)));
+	connect(b6,TQ_SIGNAL(toggled(bool)),b7,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,1,0,1);
 }
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index e2e81b8c..0c3db84f 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -91,11 +91,11 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(TQWidget * par,const TQStri
 
 	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Cancel","options"),h);
 	//g->addWidget(pb,4,2);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 
 	pb = new TQPushButton(__tr2qs_ctx("Ok","options"),h);
 	pb->setDefault(true);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 	
 	g->setColStretch(0,1);
 	
@@ -138,11 +138,11 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(TQWidget * par,const TQString &
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("Abort","options"),this);
 	g->addWidget(b,1,1);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 
 	m_pRequest = new KviHttpRequest();
 	
-	TQTimer::singleShot(0,this,TQT_SLOT(startDownload()));
+	TQTimer::singleShot(0,this,TQ_SLOT(startDownload()));
 
 	g->setRowStretch(0,1);
 	g->setColStretch(0,1);
@@ -157,8 +157,8 @@ KviAvatarDownloadDialog::~KviAvatarDownloadDialog()
 
 void KviAvatarDownloadDialog::startDownload()
 {
-	connect(m_pRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(downloadTerminated(bool)));
-	connect(m_pRequest,TQT_SIGNAL(status(const char *)),this,TQT_SLOT(downloadMessage(const char *)));
+	connect(m_pRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(downloadTerminated(bool)));
+	connect(m_pRequest,TQ_SIGNAL(status(const char *)),this,TQ_SLOT(downloadMessage(const char *)));
 
 	TQString tmp = m_szUrl;
 	g_pIconManager->urlToCachedFileName(tmp);
@@ -235,18 +235,18 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(TQWidget * par,const TQString
 	g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&Browse...","options"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFileClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
 	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
 	b = new TQPushButton(__tr2qs_ctx("&OK","options"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	//g->addWidget(b,2,1);
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),h);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	//g->addWidget(b,2,2);
 	
 	g->setRowStretch(0,1);
@@ -329,7 +329,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare
 	sel->setValidator(v);
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(setNickAlternatives()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(setNickAlternatives()));
 
 	sel = addStringSelector(gbox,__tr2qs_ctx("Username:","options"),KviOption_stringUsername);
 	sel->setMinimumLabelWidth(120);
@@ -519,7 +519,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 	addWidgetToLayout(m_pAvatarPreview,0,1,0,1);
 	m_pAvatarPreview->setPixmap(m_pLocalAvatar);
 	m_pAvatarPreview->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarPreview,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pAvatarPreview,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pAvatarPreview,szTip);
 #endif
@@ -532,13 +532,13 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 	m_pAvatarNameEdit->setReadOnly(true);
 	m_pAvatarNameEdit->setEnabled(bHaveAvatar);
 	m_pAvatarNameEdit->setText(KVI_OPTION_STRING(KviOption_stringMyAvatar));
-	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQ_SLOT(setEnabled(bool)));
 
 	m_pChooseAvatarButton = new TQPushButton(__tr2qs_ctx("Choose...","options"),hb);
 	m_pChooseAvatarButton->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQ_SLOT(setEnabled(bool)));
 
-	connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar()));
+	connect(m_pChooseAvatarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseAvatar()));
 
 	layout()->setRowStretch(1,2);
 }
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 3dd923e3..06a70035 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -39,7 +39,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent)
 	m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg);
 	m_pIgnoreNotice  = addBoolSelector(g,__tr2qs_ctx("Private/channel notices","options"),KviOption_boolEnableIgnoreOnNotice);
 
-	connect(m_pIgnorePrivmsg,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableVerbose(bool)));
+	connect(m_pIgnorePrivmsg,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableVerbose(bool)));
 
 	m_pVerboseIgnore = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use verbose ignore (show messages in console)","options"),
 				KviOption_boolVerboseIgnore,
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index b745c0cd..424786b6 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -41,7 +41,7 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
 	KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
 							KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
 
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,1,3);
 }
@@ -82,22 +82,22 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
 
 	KviUIntSelector * u = addUIntSelector(0,1,1,1,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,
 							0,100,35,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,
 							0,100,10,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	KviColorSelector * c = addColorSelector(0,3,1,3,__tr2qs_ctx("Blend color:","options"),KviOption_colorGlobalTransparencyFade,
 						KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),c,TQ_SLOT(setEnabled(bool)));
 
 //	addRowSpacer(0,13,0,13);
 #ifdef COMPILE_TDE_SUPPORT
 	m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use TDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQT_SLOT(setEnabled(bool)));
-	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQ_SLOT(setEnabled(bool)));
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
 
 	m_pUpdateKdeBackgroundOnChangeBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Keep in sync with TDE background changes","options"),KviOption_boolUpdateKdeBackgroundOnChange,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
@@ -105,15 +105,15 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
 	layout()->setRowStretch(6,1);
-	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 
 #else //!COMPILE_TDE_SUPPORT
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
 	layout()->setRowStretch(4,1);
 #endif //!COMPILE_TDE_SUPPORT
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
 #else
 	createLayout(1,1);
 	addRowSpacer(0,0,0,0);
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 3c21a659..addfa7a4 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -53,7 +53,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
 			"the pings (if any) will be sent really less often. " \
 			"5000 is a reasonable value.</center>","options"));
 #endif
-    connect(pUse,TQT_SIGNAL(toggled(bool)),pInterval,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),pInterval,TQ_SLOT(setEnabled(bool)));
 
     KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
     pAlarm->setSuffix(__tr2qs_ctx(" msec","options"));
@@ -63,15 +63,15 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
 			"the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \
 			"back below the threshold then OnLagAlarmTimeDown will be triggered</center>","options"));
 #endif
-    connect(pUse,TQT_SIGNAL(toggled(bool)),pAlarm,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),pAlarm,TQ_SLOT(setEnabled(bool)));
 
     KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
 #ifdef COMPILE_INFO_TIPS
     mergeTip(pShow,__tr2qs_ctx("<center>This makes the IRC context display applet show the current lag after the user's nickname (in seconds)</center>","options"));
 #endif
 
-    connect(pUse,TQT_SIGNAL(toggled(bool)),pShow,TQT_SLOT(setEnabled(bool)));
-    connect(pUse,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),pShow,TQ_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index c4fb6943..5b1ec8a2 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -75,7 +75,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
 
 
 
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentItemChanged(KviTalListViewItem *)));
 
 	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
 
@@ -132,11 +132,11 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
 	layout()->addMultiCellWidget(f,9,9,0,2);
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(newMediaType()));
 	layout()->addWidget(b,10,1);
 
 	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
-	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
+	connect(m_pDelete,TQ_SIGNAL(clicked()),this,TQ_SLOT(delMediaType()));
 	layout()->addWidget(m_pDelete,10,2);
 	
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index b7a7a5e0..ea9dfafb 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -89,7 +89,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
 
 	b1 = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks);
 	b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks));
-	connect(b1,TQT_SIGNAL(toggled(bool)),b2,TQT_SLOT(setNotEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b2,TQ_SLOT(setNotEnabled(bool)));
 	addBoolSelector(g,__tr2qs_ctx("Show nicknames in bold","options"),KviOption_boolBoldedNicks);
 	addBoolSelector(g,__tr2qs_ctx("Show user and host","options"),KviOption_boolShowUserAndHostInPrivmsgView);
 	addBoolSelector(g,__tr2qs_ctx("Show channel mode prefix","options"),KviOption_boolShowChannelUserFlagInPrivmsgView);
@@ -99,23 +99,23 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
 
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		l,
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 
 	KviTalVBox * vb = new KviTalVBox(g);
 	vb->setSpacing(5);
 
 	connect(
 		b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addStringSelector(vb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(
 		b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addStringSelector(vb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }
 
@@ -130,24 +130,24 @@ KviTimestampOptionsWidget::KviTimestampOptionsWidget(TQWidget * pParent)
 	createLayout(5,1);
 	m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
 	
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableTimestampSelector(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableTimestampSelector(bool)));
 	KviBoolSelector* b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use UTC time for timestamp","options"),KviOption_boolIrcViewTimestampUTC,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool)));
 	
 	KviTalHBox *hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
 	
 	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
-	connect(m_pSpecialTimestampColorSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableTimestampSelector(bool)));
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool)));
+	connect(m_pSpecialTimestampColorSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableTimestampSelector(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQ_SLOT(setEnabled(bool)));
 	
 	m_pTimestampColorSelector = addMircTextColorSelector(hb,"",KviOption_uintTimeStampForeground,KviOption_uintTimeStampBackground,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp) && KVI_OPTION_BOOL(KviOption_boolUseSpecialColorForTimestamp));
 
 	KviStringSelector * st=addStringSelector(0,3,0,3,__tr2qs_ctx("Timestamp format:","options"),KviOption_stringIrcViewTimestampFormat);
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),st,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),st,TQ_SLOT(setEnabled(bool)));
 
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,4,0,4);
 }
 
@@ -418,11 +418,11 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	}
 
 	m_pIconButton = new KviStyledToolButton(box);
-	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked()));
+	connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(iconButtonClicked()));
 
 	m_pIconPopup = new KviTalPopupMenu(this);
 	KviIconWidget * iw = new KviIconWidget(m_pIconPopup);
-	connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(newIconSelected(int)));
+	connect(iw,TQ_SIGNAL(selected(int)),this,TQ_SLOT(newIconSelected(int)));
 	m_pIconPopup->insertItem(iw);
 
 
@@ -431,9 +431,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	KviTalHBox * h = new KviTalHBox(this);
 	addWidgetToLayout(h,0,1,3,1);
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("Load From...","options"),h);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(load()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(load()));
 	b = new TQPushButton(__tr2qs_ctx("Save As...","options"),h);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(save()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(save()));
 
 
 	KviMessageListViewItem * it;
@@ -446,9 +446,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	layout()->setRowStretch(0,1);
 	layout()->setColStretch(0,1);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *)));
-	connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
-	connect(m_pBackListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(itemChanged(KviTalListViewItem *)));
+	connect(m_pForeListBox,TQ_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQ_SLOT(colorChanged(KviTalListBoxItem *)));
+	connect(m_pBackListBox,TQ_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQ_SLOT(colorChanged(KviTalListBoxItem *)));
 
 	itemChanged(0);
 }
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 612627f9..83f0a4a6 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -136,13 +136,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 
 	TQPushButton * p = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	p->setMinimumWidth(100);
-	connect(p,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(p,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	gl->addWidget(p,iNextLine,2);
 
 	m_pOkButton = new TQPushButton(__tr2qs_ctx("OK","options"),this);
 	m_pOkButton->setMinimumWidth(100);
 	m_pOkButton->setDefault(true);
-	connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okPressed()));
+	connect(m_pOkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(okPressed()));
 	gl->addWidget(m_pOkButton,iNextLine,3);
 
 	gl->setColStretch(1,1);
@@ -257,7 +257,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));
-	connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableNickServControls()));
 
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
@@ -274,18 +274,18 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
 #endif
 
 	m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),this);
-	connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule()));
+	connect(m_pAddRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addNickServRule()));
 	gl->addWidget(m_pAddRuleButton,2,0);
 
 	m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),this);
-	connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule()));
+	connect(m_pEditRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editNickServRule()));
 	gl->addWidget(m_pEditRuleButton,2,1);
 
 	m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),this);
-	connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule()));
+	connect(m_pDelRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delNickServRule()));
 	gl->addWidget(m_pDelRuleButton,2,2);
 
-	connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableNickServControls()));
 
 	if(rs && rs->rules())
 	{
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 423be23a..e1b4711a 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -38,60 +38,60 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent)
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList);
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool)));
 
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"),
 				KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"),
 				KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"),
 				KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 
 	g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool)));
 
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"),
 				KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"),
 				KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"),
 				KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds)","options"),
 				KviOption_uintNotifyListCheckTimeInSecs,
 				5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds)","options"),
 				KviOption_uintNotifyListIsOnDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds)","options"),
 				KviOption_uintNotifyListUserhostDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 
 	addLabel(0,3,0,3,__tr2qs_ctx("<p><b>Note:</b><br>The notify list is managed using the \"Registered Users\" settings.</p>","options"));
 	addRowSpacer(0,4,0,4);
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 02c29e4f..b36a0fb3 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -67,10 +67,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 	m_pListView->setAllColumnsShowFocus(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),
-		this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),
+		this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 #ifdef COMPILE_INFO_TIPS
   TQString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
@@ -85,7 +85,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
   TQToolButton * tb = new KviStyledToolButton(vbox);
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)));
   tb->setAutoRaise(true);
-  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(newProxy()));
+  connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(newProxy()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("New Proxy","options"));
 #endif
@@ -94,7 +94,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
   //tb->setEnabled(false);
   tb->setAutoRaise(true);
-  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
+  connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("Remove Proxy","options"));
 #endif
@@ -138,7 +138,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 	m_pProtocolBox->insertStringList(l);
 
 	m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
-	connect(m_pIpV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(ipV6CheckToggled(bool)));
+	connect(m_pIpV6Check,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(ipV6CheckToggled(bool)));
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIpV6Check->setEnabled(false);
 #endif
@@ -333,8 +333,8 @@ void KviProxyOptionsWidget::commit()
 void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col)
 {
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQT_SLOT(newProxy()));
-	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQT_SLOT(removeCurrent())),it);
+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQ_SLOT(newProxy()));
+	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQ_SLOT(removeCurrent())),it);
 	m_pContextPopup->popup(TQCursor::pos());
 }
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index adca6260..336d899b 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -277,7 +277,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));
-	connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableNickServControls()));
 	
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
@@ -291,19 +291,19 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
 #endif
 	
 	m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),tab);
-	connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule()));
+	connect(m_pAddRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addNickServRule()));
 	gl->addWidget(m_pAddRuleButton,2,0);
 	
 	
 	m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),tab);
-	connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule()));
+	connect(m_pEditRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editNickServRule()));
 	gl->addWidget(m_pEditRuleButton,2,1);
 	
 	m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),tab);
-	connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule()));
+	connect(m_pDelRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delNickServRule()));
 	gl->addWidget(m_pDelRuleButton,2,2);
 	
-	connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableNickServControls()));
 	
 	if(rs && rs->rules())
 	{
@@ -324,12 +324,12 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
 	b->setMinimumWidth(80);
 	g->addWidget(b,3,2);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	g->addWidget(b,3,3);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 
 
 	g->setRowStretch(2,1);
@@ -525,7 +525,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 	bool bHasUmode = !(s->initUMode().isEmpty());
 	KviStr szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_pUseDefaultInitUMode->setChecked(!bHasUmode);
-	connect(m_pUseDefaultInitUMode,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useDefaultInitUModeToggled(bool)));
+	connect(m_pUseDefaultInitUMode,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(useDefaultInitUModeToggled(bool)));
 	
 	m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
 	m_pIMode->setEnabled(bHasUmode);
@@ -564,7 +564,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPortEditor,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options"));
 #endif
-	connect(m_pPortEditor,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(portEditorTextChanged(const TQString &)));
+	connect(m_pPortEditor,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(portEditorTextChanged(const TQString &)));
 
 
 
@@ -613,7 +613,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 #else
 	m_pUseIPV6Check->setEnabled(false);
 #endif
-	connect(m_pUseIPV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useIPV6CheckToggled(bool)));
+	connect(m_pUseIPV6Check,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(useIPV6CheckToggled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
@@ -804,12 +804,12 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 	b->setMinimumWidth(80);
 	g->addWidget(b,3,2);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	g->addWidget(b,3,3);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 
 	g->setRowStretch(2,1);
 	g->setColStretch(1,1);
@@ -1029,8 +1029,8 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pImportPopup = new KviTalPopupMenu(this);
 
-	connect(m_pImportPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(importPopupAboutToShow()));
-	connect(m_pImportPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(importPopupActivated(int)));
+	connect(m_pImportPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(importPopupAboutToShow()));
+	connect(m_pImportPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(importPopupActivated(int)));
 
 	m_pServerDetailsDialog = 0;
 	m_pNetworkDetailsDialog = 0;
@@ -1043,12 +1043,12 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setAllColumnsShowFocus(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),
-		this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem*, const TQPoint&, int )),
-		this,TQT_SLOT(detailsClicked()));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),
+		this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem*, const TQPoint&, int )),
+		this,TQ_SLOT(detailsClicked()));
 
 #ifdef COMPILE_INFO_TIPS
 	TQString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \
@@ -1064,7 +1064,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pNewNetworkButton = new KviStyledToolButton(vbox);
 	m_pNewNetworkButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)));
 	m_pNewNetworkButton->setAutoRaise(true);
-	connect(m_pNewNetworkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newNetwork()));
+	connect(m_pNewNetworkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newNetwork()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
 #endif
@@ -1072,7 +1072,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pNewServerButton = new KviStyledToolButton(vbox);
 	m_pNewServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
 	m_pNewServerButton->setAutoRaise(true);
-	connect(m_pNewServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newServer()));
+	connect(m_pNewServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
 #endif
@@ -1081,7 +1081,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pRemoveButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
 	m_pRemoveButton->setEnabled(false);
 	m_pRemoveButton->setAutoRaise(true);
-	connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
+	connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
 #endif
@@ -1093,7 +1093,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pCopyServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)));
 	m_pCopyServerButton->setEnabled(false);
 	m_pCopyServerButton->setAutoRaise(true);
-	connect(m_pCopyServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(copyServer()));
+	connect(m_pCopyServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(copyServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
 #endif
@@ -1102,7 +1102,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pPasteServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)));
 	m_pPasteServerButton->setEnabled(false);
 	m_pPasteServerButton->setAutoRaise(true);
-	connect(m_pPasteServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(pasteServer()));
+	connect(m_pPasteServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(pasteServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
 #endif
@@ -1151,22 +1151,22 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 */
 
 	m_pDetailsButton = new TQPushButton(__tr2qs_ctx("Advanced...","options"),gbox);
-	connect(m_pDetailsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(detailsClicked()));
+	connect(m_pDetailsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(detailsClicked()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options"));
 #endif
 
 	m_pConnectCurrent = new TQPushButton(__tr2qs_ctx("Connect &Now","options"),this);
 	addWidgetToLayout(m_pConnectCurrent,0,2,0,2);
-	connect(m_pConnectCurrent,TQT_SIGNAL(clicked()),this,TQT_SLOT(connectCurrentClicked()));
+	connect(m_pConnectCurrent,TQ_SIGNAL(clicked()),this,TQ_SLOT(connectCurrentClicked()));
 
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
 #endif
 
 	m_pRecentPopup = new KviTalPopupMenu(this);
-	connect(m_pRecentPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(recentServersPopupAboutToShow()));
-	connect(m_pRecentPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(recentServersPopupClicked(int)));
+	connect(m_pRecentPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(recentServersPopupAboutToShow()));
+	connect(m_pRecentPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(recentServersPopupClicked(int)));
 
 	TQToolButton * tb = new KviStyledToolButton(this);
 	addWidgetToLayout(tb,1,2,1,2);
@@ -1427,21 +1427,21 @@ void KviServerOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,c
 	int id;
 	bool bServer = (it && ((KviServerOptionsListViewItem *)it)->m_pServerData);
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,TQT_SLOT(newNetwork()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,TQT_SLOT(removeCurrent()));
+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,TQ_SLOT(newNetwork()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,TQ_SLOT(removeCurrent()));
 	m_pContextPopup->setItemEnabled(id,!bServer);
 	m_pContextPopup->insertSeparator();
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,TQT_SLOT(newServer()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,TQT_SLOT(removeCurrent()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,TQ_SLOT(newServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,TQ_SLOT(removeCurrent()));
 	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQT_SLOT(copyServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQ_SLOT(copyServer()));
 	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQT_SLOT(pasteServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQ_SLOT(pasteServer()));
 	m_pContextPopup->setItemEnabled(id,m_pClipboard);
 
 	m_pContextPopup->insertSeparator();
-	//	m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,TQT_SLOT(importFromIni()));
-	m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,TQT_SLOT(clearList()));
+	//	m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,TQ_SLOT(importFromIni()));
+	m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,TQ_SLOT(clearList()));
 	m_pContextPopup->insertSeparator();
 	m_pContextPopup->insertItem(__tr2qs_ctx("Import List","options"),m_pImportPopup);
 	m_pContextPopup->popup(TQCursor::pos());
@@ -1501,8 +1501,8 @@ void KviServerOptionsWidget::importPopupActivated(int id)
 		return;
 	}
 
-	connect(m_pImportFilter,TQT_SIGNAL(server(const KviIrcServer &,const char *)),this,TQT_SLOT(importServer(const KviIrcServer &,const char *)));
-	connect(m_pImportFilter,TQT_SIGNAL(destroyed()),this,TQT_SLOT(importerDead()));
+	connect(m_pImportFilter,TQ_SIGNAL(server(const KviIrcServer &,const char *)),this,TQ_SLOT(importServer(const KviIrcServer &,const char *)));
+	connect(m_pImportFilter,TQ_SIGNAL(destroyed()),this,TQ_SLOT(importerDead()));
 
 	m_pImportFilter->start();
 }
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 72f527a7..b77262ce 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -70,10 +70,10 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
 	m_pSoundSystemBox = new TQComboBox(false,h);
 
 	m_pSoundAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pSoundAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundAutoDetect()));
+	connect(m_pSoundAutoDetectButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(soundAutoDetect()));
 
 	m_pSoundTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pSoundTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundTest()));
+	connect(m_pSoundTestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(soundTest()));
 
 
 	g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Media Player","options"),true);
@@ -86,10 +86,10 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
 	m_pMediaPlayerBox = new TQComboBox(false,h);
 
 	m_pMediaAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pMediaAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaAutoDetect()));
+	connect(m_pMediaAutoDetectButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(mediaAutoDetect()));
 
 	m_pMediaTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pMediaTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaTest()));
+	connect(m_pMediaTestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(mediaTest()));
 
 	addRowSpacer(0,2,0,2);
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 01a0290f..f9c24501 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -42,8 +42,8 @@ KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIc
 	m_pIcon = icon;
 	m_pPopup = 0;
 	updateIcon();
-	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(doPopup()));
-	connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFromFile()));
+	connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(doPopup()));
+	connect(m_pBrowseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFromFile()));
 }
 
 
@@ -58,7 +58,7 @@ void KviTextIconEditor::doPopup()
 	{
 		m_pPopup = new KviTalPopupMenu(this);
 		KviIconWidget * iw = new KviIconWidget(m_pPopup);
-		connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(iconSelected(int)));
+		connect(iw,TQ_SIGNAL(selected(int)),this,TQ_SLOT(iconSelected(int)));
 		m_pPopup->insertItem(iw);
 	}
 	m_pPopup->popup(TQCursor::pos());
@@ -164,15 +164,15 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
 
 	m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this);
 	layout()->addWidget(m_pAdd,1,0);
-	connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAdd,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 
 	m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this);
 	layout()->addWidget(m_pDel,1,1);
-	connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
+	connect(m_pDel,TQ_SIGNAL(clicked()),this,TQ_SLOT(delClicked()));
 
 	m_pDel->setEnabled(false);
 
-	connect(m_pTable,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
+	connect(m_pTable,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged()));
 }
 
 KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 6ddc3ede..32a5f4cf 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -56,8 +56,8 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent)
 	
 	addRowSpacer(0,6,0,6);
 	
-	connect(m_pEnable,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool)));
-	connect(m_pLevelBasedNotify,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnable,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabled(bool)));
+	connect(m_pLevelBasedNotify,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabled(bool)));
 	setEnabled(true);
 }
 
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index 6e356770..f7b366e9 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -62,7 +62,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * parent)
 	m_pMailtoHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));
 	m_pOtherHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));
 
-	connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleEditors(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggleEditors(bool)));
 
 #endif
 
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index e5f68b48..a75c1efa 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -65,7 +65,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(T
 	hb->setSpacing(4);
 	KviBoolSelector * b = addBoolSelector(hb,__tr2qs_ctx("Use different color for own nick:","options"),KviOption_boolUseDifferentColorForOwnNick);
 	KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,0,3);
 }
@@ -81,7 +81,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
 	KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
 
 	KviColorSelector* s = addColorSelector(0,1,0,1,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
 	KviTalHBox* hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
@@ -89,7 +89,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
 
 	TQLabel * l = new TQLabel(__tr2qs_ctx("Grid type:","options"),hb);
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),l,TQ_SLOT(setEnabled(bool)));
 	m_pGridTypeCombo = new TQComboBox(false,hb);
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Grid","options"));
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Buttons","options"));
@@ -97,7 +97,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("Dotted Grid","options"));
 	m_pGridTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintUserListViewGridType));
 	m_pGridTypeCombo->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,TQT_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }
 
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 7fe805c7..1a5265c2 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -201,7 +201,7 @@ KviSinglePopupEditor::KviSinglePopupEditor(TQWidget * par)
 
 	m_pMenuButton = new TQPushButton(__tr2qs("Test"),this);
 	g->addWidget(m_pMenuButton,0,2);
-	connect(m_pMenuButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(testPopup()));
+	connect(m_pMenuButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(testPopup()));
 	TQSplitter * spl = new TQSplitter(TQt::Vertical,this);
 
 	m_pListView = new KviTalListView(spl);
@@ -214,9 +214,9 @@ KviSinglePopupEditor::KviSinglePopupEditor(TQWidget * par)
 	m_pListView->setSorting(-1);
 
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(selectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(selectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 	m_pEditor = KviScriptEditor::createInstance(spl);
 
@@ -287,7 +287,7 @@ void KviSinglePopupEditor::testPopup()
 	if(m_pTestPopup)delete m_pTestPopup;
 	m_pTestPopup = getMenu();
 	if(!m_pTestPopup)return;
-	connect(m_pTestPopup,TQT_SIGNAL(testModeItemClicked(KviKvsPopupMenuItem *)),this,TQT_SLOT(testModeMenuItemClicked(KviKvsPopupMenuItem *)));
+	connect(m_pTestPopup,TQ_SIGNAL(testModeItemClicked(KviKvsPopupMenuItem *)),this,TQ_SLOT(testModeMenuItemClicked(KviKvsPopupMenuItem *)));
 	TQPoint pnt = m_pMenuButton->mapToGlobal(TQPoint(0,m_pMenuButton->height()));
 	KviKvsVariantList * parms = new KviKvsVariantList();
 	parms->append(new KviKvsVariant(TQString("test1")));
@@ -378,52 +378,52 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
 	}
 
-	m_pContextPopup->insertItem(__tr2qs("New Separator Below"),this,TQT_SLOT(contextNewSeparatorBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Separator Below"),this,TQ_SLOT(contextNewSeparatorBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Separator Above"),this,TQT_SLOT(contextNewSeparatorAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Separator Above"),this,TQ_SLOT(contextNewSeparatorAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Separator Inside"),this,TQT_SLOT(contextNewSeparatorInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Separator Inside"),this,TQ_SLOT(contextNewSeparatorInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New Label Below"),this,TQT_SLOT(contextNewLabelBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Label Below"),this,TQ_SLOT(contextNewLabelBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Label Above"),this,TQT_SLOT(contextNewLabelAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Label Above"),this,TQ_SLOT(contextNewLabelAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Label Inside"),this,TQT_SLOT(contextNewLabelInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Label Inside"),this,TQ_SLOT(contextNewLabelInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New Item Below"),this,TQT_SLOT(contextNewItemBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Item Below"),this,TQ_SLOT(contextNewItemBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Item Above"),this,TQT_SLOT(contextNewItemAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Item Above"),this,TQ_SLOT(contextNewItemAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Item Inside"),this,TQT_SLOT(contextNewItemInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Item Inside"),this,TQ_SLOT(contextNewItemInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New Menu Below"),this,TQT_SLOT(contextNewMenuBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Menu Below"),this,TQ_SLOT(contextNewMenuBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Menu Above"),this,TQT_SLOT(contextNewMenuAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Menu Above"),this,TQ_SLOT(contextNewMenuAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Menu Inside"),this,TQT_SLOT(contextNewMenuInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Menu Inside"),this,TQ_SLOT(contextNewMenuInside())),
 		it && bIsMenu);
 
 		m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New External Menu Below"),this,TQT_SLOT(contextNewExtMenuBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New External Menu Below"),this,TQ_SLOT(contextNewExtMenuBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New External Menu Above"),this,TQT_SLOT(contextNewExtMenuAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New External Menu Above"),this,TQ_SLOT(contextNewExtMenuAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New External Menu Inside"),this,TQT_SLOT(contextNewExtMenuInside())),
+		m_pContextPopup->insertItem(__tr2qs("New External Menu Inside"),this,TQ_SLOT(contextNewExtMenuInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
@@ -432,28 +432,28 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),
 			__tr2qs("Cu&t"),
-			this,TQT_SLOT(contextCut())),
+			this,TQ_SLOT(contextCut())),
 		it);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),
 			__tr2qs("&Copy"),
-			this,TQT_SLOT(contextCopy())),
+			this,TQ_SLOT(contextCopy())),
 		it);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),
-			__tr2qs("&Paste Below"),this,TQT_SLOT(contextPasteBelow())),
+			__tr2qs("&Paste Below"),this,TQ_SLOT(contextPasteBelow())),
 		m_pClipboard);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),
-			__tr2qs("Paste Above"),this,TQT_SLOT(contextPasteAbove())),
+			__tr2qs("Paste Above"),this,TQ_SLOT(contextPasteAbove())),
 		it && m_pClipboard);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),
-			__tr2qs("Paste Inside"),this,TQT_SLOT(contextPasteInside())),
+			__tr2qs("Paste Inside"),this,TQ_SLOT(contextPasteInside())),
 		it && bIsMenu && m_pClipboard);
 
 
@@ -465,7 +465,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		bSeparatorInserted = true;
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROLOGUE)),
-				__tr2qs("New Menu Prologue"),this,TQT_SLOT(contextNewPrologue()));
+				__tr2qs("New Menu Prologue"),this,TQ_SLOT(contextNewPrologue()));
 //	}
 
 //	if(!findEpilogue(parentMenu))
@@ -473,7 +473,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		if(!bSeparatorInserted)m_pContextPopup->insertSeparator();
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EPILOGUE)),
-				__tr2qs("New Menu Epilogue"),this,TQT_SLOT(contextNewEpilogue()));
+				__tr2qs("New Menu Epilogue"),this,TQ_SLOT(contextNewEpilogue()));
 //	}
 
 	m_pContextPopup->popup(pnt);
@@ -1034,9 +1034,9 @@ KviPopupEditor::KviPopupEditor(TQWidget * par)
 	m_pListView->setShowSortIndicator(true);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&Export All To..."),box);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportAll()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportAll()));
 	TQPushButton * gn = new TQPushButton(__tr2qs("&Export selected To..."),box);
-	connect(gn,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportSelected()));
+	connect(gn,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportSelected()));
 
 	m_pEditor = new KviSinglePopupEditor(spl);
 
@@ -1073,9 +1073,9 @@ void KviPopupEditor::oneTimeSetup()
 		++it;
 	}
 
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 }
 
@@ -1087,20 +1087,20 @@ void KviPopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	m_pContextPopup->insertItem(
 		*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP)),
 		__tr2qs("&New Popup"),
-		this,TQT_SLOT(newPopup()));
+		this,TQ_SLOT(newPopup()));
 
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
 				__tr2qs("Re&move Popup"),
-				this,TQT_SLOT(removeCurrentPopup())),
+				this,TQ_SLOT(removeCurrentPopup())),
 	it);
 	
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 				__tr2qs("&Export Popup To..."),
-				this,TQT_SLOT(exportCurrentPopup())),
+				this,TQ_SLOT(exportCurrentPopup())),
 	it);
 
 	m_pContextPopup->popup(pnt);
@@ -1316,17 +1316,17 @@ KviPopupEditorWindow::KviPopupEditorWindow(KviFrame * lpFrm)
 	TQGridLayout * g = new TQGridLayout(m_pBase,1,4,4,4);
 
 	TQPushButton * btn = new TQPushButton(__tr2qs("&OK"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new TQPushButton(__tr2qs("&Apply"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new TQPushButton(__tr2qs("Cancel"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index b7786fee..a1221d73 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -85,7 +85,7 @@ KviRawEditor::KviRawEditor(TQWidget * par)
 	m_pListView->setRootIsDecorated(true);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&Export All To..."),boxi);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportAllEvents()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportAllEvents()));
 	
 	KviTalVBox * box = new KviTalVBox(spl);
 	m_pNameEditor = new TQLineEdit(box);
@@ -130,9 +130,9 @@ void KviRawEditor::oneTimeSetup()
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(selectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(selectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 }
 
 void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col)
@@ -146,25 +146,25 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
 			if(!(((KviRawHandlerListViewItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
-					__tr2qs("&Enable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled()));
+					__tr2qs("&Enable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled()));
 			else
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)),
-					__tr2qs("&Disable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled()));
+					__tr2qs("&Disable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled()));
 		
 			m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
 					__tr2qs("Re&move Handler"),
-					this,TQT_SLOT(removeCurrentHandler()));
+					this,TQ_SLOT(removeCurrentHandler()));
 			m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 					__tr2qs("&Export Handler To..."),
-					this,TQT_SLOT(exportCurrentHandler()));
+					this,TQ_SLOT(exportCurrentHandler()));
 		} else {
 			m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
 				__tr2qs("&New Handler"),
-				this,TQT_SLOT(addHandlerForCurrentRaw()));
+				this,TQ_SLOT(addHandlerForCurrentRaw()));
 		}
 	}
 
@@ -172,7 +172,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
 	m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)),
 			__tr2qs("&Add Raw Event..."),
-			this,TQT_SLOT(addRaw()));
+			this,TQ_SLOT(addRaw()));
 
 	m_pContextPopup->popup(pnt);
 }
@@ -451,17 +451,17 @@ KviRawEditorWindow::KviRawEditorWindow(KviFrame * lpFrm)
 	TQGridLayout * g = new TQGridLayout(m_pBase,1,4,4,4);
 
 	TQPushButton * btn = new TQPushButton(__tr2qs("&OK"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new TQPushButton(__tr2qs("&Apply"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new TQPushButton(__tr2qs("Cancel"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index f4865263..d0eee4a6 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -188,8 +188,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 		"Notify list fine-tuning can be performed by editing the entry properties.</center>"));
 #endif // COMPILE_INFO_TIPS
 
-	connect(m_pListView,TQT_SIGNAL(pressed(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(pressed(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *)));
 
 	g->addMultiCellWidget(m_pListView,0,1,0,1);
 
@@ -198,7 +198,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 	g->addWidget(vbox,0,2);
 
 	m_pWizardAddButton = new TQPushButton(__tr2qs("Add (Wizard)..."),vbox);
-	connect(m_pWizardAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addWizardClicked()));
+	connect(m_pWizardAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addWizardClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pWizardAddButton,__tr2qs("Add a registered user by means of a user-friendly wizard."));
 #endif // COMPILE_INFO_TIPS
@@ -206,21 +206,21 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	m_pAddButton = new TQPushButton(__tr2qs("&Add..."),vbox);
-	connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pAddButton,__tr2qs("Open the edit dialog to create a new user entry."));
 #endif // COMPILE_INFO_TIPS
 	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 	
 	m_pAddGroupButton = new TQPushButton(__tr2qs("&Add Group..."),vbox);
-	connect(m_pAddGroupButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addGroupClicked()));
+	connect(m_pAddGroupButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addGroupClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pAddGroupButton,__tr2qs("Adds a new group"));
 #endif // COMPILE_INFO_TIPS
 	m_pAddGroupButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 
 	m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),vbox);
-	connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked()));
+	connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked()));
 	m_pRemoveButton->setEnabled(false);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pRemoveButton,__tr2qs("Remove the currently selected entries."));
@@ -229,7 +229,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	m_pEditButton = new TQPushButton(__tr2qs("&Edit..."),vbox);
-	connect(m_pEditButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editClicked()));
+	connect(m_pEditButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editClicked()));
 	m_pEditButton->setEnabled(false);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pEditButton,__tr2qs("Edit the first selected entry."));
@@ -241,7 +241,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 	m_pExportButton = new TQPushButton(__tr("Export To..."),vbox);
 	m_pExportButton->setEnabled(false);
-	connect(m_pExportButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportClicked()));
+	connect(m_pExportButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pExportButton,__tr2qs("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button."));
 #endif // COMPILE_INFO_TIPS
@@ -249,7 +249,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	m_pImportButton = new TQPushButton(__tr("Import From..."),vbox);
-	connect(m_pImportButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importClicked()));
+	connect(m_pImportButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pImportButton,__tr2qs("Import entries from a file exported earlier by the \"export\" function of this dialog."));
 #endif // COMPILE_INFO_TIPS
@@ -264,12 +264,12 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	b = new TQPushButton(__tr2qs("&OK"),hbox);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	//b->setMinimumWidth(120);
 
 	b = new TQPushButton(__tr2qs("Cancel"),hbox);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	//b->setMinimumWidth(120);
 
@@ -279,8 +279,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 	g->setColStretch(0,1);
 	g->setRowStretch(1,1);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
-	connect(m_pListView,TQT_SIGNAL(rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ) ),this,TQT_SLOT(listViewRightButtonClicked ( KviTalListViewItem *, const TQPoint &, int )));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged()));
+	connect(m_pListView,TQ_SIGNAL(rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ) ),this,TQ_SLOT(listViewRightButtonClicked ( KviTalListViewItem *, const TQPoint &, int )));
 
 	fillList();
 
@@ -428,7 +428,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 				m_TmpDict.replace(id,g->data());
 			}
 			
-			connect(groups,TQT_SIGNAL(activated ( int )),this,TQT_SLOT(moveToGroupMenuClicked(int)));
+			connect(groups,TQ_SIGNAL(activated ( int )),this,TQ_SLOT(moveToGroupMenuClicked(int)));
 			
 			KviTalPopupMenu *mainPopup = new KviTalPopupMenu;
 			mainPopup->insertItem(__tr("Move to group"),groups);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 6a82fa7e..2da4c6f9 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -92,18 +92,18 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa
 	m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value"));
 
 	m_pTable->setMinimumSize(250,250);
-	//connect(m_pTable,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(propertyValueChanged(int,int)));
+	//connect(m_pTable,TQ_SIGNAL(valueChanged(int,int)),this,TQ_SLOT(propertyValueChanged(int,int)));
 
 	KviTalVBox * vb = new KviTalVBox(this);
 	vb->setSpacing(4);
 	g->addWidget(vb,0,2);
 
 	m_pAddButton = new TQPushButton(__tr2qs("&New"),vb);
-	connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 
 	m_pDelButton = new TQPushButton(__tr2qs("&Remove"),vb);
-	connect(m_pDelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
+	connect(m_pDelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delClicked()));
 	m_pDelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
 
 	KviTalHBox * b = new KviTalHBox(this);
@@ -111,12 +111,12 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa
 	g->addMultiCellWidget(b,2,2,1,2);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
 
 	pb = new TQPushButton(__tr2qs("Cancel"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 
 	g->setRowStretch(1,1);
@@ -255,11 +255,11 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
 	g->addWidget(b,2,1);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	//pb->setMinimumWidth(120);
 
 	pb = new TQPushButton(__tr2qs("Cancel"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	//pb->setMinimumWidth(120);
 
 
@@ -346,7 +346,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	g->addMultiCellWidget(l,3,3,0,1);
 
 	m_pMaskListBox = new KviTalListBox(p1);
-	connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(maskCurrentChanged(KviTalListBoxItem *)));
+	connect(m_pMaskListBox,TQ_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQ_SLOT(maskCurrentChanged(KviTalListBoxItem *)));
 	m_pMaskListBox->setMinimumSize(300,200);
 
 	g->addMultiCellWidget(m_pMaskListBox,4,4,0,1);
@@ -356,17 +356,17 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	b->setSpacing(4);
 
 	m_pAddMaskButton = new TQPushButton(__tr2qs("&Add..."),b);
-	connect(m_pAddMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addMaskClicked()));
+	connect(m_pAddMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addMaskClicked()));
 	m_pAddMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 
 	m_pDelMaskButton = new TQPushButton(__tr2qs("Re&move"),b);
 	m_pDelMaskButton->setEnabled(false);
-	connect(m_pDelMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMaskClicked()));
+	connect(m_pDelMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delMaskClicked()));
 	m_pDelMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
 
 	m_pEditMaskButton = new TQPushButton(__tr2qs("&Edit"),b);
 	m_pEditMaskButton->setEnabled(false);
-	connect(m_pEditMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editMaskClicked()));
+	connect(m_pEditMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editMaskClicked()));
 	m_pEditMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));
 
 	g->setRowStretch(4,1);
@@ -386,7 +386,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	l = new TQLabel(__tr2qs("Notify nicknames:"),p2);
 	l->setEnabled(m_pNotifyCheck->isChecked());
 	g->addWidget(l,1,0);
-	connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool)));
+	connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),l,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pNotifyCheck,__tr2qs("<center>You can enter a space separated list of nicknames.</center>"));
 #endif
@@ -395,7 +395,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	m_pNotifyNick = new TQLineEdit(p2);
 	m_pNotifyNick->setEnabled(false);
 	g->addMultiCellWidget(m_pNotifyNick,1,1,1,2);
-	connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),m_pNotifyNick,TQT_SLOT(setEnabled(bool)));
+	connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),m_pNotifyNick,TQ_SLOT(setEnabled(bool)));
 
 
 	f = new TQFrame(p2);
@@ -429,7 +429,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	g->addWidget(m_pCustomColorSelector,5,2);
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs("All Properties..."),p2);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(editAllPropertiesClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(editAllPropertiesClicked()));
 	g->addWidget(pb,6,2);
 
 	g->setColStretch(1,1);
@@ -444,7 +444,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb);
 
 	TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb);
-	connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool)));
+	connect(m_pIgnoreEnabled,TQ_SIGNAL(toggled(bool)),gb,TQ_SLOT(setEnabled(bool)));
 	
 	TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3);
 	
@@ -473,8 +473,8 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 
 	setCancelButton(__tr2qs("Cancel"));
 	setOkButton(__tr2qs("&OK"));
-	connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(okClicked()));
-	connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(reject()));
+	connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(okClicked()));
+	connect(this,TQ_SIGNAL(cancelButtonPressed()),this,TQ_SLOT(reject()));
 
 	if(r)
 	{
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index e0e49a4b..f77a4350 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -95,7 +95,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	if(mask.nick() != "*")m_pEditRealName->setText(mask.nick());
 
-	connect(m_pEditRealName,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(realNameChanged(const TQString &)));
+	connect(m_pEditRealName,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(realNameChanged(const TQString &)));
 
 	// PAGE 2
 
@@ -119,18 +119,18 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
     m_pNicknameEdit1->setAlignment(TQt::AlignRight);
 	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
-	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
+	connect(m_pNicknameEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
     m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
     m_pUsernameEdit1->setAlignment(TQt::AlignHCenter);
 	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
-	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
+	connect(m_pUsernameEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
 
 	m_pHostEdit1 = new TQLineEdit(m_pPage2);
 	if(mask.hasHost())m_pHostEdit1->setText(mask.host());
-	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
+	connect(m_pHostEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &)));
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
     m_pNicknameEdit2 = new TQLineEdit(m_pPage2);
@@ -211,7 +211,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pNotifyCheck = new TQCheckBox(m_pPage4);
     m_pNotifyCheck->setText(__tr2qs("Add this user to the notify list"));
 	m_pNotifyCheck->setChecked(false);
-	connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(notifyCheckToggled(bool)));
+	connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(notifyCheckToggled(bool)));
     m_pPage4Layout->addMultiCellWidget(m_pNotifyCheck,2,2,0,1);
 
     m_pNotifyNickLabel1 = new TQLabel(m_pPage4);
@@ -224,11 +224,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
     m_pNotifyNickEdit1 = new TQLineEdit(m_pPage4);
 	if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick());
-	connect(m_pNotifyNickEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &)));
+	connect(m_pNotifyNickEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(notifyNickChanged(const TQString &)));
     m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
 
     m_pNotifyNickEdit2 = new TQLineEdit(m_pPage4);
-	connect(m_pNotifyNickEdit2,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &)));
+	connect(m_pNotifyNickEdit2,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(notifyNickChanged(const TQString &)));
     m_pPage4Layout->addWidget(m_pNotifyNickEdit2,4,1);
 
 	m_pPage4Layout->setRowStretch(0,1);
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 597b3c20..355874ec 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -231,19 +231,19 @@ KviSetupWizard::KviSetupWizard()
 
 	m_pDirButtonGroup = new KviTalVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
 	m_pDirUsePrev = new TQRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup);
-	connect(m_pDirUsePrev,TQT_SIGNAL(clicked()),this,TQT_SLOT(oldDirClicked()));
+	connect(m_pDirUsePrev,TQ_SIGNAL(clicked()),this,TQ_SLOT(oldDirClicked()));
 	
 	m_pOldPathBox = new KviTalHBox(m_pDirButtonGroup);
 	m_pOldDataPathEdit = new TQLineEdit(m_pOldPathBox);
-	connect(m_pOldDataPathEdit,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(oldDataTextChanged ( const TQString & )));
+	connect(m_pOldDataPathEdit,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(oldDataTextChanged ( const TQString & )));
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs("&Browse..."),m_pOldPathBox);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseOldDataPath()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseOldDataPath()));
 	m_pOldPathBox->setSpacing(3);
 	m_pOldPathBox->setStretchFactor(m_pOldDataPathEdit,1);
 	
 	m_pDirUseNew = new TQRadioButton(__tr2qs("Use new settings folder"),m_pDirButtonGroup);
-	connect(m_pDirUseNew,TQT_SIGNAL(clicked()),this,TQT_SLOT(newDirClicked()));
+	connect(m_pDirUseNew,TQ_SIGNAL(clicked()),this,TQ_SLOT(newDirClicked()));
 	
 	TQLabel* l = new TQLabel(m_pDirButtonGroup);
 	l->setText(__tr2qs("Settings folder:"));
@@ -252,7 +252,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pDataPathEdit = new TQLineEdit(m_pNewPathBox);
 	
 	pb = new TQPushButton(__tr2qs("&Browse..."),m_pNewPathBox);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseDataPath()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseDataPath()));
 
 	m_pNewPathBox->setSpacing(3);
 	m_pNewPathBox->setStretchFactor(m_pDataPathEdit,1);
@@ -280,7 +280,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pIncomingPathEdit = new TQLineEdit(m_pNewIncomingBox);
 	
 	pb = new TQPushButton(__tr2qs("&Browse..."),m_pNewIncomingBox);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseIncomingPath()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseIncomingPath()));
 
 	m_pNewIncomingBox->setSpacing(3);
 	m_pNewIncomingBox->setStretchFactor(m_pIncomingPathEdit,1);
@@ -308,8 +308,8 @@ KviSetupWizard::KviSetupWizard()
 
 	setHelpEnabled(m_pDirectory,false);
 
-	connect(m_pDataPathEdit,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(newDataTextChanged ( const TQString & )));
-	connect(m_pIncomingPathEdit,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(newIncomingTextChanged ( const TQString & )));
+	connect(m_pDataPathEdit,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(newDataTextChanged ( const TQString & )));
+	connect(m_pIncomingPathEdit,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(newIncomingTextChanged ( const TQString & )));
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Identity
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 6895f0c8..dcc8079c 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -73,7 +73,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile *
 
 	m_pBrowseButton = new TQPushButton(__tr2qs_ctx("&Browse...","sharedfileswindow"),this);
 	g->addWidget( m_pBrowseButton, 1, 3 );
-	connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browse()));
+	connect(m_pBrowseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(browse()));
 
 	l = new TQLabel(__tr2qs_ctx("User mask:","sharedfileswindow"),this);
 	g->addWidget(l, 2, 0 );
@@ -87,16 +87,16 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile *
 	m_pExpireDateTimeEdit = new TQDateTimeEdit(this);
 	g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 );
 
-	connect(m_pExpireCheckBox,TQT_SIGNAL(toggled(bool)),m_pExpireDateTimeEdit,TQT_SLOT(setEnabled(bool)));
+	connect(m_pExpireCheckBox,TQ_SIGNAL(toggled(bool)),m_pExpireDateTimeEdit,TQ_SLOT(setEnabled(bool)));
 
 	TQPushButton * pb;
 
 	pb = new TQPushButton(__tr2qs_ctx("&OK","sharedfileswindow"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(pb,5,2);
 	pb = new TQPushButton(__tr2qs_ctx("Cancel","sharedfileswindow"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(pb,5,3);
 
@@ -218,20 +218,20 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF
 	m_pListView->addColumn(__tr2qs_ctx("Mask","sharedfileswindow"),200);
 	m_pListView->addColumn(__tr2qs_ctx("Expires","sharedfileswindow"),200);
 	m_pListView->setSelectionMode(KviTalListView::Single);
-	connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableButtons()));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableButtons()));
 
-	connect(g_pSharedFilesManager,TQT_SIGNAL(sharedFilesChanged()),this,TQT_SLOT(fillFileView()));
-	connect(g_pSharedFilesManager,TQT_SIGNAL(sharedFileAdded(KviSharedFile *)),this,TQT_SLOT(sharedFileAdded(KviSharedFile *)));
-	connect(g_pSharedFilesManager,TQT_SIGNAL(sharedFileRemoved(KviSharedFile *)),this,TQT_SLOT(sharedFileRemoved(KviSharedFile *)));
+	connect(g_pSharedFilesManager,TQ_SIGNAL(sharedFilesChanged()),this,TQ_SLOT(fillFileView()));
+	connect(g_pSharedFilesManager,TQ_SIGNAL(sharedFileAdded(KviSharedFile *)),this,TQ_SLOT(sharedFileAdded(KviSharedFile *)));
+	connect(g_pSharedFilesManager,TQ_SIGNAL(sharedFileRemoved(KviSharedFile *)),this,TQ_SLOT(sharedFileRemoved(KviSharedFile *)));
 
 	KviTalHBox * b = new KviTalHBox(vbox);
 
 	m_pAddButton = new TQPushButton(__tr2qs_ctx("&Add...","sharedfileswindow"),b);
-	connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 	m_pRemoveButton = new TQPushButton(__tr2qs_ctx("Re&move","sharedfileswindow"),b);
-	connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked()));
+	connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked()));
 	m_pEditButton = new TQPushButton(__tr2qs_ctx("&Edit","sharedfileswindow"),b);
-	connect(m_pEditButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editClicked()));
+	connect(m_pEditButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editClicked()));
 
 	fillFileView();
 }
@@ -380,7 +380,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi
 	if(!m_pOpenFilePopup)
 	{
 		m_pOpenFilePopup= new KviTalPopupMenu(this);
-		connect(m_pOpenFilePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(openFilePopupActivated(int)));
+		connect(m_pOpenFilePopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(openFilePopupActivated(int)));
 	}
 
 	m_pContextPopup->clear();
@@ -440,18 +440,18 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi
 
 				m_pOpenFilePopup->insertSeparator();
 
-				id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("Default application","filetransferwindow"),this,TQT_SLOT(openLocalFile()));
+				id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("Default application","filetransferwindow"),this,TQ_SLOT(openLocalFile()));
 				m_pOpenFilePopup->setItemParameter(id,-1);
-				id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQT_SLOT(openLocalFileWith()));
+				id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQ_SLOT(openLocalFileWith()));
 				m_pOpenFilePopup->setItemParameter(id,-1);
 
 				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open with","filetransferwindow"),m_pOpenFilePopup);
 				m_pLocalFilePopup->insertSeparator();
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder()));
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,TQ_SLOT(openLocalFileFolder()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,TQ_SLOT(openLocalFileTerminal()));
 				m_pLocalFilePopup->insertSeparator();
 #endif //COMPILE_TDE_SUPPORT
-				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,TQT_SLOT(copyLocalFileToClipboard()));
+				m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,TQ_SLOT(copyLocalFileToClipboard()));
 
 				m_pContextPopup->insertItem(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup);
 			}
@@ -474,10 +474,10 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi
 		item = (KviSharedFilesItem *)item->nextSibling();
 	}
 
-	id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,TQT_SLOT(clearTerminated()));
+	id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,TQ_SLOT(clearTerminated()));
 	m_pContextPopup->setItemEnabled(id,bHaveTerminated);
 	
-	id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear all","filetransferwindow"),this,TQT_SLOT(clearAll()));
+	id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear all","filetransferwindow"),this,TQ_SLOT(clearAll()));
 	m_pContextPopup->setItemEnabled(id,it);
 
 	m_pContextPopup->popup(pnt);
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp
index bebb9692..2c4f3764 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/controller.cpp
@@ -63,7 +63,7 @@ bool SPasteController::pasteFileInit(TQString &fileName)
 	if(m_pFile)return false; // can't paste two files at a time
 	m_pFile = new TQFile(fileName);
 	if(!m_pFile->open(IO_ReadOnly))return false;
-	connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(pasteFile()));
+	connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(pasteFile()));
 	m_pTimer->start(KVI_OPTION_UINT(KviOption_uintPasteDelay));
 	return true;
 }
@@ -79,7 +79,7 @@ bool SPasteController::pasteClipboardInit(void)
 		m_pClipBuff = new TQStringList(TQStringList::split("\n",tmp,true));
 		m_clipBuffIterator = m_pClipBuff->begin();
 	}
-	connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(pasteClipboard()));
+	connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(pasteClipboard()));
 	m_pTimer->start(KVI_OPTION_UINT(KviOption_uintPasteDelay));
 	return true;
 }
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 67879833..e2eb8865 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -62,7 +62,7 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 		m_pCloseButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)));
 		TQToolTip::add(m_pCloseButton,__tr2qs("Close this window"));
 		m_pHBox->setStretchFactor(m_pTitleLabel,2);
-		connect(m_pCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked()));
+		connect(m_pCloseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeClicked()));
 	} else {
 		m_pHBox = 0;
 		m_pTitleLabel = 0;
@@ -84,7 +84,7 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 		{
 //			tqDebug("PART %d",m_pKonsolePart);
 			m_pKonsoleWidget = m_pKonsolePart->widget();
-			connect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed()));
+			connect(m_pKonsoleWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(konsoleDestroyed()));
 //			tqDebug("Widget %d",m_pKonsoleWidget);
 		} else {
 			m_pKonsoleWidget = new TQLabel(this,
@@ -100,7 +100,7 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 KviTermWidget::~KviTermWidget()
 {
 	if(m_pKonsoleWidget)
-		disconnect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed()));
+		disconnect(m_pKonsoleWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(konsoleDestroyed()));
 
 	if(m_bIsStandalone)g_pTermWidgetList->removeRef(this);
 	if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
@@ -135,7 +135,7 @@ void KviTermWidget::konsoleDestroyed()
 	m_pKonsoleWidget = 0;
 	m_pKonsolePart = 0;
 	hide();
-	TQTimer::singleShot(0,this,TQT_SLOT(autoClose()));
+	TQTimer::singleShot(0,this,TQ_SLOT(autoClose()));
 }
 
 void KviTermWidget::autoClose()
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 48b60869..7afabc9b 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -160,7 +160,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
 	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)));
 	tb->setUsesBigPixmap(true);
 	TQToolTip::add(tb,__tr2qs_ctx("Save Current Theme...","theme"));
-	connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(saveCurrentTheme()));
+	connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(saveCurrentTheme()));
 
 	sep = new TQFrame(hb);
 	sep->setFrameStyle(TQFrame::VLine | TQFrame::Sunken);
@@ -170,13 +170,13 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
 	m_pPackThemeButton->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK)));
 	m_pPackThemeButton->setUsesBigPixmap(true);
 	TQToolTip::add(m_pPackThemeButton,__tr2qs_ctx("Export Selected Themes to a Distributable Package","theme"));
-	connect(m_pPackThemeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(packTheme()));
+	connect(m_pPackThemeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(packTheme()));
 
 	m_pDeleteThemeButton = new KviStyledToolButton(hb);
 	m_pDeleteThemeButton->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE)));
 	m_pDeleteThemeButton->setUsesBigPixmap(true);
 	TQToolTip::add(m_pDeleteThemeButton,__tr2qs_ctx("Delete Selected Themes","theme"));
-	connect(m_pDeleteThemeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteTheme()));
+	connect(m_pDeleteThemeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteTheme()));
 
 	sep = new TQFrame(hb);
 	sep->setFrameStyle(TQFrame::VLine | TQFrame::Sunken);
@@ -186,13 +186,13 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
 	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
 	tb->setUsesBigPixmap(true);
 	TQToolTip::add(tb,__tr2qs_ctx("Install Theme Package From Disk","theme"));
-	connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(installFromFile()));
+	connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(installFromFile()));
 
 	tb = new KviStyledToolButton(hb);
 	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW)));
 	tb->setUsesBigPixmap(true);
 	TQToolTip::add(tb,__tr2qs_ctx("Get More Themes...","theme"));
-	connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreThemes()));
+	connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(getMoreThemes()));
 
 	TQWidget *w= new TQWidget(hb);
 	w->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum);
@@ -201,17 +201,17 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
 	m_pListBox->setMinimumHeight(400);
 	m_pListBox->setMinimumWidth(400);
 	m_pListBox->setSelectionMode(KviTalListBox::Extended);
-	connect(m_pListBox,TQT_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQT_SLOT(applyTheme(KviTalListBoxItem *)));
-	connect(m_pListBox,TQT_SIGNAL(contextMenuRequested(KviTalListBoxItem *,const TQPoint &)),
-		this,TQT_SLOT(contextMenuRequested(KviTalListBoxItem *,const TQPoint &)));
-	connect(m_pListBox,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableButtons()));
+	connect(m_pListBox,TQ_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQ_SLOT(applyTheme(KviTalListBoxItem *)));
+	connect(m_pListBox,TQ_SIGNAL(contextMenuRequested(KviTalListBoxItem *,const TQPoint &)),
+		this,TQ_SLOT(contextMenuRequested(KviTalListBoxItem *,const TQPoint &)));
+	connect(m_pListBox,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableButtons()));
 	g->addMultiCellWidget(m_pListBox,1,1,0,1);
 
 	KviDynamicToolTip * tip = new KviDynamicToolTip(m_pListBox); 
-	connect(tip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); 
+	connect(tip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); 
 
 	TQPushButton * b = new TQPushButton(__tr2qs("Close"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeClicked()));
 	g->addWidget(b,2,1);
 
 	g->setRowStretch(1,0);
@@ -280,8 +280,8 @@ void KviThemeManagementDialog::contextMenuRequested(KviTalListBoxItem * it,const
 	{
 		m_pListBox->setCurrentItem(it);
 		m_pContextPopup->clear();
-		m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs_ctx("&Remove Theme","theme"),this,TQT_SLOT(deleteTheme()));
-		m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)),__tr2qs_ctx("&Apply Theme","theme"),this,TQT_SLOT(applyCurrentTheme()));
+		m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs_ctx("&Remove Theme","theme"),this,TQ_SLOT(deleteTheme()));
+		m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)),__tr2qs_ctx("&Apply Theme","theme"),this,TQ_SLOT(applyCurrentTheme()));
 		m_pContextPopup->popup(pos);
 	}
 }
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 8afd2b3b..d4c5f5b8 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -271,7 +271,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem
 
 	TQString szFilter = "*.png *.jpg *.xpm";
 	m_pImageSelector = new KviFileSelector(pPage,"",&m_szImagePath,true,0,szFilter);
-	connect(m_pImageSelector,TQT_SIGNAL(selectionChanged(const TQString &)),this,TQT_SLOT(imageSelectionChanged(const TQString &)));
+	connect(m_pImageSelector,TQ_SIGNAL(selectionChanged(const TQString &)),this,TQ_SLOT(imageSelectionChanged(const TQString &)));
 	pLayout->addWidget(m_pImageSelector,2,0);
 	pLayout->setRowStretch(1,1);
 
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index e7b78334..fd8ac85f 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -158,12 +158,12 @@ KviSaveThemeDialog::KviSaveThemeDialog(TQWidget * pParent)
 
 	TQString szFilter = "*.png *.jpg *.xpm";
 	m_pImageSelector = new KviFileSelector(pPage,"",&m_szScreenshotPath,true,0,szFilter);
-	connect(m_pImageSelector,TQT_SIGNAL(selectionChanged(const TQString &)),this,TQT_SLOT(imageSelectionChanged(const TQString &)));
+	connect(m_pImageSelector,TQ_SIGNAL(selectionChanged(const TQString &)),this,TQ_SLOT(imageSelectionChanged(const TQString &)));
 	pLayout->addWidget(m_pImageSelector,2,0);
 
 	TQPushButton * pButton = new TQPushButton(pPage);
 	pButton->setText(__tr2qs_ctx("Make Screenshot Now","theme"));
-	connect(pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(makeScreenshot()));
+	connect(pButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(makeScreenshot()));
 	pLayout->addWidget(pButton,3,0);
 
 	pLayout->setRowStretch(1,1);
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 7ad6bf55..911a3f9f 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -111,7 +111,7 @@ KviTipWindow::KviTipWindow()
 		KVI_TIP_WINDOW_BUTTON_WIDTH,
 		KVI_TIP_WINDOW_BUTTON_HEIGHT
 		);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(nextTip()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(nextTip()));
 
 	pb = new TQPushButton(__tr2qs("Close"),this);
 	pb->setGeometry(
@@ -120,7 +120,7 @@ KviTipWindow::KviTipWindow()
 		KVI_TIP_WINDOW_BUTTON_WIDTH,
 		KVI_TIP_WINDOW_BUTTON_HEIGHT
 		);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(close()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(close()));
 	pb->setDefault(true);
 
 	m_pShowAtStartupCheck = new KviStyledCheckBox(__tr2qs("Show at startup"),this);
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 208c2692..e93bfe1f 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -66,7 +66,7 @@ KviTrashcanLabel::KviTrashcanLabel(TQWidget * p)
 	m_uFlashCount = 0;
 	m_pFlashTimer = 0;
 	m_clrOriginal = paletteBackgroundColor();
-	connect(KviActionManager::instance(),TQT_SIGNAL(removeActionsHintRequest()),this,TQT_SLOT(flash()));
+	connect(KviActionManager::instance(),TQ_SIGNAL(removeActionsHintRequest()),this,TQ_SLOT(flash()));
 }
 
 KviTrashcanLabel::~KviTrashcanLabel()
@@ -83,7 +83,7 @@ void KviTrashcanLabel::flash()
 	m_uFlashCount = 0;
 	if(m_pFlashTimer)return;
 	m_pFlashTimer = new TQTimer();
-	connect(m_pFlashTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat()));
+	connect(m_pFlashTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat()));
 	m_pFlashTimer->start(200);
 }
 
@@ -139,7 +139,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,
 	m_pLabelEdit = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pLabelEdit,1,1,1,5);
 	m_pLabelEdit->setText(szLabel);
-	connect(m_pLabelEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(labelTextChanged(const TQString &)));
+	connect(m_pLabelEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(labelTextChanged(const TQString &)));
 	
 	l = new TQLabel(__tr2qs("Icon") + ":",this);
 	g->addWidget(l,2,0);
@@ -150,7 +150,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,
 	
 	m_pIconButton = new TQPushButton(this);
 	g->addMultiCellWidget(m_pIconButton,2,2,5,5);
-	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked()));
+	connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(iconButtonClicked()));
 
 	iconSelected(szIconId);
 
@@ -173,17 +173,17 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,
 	m_pLabelEdit->setFocus();
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs("OK"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setMinimumWidth(80);
 	g->addMultiCellWidget(pb,4,4,4,5);
 	
 	pb = new TQPushButton(__tr2qs("Cancel"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,4,3);
 	
 	m_pAdvancedButton = new TQPushButton(__tr2qs("Advanced..."),this);
-	connect(m_pAdvancedButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(advancedClicked()));
+	connect(m_pAdvancedButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(advancedClicked()));
 	m_pAdvancedButton->setMinimumWidth(100);
 	g->addMultiCellWidget(m_pAdvancedButton,4,4,0,1);
 	
@@ -294,15 +294,15 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p)
 	g->addMultiCellWidget(m_pDrawer,0,6,0,0);
 
 	TQPushButton * b = new TQPushButton(__tr2qs("New ToolBar"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newToolBar()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(newToolBar()));
 	g->addWidget(b,0,1);
 
 	m_pDeleteToolBarButton = new TQPushButton(__tr2qs("Delete ToolBar"),this);
-	connect(m_pDeleteToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteToolBar()));
+	connect(m_pDeleteToolBarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteToolBar()));
 	g->addWidget(m_pDeleteToolBarButton,1,1);
 
 	m_pRenameToolBarButton = new TQPushButton(__tr2qs("Edit ToolBar"),this);
-	connect(m_pRenameToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameToolBar()));
+	connect(m_pRenameToolBarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameToolBar()));
 	g->addWidget(m_pRenameToolBarButton,2,1);
 
 	TQFrame * f = new TQFrame(this);
@@ -310,14 +310,14 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p)
 	g->addWidget(f,3,1);
 	
 	m_pExportToolBarButton = new TQPushButton(__tr2qs("Export ToolBar"),this);
-	connect(m_pExportToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportToolBar()));
+	connect(m_pExportToolBarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportToolBar()));
 	g->addWidget(m_pExportToolBarButton,4,1);
 
 	KviTrashcanLabel * t = new KviTrashcanLabel(this);
 	g->addWidget(t,6,1);
 
 	b = new TQPushButton(__tr2qs("Close"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeClicked()));
 	g->addWidget(b,7,1);
 
 	g->setRowStretch(5,1);
@@ -325,7 +325,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p)
 	
 	m_pDrawer->fill();
 
-	connect(KviActionManager::instance(),TQT_SIGNAL(currentToolBarChanged()),this,TQT_SLOT(currentToolBarChanged()));
+	connect(KviActionManager::instance(),TQ_SIGNAL(currentToolBarChanged()),this,TQ_SLOT(currentToolBarChanged()));
 	KviActionManager::instance()->customizeToolBarsDialogCreated();
 	
 	currentToolBarChanged();
diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp
index 046186e8..1ffd120b 100644
--- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp
+++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp
@@ -113,7 +113,7 @@ KviKTorrentDCOPInterface::KviKTorrentDCOPInterface()
 	printf("KviKTorrentDCOPInterface\n");
 
 	TQTimer *timer = new TQTimer(this);
-	connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer()));
+	connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer()));
 	timer->start(250, FALSE);
 
 	// make sure we have a list of files,
diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp
index 78a41e67..79ae46d2 100644
--- a/src/modules/torrent/tc_statusbarapplet.cpp
+++ b/src/modules/torrent/tc_statusbarapplet.cpp
@@ -8,7 +8,7 @@ KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviSt
 	: KviStatusBarApplet(parent, desc)
 {
 	TQTimer *timer = new TQTimer(this);
-	connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+	connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
 	timer->start(250, FALSE);
 //	updateDisplay();
 //
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index dfd884e8..522e4fcc 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -117,15 +117,15 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
 	KviTalPopupMenu *pop;
 
 	pop = new KviTalPopupMenu(this);
-	pop->insertItem(__tr2qs("&Configure"),this,TQT_SLOT(config()));
-	pop->insertItem(__tr2qs("&Help"),this,TQT_SLOT(help()));
-	pop->insertItem(__tr2qs("Clo&se"),this,TQT_SLOT(close_slot()));
+	pop->insertItem(__tr2qs("&Configure"),this,TQ_SLOT(config()));
+	pop->insertItem(__tr2qs("&Help"),this,TQ_SLOT(help()));
+	pop->insertItem(__tr2qs("Clo&se"),this,TQ_SLOT(close_slot()));
 	m_pMenuBar->insertItem(__tr2qs("&Module"),pop);
 
 	pop = new KviTalPopupMenu(this);
-	pop->insertItem(__tr2qs("&Load"),this,TQT_SLOT(loadList()));
-	pop->insertItem(__tr2qs("&Save"),this,TQT_SLOT(saveList()));
-	pop->insertItem(__tr2qs("&Clear"),this,TQT_SLOT(clear()));
+	pop->insertItem(__tr2qs("&Load"),this,TQ_SLOT(loadList()));
+	pop->insertItem(__tr2qs("&Save"),this,TQ_SLOT(saveList()));
+	pop->insertItem(__tr2qs("&Clear"),this,TQ_SLOT(clear()));
 	m_pMenuBar->insertItem(__tr2qs("&List"),pop);
 
 	m_pUrlList->setShowSortIndicator(true);
@@ -140,8 +140,8 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
 	m_pUrlList->setColumnWidth(2,cfg.readIntEntry("Count",70));
 	m_pUrlList->setColumnWidth(3,cfg.readIntEntry("Timestamp",70));
 
-	connect(m_pUrlList,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),TQT_SLOT(dblclk_url(KviTalListViewItem *)));
-	connect(m_pUrlList,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQT_SLOT(popup(KviTalListViewItem *, const TQPoint &, int)));
+	connect(m_pUrlList,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),TQ_SLOT(dblclk_url(KviTalListViewItem *)));
+	connect(m_pUrlList,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQ_SLOT(popup(KviTalListViewItem *, const TQPoint &, int)));
 
 //	setFocusHandlerNoChildren(m_pUrlList);
 	m_pUrlList->setFocusPolicy(TQWidget::StrongFocus);
@@ -257,15 +257,15 @@ void UrlDialog::popup(KviTalListViewItem *item, const TQPoint &point, int col)
 	if (col == 0) {
 		m_szUrl = item->text(0);
 		KviTalPopupMenu p(0,"menu");
-		p.insertItem(__tr2qs("&Remove"),this,TQT_SLOT(remove()));
-		p.insertItem(__tr2qs("&Find Text"),this,TQT_SLOT(findtext()));
+		p.insertItem(__tr2qs("&Remove"),this,TQ_SLOT(remove()));
+		p.insertItem(__tr2qs("&Find Text"),this,TQ_SLOT(findtext()));
 		p.insertSeparator();
 		m_pListPopup = new KviTalPopupMenu(0,"list");
 		int i=0;
 		for(KviWindow *w=g_pFrame->windowList()->first();w;w=g_pFrame->windowList()->next()){
 			if ((w->type() <= 2) || (w->type() == 2) || (w->type() == 6)) {	// values defined in kvi_define.h (console,channel,query,chat,uwindow)
 				m_pListPopup->insertItem(TQString(w->plainTextCaption()),i);
-				m_pListPopup->connectItem(i,this,TQT_SLOT(sayToWin(int)));
+				m_pListPopup->connectItem(i,this,TQ_SLOT(sayToWin(int)));
 				i++;
 			}
 		}
@@ -362,11 +362,11 @@ ConfigDialog::ConfigDialog()
 	TQPushButton *b;
 	// configure buttons
         b = new TQPushButton(__tr2qs("&Cancel"),this,"discard");
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(discardbtn()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(discardbtn()));
 	g->addWidget(b,4,0);
 
 	b = new TQPushButton(__tr2qs("&OK"),this,"accept");
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptbtn()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(acceptbtn()));
 	g->addWidget(b,4,1);
 
 	show();
@@ -413,7 +413,7 @@ BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled)
 	TQGridLayout *g = new TQGridLayout(this,2,2,10,10);
 
 	m_pEnable = new KviStyledCheckBox(__tr2qs("Enable URL ban list"),this);
-	connect(m_pEnable,TQT_SIGNAL(clicked()),this,TQT_SLOT(enableClicked()));
+	connect(m_pEnable,TQ_SIGNAL(clicked()),this,TQ_SLOT(enableClicked()));
 	m_pEnable->setChecked(banEnabled);
 	g->addMultiCellWidget(m_pEnable,0,0,0,1);
 
@@ -425,12 +425,12 @@ BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled)
 	g->addMultiCellWidget(m_pBanList,1,1,0,1);
 
 	m_pAddBtn = new TQPushButton(__tr2qs("&Add Ban"),this,"add");
-	connect(m_pAddBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(addBan()));
+	connect(m_pAddBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(addBan()));
 	m_pAddBtn->setEnabled(m_pEnable->isChecked());
 	g->addWidget(m_pAddBtn,2,0);
 
 	m_pRemoveBtn = new TQPushButton(__tr2qs("&Remove Selected"),this,"remove");
-	connect(m_pRemoveBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeBan()));
+	connect(m_pRemoveBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeBan()));
 	m_pRemoveBtn->setEnabled(m_pEnable->isChecked());
 	g->addWidget(m_pRemoveBtn,2,1);
 }
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index e0a77c29..adf52cd3 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -53,7 +53,7 @@ KviUserWindow::KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviCons
 //		"vertical_splitter");
 	// With the IRC view over
 	m_pIrcView = new KviIrcView(this,pFrm,this);
-	//	connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked()));
+	//	connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked()));
 	// The userlist on the right
 //	m_pUserListView = new KviUserListView(m_pSplitter,connection()->userDataBase(),this,
 //								AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view");