Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

79 files changed, 436 insertions, 436 deletions

diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index e9ff1256d..0e03b04a2 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -48,15 +48,15 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
 	m_state = None;
 	m_status = false;
 	m_actionindex = 0;
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
 
 	m_side = new SidePixmap(this);
 	m_doit = new TQPushButton(i18n("&Export"), this);
 	m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
-	connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
-	connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked()));
+	connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
+	connect(m_doit, TQ_SIGNAL(clicked()), TQ_SLOT(slotActionClicked()));
 	m_bar = new TQProgressBar(this);
 	m_text = new KActiveLabel(this);
 	TQLabel	*m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this);
@@ -245,7 +245,7 @@ void CupsAddSmb::checkActionStatus()
 void CupsAddSmb::nextAction()
 {
 	if (m_actionindex < (int)(m_actions.count()))
-		TQTimer::singleShot(1, this, TQT_SLOT(doNextAction()));
+		TQTimer::singleShot(1, this, TQ_SLOT(doNextAction()));
 }
 
 void CupsAddSmb::doNextAction()
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp
index a62e93ee9..e73dac19d 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -56,7 +56,7 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
 	m1->addWidget(from_, 1, 1);
 	m1->addWidget(to_, 2, 1);
 
-	connect(type_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
+	connect(type_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
 	slotTypeChanged(type_->currentItem());
 
 	setCaption(i18n("Browse Address"));
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index 0bd0e53ae..91ef705bf 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -97,29 +97,29 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
 	m3->addWidget(hideimplicitmembers_, 1, 0);
 	m3->addWidget(useshortnames_, 1, 1);
 
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), cups_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), slp_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseport_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseinterval_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browsetimeout_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseaddresses_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseorder_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), useimplicitclasses_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), useanyclasses_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), hideimplicitmembers_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), useshortnames_, TQT_SLOT(setEnabled(bool)));
-
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l1, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l2, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l3, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l4, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l5, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l6, TQT_SLOT(setEnabled(bool)));
-
-	connect(browseaddresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(browseaddresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(browseaddresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
-	connect(browseinterval_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), cups_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), slp_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseport_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseinterval_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browsetimeout_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseaddresses_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseorder_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), useimplicitclasses_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), useanyclasses_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), hideimplicitmembers_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), useshortnames_, TQ_SLOT(setEnabled(bool)));
+
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l1, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l2, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l3, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l4, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l5, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l6, TQ_SLOT(setEnabled(bool)));
+
+	connect(browseaddresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(browseaddresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(browseaddresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
+	connect(browseinterval_, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int)));
 	browsing_->setChecked(true);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index b277006b2..1ac0c739b 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -69,7 +69,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
 	m1->addWidget(maxjobsperprinter_, 4, 1);
 	m1->addWidget(maxjobsperuser_, 5, 1);
 
-	connect(keepjobhistory_, TQT_SIGNAL(toggled(bool)), TQT_SLOT(historyChanged(bool)));
+	connect(keepjobhistory_, TQ_SIGNAL(toggled(bool)), TQ_SLOT(historyChanged(bool)));
 	keepjobhistory_->setChecked(true);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index a9341fcf2..f040f430c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -88,10 +88,10 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
 	m1->addWidget(clienttimeout_, 5, 1);
 	m1->addWidget(listen_, 6, 1);
 
-	connect(listen_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(listen_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(listen_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
-	connect(keepalive_, TQT_SIGNAL(toggled(bool)), keepalivetimeout_, TQT_SLOT(setEnabled(bool)));
+	connect(listen_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(listen_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(listen_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
+	connect(keepalive_, TQ_SIGNAL(toggled(bool)), keepalivetimeout_, TQ_SLOT(setEnabled(bool)));
 	keepalive_->setChecked(true);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index c23a753dd..1a5fa9e53 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -66,10 +66,10 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
 	m1->addWidget(encryptkey_, 3, 1);
 	m1->addWidget(locations_, 4, 1);
 
-	connect(locations_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(locations_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(locations_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
-	connect(locations_, TQT_SIGNAL(deleted(int)), TQT_SLOT(slotDeleted(int)));
+	connect(locations_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(locations_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(locations_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
+	connect(locations_, TQ_SIGNAL(deleted(int)), TQ_SLOT(slotDeleted(int)));
 }
 
 bool CupsdSecurityPage::loadConfig(CupsdConf *conf, TQString&)
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index a2bb81972..ac38bb19c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -88,7 +88,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name)
 	TQLabel *l6 = new TQLabel(i18n("Printcap file:"), this);
 	TQLabel *l7 = new TQLabel(i18n("Printcap format:"), this);
 
-	connect(classification_, TQT_SIGNAL(activated(int)), TQT_SLOT(classChanged(int)));
+	connect(classification_, TQ_SIGNAL(activated(int)), TQ_SLOT(classChanged(int)));
 	classification_->setCurrentItem(0);
 	charset_->setCurrentItem(0);
 	printcapformat_->setCurrentItem(0);
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 2e0d523f0..fd7f6b6c6 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -43,11 +43,11 @@ EditList::EditList(TQWidget *parent, const char *name)
 	m1->addWidget(delbtn_, 2, 1);
 	m1->addWidget(defbtn_, 3, 1);
 
-	connect(addbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(add()));
-	connect(editbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
-	connect(delbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete()));
-	connect(defbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(defaultList()));
-	connect(list_, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSelected(int)));
+	connect(addbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(add()));
+	connect(editbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()));
+	connect(delbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete()));
+	connect(defbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(defaultList()));
+	connect(list_, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSelected(int)));
 	slotSelected(-1);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp
index addd3eea4..a203f4e5e 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -66,8 +66,8 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
 	order_->insertItem(i18n("Allow, Deny"));
 	order_->insertItem(i18n("Deny, Allow"));
 
-	connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int)));
-	connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
+	connect(authclass_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotClassChanged(int)));
+	connect(authtype_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
 
 	TQLabel	*l1 = new TQLabel(i18n("Resource:"), dummy);
 	TQLabel	*l2 = new TQLabel(i18n("Authentication:"), dummy);
@@ -104,9 +104,9 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
 	slotClassChanged(AUTHCLASS_ANONYMOUS);
 	encryption_->setCurrentItem(ENCRYPT_IFREQUESTED);
 
-	connect(addresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(addresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(addresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
+	connect(addresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(addresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(addresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
 }
 
 void LocationDialog::setInfos(CupsdConf *conf)
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
index c3a6d50d2..e82a6fba6 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
@@ -31,7 +31,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
 	edit_ = new TQLineEdit(this);
 	button_ = new KPushButton(this);
 	button_->setPixmap(SmallIcon("document-open"));
-	connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked()));
+	connect(button_,TQ_SIGNAL(clicked()),TQ_SLOT(buttonClicked()));
 
 	TQHBoxLayout	*main_ = new TQHBoxLayout(this, 0, 3);
 	main_->addWidget(edit_);
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index e6cade32e..cc1392577 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -34,14 +34,14 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
 	m_view->header()->hide();
 	m_view->addColumn("");
 	m_view->setFullWidth(true);
-	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*)));
+	connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelected(TQListViewItem*)));
 
 	m_add = new TQPushButton(this);
 	m_add->setPixmap(SmallIcon("folder-new"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked()));
 	m_remove = new TQPushButton(this);
 	m_remove->setPixmap(SmallIcon("edit-delete"));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked()));
 	m_remove->setEnabled(false);
 
 	m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2));
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 47d2c7f32..7dd7e5abc 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -48,7 +48,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	lay1->addWidget(m_stddir);
 	lay1->addWidget(m_installdir);
 
-	connect(m_stddir,TQT_SIGNAL(toggled(bool)),m_installdir,TQT_SLOT(setDisabled(bool)));
+	connect(m_stddir,TQ_SIGNAL(toggled(bool)),m_installdir,TQ_SLOT(setDisabled(bool)));
 	m_stddir->setChecked(true);
 }
 
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index 08ec61911..9f05f3b16 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -103,9 +103,9 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
 	lay3->addMultiCellWidget(m_anonymous,3,3,0,1);
 
 	// connections
-	connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setDisabled(bool)));
-	connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setDisabled(bool)));
-	connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_savepwd,TQT_SLOT(setDisabled(bool)));
+	connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setDisabled(bool)));
+	connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setDisabled(bool)));
+	connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_savepwd,TQ_SLOT(setDisabled(bool)));
 }
 
 void KMCupsConfigWidget::load()
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index ee1c62728..3e5876451 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -292,8 +292,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
 	// Give 2 seconds to connect to the printer, or abort
 	KExtendedSocket *kes = new KExtendedSocket(p->uri().host(),
 	p->uri().port());
-	connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot()));
-	connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot()));
+	connect(kes, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(hostPingSlot()));
+	connect(kes, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(hostPingFailedSlot()));
 	if (kes->startAsyncConnect() != 0) {
 	delete kes;
 	m_hostSuccess = false;
@@ -938,9 +938,9 @@ TQStringList KMCupsManager::detectLocalPrinters()
 
 void KMCupsManager::createPluginActions(TDEActionCollection *coll)
 {
-	TDEAction	*act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
+	TDEAction	*act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQ_SLOT(exportDriver()), coll, "plugin_export_driver");
 	act->setGroup("plugin");
-	act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
+	act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQ_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
 	act->setGroup("plugin");
 }
 
@@ -1020,12 +1020,12 @@ void KMCupsManager::checkUpdatePossibleInternal()
 	delete m_socket;
         m_socket = new KNetwork::TDEBufferedSocket;
 	m_socket->setTimeout( 1500 );
