Rename a number of old tq methods that are no longer tq specific

44 files changed, 85 insertions, 85 deletions

diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp
index 92ea782e5..9798a2228 100644
--- a/tdeprint/management/cjanuswidget.cpp
+++ b/tdeprint/management/cjanuswidget.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <klistbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kseparator.h>
 
 class CJanusWidget::CPage
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 32fb7db11..1f27483cf 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kdialog.h>
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index 3bd89a751..c269f1e35 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -29,7 +29,7 @@
 #include "kmconfigfonts.h"
 #include "kmconfigjobs.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kconfig.h>
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 29d5107e0..09413b6fc 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -24,7 +24,7 @@
 #include <tqgroupbox.h>
 #include <tqlineedit.h>
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
 
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 183d0b621..a11e137d2 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -21,7 +21,7 @@
 
 #include <tqgroupbox.h>
 #include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index 40d187c3c..1ab5456d8 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -19,7 +19,7 @@
 
 #include "kmconfiggeneral.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 1088e1b3a..638839e74 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -20,7 +20,7 @@
 #include "kmconfigjobs.h"
 
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <knuminput.h>
 #include <klocale.h>
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index cd777ec7a..c7f1c565a 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -20,7 +20,7 @@
 #include "kmconfigpreview.h"
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 1a89d0a8e..3fab5929e 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -109,7 +109,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 	{
 		if (!m_dlg)
 		{
-			m_dlg = new TQProgressDialog(parent->tqtopLevelWidget(),"progress-dialog",true);
+			m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true);
 			m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database."));
 			m_dlg->setCaption(i18n("Driver Database"));
 			connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled()));
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 6fbab45ec..906338b52 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
@@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
 TQString KMDriverDB::dbFile()
 {
 	// this calls insure missing directories creation
-	TQString	filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
+	TQString	filename = locateLocal("data",TQString::fromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
 	return filename;
 }
 
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index e9c490206..8fadc8146 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -29,7 +29,7 @@
 #include <kcursor.h>
 #include <tqapplication.h>
 #include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstrlist.h>
 
@@ -105,7 +105,7 @@ void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model)
 			// try by stripping the manufacturer name from
 			// the beginning of the model string. This is
 			// often the case with PPD files
-			item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1("")));
+			item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1("")));
 		if (item)
 			m_model->setCurrentItem(item);
 	}
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 905f4d248..0978c0782 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -99,7 +99,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 			setText(TQString::null);
 			setText(p->name());
 		}
-		setKey(TQString::tqfromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
+		setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
 		m_isclass = p->isClass(false);
 	}
 	if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap))
@@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 			setPixmap(SmallIcon(m_pixmap, 0, iconstate));
 	}
 	//if (update)
-	//	tqrepaint();
+	//	repaint();
 	setDiscarded(false);
 }
 
@@ -180,7 +180,7 @@ void KMIconView::setPrinterList(TQPtrList<KMPrinter> *list)
 	}
 
 	for (uint i=0; i<m_items.count(); i++)
-		if (m_items.tqat(i)->isDiscarded())
+		if (m_items.at(i)->isDiscarded())
 		{
 			delete m_items.take(i);
 			i--;
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index 2c3e7a2fa..449f71d47 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqpixmap.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
@@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
 	}
 	else
 	{
-		m_title->setText(TQString::tqfromLatin1("<b>%1</b>").arg(p->name()));
+		m_title->setText(TQString::fromLatin1("<b>%1</b>").arg(p->name()));
 		m_titlepixmap->setPixmap(SmallIcon(p->pixmap()));
 		if (p->isImplicit()) m_type->setText(i18n("Implicit class"));
 		else if (p->isClass(false))
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 25c037516..b571881c0 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -26,7 +26,7 @@
 #include "kprinter.h"
 #include "kmtimer.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 9fca665a7..465e31dd3 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -46,7 +46,7 @@
 #include <twin.h>
 #include <kio/netaccess.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <stdlib.h>
 #include <tqlineedit.h>
 #include <kdialogbase.h>
@@ -398,7 +398,7 @@ void KMJobViewer::updateJobs()
 	}
 
 	for (uint i=0; i<m_items.count(); i++)
