Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit d5688771d8a6837975be512ee37f61bad7dbd345)

10 files changed, 41 insertions, 41 deletions

diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index 608940574..08ec61911 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -41,7 +41,7 @@ public:
 };
 
 PortValidator::PortValidator(TQWidget *parent, const char *name)
-: TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name)
+: TQIntValidator(1, 65535, parent, name)
 {
 }
 
diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp
index a8ec8d425..e2b4423d0 100644
--- a/tdeprint/cups/kmwipp.cpp
+++ b/tdeprint/cups/kmwipp.cpp
@@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name)
 	m_ID = KMWizard::IPP;
 	m_title = i18n("Remote IPP server");
 	m_nextpage = KMWizard::IPPSelect;
-	lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) );
+	lineEdit( 1 )->setValidator( new TQIntValidator( this ) );
 
 	setInfo(i18n("<p>Enter the information concerning the remote IPP server "
 		     "owning the targeted printer. This wizard will poll the server "
diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp
index 4dd6966d3..c1a7a442a 100644
--- a/tdeprint/kmuimanager.cpp
+++ b/tdeprint/kmuimanager.cpp
@@ -144,7 +144,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg)
 		// retrieve the KPrinter object
 		KPrinter	*prt(0);
 		if (dlg->parent() && dlg->parent()->isA("KPrintDialog"))
-			prt = static_cast<KPrintDialog*>(TQT_TQWIDGET(dlg->parent()))->printer();
+			prt = static_cast<KPrintDialog*>(dlg->parent())->printer();
 
 		// add margin page
 		if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog )
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 849bd9f75..d6cf3a03b 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -489,7 +489,7 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages)
 	else
 	{
 		// more than one page.
-		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
+		TQTabWidget	*tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
 		if (!tabs)
 		{
 			// TQTabWidget doesn't exist. Create it and reparent all
@@ -822,7 +822,7 @@ void KPrintDialog::slotWizard()
 void KPrintDialog::reload()
 {
 	// remove printer dependent pages (usually from plugin)
-	TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
+	TQTabWidget	*tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
 	for (uint i=0; i<d->m_pages.count(); i++)
 		if (d->m_pages.at(i)->onlyRealPrinters())
 		{
@@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag )
 
 	if ( d->m_pages.count() > 1 )
 	{
-		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
+		TQTabWidget	*tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
 		tabs->setTabEnabled( d->m_pages.at( index ), flag );
 	}
 	else
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index e7d8f5728..0684c3428 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
 	// create main view and actions
 	setMainWidget(d->mainwidget_);
 	if (previewOnly)
-		KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
+		KStdAction::close(this, TQT_SLOT(reject()), d->actions_, "close_print");
 	else
 	{
-		new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
-		new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
+		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");
 	}
 
 }
@@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview()
 void KPrintPreview::initView(KLibFactory *factory)
 {
 	// load the component
-	d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart");
+	d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart");
 
 	// populate the toolbar
 	if (d->previewonly_)
@@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	conf->setGroup("General");
 	KLibFactory	*factory(0);
 	bool	externalPreview = conf->readBoolEntry("ExternalPreview", false);
-	TQWidget	*parentW = TQT_TQWIDGET(TQWidget::find(parentId));
+	TQWidget	*parentW = TQWidget::find(parentId);
 	TQString	exe;
 	if (!externalPreview && isPS && (factory = componentFactory()) != 0)
 	{
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 6511a8d61..ba1e30204 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -261,10 +261,10 @@ void KMJobViewer::init()
 void KMJobViewer::initActions()
 {
 	// job actions
-	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
-	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
-	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
-	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
+	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");
 	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)));
@@ -324,12 +324,12 @@ void KMJobViewer::initActions()
 	}
 	else
 	{// stand-alone application
-		KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection());
-		KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection());
-		KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
+		KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection());
+		KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection());
+		KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
 
 		// refresh action
-		new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
+		new TDEAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
 
 		// create status bar
 		KStatusBar	*statusbar = statusBar();
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 6b75edba6..c13c6930c 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -183,23 +183,23 @@ void KMMainView::initActions()
 
 	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,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
-	stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
+	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 = 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,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
-	stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
-
-	new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
-	new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
-	new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
-	new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
-	new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
-	new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
-	new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
-	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
-	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
+	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");
 
 	TDEIconSelectAction	*dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
 	iconlst.clear();
@@ -208,9 +208,9 @@ void KMMainView::initActions()
 	dact->setCurrentItem(0);
 	connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
 
-	new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
-	new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
-	new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
+	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");
 
 	TDEToggleAction	*tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
 	tact->setCheckedState(i18n("Hide &Toolbar"));
@@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID)
 		{
 			TQStringList	args;
 			args << m_current->device() << m_current->printerName();
-			KDialogBase	*dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args)));
+			KDialogBase	*dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args));
 			if (dlg)
 				dlg->exec();
 			delete dlg;
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index aa0648e6b..d97f66646 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name )
 	d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this );
 	d->timer = new TQTimer( this );
 #ifdef USE_QSOCKET
-	d->socket = new TQSocket( TQT_TQOBJECT(this) );
+	d->socket = new TQSocket( this );
 #else
 	d->socket = new KExtendedSocket();
 #endif
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index 984880190..1ca19fecd 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -37,7 +37,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	m_useproxy->setCursor(KCursor::handCursor());
 	m_proxyhost = new TQLineEdit(this);
 	m_proxyport = new TQLineEdit(this);
-	m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport)));
+	m_proxyport->setValidator(new TQIntValidator(m_proxyport));
 	m_hostlabel->setBuddy(m_proxyhost);
 	m_portlabel->setBuddy(m_proxyport);
 	
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index a3a395aaf..f1584bbe3 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -42,14 +42,14 @@ protected:
 	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
 	{
                Q_UNUSED(className);
-		KDialogBase	*dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
+		KDialogBase	*dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
 		EscpWidget	*w = new EscpWidget(dlg);
 		if (args.count() > 0)
 			w->setDevice(args[0]);
 		if (args.count() > 1)
 			w->setPrinterName(args[1]);
 		dlg->setMainWidget(w);
-		return TQT_TQOBJECT(dlg);
+		return dlg;
 	}
 };