-	connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), 
-                TQT_SLOT( slotConnectionSuccess() ) );
-	connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) );
+	connect( m_socket, TQ_SIGNAL( connected(const KResolverEntry&) ), 
+                TQ_SLOT( slotConnectionSuccess() ) );
+	connect( m_socket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) );
 
         trials = 5;
-        TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) );
+        TQTimer::singleShot( 1, this, TQ_SLOT( slotAsyncConnect() ) );
 }
 
 void KMCupsManager::slotConnectionSuccess()
@@ -1044,7 +1044,7 @@ void KMCupsManager::slotConnectionSuccess()
 		if ( trials > 0 )
 		{
 			trials--;
-			TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) );
+			TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) );
 		}
 		else
 		{
@@ -1074,7 +1074,7 @@ void KMCupsManager::slotConnectionFailed( int errcode )
 		//m_socket->cancelAsyncConnect();
 		trials--;
 		m_socket->close();
-		TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) );
+		TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) );
 		return;
 	}
 
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index f7a4f0593..bbc878055 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -70,12 +70,12 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
 	KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	sep->setFixedHeight(20);
 
-	connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) );
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
-	connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport()));
+	connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*)));
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) );
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) );
+	connect(m_ippreport, TQ_SIGNAL(clicked()), TQ_SLOT(slotIppReport()));
 
 	// layout
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(this, 0, 10);
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 497fa03c3..67707b3ea 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -53,7 +53,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name)
 	m_uriview->addColumn( "" );
 	m_uriview->header()->hide();
 	m_uriview->setSorting( -1 );
-	connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) );
+	connect( m_uriview, TQ_SIGNAL( pressed( TQListViewItem* ) ), TQ_SLOT( slotPressed( TQListViewItem* ) ) );
 
 	TQVBoxLayout	*lay1 = new TQVBoxLayout(this, 0, 15);
 	TQVBoxLayout	*lay2 = new TQVBoxLayout(0, 0, 5);
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index 29be5bc0c..0c6eb4770 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -263,10 +263,10 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	m_gamma->setRange(1, 3000, 100, true);
 	  TQWhatsThis::add(m_gamma, whatsThisGammaImagePage);
 
-	connect(m_brightness, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
-	connect(m_hue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
-	connect(m_saturation, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
-	//connect(m_gamma, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
+	connect(m_brightness, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
+	connect(m_hue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
+	connect(m_saturation, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
+	//connect(m_gamma, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
 
 	m_preview = new ImagePreview(colorbox);
 	bool	useColor = (driver ? driver->get("colordevice") == "1" : true);
@@ -282,7 +282,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 
 	TQPushButton	*defbtn = new TQPushButton(i18n("&Default Settings"), colorbox);
 	  TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage);
-	connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked()));
+	connect(defbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultClicked()));
 	slotDefaultClicked();
 
 	m_sizetype = new TQComboBox(sizebox);
@@ -297,7 +297,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	m_size->setRange(1, 1200, 20, true);
 	m_size->setValue(72);
 
-	connect(m_sizetype, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeTypeChanged(int)));
+	connect(m_sizetype, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeTypeChanged(int)));
 	m_sizetype->setCurrentItem(0);
 	slotSizeTypeChanged(0);
 
@@ -342,8 +342,8 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	    m_horizgrp->insert(hcenter, 1);
 	    m_horizgrp->insert(right, 2);
 	}
-	connect(m_vertgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged()));
-	connect(m_horizgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged()));
+	connect(m_vertgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged()));
+	connect(m_horizgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged()));
 	m_vertgrp->setButton(1);
 	m_horizgrp->setButton(1);
 	slotPositionChanged();
diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp
index e37400679..0a3513c67 100644
--- a/tdeprint/cups/kpschedulepage.cpp
+++ b/tdeprint/cups/kpschedulepage.cpp
@@ -186,7 +186,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
 	l0->addMultiCellWidget(m_priority, 4, 4, 0, 1);
 	l0->setRowStretch(5, 1);
 
-	connect(m_time, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeChanged()));
+	connect(m_time, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeChanged()));
 }
 
 KPSchedulePage::~KPSchedulePage()
diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp
index 9ad9d7cb5..4e990007e 100644
--- a/tdeprint/cups/kptextpage.cpp
+++ b/tdeprint/cups/kptextpage.cpp
@@ -208,7 +208,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter);
 	m_columns->setRange(1, 10, 1, false);
 	KSeparator	*sep = new KSeparator(TQt::Horizontal, formatbox);
-	connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int)));
+	connect(m_columns, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotColumnsChanged(int)));
 
 	m_prettypix = new TQLabel(prettybox);
 	  TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage);
@@ -222,7 +222,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	m_prettyprint->insert(off, 0);
 	m_prettyprint->insert(on, 1);
 	m_prettyprint->setButton(0);
-	connect(m_prettyprint, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPrettyChanged(int)));
+	connect(m_prettyprint, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPrettyChanged(int)));
 	slotPrettyChanged(0);
 
 	m_margin = new MarginWidget(marginbox);
diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp
index 4b40ed190..285a0864d 100644
--- a/tdeprint/driverview.cpp
+++ b/tdeprint/driverview.cpp
@@ -105,8 +105,8 @@ DriverView::DriverView(TQWidget *parent, const char *name)
 	m_optview = new DrOptionView(splitter);
 	  TQWhatsThis::add(m_optview, whatsThisOptionSettingsDriverPage);
 
-	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQT_SLOT(slotItemSelected(TQListViewItem*)));
-	connect(m_optview,TQT_SIGNAL(changed()),TQT_SLOT(slotChanged()));
+	connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_optview,TQ_SIGNAL(changed()),TQ_SLOT(slotChanged()));
 }
 
 DriverView::~DriverView()
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index a13900156..d58c20863 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -78,8 +78,8 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name)
 	sub2_->addWidget(m_slider,1);
 	sub2_->addWidget(m_maxval,0);
 
-	connect(m_slider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotSliderChanged(int)));
-	connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotEditChanged(const TQString&)));
+	connect(m_slider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotSliderChanged(int)));
+	connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotEditChanged(const TQString&)));
 }
 
 void OptionNumericView::setOption(DrBase *opt)
@@ -172,7 +172,7 @@ OptionStringView::OptionStringView(TQWidget *parent, const char *name)
 	main_->addWidget(m_edit,0);
 	main_->addStretch(1);
 
-	connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SIGNAL(valueChanged(const TQString&)));
+	connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SIGNAL(valueChanged(const TQString&)));
 }
 
 void OptionStringView::setOption(DrBase *opt)
@@ -196,7 +196,7 @@ OptionListView::OptionListView(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(m_list);
 
-	connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
+	connect(m_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
 }
 
 void OptionListView::setOption(DrBase *opt)
@@ -246,7 +246,7 @@ OptionBooleanView::OptionBooleanView(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(m_group);
 
-	connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int)));
+	connect(m_group,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotSelected(int)));
 }
 
 void OptionBooleanView::setOption(DrBase *opt)
@@ -283,23 +283,23 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
 	m_stack = new TQWidgetStack(this);
 
 	OptionBaseView	*w = new OptionListView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::List);
 
 	w = new OptionStringView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::String);
 
 	w = new OptionNumericView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::Integer);
 
 	w = new OptionBooleanView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::Boolean);
 
 	w = new OptionBaseView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,0);	// empty widget
 
 	m_stack->raiseWidget(w);
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index 0550a2861..f0afae75b 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -175,7 +175,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	TQWhatsThis::add(m_range, whatsThisPageRangeLabel);
 	m_rangeedit = new TQLineEdit(m_pagebox);
 	TQWhatsThis::add(m_rangeedit, whatsThisPageRangeLabel);
-	connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus()));
+	connect(m_range, TQ_SIGNAL(clicked()), m_rangeedit, TQ_SLOT(setFocus()));
 	TQToolTip::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
 //	TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
 	//TQLabel	*m_rangeexpl = new TQLabel(m_pagebox);
@@ -249,9 +249,9 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	slotCollateClicked();
 
 	// connections
-	connect(m_rangeedit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotRangeEntered()));
-	connect(m_collate,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked()));
-	connect(m_order,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked()));
+	connect(m_rangeedit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotRangeEntered()));
+	connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
+	connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
 
 	if (!kapp->authorize("print/copies"))
 	{
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 768e4b475..7ac9b146c 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -133,7 +133,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
 	m_view->setLineWidth(1);
 	m_view->setSorting(-1);
 	m_view->header()->hide();
-	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotItemSelected(TQListViewItem*)));
 
 	m_add = new TQToolButton(this);
 	  TQWhatsThis::add(m_add, whatsThisAddFilterButton);
@@ -160,12 +160,12 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
 	m_configure->setIconSet(BarIconSet("configure"));
 	TQToolTip::add(m_configure, i18n("Configure filter"));
 
-	connect(m_add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddClicked()));
-	connect(m_remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveClicked()));
-	connect(m_up,TQT_SIGNAL(clicked()),TQT_SLOT(slotUpClicked()));
-	connect(m_down,TQT_SIGNAL(clicked()),TQT_SLOT(slotDownClicked()));
-	connect(m_configure,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigureClicked()));
-	connect(m_view,TQT_SIGNAL(doubleClicked(TQListViewItem*)),TQT_SLOT(slotConfigureClicked()));
+	connect(m_add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddClicked()));
+	connect(m_remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveClicked()));
+	connect(m_up,TQ_SIGNAL(clicked()),TQ_SLOT(slotUpClicked()));
+	connect(m_down,TQ_SIGNAL(clicked()),TQ_SLOT(slotDownClicked()));
+	connect(m_configure,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigureClicked()));
+	connect(m_view,TQ_SIGNAL(doubleClicked(TQListViewItem*)),TQ_SLOT(slotConfigureClicked()));
 
 	m_info = new KActiveLabel(this);
 	  TQWhatsThis::add(m_info, whatsThisFilterInfoPane);
diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp
index 1145c6f53..bce57cd1f 100644
--- a/tdeprint/kpgeneralpage.cpp
+++ b/tdeprint/kpgeneralpage.cpp
@@ -376,9 +376,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	lay6->setColStretch(1, 1);
 
 	// connections (+ misc)
-	connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int)));
-	connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int)));
-	connect(m_duplexbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotDuplexChanged(int)));
+	connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int)));
+	connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int)));
+	connect(m_duplexbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotDuplexChanged(int)));
 
 	// init
 	initialize();
diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp
index 9c0a42501..23e11a760 100644
--- a/tdeprint/kpposterpage.cpp
+++ b/tdeprint/kpposterpage.cpp
@@ -199,15 +199,15 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name )
 	m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) );
 	slotPosterSizeChanged( m_postersize->currentItem() );
 
-	connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_postercheck, TQ_SIGNAL( toggled( bool ) ), dummy, TQ_SLOT( setEnabled( bool ) ) );
 	dummy->setEnabled( false );
-	connect( m_postersize, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotPosterSizeChanged( int ) ) );
-	connect( m_cutmargin, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotMarginChanged( int ) ) );
-	connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), m_printsize, TQT_SLOT( setDisabled( bool ) ) );
+	connect( m_postersize, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotPosterSizeChanged( int ) ) );
+	connect( m_cutmargin, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotMarginChanged( int ) ) );
+	connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), m_printsize, TQ_SLOT( setDisabled( bool ) ) );
 	m_printsize->setEnabled( false );
-	connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotLockToggled( bool ) ) );
-	connect( m_selection, TQT_SIGNAL( textChanged( const TQString& ) ), m_preview, TQT_SLOT( setSelectedPages( const TQString& ) ) );
-	connect( m_preview, TQT_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQT_SLOT( setText( const TQString& ) ) );
+	connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotLockToggled( bool ) ) );
+	connect( m_selection, TQ_SIGNAL( textChanged( const TQString& ) ), m_preview, TQ_SLOT( setSelectedPages( const TQString& ) ) );
+	connect( m_preview, TQ_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQ_SLOT( setText( const TQString& ) ) );
 
 	if ( KMFactory::self()->settings()->application != KPrinter::Dialog 
 			&& KMFactory::self()->settings()->application >= 0 )
diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp
index be88508fd..e6088d489 100644
--- a/tdeprint/kpqtpage.cpp
+++ b/tdeprint/kpqtpage.cpp
@@ -218,9 +218,9 @@ void KPQtPage::init()
 	}
 
 	// connections
-	connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int)));
-	connect(m_colorbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotColorModeChanged(int)));
-	connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int)));
+	connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int)));
+	connect(m_colorbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotColorModeChanged(int)));
+	connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int)));
 }
 
 void KPQtPage::slotOrientationChanged(int ID)
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index 4a4aac597..d09997785 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -67,8 +67,8 @@ KPrintAction::~KPrintAction()
 
 void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget)
 {
-	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
-	connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+	connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
+	connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 
 	d->type = type;
 	d->parentWidget = parentWidget;
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index d6cf3a03b..25691e673 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -396,19 +396,19 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	l3->addMultiCellWidget(d->m_cmd,2,2,1,2);
 
 	// connections
-	connect(d->m_ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept()));
-	connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()));
-	connect(d->m_properties,TQT_SIGNAL(clicked()),TQT_SLOT(slotProperties()));
-	connect(d->m_default,TQT_SIGNAL(clicked()),TQT_SLOT(slotSetDefault()));
-	connect(d->m_printers,TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
-	connect(d->m_options,TQT_SIGNAL(clicked()),TQT_SLOT(slotOptions()));
-	connect(d->m_wizard,TQT_SIGNAL(clicked()),TQT_SLOT(slotWizard()));
-	connect(d->m_extbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotExtensionClicked()));
-	connect(d->m_filter, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
-	connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()));
-	connect(d->m_file, TQT_SIGNAL(urlSelected(const TQString&)), TQT_SLOT(slotOutputFileSelected(const TQString&)));
-	connect( d->m_file, TQT_SIGNAL( openFileDialog( KURLRequester* ) ), TQT_SLOT( slotOpenFileDialog() ) );
-	connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect(d->m_ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept()));
+	connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()));
+	connect(d->m_properties,TQ_SIGNAL(clicked()),TQ_SLOT(slotProperties()));
+	connect(d->m_default,TQ_SIGNAL(clicked()),TQ_SLOT(slotSetDefault()));
+	connect(d->m_printers,TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int)));
+	connect(d->m_options,TQ_SIGNAL(clicked()),TQ_SLOT(slotOptions()));
+	connect(d->m_wizard,TQ_SIGNAL(clicked()),TQ_SLOT(slotWizard()));
+	connect(d->m_extbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotExtensionClicked()));
+	connect(d->m_filter, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool)));
+	connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()));
+	connect(d->m_file, TQ_SIGNAL(urlSelected(const TQString&)), TQ_SLOT(slotOutputFileSelected(const TQString&)));
+	connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) );
+	connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
 	d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection");
 	d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection");
@@ -841,7 +841,7 @@ void KPrintDialog::reload()
 		d->m_dummy->show();
 	// other initializations
 	setFlags(KMFactory::self()->uiManager()->dialogFlags());
-	connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 	init();
 }
 
diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp
index c120ba843..24479daba 100644
--- a/tdeprint/kprinterpropertydialog.cpp
+++ b/tdeprint/kprinterpropertydialog.cpp
@@ -40,7 +40,7 @@ KPrinterPropertyDialog::KPrinterPropertyDialog(KMPrinter *p, TQWidget *parent, c
 	// set a margin
 	m_tw = new TQTabWidget(this);
 	m_tw->setMargin(10);
-	connect(m_tw,TQT_SIGNAL(currentChanged(TQWidget*)),TQT_SLOT(slotCurrentChanged(TQWidget*)));
+	connect(m_tw,TQ_SIGNAL(currentChanged(TQWidget*)),TQ_SLOT(slotCurrentChanged(TQWidget*)));
 	setMainWidget(m_tw);
 
 	if (m_printer)
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 0684c3428..e2642e514 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -45,7 +45,7 @@ KPreviewProc::KPreviewProc()
 : TDEProcess()
 {
 	m_bOk = false;
-	connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
 }
 
 KPreviewProc::~KPreviewProc()
@@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
 	// create main view and actions
 	setMainWidget(d->mainwidget_);
 	if (previewOnly)
-		KStdAction::close(this, TQT_SLOT(reject()), d->actions_, "close_print");
+		KStdAction::close(this, TQ_SLOT(reject()), d->actions_, "close_print");
 	else
 	{
-		new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQT_SLOT(accept()), d->actions_, "continue_print");
-		new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQT_SLOT(reject()), d->actions_, "stop_print");
+		new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQ_SLOT(accept()), d->actions_, "continue_print");
+		new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(reject()), d->actions_, "stop_print");
 	}
 
 }
diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp
index 2b0c0f6f6..13ed3f7ca 100644
--- a/tdeprint/kprintprocess.cpp
+++ b/tdeprint/kprintprocess.cpp
@@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess()
 : KShellProcess()
 {
 	// redirect everything to a single buffer
-	connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
-	connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
-	connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) );
+	connect(this,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(this,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotExited( TDEProcess* ) ) );
 	m_state = None;
 }
 
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index bf61919c3..e70e85907 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -86,12 +86,12 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
 	slotTypeChanged(0);
 	m_block = false;
 
-	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotItemSelected(TQListViewItem*)));
-	connect(m_string, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_boolean, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-	connect(m_number, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
-	connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
-	connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
+	connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_string, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_boolean, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+	connect(m_number, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
+	connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
+	connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
 
 	resize(500,400);
 }
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 046f082f7..f207df9ee 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt)
 
 void KMLprManager::createPluginActions(TDEActionCollection *coll)
 {
-	TDEAction	*act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
+	TDEAction	*act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQ_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
 	act->setGroup("plugin");
 }
 
diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp
index 4d9820555..58a051370 100644
--- a/tdeprint/management/cjanuswidget.cpp
+++ b/tdeprint/management/cjanuswidget.cpp
@@ -143,7 +143,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name)
 	f = m_iconlist->font();
 	f.setBold(true);
 	m_iconlist->setFont(f);
-	connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*)));
+	connect(m_iconlist,TQ_SIGNAL(selectionChanged(TQListBoxItem*)),TQ_SLOT(slotSelected(TQListBoxItem*)));
 
 	m_empty = new TQWidget(this, "Empty");
 	m_stack->addWidget(m_empty,0);
diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index ea6efa753..132ca990c 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -94,7 +94,7 @@ int TDEIconSelectAction::plug(TQWidget* widget, int index)
 		bar->getButton(id)->setPopup(d->m_menu, true);
 		bar->setItemEnabled(id, isEnabled());
 		addContainer(bar, id);
-		connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed()));
+		connect(bar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotDestroyed()));
 
 		value = containerCount()-1;
 	}
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 1badc0ee1..18354839d 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -80,10 +80,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 	l3->addWidget(lab1, 0);
 	l3->addWidget(m_locationre, 1);
 
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
-	connect(m_list1, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
-	connect(m_list2, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked()));
+	connect(m_list1, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
+	connect(m_list2, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
 	m_add->setEnabled(false);
 	m_remove->setEnabled(false);
 }
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 943719534..7107bc74d 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -91,12 +91,12 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 			     "font path is used, so adding those directories is not needed. The default "
 			     "search path should be sufficient in most cases."));
 
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
-	connect(m_fontpath, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelected()));
-	connect(m_addpath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&)));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));
+	connect(m_fontpath, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelected()));
+	connect(m_addpath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged(const TQString&)));
 	m_add->setEnabled(false);
 	m_remove->setEnabled(false);
 	m_up->setEnabled(false);
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index bf5a74d6e..1b21dbca6 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -58,10 +58,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck");
 	m_testpage = new KURLRequester(m_testpagebox,"TestPage");
 	m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox);
