Finished remaining porting to new TQt API

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 47 insertions, 47 deletions

diff --git a/kdeprint/rlpr/kmconfigproxy.cpp b/kdeprint/rlpr/kmconfigproxy.cpp
index 0676fc7e6..6be500e8f 100644
--- a/kdeprint/rlpr/kmconfigproxy.cpp
+++ b/kdeprint/rlpr/kmconfigproxy.cpp
@@ -31,7 +31,7 @@ KMConfigProxy::KMConfigProxy(TQWidget *parent)
 	setPagePixmap("proxy");
 
 	m_widget = new KMProxyWidget(this);
-	QVBoxLayout	*lay0 = new TQVBoxLayout(this, 5, 0);
+	TQVBoxLayout	*lay0 = new TQVBoxLayout(this, 5, 0);
 	lay0->addWidget(m_widget);
 	lay0->addStretch(1);
 }
diff --git a/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp
index 3296949a3..c40a3985e 100644
--- a/kdeprint/rlpr/kmproprlpr.cpp
+++ b/kdeprint/rlpr/kmproprlpr.cpp
@@ -31,11 +31,11 @@ KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
 	m_host = new TQLabel("",this);
 	m_queue = new TQLabel("",this);
 
-	QLabel	*l1 = new TQLabel(i18n("Host:"), this);
-	QLabel	*l2 = new TQLabel(i18n("Queue:"), this);
+	TQLabel	*l1 = new TQLabel(i18n("Host:"), this);
+	TQLabel	*l2 = new TQLabel(i18n("Queue:"), this);
 
 	// layout
-	QGridLayout	*main_ = new TQGridLayout(this, 3, 2, 10, 7);
+	TQGridLayout	*main_ = new TQGridLayout(this, 3, 2, 10, 7);
 	main_->setColStretch(0,0);
 	main_->setColStretch(1,1);
 	main_->setRowStretch(2,1);
diff --git a/kdeprint/rlpr/kmproprlpr.h b/kdeprint/rlpr/kmproprlpr.h
index cc6631fa1..630bdf671 100644
--- a/kdeprint/rlpr/kmproprlpr.h
+++ b/kdeprint/rlpr/kmproprlpr.h
@@ -36,8 +36,8 @@ protected:
 	void configureWizard(KMWizard*);
 
 private:
-	QLabel	*m_host;
-	QLabel	*m_queue;
+	TQLabel	*m_host;
+	TQLabel	*m_queue;
 };
 
 #endif
diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp
index c6dd59189..daf4b7665 100644
--- a/kdeprint/rlpr/kmproxywidget.cpp
+++ b/kdeprint/rlpr/kmproxywidget.cpp
@@ -31,13 +31,13 @@
 KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 : TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name)
 {
-	QLabel	*m_hostlabel = new TQLabel(i18n("&Host:"), this);
-	QLabel	*m_portlabel = new TQLabel(i18n("&Port:"), this);
+	TQLabel	*m_hostlabel = new TQLabel(i18n("&Host:"), this);
+	TQLabel	*m_portlabel = new TQLabel(i18n("&Port:"), this);
 	m_useproxy = new TQCheckBox(i18n("&Use proxy server"), this);
 	m_useproxy->setCursor(KCursor::handCursor());
 	m_proxyhost = new TQLineEdit(this);
 	m_proxyport = new TQLineEdit(this);
-	m_proxyport->setValidator(new TQIntValidator(m_proxyport));
+	m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport)));
 	m_hostlabel->setBuddy(m_proxyhost);
 	m_portlabel->setBuddy(m_proxyport);
 	
@@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	m_proxyhost->setEnabled(false);
 	m_proxyport->setEnabled(false);
 
-	QGridLayout	*lay0 = new TQGridLayout(layout(), 3, 2, 10);
+	TQGridLayout	*lay0 = new TQGridLayout(layout(), 3, 2, 10);
 	lay0->setColStretch(1,1);
 	lay0->addMultiCellWidget(m_useproxy,0,0,0,1);
 	lay0->addWidget(m_hostlabel,1,0);
diff --git a/kdeprint/rlpr/kmproxywidget.h b/kdeprint/rlpr/kmproxywidget.h
index 4d2799a67..85dcbf111 100644
--- a/kdeprint/rlpr/kmproxywidget.h
+++ b/kdeprint/rlpr/kmproxywidget.h
@@ -35,9 +35,9 @@ public:
 	void saveConfig(KConfig*);
 
 private:
-	QLineEdit	*m_proxyhost;
-	QLineEdit	*m_proxyport;
-	QCheckBox	*m_useproxy;
+	TQLineEdit	*m_proxyhost;
+	TQLineEdit	*m_proxyport;
+	TQCheckBox	*m_useproxy;
 };
 
 #endif
