summaryrefslogtreecommitdiffstats
path: root/tdeprint/rlpr
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdeprint/rlpr
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdeprint/rlpr')
-rw-r--r--tdeprint/rlpr/kmconfigproxy.cpp2
-rw-r--r--tdeprint/rlpr/kmproprlpr.cpp2
-rw-r--r--tdeprint/rlpr/kmproxywidget.cpp4
-rw-r--r--tdeprint/rlpr/kmrlprmanager.cpp4
-rw-r--r--tdeprint/rlpr/kmwrlpr.cpp8
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp2
6 files changed, 11 insertions, 11 deletions
diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp
index 38ccf62e6..0f8ca3743 100644
--- a/tdeprint/rlpr/kmconfigproxy.cpp
+++ b/tdeprint/rlpr/kmconfigproxy.cpp
@@ -20,7 +20,7 @@
#include "kmconfigproxy.h"
#include "kmproxywidget.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
KMConfigProxy::KMConfigProxy(TQWidget *parent)
diff --git a/tdeprint/rlpr/kmproprlpr.cpp b/tdeprint/rlpr/kmproprlpr.cpp
index 022ab80f7..62fe97827 100644
--- a/tdeprint/rlpr/kmproprlpr.cpp
+++ b/tdeprint/rlpr/kmproprlpr.cpp
@@ -22,7 +22,7 @@
#include "kmwizard.h"
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index 9c2920795..94ad60340 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -22,7 +22,7 @@
#include <tqlineedit.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvalidator.h>
#include <klocale.h>
#include <kconfig.h>
@@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
m_proxyhost->setEnabled(false);
m_proxyport->setEnabled(false);
- TQGridLayout *lay0 = new TQGridLayout(layout(), 3, 2, 10);
+ TQGridLayout *lay0 = new TQGridLayout(tqlayout(), 3, 2, 10);
lay0->setColStretch(1,1);
lay0->addMultiCellWidget(m_useproxy,0,0,0,1);
lay0->addWidget(m_hostlabel,1,0);
diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp
index 553d9be13..64f6acde1 100644
--- a/tdeprint/rlpr/kmrlprmanager.cpp
+++ b/tdeprint/rlpr/kmrlprmanager.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqmap.h>
#include <kstandarddirs.h>
@@ -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::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2]));
+ printer->setDevice(TQString::tqfromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2]));
addPrinter(printer);
}
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index e211dbd44..70defc27b 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -23,8 +23,8 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <textstream.h>
-#include <layout.h>
+#include <tqtextstream.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqheader.h>
@@ -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::fromLatin1(""));
+ m_view->addColumn(TQString::tqfromLatin1(""));
m_view->header()->hide();
m_view->setRootIsDecorated(true);
m_view->setSorting(0);
@@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p)
void KMWRlpr::updatePrinter(KMPrinter *p)
{
- TQString uri = TQString::fromLatin1("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());
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 2833c9598..a6b0e5986 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -54,7 +54,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
return false;
}
- cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
+ cmd = TQString::tqfromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
// proxy settings
KConfig *conf = KMFactory::self()->printConfig();