-	connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool)));
-	connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool)));
-	connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview()));
-        connect(m_testpage->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(testPageChanged(const TQString & )));
+	connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),m_testpage,TQ_SLOT(setEnabled(bool)));
+	connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabledPreviewButton(bool)));
+	connect(m_preview,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestPagePreview()));
+        connect(m_testpage->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(testPageChanged(const TQString & )));
 	m_testpage->setDisabled(true);
 	m_preview->setDisabled(true);
 	m_defaulttestpage->setCursor(KCursor::handCursor());
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 556ec4652..b3c8aa39e 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -55,7 +55,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	l1->addWidget(m_useext);
 	l1->addWidget(m_program);
 
-	connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool)));
+	connect(m_useext, TQ_SIGNAL(toggled(bool)), m_program, TQ_SLOT(setEnabled(bool)));
 	m_program->setEnabled(false);
 }
 
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 6154ebea2..720b213a3 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name)
 	m_dlg = 0;
 	m_status = true;
 
-	connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
-	connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(&m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(&m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*)));
 }
 
 KMDBCreator::~KMDBCreator()
@@ -112,7 +112,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 			m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true);
 			m_dlg->setLabelText(i18n("Please wait while TDE rebuilds a driver database."));
 			m_dlg->setCaption(i18n("Driver Database"));
-			connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled()));
+			connect(m_dlg,TQ_SIGNAL(canceled()),TQ_SLOT(slotCancelled()));
 		}
 		m_dlg->setMinimumDuration(0);	// always show the dialog
 		m_dlg->setProgress(0);		// to force showing
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 5a172281b..80c44a5a8 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -47,7 +47,7 @@ KMDriverDB::KMDriverDB(TQObject *parent, const char *name)
 : TQObject(parent,name)
 {
 	m_creator = new KMDBCreator(this,"db-creator");
-	connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated()));
+	connect(m_creator,TQ_SIGNAL(dbCreated()),TQ_SLOT(slotDbCreated()));
 
 	m_entries.setAutoDelete(true);
 	m_pnpentries.setAutoDelete(true);
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index a6d3a6a72..c49af544a 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -74,19 +74,19 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 	sub2_->addWidget(m_other,0);
 
 	// build connections
-	connect(KMDriverDB::self(),TQT_SIGNAL(dbLoaded(bool)),TQT_SLOT(slotDbLoaded(bool)));
-	connect(KMDriverDB::self(), TQT_SIGNAL(error(const TQString&)), TQT_SLOT(slotError(const TQString&)));
-	connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),TQT_SLOT(slotManufacturerSelected(const TQString&)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_postscript,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_raw,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotPostscriptToggled(bool)));
-	connect(m_other,TQT_SIGNAL(clicked()),TQT_SLOT(slotOtherClicked()));
+	connect(KMDriverDB::self(),TQ_SIGNAL(dbLoaded(bool)),TQ_SLOT(slotDbLoaded(bool)));
+	connect(KMDriverDB::self(), TQ_SIGNAL(error(const TQString&)), TQ_SLOT(slotError(const TQString&)));
+	connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),TQ_SLOT(slotManufacturerSelected(const TQString&)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_postscript,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_raw,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotPostscriptToggled(bool)));
+	connect(m_other,TQ_SIGNAL(clicked()),TQ_SLOT(slotOtherClicked()));
 }
 
 KMDriverDbWidget::~KMDriverDbWidget()
@@ -240,7 +240,7 @@ void KMDriverDbWidget::slotOtherClicked()
 				if (driver)
 				{
 					m_external = filename;
-					disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&)));
+					disconnect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&)));
 					m_manu->clear();
 					m_model->clear();
 					TQString	s = driver->get("manufacturer");
@@ -264,7 +264,7 @@ void KMDriverDbWidget::slotOtherClicked()
 	else
 	{
 		m_external = TQString::null;
-		connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&)));
+		connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&)));
 		m_other->setText(i18n("Other"));
 		m_desc = TQString::null;
 		slotDbLoaded(true);
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 5cd37c948..bfc34570d 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -129,8 +129,8 @@ KMIconView::KMIconView(TQWidget *parent, const char *name)
 	m_items.setAutoDelete(false);
 	setViewMode(KMIconView::Big);
 
-	connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&)));
-	connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
+	connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&)));
+	connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
 }
 
 KMIconView::~KMIconView()
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 45030a587..411f86325 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -78,20 +78,20 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons
 	btn->setText(txt);
 	btn->setIconSet(BarIconSet(pixmap));
 	btn->setFlat(true);
-	connect(btn, TQT_SIGNAL(clicked()), receiver);
+	connect(btn, TQ_SIGNAL(clicked()), receiver);
 	m_buttons.append(btn);
 }
 
 void KMInstancePage::initActions()
 {
-	addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew()));
-	addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy()));
-	addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove()));
+	addButton(i18n("New..."), "document-new", TQ_SLOT(slotNew()));
+	addButton(i18n("Copy..."), "edit-copy", TQ_SLOT(slotCopy()));
+	addButton(i18n("Remove"), "edittrash", TQ_SLOT(slotRemove()));
 	m_buttons.append(0);
-	addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault()));
-	addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings()));
+	addButton(i18n("Set as Default"), "application-x-executable", TQ_SLOT(slotDefault()));
+	addButton(i18n("Settings"), "configure", TQ_SLOT(slotSettings()));
 	m_buttons.append(0);
-	addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest()));
+	addButton(i18n("Test..."), "document-print", TQ_SLOT(slotTest()));
 }
 
 void KMInstancePage::setPrinter(KMPrinter *p)
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index ba1e30204..c64f765a8 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -105,7 +105,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
 		resize( conf->readSizeEntry( "Size", &defSize ) );
 	}
 
-	connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated()));
+	connect(KMFactory::self()->manager(), TQ_SIGNAL(printerListUpdated()),TQ_SLOT(slotPrinterListUpdated()));
 }
 
 KMJobViewer::~KMJobViewer()
@@ -241,7 +241,7 @@ void KMJobViewer::init()
 		m_view->addColumn(i18n("Size (KB)"));
 		m_view->addColumn(i18n("Page(s)"));
 		m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter);
-		connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
+		connect( m_view, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
 		//m_view->addColumn(i18n("Printer"));
 		//m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter);
 		KMFactory::self()->uiManager()->setupJobViewer(m_view);
@@ -250,8 +250,8 @@ void KMJobViewer::init()
 		m_view->setSorting(0);
 		m_view->setAllColumnsShowFocus(true);
 		m_view->setSelectionMode(TQListView::Extended);
-		connect(m_view,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
-		connect(m_view,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int)));
+		connect(m_view,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
+		connect(m_view,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int)));
 		setCentralWidget(m_view);
 	}
 
@@ -261,26 +261,26 @@ void KMJobViewer::init()
 void KMJobViewer::initActions()
 {
 	// job actions
-	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQT_SLOT(slotHold()),actionCollection(),"job_hold");
-	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQT_SLOT(slotResume()),actionCollection(),"job_resume");
-	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
-	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
+	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQ_SLOT(slotHold()),actionCollection(),"job_hold");
+	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQ_SLOT(slotResume()),actionCollection(),"job_resume");
+	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQ_SLOT(slotRemove()),actionCollection(),"job_remove");
+	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQ_SLOT(slotRestart()),actionCollection(),"job_restart");
 	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move");
 	mact->setDelayed(false);
-	connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
-	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-	connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
-	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu()));
+	connect(mact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotMove(int)));
+	connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+	connect(mact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
+	connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowMoveMenu()));
 	TDEToggleAction	*tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
 	tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
-	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool)));
+	connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowCompleted(bool)));
 	TDEToggleAction	*uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs");
 	uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal"));
-	connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool)));
+	connect(uact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUserOnly(bool)));
 	m_userfield = new TQLineEdit(0);
 	m_userfield->setText(getenv("USER"));
-	connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged()));
-	connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool)));
+	connect(m_userfield, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotUserChanged()));
+	connect(uact, TQ_SIGNAL(toggled(bool)), m_userfield, TQ_SLOT(setEnabled(bool)));
 	m_userfield->setEnabled(false);
 	m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	KWidgetAction	*ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username");
@@ -288,8 +288,8 @@ void KMJobViewer::initActions()
 	if (!m_pop)
 	{
 		m_pop = new TQPopupMenu(this);
-		connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-		connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
+		connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+		connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
 		hact->plug(m_pop);
 		ract->plug(m_pop);
 		m_pop->insertSeparator();
@@ -302,10 +302,10 @@ void KMJobViewer::initActions()
 	// Filter actions
 	TDEActionMenu	*fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
 	fact->setDelayed(false);
-	connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
-	connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-	connect(fact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
-	connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowPrinterMenu()));
+	connect(fact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int)));
+	connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+	connect(fact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
+	connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowPrinterMenu()));
 
 	if (!m_standalone)
 	{
@@ -324,12 +324,12 @@ void KMJobViewer::initActions()
 	}
 	else
 	{// stand-alone application
-		KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection());
-		KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection());
-		KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
+		KStdAction::quit(kapp,TQ_SLOT(quit()),actionCollection());
+		KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection());
+		KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
 
 		// refresh action