-		if (m_items.tqat(i)->isDiscarded())
+		if (m_items.at(i)->isDiscarded())
 		{
 			delete m_items.take(i);
 			i--;
@@ -510,7 +510,7 @@ void KMJobViewer::slotMove(int prID)
 {
 	if (prID >= 0 && prID < (int)(m_printers.count()))
 	{
-		KMPrinter	*p = m_printers.tqat(prID);
+		KMPrinter	*p = m_printers.at(prID);
 		send(KMJob::Move,i18n("Move to %1").arg(p->printerName()),p->printerName());
 	}
 }
@@ -540,7 +540,7 @@ void KMJobViewer::slotPrinterSelected(int prID)
 {
 	if (prID >= 0 && prID < (int)(m_printers.count()+1))
 	{
-		TQString	prname = (prID == 0 ? i18n("All Printers") : m_printers.tqat(prID-1)->printerName());
+		TQString	prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName());
 		emit printerChanged(this, prname);
 	}
 }
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 4332a8678..4bddf9203 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -89,7 +89,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
 	}
 	setDiscarded(false);
 	if (update)
-		tqrepaint();
+		repaint();
 }
 
 void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a)
@@ -216,7 +216,7 @@ void KMListView::setPrinterList(TQPtrList<KMPrinter> *list)
 	TQPtrList<KMListViewItem>	deleteList;
 	deleteList.setAutoDelete(true);
 	for (uint i=0; i<m_items.count(); i++)
-		if (m_items.tqat(i)->isDiscarded())
+		if (m_items.at(i)->isDiscarded())
 		{
 			// instance items are put in front of the list
 			// so that they are destroyed first
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index f5f905af3..cd58ff3ce 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -40,7 +40,7 @@
 #include <tqtimer.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <kmessagebox.h>
 #include <kaction.h>
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index 59911ff34..290309c70 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -24,7 +24,7 @@
 #include "kmtimer.h"
 #include "kmmanager.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <kaction.h>
 #include <klocale.h>
diff --git a/tdeprint/management/kmpropbackend.cpp b/tdeprint/management/kmpropbackend.cpp
index 98004d2ed..4ebfc9e80 100644
--- a/tdeprint/management/kmpropbackend.cpp
+++ b/tdeprint/management/kmpropbackend.cpp
@@ -22,7 +22,7 @@
 #include "kmwizard.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp
index 9c7808199..123ab0a3e 100644
--- a/tdeprint/management/kmpropcontainer.cpp
+++ b/tdeprint/management/kmpropcontainer.cpp
@@ -21,7 +21,7 @@
 #include "kmpropwidget.h"
 
 #include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kseparator.h>
 #include <kguiitem.h>
diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp
index 55daf0ed5..bddbd7271 100644
--- a/tdeprint/management/kmpropdriver.cpp
+++ b/tdeprint/management/kmpropdriver.cpp
@@ -22,7 +22,7 @@
 #include "kmwizard.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmpropgeneral.cpp b/tdeprint/management/kmpropgeneral.cpp
index c55603da9..0a7bab776 100644
--- a/tdeprint/management/kmpropgeneral.cpp
+++ b/tdeprint/management/kmpropgeneral.cpp
@@ -24,7 +24,7 @@
 #include "kmmanager.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp
index 4efbcf547..3d8999436 100644
--- a/tdeprint/management/kmpropmembers.cpp
+++ b/tdeprint/management/kmpropmembers.cpp
@@ -21,15 +21,15 @@
 #include "kmprinter.h"
 #include "kmwizard.h"
 
-#include <tqtextview.h>
-#include <tqlayout.h>
+#include <textview.h>
+#include <layout.h>
 #include <klocale.h>
 
 KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
 {
 	m_members = new TQTextView(this);
-	m_members->setPaper(tqcolorGroup().background());
+	m_members->setPaper(colorGroup().background());
 	m_members->setFrameStyle(TQFrame::NoFrame);
 
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 10, 0);
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 6569f3f83..d4dbc97e6 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqgroupbox.h>
 #include <klocale.h>
@@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	l0->addWidget(sep);
 	l0->addWidget(m_gb);
 	l0->addWidget(m_outfile_gb);
-	TQGridLayout	*l6 = new TQGridLayout(m_outfile_gb->tqlayout(), 3, 2, 10);
+	TQGridLayout	*l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10);
 	l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 );
 	l6->addWidget(m_mimetypelabel, 1, 0);
 	l6->addWidget(m_mimetype, 1, 1);
diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp
index e39b52f8d..17c519435 100644
--- a/tdeprint/management/kmwbackend.cpp
+++ b/tdeprint/management/kmwbackend.cpp
@@ -21,7 +21,7 @@
 #include "kmwizard.h"
 #include "kmprinter.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -102,7 +102,7 @@ void KMWBackend::updatePrinter(KMPrinter *p)
 	else p->setType(KMPrinter::Printer);
 	p->setOption("kde-backend",TQString::number(ID));
 	TQString	s = m_buttons->selected()->text();
-	s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1(""));
+	s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1(""));
 	p->setOption("kde-backend-description",s);
 	setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error));
 }
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index a87388a6f..0232c42dd 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -23,7 +23,7 @@
 #include "kmmanager.h"
 #include "kmprinter.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <klistbox.h>
diff --git a/tdeprint/management/kmwdriver.cpp b/tdeprint/management/kmwdriver.cpp
index 58793c192..1a6720224 100644
--- a/tdeprint/management/kmwdriver.cpp
+++ b/tdeprint/management/kmwdriver.cpp
@@ -23,7 +23,7 @@
 #include "kmdriverdbwidget.h"
 #include "kmdriverdb.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 KMWDriver::KMWDriver(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index e3d253660..fbfe2c4a0 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -24,7 +24,7 @@
 #include "kmdriverdb.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kpushbutton.h>
 #include <klistbox.h>
 #include <klocale.h>
@@ -93,7 +93,7 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p)
 	int	index = m_list->currentItem();
 	if (m_entries && index >= 0 && index < (int)(m_entries->count()))
 	{
-		KMDBEntry	*entry = m_entries->tqat(index);
+		KMDBEntry	*entry = m_entries->at(index);
 		p->setDbEntry(entry);
 		p->setDriverInfo(entry->description);
 	}
@@ -107,8 +107,8 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p)
 void KMWDriverSelect::slotDriverComment()
 {
 	int	index = m_list->currentItem();
-	if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->tqat(index)->drivercomment.isEmpty())
-		KMessageBox::information(this, m_entries->tqat(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink);
+	if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->at(index)->drivercomment.isEmpty())
+		KMessageBox::information(this, m_entries->at(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink);
 	else
 		KMessageBox::error(this, i18n("No information about the selected driver."));
 }
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 545d3b94d..baa30a23a 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -27,7 +27,7 @@
 
 #include <tqlabel.h>
 #include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp
index 54294fb13..7daa793c0 100644
--- a/tdeprint/management/kmwend.cpp
+++ b/tdeprint/management/kmwend.cpp
@@ -22,9 +22,9 @@
 #include "kmwizard.h"
 #include "util.h"
 
