Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

33 files changed, 204 insertions, 204 deletions

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()