From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/rlpr/kmproprlpr.cpp | 2 +- kdeprint/rlpr/kmproxywidget.cpp | 2 +- kdeprint/rlpr/kmrlprmanager.cpp | 4 ++-- kdeprint/rlpr/kmwrlpr.cpp | 14 +++++++------- kdeprint/rlpr/krlprprinterimpl.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kdeprint/rlpr') diff --git a/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp index 46906fd83..3296949a3 100644 --- a/kdeprint/rlpr/kmproprlpr.cpp +++ b/kdeprint/rlpr/kmproprlpr.cpp @@ -34,7 +34,7 @@ KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name) QLabel *l1 = new TQLabel(i18n("Host:"), this); QLabel *l2 = new TQLabel(i18n("Queue:"), this); - // tqlayout + // layout QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index 49e6f29ee..c6dd59189 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); - QGridLayout *lay0 = new TQGridLayout(tqlayout(), 3, 2, 10); + QGridLayout *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/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp index 3ed7a48cb..f455fd1ff 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.tqfindRef(p) == -1) + if (m_printers.findRef(p) == -1) setErrorMsg(i18n("Printer not found.")); else { @@ -116,7 +116,7 @@ void KMRlprManager::loadPrintersConf(const TQString& filename) if (w.count() > 4) printer->setLocation(w[4]); } printer->setState(KMPrinter::Idle); - printer->setDevice(TQString::tqfromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); + printer->setDevice(TQString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); addPrinter(printer); } diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp index 784fa2fa1..78f483db6 100644 --- a/kdeprint/rlpr/kmwrlpr.cpp +++ b/kdeprint/rlpr/kmwrlpr.cpp @@ -32,7 +32,7 @@ #include #include -static TQListViewItem* tqfindChild(TQListViewItem *c, const TQString& txt) +static TQListViewItem* findChild(TQListViewItem *c, const TQString& txt) { QListViewItem *item(c); while (item) @@ -53,7 +53,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) m_view = new KListView(this); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); - m_view->addColumn(TQString::tqfromLatin1("")); + m_view->addColumn(TQString::fromLatin1("")); m_view->header()->hide(); m_view->setRootIsDecorated(true); m_view->setSorting(0); @@ -94,10 +94,10 @@ void KMWRlpr::initPrinter(KMPrinter *p) { m_host->setText(p->option("host")); m_queue->setText(p->option("queue")); - QListViewItem *item = tqfindChild(m_view->firstChild(),m_host->text()); + QListViewItem *item = findChild(m_view->firstChild(),m_host->text()); if (item) { - item = tqfindChild(item->firstChild(),m_queue->text()); + item = findChild(item->firstChild(),m_queue->text()); if (item) { item->parent()->setOpen(true); @@ -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()); + QString uri = TQString::fromLatin1("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()); @@ -140,7 +140,7 @@ void KMWRlpr::initialize() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - if ((p=line.tqfind(':')) != -1) + if ((p=line.find(':')) != -1) { host = line.left(p).stripWhiteSpace(); QListViewItem *hitem = new TQListViewItem(m_view,host); @@ -180,7 +180,7 @@ void KMWRlpr::initialize() } if (buffer.isEmpty()) continue; - int p = buffer.tqfind(':'); + int p = buffer.find(':'); if (p != -1) { QString name = buffer.left(p); diff --git a/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp index e51908b62..1d4845bde 100644 --- a/kdeprint/rlpr/krlprprinterimpl.cpp +++ b/kdeprint/rlpr/krlprprinterimpl.cpp @@ -40,7 +40,7 @@ KRlprPrinterImpl::~KRlprPrinterImpl() bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { // retrieve the KMPrinter object, to get host and queue name - KMPrinter *rpr = KMFactory::self()->manager()->tqfindPrinter(printer->printerName()); + KMPrinter *rpr = KMFactory::self()->manager()->findPrinter(printer->printerName()); if (!rpr) return false; @@ -54,7 +54,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) return false; } - cmd = TQString::tqfromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); + cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); // proxy settings KConfig *conf = KMFactory::self()->printConfig(); -- cgit v1.2.1