-#include <tqtextview.h>
+#include <textview.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 KMWEnd::KMWEnd(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
@@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name)
 void KMWEnd::initPrinter(KMPrinter *p)
 {
 	TQString	txt;
-	TQString	s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>"));
+	TQString	s(TQString::fromLatin1("<li><u>%1</u>: %2</li>"));
 	int	ID = p->option("kde-backend").toInt();
 
 	// general information
-	txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General")));
+	txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General")));
 	txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description")));
 	txt.append(s.arg(i18n("Name")).arg(p->name()));
 	txt.append(s.arg(i18n("Location")).arg(p->location()));
@@ -56,9 +56,9 @@ void KMWEnd::initPrinter(KMPrinter *p)
 	if (ID == KMWizard::Class)
 	{
 		// class members
-		txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
+		txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
 		TQStringList	m(p->members());
-		TQString		s1(TQString::tqfromLatin1("<li>%1</li>"));
+		TQString		s1(TQString::fromLatin1("<li>%1</li>"));
 		for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it)
 			txt.append(s1.arg(*it));
 		txt.append("</ul><br>");
@@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
 	else
 	{
 		// backend information
-		txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend")));
+		txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend")));
 		KURL url ( p->device() );
 		switch (ID)
 		{
@@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
 		if (p->option("kde-driver") == "raw" || p->driver())
 		{
 			// driver information
-			txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver")));
+			txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver")));
 			if (p->option("kde-driver") == "raw")
 				txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer")));
 			else
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index 32da27c03..98969df67 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -22,7 +22,7 @@
 #include "kmprinter.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kurlrequester.h>
 #include <klocale.h>
@@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg)
 
 void KMWFile::updatePrinter(KMPrinter *p)
 {
-	TQString	dev = TQString::tqfromLatin1("file:%1").arg(m_url->url());
+	TQString	dev = TQString::fromLatin1("file:%1").arg(m_url->url());
 	p->setDevice(dev);
 }
diff --git a/tdeprint/management/kmwinfobase.cpp b/tdeprint/management/kmwinfobase.cpp
index 993576334..fbe1d2b02 100644
--- a/tdeprint/management/kmwinfobase.cpp
+++ b/tdeprint/management/kmwinfobase.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 KMWInfoBase::KMWInfoBase(int n, TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
@@ -56,19 +56,19 @@ void KMWInfoBase::setInfo(const TQString& s)
 void KMWInfoBase::setLabel(int i, const TQString& s)
 {
 	if (i >= 0 && i < m_nlines)
-		m_labels.tqat(i)->setText(s);
+		m_labels.at(i)->setText(s);
 }
 
 void KMWInfoBase::setText(int i, const TQString& s)
 {
 	if (i >= 0 && i < m_nlines)
-		m_edits.tqat(i)->setText(s);
+		m_edits.at(i)->setText(s);
 }
 
 TQString KMWInfoBase::text(int i)
 {
 	if (i >= 0 && i < m_nlines)
-		return m_edits.tqat(i)->text();
+		return m_edits.at(i)->text();
 	return TQString::null;
 }
 
@@ -76,15 +76,15 @@ void KMWInfoBase::setCurrent(int i)
 {
 	if (i >= 0 && i < m_nlines)
 	{
-		m_edits.tqat(i)->selectAll();
-		m_edits.tqat(i)->setFocus();
+		m_edits.at(i)->selectAll();
+		m_edits.at(i)->setFocus();
 	}
 }
 
 TQLineEdit* KMWInfoBase::lineEdit( int i )
 {
 	if ( i >= 0 && i < m_nlines )
-		return m_edits.tqat( i );
+		return m_edits.at( i );
 	else
 		return NULL;
 }
diff --git a/tdeprint/management/kmwinfopage.cpp b/tdeprint/management/kmwinfopage.cpp
index 1e9652e93..7a23dd6f9 100644
--- a/tdeprint/management/kmwinfopage.cpp
+++ b/tdeprint/management/kmwinfopage.cpp
@@ -21,7 +21,7 @@
 #include "kmwizard.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kactivelabel.h>
 
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 5dc915572..38aac1cee 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqwidgetstack.h>
 #include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kseparator.h>
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index 7b56b2deb..49ab109c5 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -24,7 +24,7 @@
 #include "kmmanager.h"
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqheader.h>
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index cce4c7b5a..352a075c5 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg)
 
 void KMWLpd::updatePrinter(KMPrinter *p)
 {
-	QString	dev = TQString::tqfromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
+	QString	dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
 	p->setDevice(dev);
 }
 
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 40dc105d5..8021aecf6 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kcursor.h>
 
@@ -121,7 +121,7 @@ void KMWPassword::updatePrinter(KMPrinter *p)
 			p->setOption( "kde-password", TQString::null );
 			break;
 		case 1:
-			p->setOption( "kde-login", TQString::tqfromLatin1( "guest" ) );
+			p->setOption( "kde-login", TQString::fromLatin1( "guest" ) );
 			p->setOption( "kde-password", TQString::null );
 			break;
 		case 2:
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index e76240cf8..3056ae962 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -25,7 +25,7 @@
 
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index 98aad76a5..4d7468e70 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -27,7 +27,7 @@
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
@@ -88,7 +88,7 @@ KMWSocket::~KMWSocket()
 
 void KMWSocket::updatePrinter(KMPrinter *p)
 {
-	TQString	dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
+	TQString	dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
 	p->setDevice(dev);
 }
 
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 7b77d1d82..11c9a9fdd 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 #include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
@@ -53,7 +53,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
 	TQLabel	*portlabel = new TQLabel(i18n("&Port:"),dummy);
 	TQLabel	*toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
 	TQLineEdit	*mm = new TQLineEdit(dummy);
-	mm->setText(TQString::tqfromLatin1(".[0-255]"));
+	mm->setText(TQString::fromLatin1(".[0-255]"));
 	mm->setReadOnly(true);
 	mm->setFixedWidth(fontMetrics().width(mm->text())+10);
 
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 3b42b71d7..38cbfe44b 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -21,7 +21,7 @@
 #include "driver.h"
 #include "kxmlcommand.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -52,8 +52,8 @@
 TQString generateId(const TQMap<TQString, DrBase*>& map)
 {
 	int	index(-1);
-	while (map.contains(TQString::tqfromLatin1("item%1").arg(++index))) ;
-	return TQString::tqfromLatin1("item%1").arg(index);
+	while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ;
+	return TQString::fromLatin1("item%1").arg(index);
 }
 
 TQListViewItem* findPrev(TQListViewItem *item)
@@ -230,9 +230,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l5->addWidget(m_edit1, 0, 1);
 	l5->addWidget(m_edit2, 1, 1);
 
-	TQGridLayout	*l8 = new TQGridLayout(gb_input->tqlayout(), 2, 2,
+	TQGridLayout	*l8 = new TQGridLayout(gb_input->layout(), 2, 2,
 		KDialog::spacingHint());
-	TQGridLayout	*l9 = new TQGridLayout(gb_output->tqlayout(), 2, 2,
+	TQGridLayout	*l9 = new TQGridLayout(gb_output->layout(), 2, 2,
 		KDialog::spacingHint());
 	l8->addWidget(m_inputfilelab, 0, 0);
 	l8->addWidget(m_inputpipelab, 1, 0);
@@ -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->tqlayout()));
+	TQVBoxLayout	*l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()));
 	l11->addWidget(m_stack);
 
 	TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 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->tqlayout()), 4, 3, 10);
+	TQGridLayout	*l2 = new TQGridLayout(TQT_TQLAYOUT(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->tqlayout()), 10);
+	TQHBoxLayout	*l4 = new TQHBoxLayout(TQT_TQLAYOUT(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 6f2b4485e..cb1bcb3d7 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -26,7 +26,7 @@
 #include <kpushbutton.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqlineedit.h>
 #include <kinputdialog.h>
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index a5ca72071..1424d607b 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -23,7 +23,7 @@
 
 #include <tqprogressbar.h>
 #include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
@@ -339,7 +339,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
 	TQLabel	*portlabel = new TQLabel(i18n("&Port:"),dummy);
 	TQLabel	*toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
 	TQLineEdit	*mm = new TQLineEdit(dummy);
-	mm->setText(TQString::tqfromLatin1(".[0-255]"));
+	mm->setText(TQString::fromLatin1(".[0-255]"));
 	mm->setReadOnly(true);
 	mm->setFixedWidth(fontMetrics().width(mm->text())+10);
 
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index fde3a3451..5c1fa279c 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -31,7 +31,7 @@
 #include <kcursor.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <cstdlib>