From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/rlpr/kmconfigproxy.cpp | 6 ++-- kdeprint/rlpr/kmconfigproxy.h | 2 +- kdeprint/rlpr/kmproprlpr.cpp | 16 +++++----- kdeprint/rlpr/kmproprlpr.h | 2 +- kdeprint/rlpr/kmproxywidget.cpp | 40 ++++++++++++------------- kdeprint/rlpr/kmproxywidget.h | 4 +-- kdeprint/rlpr/kmrlprmanager.cpp | 22 +++++++------- kdeprint/rlpr/kmrlprmanager.h | 12 ++++---- kdeprint/rlpr/kmrlpruimanager.cpp | 2 +- kdeprint/rlpr/kmrlpruimanager.h | 2 +- kdeprint/rlpr/kmwrlpr.cpp | 60 +++++++++++++++++++------------------- kdeprint/rlpr/kmwrlpr.h | 6 ++-- kdeprint/rlpr/krlprprinterimpl.cpp | 10 +++---- kdeprint/rlpr/krlprprinterimpl.h | 4 +-- 14 files changed, 94 insertions(+), 94 deletions(-) (limited to 'kdeprint/rlpr') diff --git a/kdeprint/rlpr/kmconfigproxy.cpp b/kdeprint/rlpr/kmconfigproxy.cpp index 4c81ba6fc..0676fc7e6 100644 --- a/kdeprint/rlpr/kmconfigproxy.cpp +++ b/kdeprint/rlpr/kmconfigproxy.cpp @@ -20,10 +20,10 @@ #include "kmconfigproxy.h" #include "kmproxywidget.h" -#include +#include #include -KMConfigProxy::KMConfigProxy(QWidget *parent) +KMConfigProxy::KMConfigProxy(TQWidget *parent) : KMConfigPage(parent,"Proxy") { setPageName(i18n("Proxy")); @@ -31,7 +31,7 @@ KMConfigProxy::KMConfigProxy(QWidget *parent) setPagePixmap("proxy"); m_widget = new KMProxyWidget(this); - QVBoxLayout *lay0 = new QVBoxLayout(this, 5, 0); + QVBoxLayout *lay0 = new TQVBoxLayout(this, 5, 0); lay0->addWidget(m_widget); lay0->addStretch(1); } diff --git a/kdeprint/rlpr/kmconfigproxy.h b/kdeprint/rlpr/kmconfigproxy.h index ea3e80118..0fcfdaf55 100644 --- a/kdeprint/rlpr/kmconfigproxy.h +++ b/kdeprint/rlpr/kmconfigproxy.h @@ -28,7 +28,7 @@ class KConfig; class KMConfigProxy : public KMConfigPage { public: - KMConfigProxy(QWidget *parent = 0); + KMConfigProxy(TQWidget *parent = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp index f13436e0b..3296949a3 100644 --- a/kdeprint/rlpr/kmproprlpr.cpp +++ b/kdeprint/rlpr/kmproprlpr.cpp @@ -21,21 +21,21 @@ #include "kmprinter.h" #include "kmwizard.h" -#include -#include +#include +#include #include -KMPropRlpr::KMPropRlpr(QWidget *parent, const char *name) +KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_host = new QLabel("",this); - m_queue = new QLabel("",this); + m_host = new TQLabel("",this); + m_queue = new TQLabel("",this); - QLabel *l1 = new QLabel(i18n("Host:"), this); - QLabel *l2 = new QLabel(i18n("Queue:"), this); + QLabel *l1 = new TQLabel(i18n("Host:"), this); + QLabel *l2 = new TQLabel(i18n("Queue:"), this); // layout - QGridLayout *main_ = new QGridLayout(this, 3, 2, 10, 7); + QGridLayout *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 587321719..2c240f3db 100644 --- a/kdeprint/rlpr/kmproprlpr.h +++ b/kdeprint/rlpr/kmproprlpr.h @@ -27,7 +27,7 @@ class QLabel; class KMPropRlpr : public KMPropWidget { public: - KMPropRlpr(QWidget *parent = 0, const char *name = 0); + KMPropRlpr(TQWidget *parent = 0, const char *name = 0); ~KMPropRlpr(); void setPrinter(KMPrinter*); diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index 5e4256ecf..c6dd59189 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -19,34 +19,34 @@ #include "kmproxywidget.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -KMProxyWidget::KMProxyWidget(QWidget *parent, const char *name) -: QGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name) +KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) +: TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name) { - QLabel *m_hostlabel = new QLabel(i18n("&Host:"), this); - QLabel *m_portlabel = new QLabel(i18n("&Port:"), this); - m_useproxy = new QCheckBox(i18n("&Use proxy server"), this); + QLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this); + QLabel *m_portlabel = new TQLabel(i18n("&Port:"), this); + m_useproxy = new TQCheckBox(i18n("&Use proxy server"), this); m_useproxy->setCursor(KCursor::handCursor()); - m_proxyhost = new QLineEdit(this); - m_proxyport = new QLineEdit(this); - m_proxyport->setValidator(new QIntValidator(m_proxyport)); + m_proxyhost = new TQLineEdit(this); + m_proxyport = new TQLineEdit(this); + m_proxyport->setValidator(new TQIntValidator(m_proxyport)); m_hostlabel->setBuddy(m_proxyhost); m_portlabel->setBuddy(m_proxyport); - connect(m_useproxy,SIGNAL(toggled(bool)),m_proxyhost,SLOT(setEnabled(bool))); - connect(m_useproxy,SIGNAL(toggled(bool)),m_proxyport,SLOT(setEnabled(bool))); + connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyhost,TQT_SLOT(setEnabled(bool))); + connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyport,TQT_SLOT(setEnabled(bool))); m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); - QGridLayout *lay0 = new QGridLayout(layout(), 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); @@ -58,14 +58,14 @@ KMProxyWidget::KMProxyWidget(QWidget *parent, const char *name) void KMProxyWidget::loadConfig(KConfig *conf) { conf->setGroup("RLPR"); - m_proxyhost->setText(conf->readEntry("ProxyHost",QString::null)); - m_proxyport->setText(conf->readEntry("ProxyPort",QString::null)); + m_proxyhost->setText(conf->readEntry("ProxyHost",TQString::null)); + m_proxyport->setText(conf->readEntry("ProxyPort",TQString::null)); m_useproxy->setChecked(!m_proxyhost->text().isEmpty()); } void KMProxyWidget::saveConfig(KConfig *conf) { conf->setGroup("RLPR"); - conf->writeEntry("ProxyHost",(m_useproxy->isChecked() ? m_proxyhost->text() : QString::null)); - conf->writeEntry("ProxyPort",(m_useproxy->isChecked() ? m_proxyport->text() : QString::null)); + conf->writeEntry("ProxyHost",(m_useproxy->isChecked() ? m_proxyhost->text() : TQString::null)); + conf->writeEntry("ProxyPort",(m_useproxy->isChecked() ? m_proxyport->text() : TQString::null)); } diff --git a/kdeprint/rlpr/kmproxywidget.h b/kdeprint/rlpr/kmproxywidget.h index 4c9dbf7e1..91314f3d3 100644 --- a/kdeprint/rlpr/kmproxywidget.h +++ b/kdeprint/rlpr/kmproxywidget.h @@ -20,7 +20,7 @@ #ifndef KMPROXYWIDGET_H #define KMPROXYWIDGET_H -#include +#include class KConfig; class QLineEdit; @@ -29,7 +29,7 @@ class QCheckBox; class KMProxyWidget : public QGroupBox { public: - KMProxyWidget(QWidget *parent = 0, const char *name = 0); + KMProxyWidget(TQWidget *parent = 0, const char *name = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp index eafb1a497..f455fd1ff 100644 --- a/kdeprint/rlpr/kmrlprmanager.cpp +++ b/kdeprint/rlpr/kmrlprmanager.cpp @@ -20,15 +20,15 @@ #include "kmrlprmanager.h" #include "kmprinter.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -KMRlprManager::KMRlprManager(QObject *parent, const char *name, const QStringList & /*args*/) +KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMManager(parent,name) { setHasManagement(true); @@ -88,7 +88,7 @@ void KMRlprManager::listPrinters() discardAllPrinters(false); } -void KMRlprManager::loadPrintersConf(const QString& filename) +void KMRlprManager::loadPrintersConf(const TQString& filename) { QFile f(filename); if (f.exists() && f.open(IO_ReadOnly)) @@ -100,7 +100,7 @@ void KMRlprManager::loadPrintersConf(const QString& filename) line = t.readLine().stripWhiteSpace(); if (line.isEmpty() || line[0] == '#') continue; - QStringList w = QStringList::split('\t',line,true); + QStringList w = TQStringList::split('\t',line,true); if (w.count() < 3) continue; @@ -116,7 +116,7 @@ void KMRlprManager::loadPrintersConf(const QString& filename) if (w.count() > 4) printer->setLocation(w[4]); } printer->setState(KMPrinter::Idle); - printer->setDevice(QString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); + printer->setDevice(TQString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); addPrinter(printer); } @@ -128,14 +128,14 @@ void KMRlprManager::savePrinters() savePrintersConf(printerFile()); } -void KMRlprManager::savePrintersConf(const QString& filename) +void KMRlprManager::savePrintersConf(const TQString& filename) { QFile f(filename); if (f.open(IO_WriteOnly)) { QTextStream t(&f); t << "# File generated by KDE print system. Don't edit by hand." << endl; - QPtrListIterator it(m_printers); + TQPtrListIterator it(m_printers); for (;it.current();++it) { if (!it.current()->name().isEmpty() && it.current()->instanceName().isEmpty()) @@ -152,7 +152,7 @@ void KMRlprManager::savePrintersConf(const QString& filename) } } -QString KMRlprManager::printerFile() +TQString KMRlprManager::printerFile() { return locateLocal("data","kdeprint/printers.conf"); } diff --git a/kdeprint/rlpr/kmrlprmanager.h b/kdeprint/rlpr/kmrlprmanager.h index 2a2e6844d..eb47f95df 100644 --- a/kdeprint/rlpr/kmrlprmanager.h +++ b/kdeprint/rlpr/kmrlprmanager.h @@ -21,13 +21,13 @@ #define KMRLPRMANAGER_H #include "kmmanager.h" -#include -#include +#include +#include class KMRlprManager : public KMManager { public: - KMRlprManager(QObject *parent, const char *name, const QStringList & /*args*/); + KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/); ~KMRlprManager(); bool createPrinter(KMPrinter*); @@ -37,9 +37,9 @@ public: protected: void listPrinters(); void savePrinters(); - void loadPrintersConf(const QString& filename); - void savePrintersConf(const QString& filename); - QString printerFile(); + void loadPrintersConf(const TQString& filename); + void savePrintersConf(const TQString& filename); + TQString printerFile(); private: QDateTime m_checktime; diff --git a/kdeprint/rlpr/kmrlpruimanager.cpp b/kdeprint/rlpr/kmrlpruimanager.cpp index 5cdb03b95..5ca7a2230 100644 --- a/kdeprint/rlpr/kmrlpruimanager.cpp +++ b/kdeprint/rlpr/kmrlpruimanager.cpp @@ -28,7 +28,7 @@ #include -KMRlprUiManager::KMRlprUiManager(QObject *parent, const char *name, const QStringList & /*args*/) +KMRlprUiManager::KMRlprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMUiManager(parent,name) { } diff --git a/kdeprint/rlpr/kmrlpruimanager.h b/kdeprint/rlpr/kmrlpruimanager.h index 5a31f4dee..3f244eb5b 100644 --- a/kdeprint/rlpr/kmrlpruimanager.h +++ b/kdeprint/rlpr/kmrlpruimanager.h @@ -25,7 +25,7 @@ class KMRlprUiManager : public KMUiManager { public: - KMRlprUiManager(QObject *parent, const char *name, const QStringList & /*args*/); + KMRlprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/); ~KMRlprUiManager(); void setupPropertyPages(KMPropertyPage*); diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp index 50006c14c..78f483db6 100644 --- a/kdeprint/rlpr/kmwrlpr.cpp +++ b/kdeprint/rlpr/kmwrlpr.cpp @@ -21,18 +21,18 @@ #include "kmprinter.h" #include "kmwizard.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -static QListViewItem* findChild(QListViewItem *c, const QString& txt) +static TQListViewItem* findChild(TQListViewItem *c, const TQString& txt) { QListViewItem *item(c); while (item) @@ -43,7 +43,7 @@ static QListViewItem* findChild(QListViewItem *c, const QString& txt) //***************************************************************************************************** -KMWRlpr::KMWRlpr(QWidget *parent, const char *name) +KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Custom+1; @@ -51,22 +51,22 @@ KMWRlpr::KMWRlpr(QWidget *parent, const char *name) m_nextpage = KMWizard::Name; m_view = new KListView(this); - m_view->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); - m_view->addColumn(QString::fromLatin1("")); + m_view->addColumn(TQString::fromLatin1("")); m_view->header()->hide(); m_view->setRootIsDecorated(true); m_view->setSorting(0); - m_host = new QLineEdit(this); - m_queue = new QLineEdit(this); - QLabel *m_hostlabel = new QLabel(i18n("Host:"), this); - QLabel *m_queuelabel = new QLabel(i18n("Queue:"), this); + 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); m_hostlabel->setBuddy(m_host); m_queuelabel->setBuddy(m_queue); - connect(m_view,SIGNAL(selectionChanged(QListViewItem*)),SLOT(slotPrinterSelected(QListViewItem*))); + connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - QHBoxLayout *lay0 = new QHBoxLayout(this, 0, 10); - QVBoxLayout *lay1 = new QVBoxLayout(0, 0, 5); + QHBoxLayout *lay0 = new TQHBoxLayout(this, 0, 10); + QVBoxLayout *lay1 = new TQVBoxLayout(0, 0, 5); lay0->addWidget(m_view,1); lay0->addLayout(lay1,1); lay1->addWidget(m_hostlabel); @@ -79,7 +79,7 @@ KMWRlpr::KMWRlpr(QWidget *parent, const char *name) initialize(); } -bool KMWRlpr::isValid(QString& msg) +bool KMWRlpr::isValid(TQString& msg) { if (m_host->text().isEmpty()) msg = i18n("Empty host name."); @@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p) void KMWRlpr::updatePrinter(KMPrinter *p) { - QString uri = QString::fromLatin1("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()); @@ -128,7 +128,7 @@ void KMWRlpr::updatePrinter(KMPrinter *p) void KMWRlpr::initialize() { m_view->clear(); - QFile f(QDir::homeDirPath()+"/.rlprrc"); + QFile f(TQDir::homeDirPath()+"/.rlprrc"); if (!f.exists()) f.setName("/etc/rlprrc"); if (f.exists() && f.open(IO_ReadOnly)) { @@ -143,12 +143,12 @@ void KMWRlpr::initialize() if ((p=line.find(':')) != -1) { host = line.left(p).stripWhiteSpace(); - QListViewItem *hitem = new QListViewItem(m_view,host); + QListViewItem *hitem = new TQListViewItem(m_view,host); hitem->setPixmap(0,SmallIcon("kdeprint_computer")); - QStringList prs = QStringList::split(' ',line.right(line.length()-p-1),false); - for (QStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it) + QStringList prs = TQStringList::split(' ',line.right(line.length()-p-1),false); + for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it) { - QListViewItem *pitem = new QListViewItem(hitem,*it); + QListViewItem *pitem = new TQListViewItem(hitem,*it); pitem->setPixmap(0,SmallIcon("kdeprint_printer")); } } @@ -166,7 +166,7 @@ void KMWRlpr::initialize() while (hitem) if (hitem->text(0) == "localhost") break; else hitem = hitem->nextSibling(); while (!t.eof()) { - buffer = QString::null; + buffer = TQString::null; while (!t.eof()) { line = t.readLine().stripWhiteSpace(); @@ -186,20 +186,20 @@ void KMWRlpr::initialize() QString name = buffer.left(p); if (!hitem) { - hitem = new QListViewItem(m_view,"localhost"); + hitem = new TQListViewItem(m_view,"localhost"); hitem->setPixmap(0,SmallIcon("kdeprint_computer")); } - QListViewItem *pitem = new QListViewItem(hitem,name); + QListViewItem *pitem = new TQListViewItem(hitem,name); pitem->setPixmap(0,SmallIcon("kdeprint_printer")); } } } if (m_view->childCount() == 0) - new QListViewItem(m_view,i18n("No Predefined Printers")); + new TQListViewItem(m_view,i18n("No Predefined Printers")); } -void KMWRlpr::slotPrinterSelected(QListViewItem *item) +void KMWRlpr::slotPrinterSelected(TQListViewItem *item) { if (item && item->depth() == 1) { diff --git a/kdeprint/rlpr/kmwrlpr.h b/kdeprint/rlpr/kmwrlpr.h index 5f66180ad..ec4c378b8 100644 --- a/kdeprint/rlpr/kmwrlpr.h +++ b/kdeprint/rlpr/kmwrlpr.h @@ -30,14 +30,14 @@ class KMWRlpr : public KMWizardPage { Q_OBJECT public: - KMWRlpr(QWidget *parent = 0, const char *name = 0); + KMWRlpr(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); protected slots: - void slotPrinterSelected(QListViewItem*); + void slotPrinterSelected(TQListViewItem*); protected: void initialize(); diff --git a/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp index 9c77518b6..1d4845bde 100644 --- a/kdeprint/rlpr/krlprprinterimpl.cpp +++ b/kdeprint/rlpr/krlprprinterimpl.cpp @@ -23,12 +23,12 @@ #include "kmmanager.h" #include "kmprinter.h" -#include +#include #include #include #include -KRlprPrinterImpl::KRlprPrinterImpl(QObject *parent, const char *name, const QStringList & /*args*/) +KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) { } @@ -37,7 +37,7 @@ KRlprPrinterImpl::~KRlprPrinterImpl() { } -bool KRlprPrinterImpl::setupCommand(QString& cmd, KPrinter *printer) +bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { // retrieve the KMPrinter object, to get host and queue name KMPrinter *rpr = KMFactory::self()->manager()->findPrinter(printer->printerName()); @@ -54,12 +54,12 @@ bool KRlprPrinterImpl::setupCommand(QString& cmd, KPrinter *printer) return false; } - cmd = QString::fromLatin1("%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(); conf->setGroup("RLPR"); - QString host = conf->readEntry("ProxyHost",QString::null), port = conf->readEntry("ProxyPort",QString::null); + QString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); if (!host.isEmpty()) { cmd.append(" -X ").append(quote(host)); diff --git a/kdeprint/rlpr/krlprprinterimpl.h b/kdeprint/rlpr/krlprprinterimpl.h index 14c054b1e..9ed5eeebb 100644 --- a/kdeprint/rlpr/krlprprinterimpl.h +++ b/kdeprint/rlpr/krlprprinterimpl.h @@ -27,10 +27,10 @@ class KProcess; class KRlprPrinterImpl : public KPrinterImpl { public: - KRlprPrinterImpl(QObject *parent, const char *name, const QStringList & /*args*/); + KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/); ~KRlprPrinterImpl(); - bool setupCommand(QString&, KPrinter*); + bool setupCommand(TQString&, KPrinter*); }; #endif -- cgit v1.2.1