-		new TDEAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
+		new TDEAction(i18n("Refresh"),"reload",0,this,TQ_SLOT(slotRefresh()),actionCollection(),"refresh");
 
 		// create status bar
 		KStatusBar	*statusbar = statusBar();
@@ -338,7 +338,7 @@ void KMJobViewer::initActions()
 		TDEConfig *conf = KMFactory::self()->printConfig();
 		conf->setGroup("Jobs");
 		m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false));
-		connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool)));
+		connect(m_stickybox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeepWindowChange(bool)));
 		statusbar->addWidget( m_stickybox, 1, false );
 		statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true);
 		statusbar->setItemFixed(0);
@@ -617,7 +617,7 @@ void KMJobViewer::loadPluginActions()
 	for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it)
 	{
 		// connect the action to this
-		connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int)));
+		connect((*it), TQ_SIGNAL(activated(int)), TQ_SLOT(pluginActionActivated(int)));
 
 		// should add it to the toolbar and menubar
 		(*it)->plug(toolBar(), toolbarindex++);
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 046112502..09c89d915 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -117,10 +117,10 @@ KMListView::KMListView(TQWidget *parent, const char *name)
 	setLineWidth(1);
 	setSorting(0);
 
-	connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int)));
-	connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
-	connect(this,TQT_SIGNAL(onItem(TQListViewItem*)),TQT_SLOT(slotOnItem(TQListViewItem*)));
-	connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport()));
+	connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int)));
+	connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
+	connect(this,TQ_SIGNAL(onItem(TQListViewItem*)),TQ_SLOT(slotOnItem(TQListViewItem*)));
+	connect(this,TQ_SIGNAL(onViewport()),TQ_SLOT(slotOnViewport()));
 
 	m_root = new KMListViewItem(this,i18n("Print System"));
 	m_root->setPixmap(0,SmallIcon("tdeprint_printer"));
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index c13c6930c..af03b68d7 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -111,12 +111,12 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection *
 	m_layout->addWidget(m_plugin, 0);
 
 	// connections
-	connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
-	connect(m_printerview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
-	connect(m_printerview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&)));
-	connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-	connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
-	connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect(KMTimer::self(),TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer()));
+	connect(m_printerview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&)));
+	connect(m_printerview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&)));
+	connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+	connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
+	connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
 	// actions
     if (coll)
@@ -179,57 +179,57 @@ void KMMainView::initActions()
 	iconlst << "view_icon" << "view_detailed" << "view_tree";
 	vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst);
 	vact->setCurrentItem(0);
-	connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int)));
+	connect(vact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeView(int)));
 
 	TDEActionMenu	*stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
-	stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
+	stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
+	stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
 
 	stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
-	stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
-
-	new TDEAction(i18n("&Remove"),"edittrash",0,this,TQT_SLOT(slotRemove()),m_actions,"printer_remove");
-	new TDEAction(i18n("&Configure..."),"configure",0,this,TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
-	new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQT_SLOT(slotAdd()),m_actions,"printer_add");
-	new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
-	new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
-	new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
-	new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQT_SLOT(slotTest()),m_actions,"printer_test");
-	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
-	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQT_SLOT(slotInit()),m_actions,"view_refresh");
+	stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
+	stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
+
+	new TDEAction(i18n("&Remove"),"edittrash",0,this,TQ_SLOT(slotRemove()),m_actions,"printer_remove");
+	new TDEAction(i18n("&Configure..."),"configure",0,this,TQ_SLOT(slotConfigure()),m_actions,"printer_configure");
+	new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQ_SLOT(slotAdd()),m_actions,"printer_add");
+	new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQ_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
+	new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQ_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
+	new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQ_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
+	new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQ_SLOT(slotTest()),m_actions,"printer_test");
+	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQ_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
+	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQ_SLOT(slotInit()),m_actions,"view_refresh");
 
 	TDEIconSelectAction	*dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
 	iconlst.clear();
 	iconlst << "view_top_bottom" << "view_left_right";
 	dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst);
 	dact->setCurrentItem(0);
-	connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
+	connect(dact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeDirection(int)));
 
-	new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
-	new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
-	new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
+	new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQ_SLOT(slotServerRestart()),m_actions,"server_restart");
+	new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigure()),m_actions,"server_configure");
+	new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
 
 	TDEToggleAction	*tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
 	tact->setCheckedState(i18n("Hide &Toolbar"));
-	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool)));
+	connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotToggleToolBar(bool)));
 	tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
 	tact->setCheckedState(i18n("Hide Me&nu Toolbar"));
-	connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) );
+	connect( tact, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggleMenuBar( bool ) ) );
 	tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
 	tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos"));
 	tact->setChecked(true);
-	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool)));
+	connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowPrinterInfos(bool)));
 
 	tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter");
 	tact->setChecked(KMManager::self()->isFilterEnabled());
-	connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
+	connect(tact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool)));
 
 	TDEActionMenu	*mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool");
 	mact->setDelayed(false);
-	connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
+	connect(mact->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotToolSelected(int)));
 	TQStringList	files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
 	for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
 	{
@@ -776,7 +776,7 @@ void KMMainView::reload()
 	loadPluginActions();
 
 	// redo the connection as the old manager object has been removed
-	connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
 	// We must delay the refresh such that all objects has been
 	// correctly reloaded (otherwise, crash in KMJobViewer).
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index ddd0ff631..c937d3875 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -39,12 +39,12 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
 	m_current = TQString();
 	m_listset = false;
 
-	connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
-	connect(m_listview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
-	connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&)));
-	connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&)));
-	connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
-	connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
+	connect(m_iconview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
+	connect(m_listview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
+	connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&)));
+	connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&)));
+	connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&)));
+	connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&)));
 
 	setViewType(m_type);
 	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp
index c94838098..b1a993893 100644
--- a/tdeprint/management/kmpropcontainer.cpp
+++ b/tdeprint/management/kmpropcontainer.cpp
@@ -53,9 +53,9 @@ void KMPropContainer::setWidget(KMPropWidget *w)
 	{
 		m_widget = w;
 		m_widget->reparent(this,TQPoint(0,0));
-		connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange()));
-		connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool)));
-		connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool)));
+		connect(m_button,TQ_SIGNAL(clicked()),m_widget,TQ_SLOT(slotChange()));
+		connect(m_widget,TQ_SIGNAL(enable(bool)),TQ_SIGNAL(enable(bool)));
+		connect(m_widget,TQ_SIGNAL(enableChange(bool)),TQ_SLOT(slotEnableChange(bool)));
 		TQVBoxLayout	*lay = dynamic_cast<TQVBoxLayout*>(layout());
 		if (lay)
 		{
diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp
index c38b399c6..eefa38372 100644
--- a/tdeprint/management/kmpropertypage.cpp
+++ b/tdeprint/management/kmpropertypage.cpp
@@ -55,7 +55,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w)
 		m_widgets.append(w);
 		KMPropContainer	*ctn = new KMPropContainer(this,"Container");
 		ctn->setWidget(w);
-		connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool)));
+		connect(ctn,TQ_SIGNAL(enable(bool)),TQ_SLOT(slotEnable(bool)));
 
 		TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 		                                                           w->pixmap(),
diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp
index 50c1a75e8..c38b4c186 100644
--- a/tdeprint/management/kmpropwidget.cpp
+++ b/tdeprint/management/kmpropwidget.cpp
@@ -34,7 +34,7 @@ KMPropWidget::KMPropWidget(TQWidget *parent, const char *name)
 	m_printer = 0;
 	m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement());
 
-	connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool)));
+	connect(this,TQ_SIGNAL(enable(bool)),this,TQ_SIGNAL(enableChange(bool)));
 }
 
 KMPropWidget::~KMPropWidget()
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 2a9e3b313..3f2a22a75 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -50,7 +50,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 
 	// widget creation
 	m_name = new TQLineEdit(dummy);
-	connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & )));
+	connect(m_name, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotTextChanged(const TQString & )));
 	m_description = new TQLineEdit(dummy);
 	m_location = new TQLineEdit(dummy);
 	TQLabel	*m_namelabel = new TQLabel(i18n("&Name:"), dummy);
@@ -92,10 +92,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	m_icon->setIcon("document-print");
 	m_icon->setFixedSize(TQSize(48,48));
 
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) );
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extension, TQT_SLOT( setEnabled( bool ) ) );
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQT_SLOT( setEnabled( bool ) ) );
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extensionlabel, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetype, TQ_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extension, TQ_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQ_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extensionlabel, TQ_SLOT( setEnabled( bool ) ) );
 	m_mimetypelabel->setEnabled( false );
 	m_mimetype->setEnabled( false );
 	m_extensionlabel->setEnabled( false );
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index a0b1aa78d..a8ef55ee0 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -37,7 +37,7 @@ KMTimer* KMTimer::self()
 KMTimer::KMTimer(TQObject *parent, const char *name)
 : TQTimer(parent, name), m_count(0)
 {
-	connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+	connect(this, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 }
 
 KMTimer::~KMTimer()
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index e04467632..e7ff0faff 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -46,8 +46,8 @@ KMWClass::KMWClass(TQWidget *parent, const char *name)
 	TQToolButton	*remove = new TQToolButton(this);
 	add->setIconSet(BarIcon("forward"));
 	remove->setIconSet(BarIcon("back"));
-	connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd()));
-	connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove()));
+	connect(add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAdd()));
+	connect(remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemove()));
 
 	TQLabel	*l1 = new TQLabel(i18n("Available printers:"), this);
 	TQLabel	*l2 = new TQLabel(i18n("Class printers:"), this);
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index cc52f1015..8d4e1e802 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -44,7 +44,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
 			 "you want to use. You will have the opportunity to test it as well as to "
 			 "change it if necessary.</p>"));
 	m_drivercomment = new KPushButton(i18n("Driver Information"), this);
