Replaced various '#define' with actual strings - part 5

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

25 files changed, 40 insertions, 40 deletions

diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index f5c7781c2..e9ff1256d 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -109,7 +109,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
 	l1->addWidget(m_sep);
 	l1->addWidget(m_text);
 	TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 );
-	l1->addLayout( TQT_TQLAYOUT(l3) );
+	l1->addLayout( l3 );
 	l3->addWidget( m_loginlab, 1, 0 );
 	l3->addWidget( m_passwdlab, 2, 0 );
 	l3->addWidget( m_serverlab, 0, 0 );
diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp
index df2ea8793..a1fc7dd00 100644
--- a/tdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/portdialog.cpp
@@ -45,7 +45,7 @@ PortDialog::PortDialog(TQWidget *parent, const char *name)
 
 	TQVBoxLayout	*m1 = new TQVBoxLayout(dummy, 0, 10);
 	TQGridLayout	*m2 = new TQGridLayout(0, 3, 2, 0, 5);
-	m1->addLayout(TQT_TQLAYOUT(m2));
+	m1->addLayout(m2);
 	m2->addWidget(l1, 0, 0, TQt::AlignRight);
 	m2->addWidget(l2, 1, 0, TQt::AlignRight);
 	m2->addMultiCellWidget(usessl_, 2, 2, 0, 1);
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 6cabe17b6..47d2c7f32 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -44,7 +44,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	lay0->addWidget(m_dirbox);
 	lay0->addStretch(1);
-	TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10);
+	TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10);
 	lay1->addWidget(m_stddir);
 	lay1->addWidget(m_installdir);
 
diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp
index 42123375c..03271fa1c 100644
--- a/tdeprint/cups/kphpgl2page.cpp
+++ b/tdeprint/cups/kphpgl2page.cpp
@@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
 	l0->addWidget(box);
 	l0->addStretch(1);
 
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10);
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), 10);
 	l1->addWidget(m_blackplot);
 	l1->addWidget(m_fitplot);
 	l1->addWidget(m_penwidth);
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index ca21a1366..29be5bc0c 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -361,7 +361,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	l1->addWidget(m_gamma, 4, 0);
 	l1->addMultiCellWidget(m_preview, 0, 3, 1, 1);
 	l1->addWidget(defbtn, 4, 1);
-	TQVBoxLayout	*l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3);
+	TQVBoxLayout	*l2 = new TQVBoxLayout(sizebox->layout(), 3);
 	l2->addStretch(1);
 	l2->addWidget(lab);
 	l2->addWidget(m_sizetype);
diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp
index 3fecdd88a..9ad9d7cb5 100644
--- a/tdeprint/cups/kptextpage.cpp
+++ b/tdeprint/cups/kptextpage.cpp
@@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	l0->addWidget(formatbox, 0, 0);
 	l0->addWidget(prettybox, 0, 1);
 	l0->addMultiCellWidget(marginbox, 1, 1, 0, 1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5);
+	TQVBoxLayout	*l1 = new TQVBoxLayout(formatbox->layout(), 5);
 	l1->addWidget(m_cpi);
 	l1->addWidget(m_lpi);
 	l1->addWidget(sep);
 	l1->addWidget(m_columns);
-	TQGridLayout	*l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10);
+	TQGridLayout	*l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10);
 	l2->addWidget(off, 0, 0);
 	l2->addWidget(on, 1, 0);
 	l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1);
-	TQVBoxLayout	*l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10);
+	TQVBoxLayout	*l3 = new TQVBoxLayout(marginbox->layout(), 10);
 	l3->addWidget(m_margin);
 }
 
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index cb8057f66..a13900156 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -308,7 +308,7 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
 	setColumnLayout(0, TQt::Vertical );
 	layout()->setSpacing( KDialog::spacingHint() );
 	layout()->setMargin( KDialog::marginHint() );
-	TQVBoxLayout	*main_ = new TQVBoxLayout(TQT_TQLAYOUT(layout()), KDialog::marginHint());
+	TQVBoxLayout	*main_ = new TQVBoxLayout(layout(), KDialog::marginHint());
 	main_->addWidget(m_stack);
 
 	m_item = 0;
diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp
index c498477fd..0856cc012 100644
--- a/tdeprint/foomatic2loader.cpp
+++ b/tdeprint/foomatic2loader.cpp
@@ -53,7 +53,7 @@ bool Foomatic2Loader::readFromFile( const TQString& filename )
 	TQFile f( filename );
 	m_foodata.clear();
 	if ( f.open( IO_ReadOnly ) )
-		return read( TQT_TQIODEVICE(&f) );
+		return read( &f );
 	return false;
 }
 
@@ -63,7 +63,7 @@ bool Foomatic2Loader::readFromBuffer( const TQString& buffer )
 	TQBuffer d( buf );
 	m_foodata.clear();
 	if ( d.open( IO_ReadOnly ) )
-		return read( TQT_TQIODEVICE(&d) );
+		return read( &d );
 	return false;
 }
 
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index 2ffb66cee..0550a2861 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -221,7 +221,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	l1->setColStretch(1,1);
 	l1->addWidget(m_pagebox,0,0);
 	l1->addWidget(m_copybox,0,1);