diff --git a/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp
index 718969116..3a5460dda 100644
--- a/kdeprint/rlpr/kmrlprmanager.cpp
+++ b/kdeprint/rlpr/kmrlprmanager.cpp
@@ -59,7 +59,7 @@ bool KMRlprManager::createPrinter(KMPrinter *p)
 
 bool KMRlprManager::removePrinter(KMPrinter *p)
 {
-	if (m_printers.findRef(p) == -1)
+	if (m_printers.tqfindRef(p) == -1)
 		setErrorMsg(i18n("Printer not found."));
 	else
 	{
@@ -78,7 +78,7 @@ bool KMRlprManager::testPrinter(KMPrinter *)
 
 void KMRlprManager::listPrinters()
 {
-	QFileInfo	pfi(printerFile());
+	TQFileInfo	pfi(printerFile());
 	if (pfi.exists() && (!m_checktime.isValid() || m_checktime < pfi.lastModified()))
 	{
 		loadPrintersConf(pfi.absFilePath());
@@ -90,17 +90,17 @@ void KMRlprManager::listPrinters()
 
 void KMRlprManager::loadPrintersConf(const TQString& filename)
 {
-	QFile	f(filename);
+	TQFile	f(filename);
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		QTextStream	t(&f);
-		QString		line;
+		TQTextStream	t(&f);
+		TQString		line;
 		while (!t.eof())
 		{
 			line = t.readLine().stripWhiteSpace();
 			if (line.isEmpty() || line[0] == '#')
 				continue;
-			QStringList	w = TQStringList::split('\t',line,true);
+			TQStringList	w = TQStringList::split('\t',line,true);
 			if (w.count() < 3)
 				continue;
 
@@ -130,18 +130,18 @@ void KMRlprManager::savePrinters()
 
 void KMRlprManager::savePrintersConf(const TQString& filename)
 {
-	QFile	f(filename);
+	TQFile	f(filename);
 	if (f.open(IO_WriteOnly))
 	{
-		QTextStream	t(&f);
+		TQTextStream	t(&f);
 		t << "# File generated by KDE print system. Don't edit by hand." << endl;
 		TQPtrListIterator<KMPrinter>	it(m_printers);
 		for (;it.current();++it)
 		{
 			if (!it.current()->name().isEmpty() && it.current()->instanceName().isEmpty())
 			{
-				QString	host = it.current()->option("host");
-				QString	queue = it.current()->option("queue");
+				TQString	host = it.current()->option("host");
+				TQString	queue = it.current()->option("queue");
 				if (!host.isEmpty() && !queue.isEmpty())
 				{
 					t << it.current()->name() << '\t' << host << '\t' << queue;
diff --git a/kdeprint/rlpr/kmrlprmanager.h b/kdeprint/rlpr/kmrlprmanager.h
index eb47f95df..dbc0f1096 100644
--- a/kdeprint/rlpr/kmrlprmanager.h
+++ b/kdeprint/rlpr/kmrlprmanager.h
@@ -42,7 +42,7 @@ protected:
 	TQString printerFile();
 
 private:
-	QDateTime	m_checktime;
+	TQDateTime	m_checktime;
 };
 
 #endif
diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp
index 915bf74ae..5e87be982 100644
--- a/kdeprint/rlpr/kmwrlpr.cpp
+++ b/kdeprint/rlpr/kmwrlpr.cpp
@@ -32,9 +32,9 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
-static TQListViewItem* findChild(TQListViewItem *c, const TQString& txt)
+static TQListViewItem* rlpr_findChild(TQListViewItem *c, const TQString& txt)
 {
-	QListViewItem	*item(c);
+	TQListViewItem	*item(c);
 	while (item)
 		if (item->text(0) == txt) return item;
 		else item = item->nextSibling();
@@ -59,14 +59,14 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
 	m_view->setSorting(0);
 	m_host = new TQLineEdit(this);
 	m_queue = new TQLineEdit(this);
-	QLabel	*m_hostlabel = new TQLabel(i18n("Host:"), this);
-	QLabel	*m_queuelabel = new TQLabel(i18n("Queue:"), this);
+	TQLabel	*m_hostlabel = new TQLabel(i18n("Host:"), this);
+	TQLabel	*m_queuelabel = new TQLabel(i18n("Queue:"), this);
 	m_hostlabel->setBuddy(m_host);
 	m_queuelabel->setBuddy(m_queue);
 	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
 
-	QHBoxLayout	*lay0 = new TQHBoxLayout(this, 0, 10);
-	QVBoxLayout	*lay1 = new TQVBoxLayout(0, 0, 5);
+	TQHBoxLayout	*lay0 = new TQHBoxLayout(this, 0, 10);
+	TQVBoxLayout	*lay1 = new TQVBoxLayout(0, 0, 5);
 	lay0->addWidget(m_view,1);
 	lay0->addLayout(lay1,1);
 	lay1->addWidget(m_hostlabel);
@@ -94,13 +94,13 @@ void KMWRlpr::initPrinter(KMPrinter *p)
 {
 	m_host->setText(p->option("host"));
 	m_queue->setText(p->option("queue"));
-	QListViewItem	*item = findChild(m_view->firstChild(),m_host->text());
+	TQListViewItem	*item = rlpr_findChild(m_view->firstChild(),m_host->text());
 	if (item)
 	{
-		item = findChild(item->firstChild(),m_queue->text());
+		item = rlpr_findChild(item->firstChild(),m_queue->text());
 		if (item)
 		{
-			item->parent()->setOpen(true);
+			item->tqparent()->setOpen(true);
 			m_view->setCurrentItem(item);
 			m_view->ensureItemVisible(item);
 		}
@@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p)
 
 void KMWRlpr::updatePrinter(KMPrinter *p)
 {
-	QString	uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
+	TQString	uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
 	p->setDevice(uri);
 	p->setOption("host",m_host->text());
 	p->setOption("queue",m_queue->text());
@@ -128,12 +128,12 @@ void KMWRlpr::updatePrinter(KMPrinter *p)
 void KMWRlpr::initialize()
 {
 	m_view->clear();
-	QFile	f(TQDir::homeDirPath()+"/.rlprrc");
+	TQFile	f(TQDir::homeDirPath()+"/.rlprrc");
 	if (!f.exists()) f.setName("/etc/rlprrc");
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		QTextStream	t(&f);
-		QString		line, host;
+		TQTextStream	t(&f);
+		TQString		line, host;
 		int 		p(-1);
 		while (!t.eof())
 		{
@@ -143,12 +143,12 @@ void KMWRlpr::initialize()
 			if ((p=line.tqfind(':')) != -1)
 			{
 				host = line.left(p).stripWhiteSpace();
-				QListViewItem	*hitem = new TQListViewItem(m_view,host);
+				TQListViewItem	*hitem = new TQListViewItem(m_view,host);
 				hitem->setPixmap(0,SmallIcon("kdeprint_computer"));
-				QStringList	prs = TQStringList::split(' ',line.right(line.length()-p-1),false);
+				TQStringList	prs = TQStringList::split(' ',line.right(line.length()-p-1),false);
 				for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it)
 				{
-					QListViewItem	*pitem = new TQListViewItem(hitem,*it);
+					TQListViewItem	*pitem = new TQListViewItem(hitem,*it);
 					pitem->setPixmap(0,SmallIcon("kdeprint_printer"));
 				}
 			}
@@ -160,9 +160,9 @@ void KMWRlpr::initialize()
 	f.setName("/etc/printcap");
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		QTextStream	t(&f);
-		QString		line, buffer;
-		QListViewItem	*hitem(m_view->firstChild());
+		TQTextStream	t(&f);
+		TQString		line, buffer;
+		TQListViewItem	*hitem(m_view->firstChild());
 		while (hitem) if (hitem->text(0) == "localhost") break; else hitem = hitem->nextSibling();
 		while (!t.eof())
 		{
@@ -183,13 +183,13 @@ void KMWRlpr::initialize()
 			int	p = buffer.tqfind(':');
 			if (p != -1)
 			{
-				QString	name = buffer.left(p);
+				TQString	name = buffer.left(p);
 				if (!hitem)
 				{
 					hitem = new TQListViewItem(m_view,"localhost");
 					hitem->setPixmap(0,SmallIcon("kdeprint_computer"));
 				}
-				QListViewItem	*pitem = new TQListViewItem(hitem,name);
+				TQListViewItem	*pitem = new TQListViewItem(hitem,name);
 				pitem->setPixmap(0,SmallIcon("kdeprint_printer"));
 			}
 		}
@@ -203,7 +203,7 @@ void KMWRlpr::slotPrinterSelected(TQListViewItem *item)
 {
 	if (item && item->depth() == 1)
 	{
-		m_host->setText(item->parent()->text(0));
+		m_host->setText(item->tqparent()->text(0));
 		m_queue->setText(item->text(0));
 	}
 }
diff --git a/kdeprint/rlpr/kmwrlpr.h b/kdeprint/rlpr/kmwrlpr.h
index c71f51144..14be9aee0 100644
--- a/kdeprint/rlpr/kmwrlpr.h
+++ b/kdeprint/rlpr/kmwrlpr.h
@@ -44,7 +44,7 @@ protected:
 
 private:
 	KListView	*m_view;
-	QLineEdit	*m_host, *m_queue;
+	TQLineEdit	*m_host, *m_queue;
 };
 
 #endif