-	connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment()));
+	connect(m_drivercomment, TQ_SIGNAL(clicked()), TQ_SLOT(slotDriverComment()));
 
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(l1,0);
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index b43d2f11d..dcc83d661 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 	lay3->addWidget(m_settings,0);
 	lay3->addStretch(1);
 
-	connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest()));
-	connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings()));
+	connect(m_test,TQ_SIGNAL(clicked()),TQ_SLOT(slotTest()));
+	connect(m_settings,TQ_SIGNAL(clicked()),TQ_SLOT(slotSettings()));
 }
 
 KMWDriverTest::~KMWDriverTest()
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index bc894c478..87f2e21f2 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -74,10 +74,10 @@ KMWizard::KMWizard(TQWidget *parent, const char *name)
 	KSeparator* sep2 = new KSeparator( KSeparator::HLine, this);
 	TQPushButton	*m_help = new KPushButton(KStdGuiItem::help(), this);
 
-	connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()));
-	connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext()));
-	connect(m_prev,TQT_SIGNAL(clicked()),TQT_SLOT(slotPrev()));
-	connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()));
+	connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()));
+	connect(m_next,TQ_SIGNAL(clicked()),TQ_SLOT(slotNext()));
+	connect(m_prev,TQ_SIGNAL(clicked()),TQ_SLOT(slotPrev()));
+	connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()));
 
 	m_side = new SidePixmap(this);
 	if (!m_side->isValid())
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index a3180000f..dce5fef41 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -50,10 +50,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
 	TQListViewItem	*root = new TQListViewItem(m_ports, i18n("Local System"));
 	root->setPixmap(0, SmallIcon("tdeprint_computer"));
 	root->setOpen(true);
-	connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*)));
+	connect(m_ports, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotPortSelected(TQListViewItem*)));
 	TQLabel	*l1 = new TQLabel(i18n("URI:"), this);
 	m_localuri = new TQLineEdit(this);
-	connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) );
+	connect( m_localuri, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) );
 	m_parents[0] = new TQListViewItem(root, i18n("Parallel"));
 	m_parents[1] = new TQListViewItem(root, m_parents[0], i18n("Serial"));
 	m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB"));
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 928d78173..f7340b71b 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -63,8 +63,8 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
 
 	m_login->setEnabled(false);
 	m_password->setEnabled(false);
-	connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool)));
-	connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool)));
+	connect(btn3,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setEnabled(bool)));
+	connect(btn3,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setEnabled(bool)));
 
 	// layout
 	TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 );
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index bff726cc4..94bffc2b8 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -67,10 +67,10 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
 	lay3->addWidget(m_scan);
 	lay3->addWidget(m_abort);
 
-	connect(m_scan,TQT_SIGNAL(clicked()),TQT_SLOT(slotScan()));
-	connect(m_abort,TQT_SIGNAL(clicked()),TQT_SLOT(slotAbort()));
-	connect(m_view,TQT_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&)));
-	connect(m_view,TQT_SIGNAL(running(bool)),m_abort,TQT_SLOT(setEnabled(bool)));
+	connect(m_scan,TQ_SIGNAL(clicked()),TQ_SLOT(slotScan()));
+	connect(m_abort,TQ_SIGNAL(clicked()),TQ_SLOT(slotAbort()));
+	connect(m_view,TQ_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&)));
+	connect(m_view,TQ_SIGNAL(running(bool)),m_abort,TQ_SLOT(setEnabled(bool)));
 }
 
 bool KMWSmb::isValid(TQString& msg)
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index a3fb71b3d..6692d8785 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -60,11 +60,11 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
 	KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	sep->setFixedHeight(40);
 
-	connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) );
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
+	connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*)));
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) );
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) );
 
 	// layout
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(this, 0, 10);
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 45983558c..1b0ecb183 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -252,29 +252,29 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l12->addWidget( m_commentlab );
 	l12->addWidget( m_comment );
 
-	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
-	connect(m_values, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotValueSelected(TQListViewItem*)));
-	connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
-	connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddValue()));
-	connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveValue()));
-	connect(m_apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyChanges()));
-	connect(m_addgrp, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup()));
-	connect(m_addopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddOption()));
-	connect(m_delopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveItem()));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
-	connect(m_command, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCommandChanged(const TQString&)));
-	connect(m_view, TQT_SIGNAL(itemRenamed(TQListViewItem*,int)), TQT_SLOT(slotOptionRenamed(TQListViewItem*,int)));
-	connect(m_desc, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_format, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_default, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_edit1, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_edit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
-	connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect( m_persistent, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) );
+	connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
+	connect(m_values, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotValueSelected(TQListViewItem*)));
+	connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
+	connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddValue()));
+	connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveValue()));
+	connect(m_apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyChanges()));
+	connect(m_addgrp, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup()));
+	connect(m_addopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddOption()));
+	connect(m_delopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveItem()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown()));
+	connect(m_command, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCommandChanged(const TQString&)));
+	connect(m_view, TQ_SIGNAL(itemRenamed(TQListViewItem*,int)), TQ_SLOT(slotOptionRenamed(TQListViewItem*,int)));
+	connect(m_desc, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_format, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_default, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_edit1, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_edit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
+	connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect( m_persistent, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) );
 	m_dummy->setEnabled(false);
 	viewItem(0);
 
@@ -910,14 +910,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	l8->addWidget(m_removereq);
 	l8->addStretch(1);
 
-	connect(m_addmime, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddMime()));
-	connect(m_removemime, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveMime()));
-	connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand()));
-	connect(m_requirements, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReqSelected(TQListViewItem*)));
-	connect(m_availablemime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotAvailableSelected(TQListBoxItem*)));
-	connect(m_selectedmime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotSelectedSelected(TQListBoxItem*)));
-	connect(m_addreq, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddReq()));
-	connect(m_removereq, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveReq()));
+	connect(m_addmime, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddMime()));
+	connect(m_removemime, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveMime()));
+	connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand()));
+	connect(m_requirements, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReqSelected(TQListViewItem*)));
+	connect(m_availablemime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotAvailableSelected(TQListBoxItem*)));
+	connect(m_selectedmime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotSelectedSelected(TQListBoxItem*)));
+	connect(m_addreq, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddReq()));
+	connect(m_removereq, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveReq()));
 
 	KMimeType::List	list = KMimeType::allMimeTypes();
 	for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it)
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index f94b51437..71ae148c3 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -44,19 +44,19 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 : TQWidget(parent, name)
 {
 	m_cmd = new TQComboBox(this);
-	connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int)));
+	connect(m_cmd, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCommandSelected(int)));
 	TQPushButton	*m_add = new KPushButton(this);
 	TQPushButton	*m_edit = new KPushButton(this);
 	m_add->setPixmap(SmallIcon("document-new"));
 	m_edit->setPixmap(SmallIcon("configure"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand()));
-	connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddCommand()));
+	connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand()));
 	TQToolTip::add(m_add, i18n("New command"));
 	TQToolTip::add(m_edit, i18n("Edit command"));
 	m_shortinfo = new TQLabel(this);
 	m_helpbtn = new KPushButton( this );
 	m_helpbtn->setIconSet( SmallIconSet( "help" ) );
-	connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) );
+	connect( m_helpbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHelpCommand() ) );
 	TQToolTip::add( m_helpbtn, i18n( "Information" ) );
         m_helpbtn->setEnabled( false );
 
@@ -71,14 +71,14 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 		m_line = new TQLineEdit(this);
 		m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this);
 		m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this);
-		connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse()));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_browse, TQT_SLOT(setDisabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_cmd, TQT_SLOT(setEnabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_add, TQT_SLOT(setEnabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_edit, TQT_SLOT(setEnabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_shortinfo, TQT_SLOT(setEnabled(bool)));
-		connect( m_usefilter, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotXmlCommandToggled( bool ) ) );
+		connect(m_browse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse()));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_line, TQ_SLOT(setDisabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_browse, TQ_SLOT(setDisabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_cmd, TQ_SLOT(setEnabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_add, TQ_SLOT(setEnabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_edit, TQ_SLOT(setEnabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_shortinfo, TQ_SLOT(setEnabled(bool)));
+		connect( m_usefilter, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotXmlCommandToggled( bool ) ) );
 		m_usefilter->setChecked(true);
 		m_usefilter->setChecked(false);
 		//setFocusProxy(m_line);
@@ -115,7 +115,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 	l3->addWidget(m_edit);
 
 	if ( dlg )
-		connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) );
+		connect( this, TQ_SIGNAL( commandValid( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) );
 
 	loadCommands();
 }
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index d97f66646..f9d7e585f 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -118,15 +118,15 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name )
 	l0->addWidget( d->settings, 3, 0 );
 	l0->addWidget( d->scan, 3, 1 );
 
-	connect( d->timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
-	connect( d->settings, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSettingsClicked() ) );
-	connect( d->scan, TQT_SIGNAL( clicked() ), TQT_SLOT( slotScanClicked() ) );
+	connect( d->timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
+	connect( d->settings, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSettingsClicked() ) );
+	connect( d->scan, TQ_SIGNAL( clicked() ), TQ_SLOT( slotScanClicked() ) );
 #ifdef USE_QSOCKET
-	connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) );
-	connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) );
+	connect( d->socket, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnectionSuccess() ) );
+	connect( d->socket, TQ_SIGNAL( error( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) );
 #else
-	connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) );
-	connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) );
+	connect( d->socket, TQ_SIGNAL( connectionSuccess() ), TQ_SLOT( slotConnectionSuccess() ) );
+	connect( d->socket, TQ_SIGNAL( connectionFailed( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) );
 #endif
 }
 