-	TQVBoxLayout	*l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5);
+	TQVBoxLayout	*l3 = new TQVBoxLayout(m_pagebox->layout(), 5);
 	l3->addWidget(m_all);
 	l3->addWidget(m_current);
 	TQHBoxLayout	*l4 = new TQHBoxLayout(0, 0, 5);
diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp
index 16910b72a..1145c6f53 100644
--- a/tdeprint/kpgeneralpage.cpp
+++ b/tdeprint/kpgeneralpage.cpp
@@ -331,9 +331,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	TQGridLayout	*lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint());
 	TQGridLayout	*lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
 	lay0->addStretch(1);
-	lay0->addLayout(TQT_TQLAYOUT(lay1));
+	lay0->addLayout(lay1);
 	lay0->addStretch(1);
-	lay0->addLayout(TQT_TQLAYOUT(lay2));
+	lay0->addLayout(lay2);
 	lay0->addStretch(2);
 	lay1->addWidget(m_pagesizelabel, 0, 0);
 	lay1->addWidget(m_papertypelabel, 1, 0);
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 7a291f6df..fa20b17da 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -186,7 +186,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
 	TQFile	f(getPrintcapFileName());
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		KTextBuffer	t(TQT_TQIODEVICE(&f));
+		KTextBuffer	t(&f);
 		TQMap<TQString,TQString>	entry;
 
 		while (!t.eof())
@@ -247,7 +247,7 @@ void KMLpdUnixManager::parseEtcPrintersConf()
 	TQFile	f(getEtcPrintersConfName());
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		KTextBuffer	t(TQT_TQIODEVICE(&f));
+		KTextBuffer	t(&f);
 		TQMap<TQString,TQString>	entry;
 		TQString		default_printer;
 
@@ -297,7 +297,7 @@ void KMLpdUnixManager::parseEtcLpPrinters()
 		TQFile	f(it.current()->absFilePath() + "/configuration");
 		if (f.exists() && f.open(IO_ReadOnly))
 		{
-			KTextBuffer	t(TQT_TQIODEVICE(&f));
+			KTextBuffer	t(&f);
 			TQString		line, remote;
 			while (!t.eof())
 			{
@@ -358,7 +358,7 @@ void KMLpdUnixManager::parseSpoolInterface()
 		TQFile	f(it.current()->absFilePath());
 		if (f.exists() && f.open(IO_ReadOnly))
 		{
-			KTextBuffer	t(TQT_TQIODEVICE(&f));
+			KTextBuffer	t(&f);
 			TQString		line, remote;
 
 			while (!t.eof())
diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp
index 718ffca21..8a1e1ee9a 100644
--- a/tdeprint/lpr/printcapreader.cpp
+++ b/tdeprint/lpr/printcapreader.cpp
@@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f)
 {
     if (f->isOpen())
     {
-        m_stream.setDevice(TQT_TQIODEVICE(f));
+        m_stream.setDevice(f);
         m_buffer = TQString::null;
     }
 }
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 00607f755..3c82c8663 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(gb);
 	l0->addStretch(1);
-	TQVBoxLayout	*l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint());
 	l2->addWidget(lab);
 	l2->addWidget(sel);
 }
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 49c1e0dee..1badc0ee1 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -63,10 +63,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box, 1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(lab);
 	TQGridLayout	*l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint());
-	l1->addLayout(TQT_TQLAYOUT(l2));
+	l1->addLayout(l2);
 	l2->setRowStretch(0, 1);
 	l2->setRowStretch(3, 1);
 	l2->setColStretch(0, 1);
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index e4e50da8f..943719534 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	TQLabel	*lab0 = new TQLabel(i18n("Additional director&y:"), box2);
 	lab0->setBuddy(m_addpath);
 
-	TQVBoxLayout	*l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l0->addWidget(m_embedfonts);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint());
 	l1->addWidget(m_fontpath);
 	TQHBoxLayout	*l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	l1->addLayout(l2);
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index f08bdfe73..bf5a74d6e 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -76,10 +76,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	lay0->addWidget(m_testpagebox);
 	lay0->addWidget(m_statusbox);
 	lay0->addStretch(1);
-	TQVBoxLayout	*lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()),
+	TQVBoxLayout	*lay1 = new TQVBoxLayout(m_timerbox->layout(),
 		KDialog::spacingHint());
 	lay1->addWidget(m_timer);
-	TQVBoxLayout	*lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()),
+	TQVBoxLayout	*lay2 = new TQVBoxLayout(m_testpagebox->layout(),
 		KDialog::spacingHint());
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 0);
 	lay2->addWidget(m_defaulttestpage);
@@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	lay2->addLayout(lay3);
 	lay3->addStretch(1);
 	lay3->addWidget(m_preview);