@@ -219,7 +219,7 @@ void NetworkScanner::next()
 	else
 	{
 		d->bar->setProgress( d->currentaddress );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( slotNext() ) );
 	}
 }
 
diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp
index 377a28217..3a19b6262 100644
--- a/tdeprint/management/pluginaction.cpp
+++ b/tdeprint/management/pluginaction.cpp
@@ -23,7 +23,7 @@
 PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name)
 : TDEAction(txt, icon, accel, parent, name), m_id(ID)
 {
-	connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated()));
+	connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActivated()));
 }
 
 void PluginAction::slotActivated()
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index f5977bfb0..0363c6338 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -52,9 +52,9 @@ SmbView::SmbView(TQWidget *parent, const char *name)
 	m_proc = new TDEProcess();
 	m_proc->setUseShell(true);
 	m_passwdFile = 0;
-	connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*)));
-	connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+	connect(m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*)));
+	connect(m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 }
 
 SmbView::~SmbView()
diff --git a/tdeprint/marginvaluewidget.cpp b/tdeprint/marginvaluewidget.cpp
index e4f1365c6..fc43b8bef 100644
--- a/tdeprint/marginvaluewidget.cpp
+++ b/tdeprint/marginvaluewidget.cpp
@@ -31,7 +31,7 @@ MarginValueWidget::MarginValueWidget(KNumInput *below, double value, TQWidget *p
 	m_margin = ( float )value;
 	setMode(m_mode);
 	setRange(0, 999, 1, false);
-	connect(this, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotValueChanged(double)));
+	connect(this, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotValueChanged(double)));
 }
 
 float MarginValueWidget::margin()
diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp
index f00b37b10..d46cd8e2f 100644
--- a/tdeprint/marginwidget.cpp
+++ b/tdeprint/marginwidget.cpp
@@ -169,25 +169,25 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU
 		m_units->insertItem( i18n( "Millimeters (mm)" ) );
 	}
 	m_units->setCurrentItem(0);
-	connect(m_units, TQT_SIGNAL(activated(int)), m_top, TQT_SLOT(setMode(int)));
-	connect(m_units, TQT_SIGNAL(activated(int)), m_bottom, TQT_SLOT(setMode(int)));
-	connect(m_units, TQT_SIGNAL(activated(int)), m_left, TQT_SLOT(setMode(int)));
-	connect(m_units, TQT_SIGNAL(activated(int)), m_right, TQT_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_top, TQ_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_bottom, TQ_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_left, TQ_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_right, TQ_SLOT(setMode(int)));
 	m_preview = new MarginPreview(this);
 	  TQWhatsThis::add(m_preview, whatsThisDragAndPreviewMarginWidget);
 	m_preview->setMinimumSize(60, 80);
 	m_preview->setPageSize(m_pagesize[ 0 ], m_pagesize[ 1 ]);
-	connect(m_preview, TQT_SIGNAL(marginChanged(int,float)), TQT_SLOT(slotMarginPreviewChanged(int,float)));
-	connect(m_top, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
-	connect(m_bottom, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
-	connect(m_left, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
-	connect(m_right, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
+	connect(m_preview, TQ_SIGNAL(marginChanged(int,float)), TQ_SLOT(slotMarginPreviewChanged(int,float)));
+	connect(m_top, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
+	connect(m_bottom, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
+	connect(m_left, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
+	connect(m_right, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
 	slotMarginValueChanged();
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), m_top, TQT_SLOT(setEnabled(bool)));
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), m_left, TQT_SLOT(setEnabled(bool)));
-	//connect(m_custom, TQT_SIGNAL(toggled(bool)), m_units, TQT_SLOT(setEnabled(bool)));
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCustomMarginsToggled(bool)));
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), m_preview, TQT_SLOT(enableRubberBand(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), m_top, TQ_SLOT(setEnabled(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), m_left, TQ_SLOT(setEnabled(bool)));
+	//connect(m_custom, TQ_SIGNAL(toggled(bool)), m_units, TQ_SLOT(setEnabled(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCustomMarginsToggled(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), m_preview, TQ_SLOT(enableRubberBand(bool)));
 	m_top->setEnabled(false);
 	m_bottom->setEnabled(false);
 	m_left->setEnabled(false);
@@ -237,8 +237,8 @@ void MarginWidget::setSymetricMargins(bool on)
 	m_right->setEnabled(on && m_custom->isChecked());
 	if (on)
 	{
-		connect(m_top, TQT_SIGNAL(marginChanged(float)), m_bottom, TQT_SLOT(setMargin(float)));
-		connect(m_left, TQT_SIGNAL(marginChanged(float)), m_right, TQT_SLOT(setMargin(float)));
+		connect(m_top, TQ_SIGNAL(marginChanged(float)), m_bottom, TQ_SLOT(setMargin(float)));
+		connect(m_left, TQ_SIGNAL(marginChanged(float)), m_right, TQ_SLOT(setMargin(float)));
 		m_bottom->setMargin(m_top->margin());
 		m_right->setMargin(m_left->margin());
 	}
diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp
index 7f642896e..ba3d69c8b 100644
--- a/tdeprint/messagewindow.cpp
+++ b/tdeprint/messagewindow.cpp
@@ -50,7 +50,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent,
 	if ( delay == 0 )
 		slotTimer();
 	else
-		TQTimer::singleShot( delay, this, TQT_SLOT( slotTimer() ) );
+		TQTimer::singleShot( delay, this, TQ_SLOT( slotTimer() ) );
 }
 
 MessageWindow::~MessageWindow()
diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp
index b2a686f6e..22383ff98 100644
--- a/tdeprint/plugincombobox.cpp
+++ b/tdeprint/plugincombobox.cpp
@@ -63,7 +63,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
 		m_pluginlist.append((*it).name);
 	}
 
-	connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+	connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 	configChanged();
 }
 
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index 99f2e6a2b..2f7109477 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -54,8 +54,8 @@ PosterPreview::~PosterPreview()
 void PosterPreview::init()
 {
 	m_process = new TDEProcess;
-	connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) );
-	connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
+	connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) );
+	connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
 
 	m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0;
 	m_dirty = false;
@@ -83,7 +83,7 @@ void PosterPreview::setDirty()
 	if ( !m_dirty )
 	{
 		m_dirty = true;
-		TQTimer::singleShot( 1, this, TQT_SLOT( updatePoster() ) );
+		TQTimer::singleShot( 1, this, TQ_SLOT( updatePoster() ) );
 	}
 }
 
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index 1ca19fecd..38f914faf 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -41,8 +41,8 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	m_hostlabel->setBuddy(m_proxyhost);
 	m_portlabel->setBuddy(m_proxyport);
 	
-	connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyhost,TQT_SLOT(setEnabled(bool)));
-	connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyport,TQT_SLOT(setEnabled(bool)));
+	connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyhost,TQ_SLOT(setEnabled(bool)));
+	connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyport,TQ_SLOT(setEnabled(bool)));
 	m_proxyhost->setEnabled(false);
 	m_proxyport->setEnabled(false);
 
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index 056cba1f0..1cb156342 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -63,7 +63,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
 	TQLabel	*m_queuelabel = new TQLabel(i18n("Queue:"), this);
 	m_hostlabel->setBuddy(m_host);
 	m_queuelabel->setBuddy(m_queue);
-	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
+	connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*)));
 
 	TQHBoxLayout	*lay0 = new TQHBoxLayout(this, 0, 10);
 	TQVBoxLayout	*lay1 = new TQVBoxLayout(0, 0, 5);
diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp
index 311950e02..602329f33 100644
--- a/tdeprint/tdefilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -107,38 +107,38 @@ KFileList::KFileList(TQWidget *parent, const char *name)
 	m_files->setSelectionMode(TQListView::Extended);
 	m_files->header()->setStretchEnabled(true, 2);
 	TQWhatsThis::add(m_files, whatsThisFileSelectionListview);
-	connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+	connect(m_files, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
 
 	m_add = new TQToolButton(this);
 	m_add->setIconSet(SmallIconSet("document-open"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFile()));
 	TQToolTip::add(m_add, i18n("Add file"));
 	TQWhatsThis::add(m_add, whatsThisAddFileButton);
 
 	m_remove = new TQToolButton(this);
 	m_remove->setIconSet(SmallIconSet("remove"));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFile()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFile()));
 	TQToolTip::add(m_remove, i18n("Remove file"));
 	TQWhatsThis::add(m_remove, whatsThisRemoveFileButton);
 	m_remove->setEnabled(false);
 
 	m_open = new TQToolButton(this);
 	m_open->setIconSet(SmallIconSet("filefind"));
-	connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile()));
+	connect(m_open, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenFile()));
 	TQToolTip::add(m_open, i18n("Open file"));
 	TQWhatsThis::add(m_open, whatsThisOpenFileButton);
 	m_open->setEnabled(false);
 
 	m_up = new TQToolButton(this);
 	m_up->setIconSet(SmallIconSet("go-up"));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp()));
 	TQToolTip::add(m_up, i18n("Move up"));
 	TQWhatsThis::add(m_up, whatsThisMoveFileUpButton);
 	m_up->setEnabled(false);
 
 	m_down = new TQToolButton(this);
 	m_down->setIconSet(SmallIconSet("go-down"));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));
 	TQToolTip::add(m_down, i18n("Move down"));
 	TQWhatsThis::add(m_down, whatsThisMoveFileDownButton);
 	m_down->setEnabled(false);
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 754f67c3c..c3e1e474c 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -78,7 +78,7 @@ StatusWindow::StatusWindow(int pid)
 	l0->addMultiCellWidget(m_label, 0, 0, 1, 2);
 	l0->addWidget(m_button, 1, 2);
 	l0->addMultiCellWidget(m_icon, 0, 1, 0, 0);
-	connect(m_button, TQT_SIGNAL(clicked()), TQT_SLOT(hide()));
+	connect(m_button, TQ_SIGNAL(clicked()), TQ_SLOT(hide()));
 	resize(200, 50);
 }
 
@@ -115,8 +115,8 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
 	TQString	command(cmd);
 	TQRegExp re( "\\$out\\{([^}]*)\\}" );
 
-	connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*)));
-	connect(proc,TQT_SIGNAL(printError(KPrintProcess*,const TQString&)),TQT_SLOT(slotPrintError(KPrintProcess*,const TQString&)));
+	connect(proc,TQ_SIGNAL(printTerminated(KPrintProcess*)),TQ_SLOT(slotPrintTerminated(KPrintProcess*)));
+	connect(proc,TQ_SIGNAL(printError(KPrintProcess*,const TQString&)),TQ_SLOT(slotPrintError(KPrintProcess*,const TQString&)));
 	proc->setCommand( command );
 	if ( re.search( command ) != -1 )
 	{
@@ -200,7 +200,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN
 			w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")"));
 		else
 			w->setCaption(i18n("Printing Status - %1").arg(appName));
-		connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed()));
+		connect(w, TQ_SIGNAL(destroyed()), TQ_SLOT(slotClosed()));
 		w->show();
 		m_windows.insert(pid, w);
 	}
@@ -242,7 +242,7 @@ TQString KDEPrintd::requestPassword( const TQString& user, const TQString& host,
 	req->transaction = callingDcopClient()->beginTransaction();
 	m_requestsPending.append( req );
 	if ( m_requestsPending.count() == 1 )
-		TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) );
 	return "::";
 }
 
@@ -291,7 +291,7 @@ void KDEPrintd::processRequest()
 
 	m_requestsPending.remove( ( unsigned int )0 );
 	if ( m_requestsPending.count() > 0 )
-		TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) );
 }
 
 void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, const TQString& host, int port )
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 3dce8cacc..8c44543d9 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -133,7 +133,7 @@ DrawView::DrawView()
     // Create a button group to contain all buttons
     bgroup = new TQButtonGroup( this );
     bgroup->resize( 200, 200 );
-    connect( bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateIt(int)) );
+    connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) );
 
     // Calculate the size for the radio buttons
     int maxwidth = 80;
@@ -164,7 +164,7 @@ DrawView::DrawView()
     print = new TQPushButton( "Print...", bgroup );
     print->resize( 80, 30 );
     print->move( maxwidth/2 - print->width()/2, maxindex*30+20 );
-    connect( print, TQT_SIGNAL(clicked()), TQT_SLOT(printIt()) );
+    connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) );
 
     bgroup->resize( maxwidth, print->y()+print->height()+10 );
 
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 2f172acc0..c9188c25f 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -48,26 +48,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
     browser = new TQTextBrowser( this );
     browser->mimeSourceFactory()->setFilePath( _path );
     browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    connect( browser, TQT_SIGNAL( textChanged() ),
-	     this, TQT_SLOT( textChanged() ) );
+    connect( browser, TQ_SIGNAL( textChanged() ),
+	     this, TQ_SLOT( textChanged() ) );
 
     setCentralWidget( browser );
 
     if ( !home_.isEmpty() )
 	browser->setSource( home_ );
 
-    connect( browser, TQT_SIGNAL( highlighted( const TQString&) ),
-	     statusBar(), TQT_SLOT( message( const TQString&)) );
+    connect( browser, TQ_SIGNAL( highlighted( const TQString&) ),
+	     statusBar(), TQ_SLOT( message( const TQString&)) );
 
     resize( 640,700 );
 
     TQPopupMenu* file = new TQPopupMenu( this );
-    file->insertItem( "&New Window", this, TQT_SLOT( newWindow() ), ALT | Key_N );
-    file->insertItem( "&Open File", this, TQT_SLOT( openFile() ), ALT | Key_O );
-    file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P );
+    file->insertItem( "&New Window", this, TQ_SLOT( newWindow() ), ALT | Key_N );
+    file->insertItem( "&Open File", this, TQ_SLOT( openFile() ), ALT | Key_O );
+    file->insertItem( "&Print", this, TQ_SLOT( print() ), ALT | Key_P );
     file->insertSeparator();
-    file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q );
-    file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X );
+    file->insertItem( "&Close", this, TQ_SLOT( close() ), ALT | Key_Q );
+    file->insertItem( "E&xit", tqApp, TQ_SLOT( closeAllWindows() ), ALT | Key_X );
 
     // The same three icons are used twice each.
     TQIconSet icon_back( TQPixmap("back.xpm") );
@@ -76,33 +76,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 
     TQPopupMenu* go = new TQPopupMenu( this );
     backwardId = go->insertItem( icon_back,
-				 "&Backward", browser, TQT_SLOT( backward() ),
+				 "&Backward", browser, TQ_SLOT( backward() ),
 				 ALT | Key_Left );
     forwardId = go->insertItem( icon_forward,
-				"&Forward", browser, TQT_SLOT( forward() ),
+				"&Forward", browser, TQ_SLOT( forward() ),
 				ALT | Key_Right );
-    go->insertItem( icon_home, "&Home", browser, TQT_SLOT( home() ) );
+    go->insertItem( icon_home, "&Home", browser, TQ_SLOT( home() ) );
 
     TQPopupMenu* help = new TQPopupMenu( this );
-    help->insertItem( "&About ...", this, TQT_SLOT( about() ) );
-    help->insertItem( "About &Qt ...", this, TQT_SLOT( aboutQt() ) );
+    help->insertItem( "&About ...", this, TQ_SLOT( about() ) );
+    help->insertItem( "About &Qt ...", this, TQ_SLOT( aboutQt() ) );
 
     hist = new TQPopupMenu( this );
     TQStringList::Iterator it = history.begin();
     for ( ; it != history.end(); ++it )
 	mHistory[ hist->insertItem( *it ) ] = *it;
-    connect( hist, TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( histChosen( int ) ) );
+    connect( hist, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( histChosen( int ) ) );
 
     bookm = new TQPopupMenu( this );
-    bookm->insertItem( tr( "Add Bookmark" ), this, TQT_SLOT( addBookmark() ) );
+    bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) );
     bookm->insertSeparator();
 
     TQStringList::Iterator it2 = bookmarks.begin();
     for ( ; it2 != bookmarks.end(); ++it2 )
 	mBookmarks[ bookm->insertItem( *it2 ) ] = *it2;
-    connect( bookm, TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( bookmChosen( int ) ) );
+    connect( bookm, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( bookmChosen( int ) ) );
 
     menuBar()->insertItem( tr("&File"), file );
     menuBar()->insertItem( tr("&Go"), go );
@@ -113,29 +113,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 
     menuBar()->setItemEnabled( forwardId, false);
     menuBar()->setItemEnabled( backwardId, false);
-    connect( browser, TQT_SIGNAL( backwardAvailable( bool ) ),
-	     this, TQT_SLOT( setBackwardAvailable( bool ) ) );
-    connect( browser, TQT_SIGNAL( forwardAvailable( bool ) ),
-	     this, TQT_SLOT( setForwardAvailable( bool ) ) );
+    connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ),
+	     this, TQ_SLOT( setBackwardAvailable( bool ) ) );
+    connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ),
+	     this, TQ_SLOT( setForwardAvailable( bool ) ) );
 
 
     TQToolBar* toolbar = new TQToolBar( this );
     addToolBar( toolbar, "Toolbar");
     TQToolButton* button;
 
-    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQT_SLOT(backward()), toolbar );
-    connect( browser, TQT_SIGNAL( backwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) );
+    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar );
+    connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) );
     button->setEnabled( false );
-    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQT_SLOT(forward()), toolbar );
-    connect( browser, TQT_SIGNAL( forwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) );
+    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar );
+    connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) );
     button->setEnabled( false );
-    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQT_SLOT(home()), toolbar );
+    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar );
 
     toolbar->addSeparator();
 
     pathCombo = new TQComboBox( true, toolbar );
-    connect( pathCombo, TQT_SIGNAL( activated( const TQString & ) ),
-	     this, TQT_SLOT( pathSelected( const TQString & ) ) );
+    connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ),
+	     this, TQ_SLOT( pathSelected( const TQString & ) ) );
     toolbar->setStretchableWidget( pathCombo );
     setRightJustification( true );
     setDockEnabled( DockLeft, false );
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index c91cd23a7..0405fafe3 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -34,8 +34,8 @@ int main( int argc, char ** argv )
     else
 	help->showMaximized();
 
-    TQObject::connect( &a, TQT_SIGNAL(lastWindowClosed()),
-                      &a, TQT_SLOT(quit()) );
+    TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()),
+                      &a, TQ_SLOT(quit()) );
 
     return a.exec();
 }
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index f1584bbe3..8ba04447a 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 {
 	m_hasoutput = false;
 
-	connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
+	connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
 
 	TQPushButton	*cleanbtn = new TQPushButton(this, "-c");
 	cleanbtn->setPixmap(DesktopIcon("application-x-executable"));
@@ -90,11 +90,11 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 	m_device->setFont(f);
 	m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this);
 
-	connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
+	connect(cleanbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(nozzlebtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(alignbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(inkbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(identbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
 
 	TQLabel	*printerlab = new TQLabel(i18n("Printer:"), this);
 	printerlab->setAlignment(AlignRight|AlignVCenter);