-	TQVBoxLayout	*lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()),
+	TQVBoxLayout	*lay4 = new TQVBoxLayout(m_statusbox->layout(),
 		KDialog::spacingHint());
 	lay4->addWidget(m_statusmsg);
 	lay4->addWidget(m_uselast);
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 06915230a..39b783d48 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box, 0);
 	l0->addStretch(1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(m_limit);
 }
 
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index d8a73b3e9..556ec4652 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -50,7 +50,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box);
 	l0->addStretch(1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(lab);
 	l1->addWidget(m_useext);
 	l1->addWidget(m_program);
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 7223dbcd3..a6d3a6a72 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -62,7 +62,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	TQGridLayout	*sub1_ = new TQGridLayout(0, 2, 3, 0, 0);
 	TQHBoxLayout	*sub2_ = new TQHBoxLayout(0, 0, 10);
-	main_->addLayout(TQT_TQLAYOUT(sub1_));
+	main_->addLayout(sub1_);
 	main_->addLayout(sub2_);
 	main_->addWidget(m_raw);
 	sub1_->addWidget(l1,0,0);
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 5db68ad42..2a9e3b313 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -125,7 +125,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	// layout creation
 	TQVBoxLayout	*l0 = new TQVBoxLayout(dummy, 0, 10);
 	TQGridLayout	*l1 = new TQGridLayout(0, 3, 3, 0, 5);
-	l0->addLayout(TQT_TQLAYOUT(l1));
+	l0->addLayout(l1);
 	l1->setColStretch(2,1);
 	l1->addColSpacing(0,60);
 	l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter);
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 00409c97f..b43d2f11d 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -65,7 +65,7 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 	TQGridLayout	*lay2 = new TQGridLayout(0, 3, 3, 0, 0);
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 10);
 	lay1->addWidget(l0,0);
-	lay1->addLayout(TQT_TQLAYOUT(lay2),0);
+	lay1->addLayout(lay2,0);
 	lay1->addLayout(lay3,0);
 	lay1->addStretch(1);
 	lay2->setColStretch(2,1);
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 3cd71aadd..928d78173 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
 	main_->addSpacing( 10 );
 	main_->addWidget( m_btngroup );
 	TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 );
-	main_->addLayout( TQT_TQLAYOUT(l1) );
+	main_->addLayout( l1 );
 	main_->addStretch( 1 );
 	l1->setColSpacing( 0, 35 );
 	l1->setColStretch( 2, 1 );
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index 44b2f493c..bff726cc4 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -51,7 +51,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
 	TQVBoxLayout	*lay0 = new TQVBoxLayout(this, 0, 10);
 	TQGridLayout	*lay1 = new TQGridLayout(0, 3, 2, 0, 10);
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 10);
-	lay0->addLayout(TQT_TQLAYOUT(lay1),0);
+	lay0->addLayout(lay1,0);
 	lay0->addWidget(m_view,1);
 	lay0->addLayout(lay3,0);
 	lay0->addSpacing(10);
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 5f6b6032d..45983558c 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -184,7 +184,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	TQHBoxLayout	*l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	TQGridLayout	*l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
 	l2->addLayout(l0, 1);
-	l0->addLayout(TQT_TQLAYOUT(l10));
+	l0->addLayout(l10);
 	l10->addMultiCellWidget(m_view, 0, 0, 0, 1);
 	l10->addWidget(gb_input, 1, 0);
 	l10->addWidget(gb_output, 1, 1);
@@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l9->addWidget(m_outputfile, 0, 1);
 	l9->addWidget(m_outputpipe, 1, 1);
 
-	TQVBoxLayout	*l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()));
+	TQVBoxLayout	*l11 = new TQVBoxLayout(gb->layout());
 	l11->addWidget(m_stack);
 
 	TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 );
@@ -877,7 +877,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 
 	TQVBoxLayout	*l0 = new TQVBoxLayout(topmain, 0, 10);
 	TQGridLayout	*l5 = new TQGridLayout(0, 2, 2, 0, 5);
-	l0->addLayout(TQT_TQLAYOUT(l5));
+	l0->addLayout(l5);
 	l5->addWidget(m_idnamelab, 0, 0);
 	l5->addWidget(m_idname, 0, 1);
 	l5->addWidget(m_desclab, 1, 0);
@@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	l6->addWidget(m_mimetypelab, 0);
 	l6->addWidget(m_mimetype, 1);
 	l7->addWidget(m_gb1);
-	TQGridLayout	*l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10);
+	TQGridLayout	*l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10);
 	l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2);
 	l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0);
 	l2->addWidget(m_addmime, 1, 1);
 	l2->addWidget(m_removemime, 2, 1);
 	l2->setRowStretch(0, 1);
 	l2->setRowStretch(3, 1);
-	TQHBoxLayout	*l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10);
+	TQHBoxLayout	*l4 = new TQHBoxLayout(m_gb2->layout(), 10);
 	l4->addWidget(m_requirements);
 	TQVBoxLayout	*l8 = new TQVBoxLayout(0, 0, 0);
 	l4->addLayout(l8);
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 135904231..f94b51437 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -99,7 +99,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 
 	TQGridLayout	*l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5);
 	int	c(0);
-	l0->addLayout(TQT_TQLAYOUT(l2));
+	l0->addLayout(l2);
 	if (m_usefilter)
 	{
 		l2->addWidget(m_usefilter, 0, c++);