diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
commit | ffe8a83e053396df448e9413828527613ca3bd46 (patch) | |
tree | a73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /kdeprint/cups | |
parent | 682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff) | |
download | tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint/cups')
102 files changed, 1506 insertions, 1506 deletions
diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index 993a72c9b..ef1b0f4e8 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -21,93 +21,93 @@ #include "cupsinfos.h" #include "sidepixmap.h" -#include <qtimer.h> -#include <qprogressbar.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> +#include <tqtimer.h> +#include <tqprogressbar.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> #include <klocale.h> #include <kmessagebox.h> -#include <qmessagebox.h> -#include <qfile.h> +#include <tqmessagebox.h> +#include <tqfile.h> #include <kio/passdlg.h> #include <kdebug.h> #include <kseparator.h> #include <kactivelabel.h> -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kpushbutton.h> #include <kstdguiitem.h> #include <cups/cups.h> #include <ctype.h> -CupsAddSmb::CupsAddSmb(QWidget *parent, const char *name) +CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) : KDialog(parent, name) { m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, SIGNAL(receivedStdout(KProcess*,char*,int)), SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, SIGNAL(receivedStderr(KProcess*,char*,int)), SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, SIGNAL(processExited(KProcess*)), SLOT(slotProcessExited(KProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); m_side = new SidePixmap(this); - m_doit = new QPushButton(i18n("&Export"), this); + m_doit = new TQPushButton(i18n("&Export"), this); m_cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(m_cancel, SIGNAL(clicked()), SLOT(reject())); - connect(m_doit, SIGNAL(clicked()), SLOT(slotActionClicked())); - m_bar = new QProgressBar(this); + connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked())); + m_bar = new TQProgressBar(this); m_text = new KActiveLabel(this); - QLabel *m_title = new QLabel(i18n("Export Printer Driver to Windows Clients"), this); + QLabel *m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this); setCaption(m_title->text()); QFont f(m_title->font()); f.setBold(true); m_title->setFont(f); KSeparator *m_sep = new KSeparator(Qt::Horizontal, this); - m_textinfo = new QLabel( this ); - m_logined = new QLineEdit( this ); - m_passwded = new QLineEdit( this ); - m_passwded->setEchoMode( QLineEdit::Password ); - m_servered = new QLineEdit( this ); - QLabel *m_loginlab = new QLabel( i18n( "&Username:" ), this ); - QLabel *m_serverlab = new QLabel( i18n( "&Samba server:" ), this ); - QLabel *m_passwdlab = new QLabel( i18n( "&Password:" ), this ); + m_textinfo = new TQLabel( this ); + m_logined = new TQLineEdit( this ); + m_passwded = new TQLineEdit( this ); + m_passwded->setEchoMode( TQLineEdit::Password ); + m_servered = new TQLineEdit( this ); + TQLabel *m_loginlab = new TQLabel( i18n( "&Username:" ), this ); + TQLabel *m_serverlab = new TQLabel( i18n( "&Samba server:" ), this ); + TQLabel *m_passwdlab = new TQLabel( i18n( "&Password:" ), this ); m_loginlab->setBuddy( m_logined ); m_serverlab->setBuddy( m_servered ); m_passwdlab->setBuddy( m_passwded ); - QString txt = i18n( "<p><b>Samba server</b></p>" + TQString txt = i18n( "<p><b>Samba server</b></p>" "Adobe Windows PostScript driver files plus the CUPS printer PPD will be " "exported to the <tt>[print$]</tt> special share of the Samba server (to change " "the source CUPS server, use the <nobr><i>Configure Manager -> CUPS server</i></nobr> first). " "The <tt>[print$]</tt> share must exist on the Samba side prior to clicking the " "<b>Export</b> button below." ); - QWhatsThis::add( m_serverlab, txt ); - QWhatsThis::add( m_servered, txt ); + TQWhatsThis::add( m_serverlab, txt ); + TQWhatsThis::add( m_servered, txt ); txt = i18n( "<p><b>Samba username</b></p>" "User needs to have write access to the <tt>[print$]</tt> share on the Samba server. " "<tt>[print$]</tt> holds printer drivers prepared for download to Windows clients. " "This dialog does not work for Samba servers configured with <tt>security = share</tt> " "(but works fine with <tt>security = user</tt>)." ); - QWhatsThis::add( m_loginlab, txt ); - QWhatsThis::add( m_logined, txt ); + TQWhatsThis::add( m_loginlab, txt ); + TQWhatsThis::add( m_logined, txt ); txt = i18n( "<p><b>Samba password</b></p>" "The Samba setting <tt>encrypt passwords = yes</tt> " "(default) requires prior use of <tt>smbpasswd -a [username]</tt> command, " "to create an encrypted Samba password and have Samba recognize it." ); - QWhatsThis::add( m_passwdlab, txt ); - QWhatsThis::add( m_passwded, txt ); + TQWhatsThis::add( m_passwdlab, txt ); + TQWhatsThis::add( m_passwded, txt ); - QHBoxLayout *l0 = new QHBoxLayout(this, 10, 10); - QVBoxLayout *l1 = new QVBoxLayout(0, 0, 10); + QHBoxLayout *l0 = new TQHBoxLayout(this, 10, 10); + QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 10); l0->addWidget(m_side); l0->addLayout(l1); l1->addWidget(m_title); l1->addWidget(m_sep); l1->addWidget(m_text); - QGridLayout *l3 = new QGridLayout( 0, 3, 2, 0, 10 ); + TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 ); l1->addLayout( l3 ); l3->addWidget( m_loginlab, 1, 0 ); l3->addWidget( m_passwdlab, 2, 0 ); @@ -120,7 +120,7 @@ CupsAddSmb::CupsAddSmb(QWidget *parent, const char *name) l1->addWidget(m_bar); l1->addWidget( m_textinfo ); l1->addSpacing(30); - QHBoxLayout *l2 = new QHBoxLayout(0, 0, 10); + QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10); l1->addLayout(l2); l2->addStretch(1); l2->addWidget(m_doit); @@ -156,7 +156,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) while (1) { // read a line - line = QString::fromLatin1(""); + line = TQString::fromLatin1(""); partial = true; while (index < buflen) { @@ -244,7 +244,7 @@ void CupsAddSmb::checkActionStatus() void CupsAddSmb::nextAction() { if (m_actionindex < (int)(m_actions.count())) - QTimer::singleShot(1, this, SLOT(doNextAction())); + TQTimer::singleShot(1, this, TQT_SLOT(doNextAction())); } void CupsAddSmb::doNextAction() @@ -273,7 +273,7 @@ void CupsAddSmb::doNextAction() m_state = Copy; //m_text->setText(i18n("Uploading %1").arg(m_actions[m_actionindex+1])); m_textinfo->setText(i18n("Uploading %1").arg(m_actions[m_actionindex+1])); - s.append(" ").append(QFile::encodeName(m_actions[m_actionindex]).data()).append(" ").append(m_actions[m_actionindex+1].latin1()); + s.append(" ").append(TQFile::encodeName(m_actions[m_actionindex]).data()).append(" ").append(m_actions[m_actionindex+1].latin1()); m_actionindex += 2; } else if (s == "adddriver") @@ -332,7 +332,7 @@ void CupsAddSmb::slotProcessExited(KProcess*) m_passwded->setEnabled( true ); m_text->setText(i18n("Driver successfully exported.")); m_bar->reset(); - m_textinfo->setText( QString::null ); + m_textinfo->setText( TQString::null ); return; } } @@ -353,7 +353,7 @@ void CupsAddSmb::slotProcessExited(KProcess*) } } -void CupsAddSmb::showError(const QString& msg) +void CupsAddSmb::showError(const TQString& msg) { m_text->setText(i18n("<h3>Operation failed.</h3><p>%1</p>").arg(msg)); m_cancel->setEnabled(true); @@ -364,7 +364,7 @@ void CupsAddSmb::showError(const QString& msg) m_state = None; } -bool CupsAddSmb::exportDest(const QString &dest, const QString& datadir) +bool CupsAddSmb::exportDest(const TQString &dest, const TQString& datadir) { CupsAddSmb dlg; dlg.m_dest = dest; @@ -386,8 +386,8 @@ bool CupsAddSmb::doExport() m_status = false; m_state = None; - if (!QFile::exists(m_datadir+"/drivers/ADOBEPS5.DLL") || - !QFile::exists(m_datadir+"/drivers/ADOBEPS4.DRV")) + if (!TQFile::exists(m_datadir+"/drivers/ADOBEPS5.DLL") || + !TQFile::exists(m_datadir+"/drivers/ADOBEPS4.DRV")) { showError( i18n("Some driver files are missing. You can get them on " @@ -433,7 +433,7 @@ bool CupsAddSmb::doExport() m_actions << "quit"; m_proc.clearArguments(); - m_proc << "smbclient" << QString::fromLatin1("//")+m_servered->text()+"/print$"; + m_proc << "smbclient" << TQString::fromLatin1("//")+m_servered->text()+"/print$"; return startProcess(); } diff --git a/kdeprint/cups/cupsaddsmb2.h b/kdeprint/cups/cupsaddsmb2.h index 1f364fc26..43cd61e8c 100644 --- a/kdeprint/cups/cupsaddsmb2.h +++ b/kdeprint/cups/cupsaddsmb2.h @@ -20,8 +20,8 @@ #ifndef CUPSADDSMB_H #define CUPSADDSMB_H -#include <qobject.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstringlist.h> #include <kprocess.h> #include <kdialog.h> @@ -38,10 +38,10 @@ class CupsAddSmb : public KDialog public: enum State { None, Start, MkDir, Copy, AddDriver, AddPrinter }; - CupsAddSmb(QWidget *parent = 0, const char *name = 0); + CupsAddSmb(TQWidget *parent = 0, const char *name = 0); ~CupsAddSmb(); - static bool exportDest(const QString& dest, const QString& datadir); + static bool exportDest(const TQString& dest, const TQString& datadir); protected slots: void slotReceived(KProcess*, char*, int); @@ -55,7 +55,7 @@ protected: bool startProcess(); bool doExport(); bool doInstall(); - void showError(const QString& msg); + void showError(const TQString& msg); private: KProcess m_proc; @@ -69,8 +69,8 @@ private: SidePixmap *m_side; QPushButton *m_doit, *m_cancel; KActiveLabel *m_text; - QLabel *m_textinfo; - QLineEdit *m_logined, *m_passwded, *m_servered; + TQLabel *m_textinfo; + TQLineEdit *m_logined, *m_passwded, *m_servered; QString m_datadir; }; diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index b7472c5a4..1811abf68 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -19,27 +19,27 @@ #include "addressdialog.h" -#include <qcombobox.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqcombobox.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> -AddressDialog::AddressDialog(QWidget *parent, const char *name) +AddressDialog::AddressDialog(TQWidget *parent, const char *name) : KDialogBase(Swallow, i18n("ACL Address"), Ok|Cancel, Ok, parent, name, true, true) { - QWidget *w = new QWidget(this); - type_ = new QComboBox(w); - address_ = new QLineEdit(w); + TQWidget *w = new TQWidget(this); + type_ = new TQComboBox(w); + address_ = new TQLineEdit(w); type_->insertItem(i18n("Allow")); type_->insertItem(i18n("Deny")); - QLabel *l1 = new QLabel(i18n("Type:"), w); - QLabel *l2 = new QLabel(i18n("Address:"), w); + QLabel *l1 = new TQLabel(i18n("Type:"), w); + QLabel *l2 = new TQLabel(i18n("Address:"), w); - QGridLayout *m1 = new QGridLayout(w, 2, 2, 0, 5); + QGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, Qt::AlignRight); @@ -50,9 +50,9 @@ AddressDialog::AddressDialog(QWidget *parent, const char *name) resize(300, 100); } -QString AddressDialog::addressString() +TQString AddressDialog::addressString() { - QString s; + TQString s; if (type_->currentItem() == 0) s.append("Allow "); else @@ -64,16 +64,16 @@ QString AddressDialog::addressString() return s; } -QString AddressDialog::newAddress(QWidget *parent) +TQString AddressDialog::newAddress(TQWidget *parent) { AddressDialog dlg(parent); if (dlg.exec()) return dlg.addressString(); else - return QString::null; + return TQString::null; } -QString AddressDialog::editAddress(const QString& addr, QWidget *parent) +TQString AddressDialog::editAddress(const TQString& addr, TQWidget *parent) { AddressDialog dlg(parent); int p = addr.find(' '); @@ -85,5 +85,5 @@ QString AddressDialog::editAddress(const QString& addr, QWidget *parent) if (dlg.exec()) return dlg.addressString(); else - return QString::null; + return TQString::null; } diff --git a/kdeprint/cups/cupsdconf2/addressdialog.h b/kdeprint/cups/cupsdconf2/addressdialog.h index 4560dd72b..0372f8cc6 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.h +++ b/kdeprint/cups/cupsdconf2/addressdialog.h @@ -28,11 +28,11 @@ class QLineEdit; class AddressDialog : public KDialogBase { public: - AddressDialog(QWidget *parent = 0, const char *name = 0); + AddressDialog(TQWidget *parent = 0, const char *name = 0); - QString addressString(); - static QString newAddress(QWidget *parent = 0); - static QString editAddress(const QString& s, QWidget *parent = 0); + TQString addressString(); + static TQString newAddress(TQWidget *parent = 0); + static TQString editAddress(const TQString& s, TQWidget *parent = 0); private: QComboBox *type_; diff --git a/kdeprint/cups/cupsdconf2/browsedialog.cpp b/kdeprint/cups/cupsdconf2/browsedialog.cpp index 846ea41a5..0856df11a 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/kdeprint/cups/cupsdconf2/browsedialog.cpp @@ -20,35 +20,35 @@ #include "browsedialog.h" #include "cupsdconf.h" -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qregexp.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> #include <klocale.h> -BrowseDialog::BrowseDialog(QWidget *parent, const char *name) - : KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok, true) +BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new QWidget(this); + QWidget *dummy = new TQWidget(this); setMainWidget(dummy); - type_ = new QComboBox(dummy); - from_ = new QLineEdit(dummy); - to_ = new QLineEdit(dummy); + type_ = new TQComboBox(dummy); + from_ = new TQLineEdit(dummy); + to_ = new TQLineEdit(dummy); type_->insertItem(i18n("Send")); type_->insertItem(i18n("Allow")); type_->insertItem(i18n("Deny")); type_->insertItem(i18n("Relay")); type_->insertItem(i18n("Poll")); - QLabel *l1 = new QLabel(i18n("Type:"), dummy); - QLabel *l2 = new QLabel(i18n("From:"), dummy); - QLabel *l3 = new QLabel(i18n("To:"), dummy); + QLabel *l1 = new TQLabel(i18n("Type:"), dummy); + QLabel *l2 = new TQLabel(i18n("From:"), dummy); + QLabel *l3 = new TQLabel(i18n("To:"), dummy); - QGridLayout *m1 = new QGridLayout(dummy, 3, 2, 0, 5); + QGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5); m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, Qt::AlignRight); @@ -56,16 +56,16 @@ BrowseDialog::BrowseDialog(QWidget *parent, const char *name) m1->addWidget(from_, 1, 1); m1->addWidget(to_, 2, 1); - connect(type_, SIGNAL(activated(int)), SLOT(slotTypeChanged(int))); + connect(type_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); slotTypeChanged(type_->currentItem()); setCaption(i18n("Browse Address")); resize(250, 100); } -QString BrowseDialog::addressString() +TQString BrowseDialog::addressString() { - QString s; + TQString s; switch (type_->currentItem()) { case 0: @@ -93,10 +93,10 @@ QString BrowseDialog::addressString() void BrowseDialog::setInfos(CupsdConf *conf) { - QWhatsThis::add(type_, conf->comments_.toolTip("browsetype")); + TQWhatsThis::add(type_, conf->comments_.toolTip("browsetype")); } -QString BrowseDialog::newAddress(QWidget *parent, CupsdConf *conf) +TQString BrowseDialog::newAddress(TQWidget *parent, CupsdConf *conf) { BrowseDialog dlg(parent); dlg.setInfos(conf); @@ -104,14 +104,14 @@ QString BrowseDialog::newAddress(QWidget *parent, CupsdConf *conf) { return dlg.addressString(); } - return QString::null; + return TQString::null; } -QString BrowseDialog::editAddress(const QString& s, QWidget *parent, CupsdConf *conf) +TQString BrowseDialog::editAddress(const TQString& s, TQWidget *parent, CupsdConf *conf) { BrowseDialog dlg(parent); dlg.setInfos(conf); - QStringList l = QStringList::split(QRegExp("\\s"), s, false); + QStringList l = TQStringList::split(TQRegExp("\\s"), s, false); if (l.count() > 1) { if (l[0] == "Send") dlg.type_->setCurrentItem(0); @@ -130,7 +130,7 @@ QString BrowseDialog::editAddress(const QString& s, QWidget *parent, CupsdConf * { return dlg.addressString(); } - return QString::null; + return TQString::null; } void BrowseDialog::slotTypeChanged(int index) diff --git a/kdeprint/cups/cupsdconf2/browsedialog.h b/kdeprint/cups/cupsdconf2/browsedialog.h index ac5be55b7..d579c3dbf 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.h +++ b/kdeprint/cups/cupsdconf2/browsedialog.h @@ -31,12 +31,12 @@ class BrowseDialog : public KDialogBase Q_OBJECT public: - BrowseDialog(QWidget *parent = 0, const char *name = 0); + BrowseDialog(TQWidget *parent = 0, const char *name = 0); - QString addressString(); + TQString addressString(); void setInfos(CupsdConf*); - static QString newAddress(QWidget *parent = 0, CupsdConf *conf = 0); - static QString editAddress(const QString& s, QWidget *parent = 0, CupsdConf *conf = 0); + static TQString newAddress(TQWidget *parent = 0, CupsdConf *conf = 0); + static TQString editAddress(const TQString& s, TQWidget *parent = 0, CupsdConf *conf = 0); protected slots: void slotTypeChanged(int); diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index a61742458..7c2b6276a 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -22,16 +22,16 @@ #include "editlist.h" #include "browsedialog.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> -CupsdBrowsingPage::CupsdBrowsingPage(QWidget *parent, const char *name) +CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Browsing")); @@ -41,15 +41,15 @@ CupsdBrowsingPage::CupsdBrowsingPage(QWidget *parent, const char *name) browseinterval_ = new KIntNumInput(this); browseport_ = new KIntNumInput(this); browsetimeout_ = new KIntNumInput(this); - browsing_ = new QCheckBox(i18n("Use browsing"), this); - cups_ = new QCheckBox("CUPS", this); - slp_ = new QCheckBox("SLP", this); + browsing_ = new TQCheckBox(i18n("Use browsing"), this); + cups_ = new TQCheckBox("CUPS", this); + slp_ = new TQCheckBox("SLP", this); browseaddresses_ = new EditList(this); - browseorder_ = new QComboBox(this); - useimplicitclasses_ = new QCheckBox(i18n("Implicit classes"), this); - hideimplicitmembers_ = new QCheckBox(i18n("Hide implicit members"), this); - useshortnames_ = new QCheckBox(i18n("Use short names"), this); - useanyclasses_ = new QCheckBox(i18n("Use \"any\" classes"), this); + browseorder_ = new TQComboBox(this); + useimplicitclasses_ = new TQCheckBox(i18n("Implicit classes"), this); + hideimplicitmembers_ = new TQCheckBox(i18n("Hide implicit members"), this); + useshortnames_ = new TQCheckBox(i18n("Use short names"), this); + useanyclasses_ = new TQCheckBox(i18n("Use \"any\" classes"), this); browseorder_->insertItem(i18n("Allow, Deny")); browseorder_->insertItem(i18n("Deny, Allow")); @@ -63,17 +63,17 @@ CupsdBrowsingPage::CupsdBrowsingPage(QWidget *parent, const char *name) browsetimeout_->setSteps(1, 10); browsetimeout_->setSuffix(i18n(" sec")); - QLabel *l1 = new QLabel(i18n("Browse port:"), this); - QLabel *l2 = new QLabel(i18n("Browse interval:"), this); - QLabel *l3 = new QLabel(i18n("Browse timeout:"), this); - QLabel *l4 = new QLabel(i18n("Browse addresses:"), this); - QLabel *l5 = new QLabel(i18n("Browse order:"), this); - QLabel *l6 = new QLabel(i18n("Browse options:"), this); + TQLabel *l1 = new TQLabel(i18n("Browse port:"), this); + TQLabel *l2 = new TQLabel(i18n("Browse interval:"), this); + TQLabel *l3 = new TQLabel(i18n("Browse timeout:"), this); + TQLabel *l4 = new TQLabel(i18n("Browse addresses:"), this); + TQLabel *l5 = new TQLabel(i18n("Browse order:"), this); + TQLabel *l6 = new TQLabel(i18n("Browse options:"), this); - QGridLayout *m1 = new QGridLayout(this, 8, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); - QHBoxLayout *m2 = new QHBoxLayout(0, 0, 10); + QHBoxLayout *m2 = new TQHBoxLayout(0, 0, 10); m1->addMultiCellLayout(m2, 0, 0, 0, 1); m2->addWidget(browsing_); m2->addWidget(cups_); @@ -90,40 +90,40 @@ CupsdBrowsingPage::CupsdBrowsingPage(QWidget *parent, const char *name) m1->addWidget(browsetimeout_, 3, 1); m1->addWidget(browseaddresses_, 4, 1); m1->addWidget(browseorder_, 5, 1); - QGridLayout *m3 = new QGridLayout(0, 2, 2, 0, 5); + QGridLayout *m3 = new TQGridLayout(0, 2, 2, 0, 5); m1->addLayout(m3, 6, 1); m3->addWidget(useimplicitclasses_, 0, 0); m3->addWidget(useanyclasses_, 0, 1); m3->addWidget(hideimplicitmembers_, 1, 0); m3->addWidget(useshortnames_, 1, 1); - connect(browsing_, SIGNAL(toggled(bool)), cups_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), slp_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), browseport_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), browseinterval_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), browsetimeout_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), browseaddresses_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), browseorder_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), useimplicitclasses_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), useanyclasses_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), hideimplicitmembers_, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), useshortnames_, SLOT(setEnabled(bool))); - - connect(browsing_, SIGNAL(toggled(bool)), l1, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), l2, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), l3, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), l4, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), l5, SLOT(setEnabled(bool))); - connect(browsing_, SIGNAL(toggled(bool)), l6, SLOT(setEnabled(bool))); - - connect(browseaddresses_, SIGNAL(add()), SLOT(slotAdd())); - connect(browseaddresses_, SIGNAL(edit(int)), SLOT(slotEdit(int))); - connect(browseaddresses_, SIGNAL(defaultList()), SLOT(slotDefaultList())); - connect(browseinterval_, SIGNAL(valueChanged(int)), SLOT(intervalChanged(int))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), cups_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), slp_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), browseport_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), browseinterval_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), browsetimeout_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), browseaddresses_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), browseorder_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), useimplicitclasses_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), useanyclasses_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), hideimplicitmembers_, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), useshortnames_, TQT_SLOT(setEnabled(bool))); + + connect(browsing_, TQT_SIGNAL(toggled(bool)), l1, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), l2, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), l3, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), l4, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), l5, TQT_SLOT(setEnabled(bool))); + connect(browsing_, TQT_SIGNAL(toggled(bool)), l6, TQT_SLOT(setEnabled(bool))); + + connect(browseaddresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); + connect(browseaddresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); + connect(browseaddresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); + connect(browseinterval_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); browsing_->setChecked(true); } -bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; browsing_->setChecked(conf_->browsing_); @@ -142,7 +142,7 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdBrowsingPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdBrowsingPage::saveConfig(CupsdConf *conf, TQString&) { conf->browsing_ = browsing_->isChecked(); QStringList l; @@ -164,30 +164,30 @@ bool CupsdBrowsingPage::saveConfig(CupsdConf *conf, QString&) void CupsdBrowsingPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(browsing_, conf->comments_.toolTip("browsing")); - QWhatsThis::add(cups_, conf->comments_.toolTip("browseprotocols")); - QWhatsThis::add(slp_, conf->comments_.toolTip("browseprotocols")); - QWhatsThis::add(browseinterval_, conf->comments_.toolTip("browseinterval")); - QWhatsThis::add(browseport_, conf->comments_.toolTip("browseport")); - QWhatsThis::add(browsetimeout_, conf->comments_.toolTip("browsetimeout")); - QWhatsThis::add(browseaddresses_, conf->comments_.toolTip("browseaddresses")); - QWhatsThis::add(browseorder_, conf->comments_.toolTip("browseorder")); - QWhatsThis::add(useimplicitclasses_, conf->comments_.toolTip("implicitclasses")); - QWhatsThis::add(useanyclasses_, conf->comments_.toolTip("implicitanyclasses")); - QWhatsThis::add(hideimplicitmembers_, conf->comments_.toolTip("hideimplicitmembers")); - QWhatsThis::add(useshortnames_, conf->comments_.toolTip("browseshortnames")); + TQWhatsThis::add(browsing_, conf->comments_.toolTip("browsing")); + TQWhatsThis::add(cups_, conf->comments_.toolTip("browseprotocols")); + TQWhatsThis::add(slp_, conf->comments_.toolTip("browseprotocols")); + TQWhatsThis::add(browseinterval_, conf->comments_.toolTip("browseinterval")); + TQWhatsThis::add(browseport_, conf->comments_.toolTip("browseport")); + TQWhatsThis::add(browsetimeout_, conf->comments_.toolTip("browsetimeout")); + TQWhatsThis::add(browseaddresses_, conf->comments_.toolTip("browseaddresses")); + TQWhatsThis::add(browseorder_, conf->comments_.toolTip("browseorder")); + TQWhatsThis::add(useimplicitclasses_, conf->comments_.toolTip("implicitclasses")); + TQWhatsThis::add(useanyclasses_, conf->comments_.toolTip("implicitanyclasses")); + TQWhatsThis::add(hideimplicitmembers_, conf->comments_.toolTip("hideimplicitmembers")); + TQWhatsThis::add(useshortnames_, conf->comments_.toolTip("browseshortnames")); } void CupsdBrowsingPage::slotAdd() { - QString s = BrowseDialog::newAddress(this, conf_); + TQString s = BrowseDialog::newAddress(this, conf_); if (!s.isEmpty()) browseaddresses_->insertItem(s); } void CupsdBrowsingPage::slotEdit(int index) { - QString s = browseaddresses_->text(index); + TQString s = browseaddresses_->text(index); s = BrowseDialog::editAddress(s, this, conf_); if (!s.isEmpty()) browseaddresses_->setText(index, s); diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h index 655998a5e..b2060c4d0 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h @@ -32,10 +32,10 @@ class CupsdBrowsingPage : public CupsdPage Q_OBJECT public: - CupsdBrowsingPage(QWidget *parent = 0, const char *name = 0); + CupsdBrowsingPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); protected slots: diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index d49a104a3..43847299b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -19,37 +19,37 @@ #include "cupsdcomment.h" -#include <qfile.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqregexp.h> #include <klocale.h> #include <kstandarddirs.h> -QString Comment::comment() +TQString Comment::comment() { - QString str = comment_; - str.replace(QRegExp("<[^>]*>"), ""); + TQString str = comment_; + str.replace(TQRegExp("<[^>]*>"), ""); str += ("#\n" + example_); return str; } -QString Comment::toolTip() +TQString Comment::toolTip() { - QString str = comment_; - str.replace(QRegExp("^#[\\s]*"), "").replace(QRegExp("\n#[\\s]*"), "\n"); + TQString str = comment_; + str.replace(TQRegExp("^#[\\s]*"), "").replace(TQRegExp("\n#[\\s]*"), "\n"); return i18n("Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)", str.utf8()); } -QString Comment::key() +TQString Comment::key() { return key_; } -bool Comment::load(QFile *f) +bool Comment::load(TQFile *f) { comment_ = ""; example_ = ""; key_ = ""; - QString line, *current = &comment_; + TQString line, *current = &comment_; while (!f->atEnd()) { f->readLine(line, 1024); @@ -83,12 +83,12 @@ bool Comment::load(QFile *f) //------------------------------------------------------------------------------------------------------------ -QString CupsdComment::operator[] (const QString& key) +TQString CupsdComment::operator[] (const TQString& key) { return comment(key); } -QString CupsdComment::comment(const QString& key) +TQString CupsdComment::comment(const TQString& key) { if (comments_.count() != 0 || loadComments()) { @@ -96,10 +96,10 @@ QString CupsdComment::comment(const QString& key) if (comm) return comm->comment(); } - return QString::null; + return TQString::null; } -QString CupsdComment::toolTip(const QString& key) +TQString CupsdComment::toolTip(const TQString& key) { if (comments_.count() != 0 || loadComments()) { @@ -107,7 +107,7 @@ QString CupsdComment::toolTip(const QString& key) if (comm) return comm->toolTip(); } - return QString::null; + return TQString::null; } bool CupsdComment::loadComments() diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.h b/kdeprint/cups/cupsdconf2/cupsdcomment.h index efe242765..8b1922f5b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.h +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.h @@ -20,36 +20,36 @@ #ifndef CUPSDCOMMENT_H #define CUPSDCOMMENT_H -#include <qstringlist.h> -#include <qdict.h> +#include <tqstringlist.h> +#include <tqdict.h> class QFile; class Comment { public: - bool load(QFile* f); - QString toolTip(); - QString comment(); - QString key(); + bool load(TQFile* f); + TQString toolTip(); + TQString comment(); + TQString key(); private: - QString comment_; - QString example_; - QString key_; + TQString comment_; + TQString example_; + TQString key_; }; class CupsdComment { public: - QString operator[] (const QString& key); - QString comment(const QString& key); - QString toolTip(const QString& key); + TQString operator[] (const TQString& key); + TQString comment(const TQString& key); + TQString toolTip(const TQString& key); private: bool loadComments(); private: - QDict<Comment> comments_; + TQDict<Comment> comments_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index 1794d693d..f500d219c 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -20,8 +20,8 @@ #include <config.h> #include "cupsdconf.h" -#include <qfile.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqregexp.h> #include <klocale.h> #include <kdebug.h> #include <kconfig.h> @@ -31,18 +31,18 @@ #include <cups/ipp.h> #include <cups/language.h> -QString findDir(const QStringList& list) +TQString findDir(const TQStringList& list) { - for (QStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) - if (QFile::exists(*it)) + for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) + if (TQFile::exists(*it)) return *it; // if nothing found, just use the first as default value return list[0]; } -void splitSizeSpec(const QString& s, int& sz, int& suff) +void splitSizeSpec(const TQString& s, int& sz, int& suff) { - int p = s.find(QRegExp("\\D")); + int p = s.find(TQRegExp("\\D")); sz = s.mid(0, p).toInt(); if (p != -1) { @@ -62,28 +62,28 @@ void splitSizeSpec(const QString& s, int& sz, int& suff) CupsdConf::CupsdConf() { // start by trying to find CUPS directories (useful later) - datadir_ = findDir(QStringList("/usr/share/cups") + datadir_ = findDir(TQStringList("/usr/share/cups") << "/usr/local/share/cups" << "/opt/share/cups" << "/opt/local/share/cups"); - documentdir_ = findDir(QStringList(datadir_+"/doc-root") + documentdir_ = findDir(TQStringList(datadir_+"/doc-root") << datadir_.left(datadir_.length()-5)+"/doc/cups"); //fontpath_ << (datadir_+"/fonts"); - requestdir_ = findDir(QStringList("/var/spool/cups") + requestdir_ = findDir(TQStringList("/var/spool/cups") << "/var/cups"); - serverbin_ = findDir(QStringList("/usr/lib" KDELIBSUFF "/cups") + serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups") << "/usr/local/lib" KDELIBSUFF "/cups" << "/opt/lib" KDELIBSUFF "/cups" << "/opt/local/lib" KDELIBSUFF "/cups"); - serverfiles_ = findDir(QStringList("/etc/cups") + serverfiles_ = findDir(TQStringList("/etc/cups") << "/usr/local/etc/cups"); tmpfiles_ = requestdir_+"/tmp"; // other options - servername_ = QString::null; - serveradmin_ = QString::null; + servername_ = TQString::null; + serveradmin_ = TQString::null; classification_ = CLASS_NONE; - otherclassname_ = QString::null; + otherclassname_ = TQString::null; classoverride_ = false; charset_ = "utf-8"; language_ = "en"; @@ -100,7 +100,7 @@ CupsdConf::CupsdConf() maxrequestsize_ = "0"; clienttimeout_ = 300; // listenaddresses_ - QString logdir = findDir(QStringList("/var/log/cups") + QString logdir = findDir(TQStringList("/var/log/cups") << "/var/spool/cups/log" << "/var/cups/log"); accesslog_ = logdir+"/access_log"; @@ -137,7 +137,7 @@ CupsdConf::~CupsdConf() { } -bool CupsdConf::loadFromFile(const QString& filename) +bool CupsdConf::loadFromFile(const TQString& filename) { QFile f(filename); if (!f.exists() || !f.open(IO_ReadOnly)) return false; @@ -173,7 +173,7 @@ bool CupsdConf::loadFromFile(const QString& filename) } } -bool CupsdConf::saveToFile(const QString& filename) +bool CupsdConf::saveToFile(const TQString& filename) { QFile f(filename); if (!f.open(IO_WriteOnly)) @@ -283,7 +283,7 @@ bool CupsdConf::saveToFile(const QString& filename) t << endl; t << "Satisfy " << (loc->satisfy_ == SATISFY_ALL ? "All" : "Any") << endl; t << "Order " << (loc->order_ == ORDER_ALLOW_DENY ? "allow,deny" : "deny,allow") << endl; - for (QStringList::ConstIterator it=loc->addresses_.begin(); it!=loc->addresses_.end(); ++it) + for (TQStringList::ConstIterator it=loc->addresses_.begin(); it!=loc->addresses_.end(); ++it) t << *it << endl; t << "</Location>" << endl; } @@ -316,7 +316,7 @@ bool CupsdConf::saveToFile(const QString& filename) t << "Timeout " << clienttimeout_ << endl; t << endl << comments_["listen"] << endl; - for (QStringList::ConstIterator it=listenaddresses_.begin(); it!=listenaddresses_.end(); ++it) + for (TQStringList::ConstIterator it=listenaddresses_.begin(); it!=listenaddresses_.end(); ++it) t << *it << endl; t << endl << "# Log" << endl; @@ -387,7 +387,7 @@ bool CupsdConf::saveToFile(const QString& filename) t << "DocumentRoot " << documentdir_ << endl; t << endl << comments_["fontpath"] << endl; - for (QStringList::ConstIterator it=fontpath_.begin(); it!=fontpath_.end(); ++it) + for (TQStringList::ConstIterator it=fontpath_.begin(); it!=fontpath_.end(); ++it) t << "FontPath " << *it << endl; t << endl << comments_["requestroot"] << endl; @@ -410,7 +410,7 @@ bool CupsdConf::saveToFile(const QString& filename) if (browsing_) { t << "BrowseProtocols "; - for (QStringList::ConstIterator it=browseprotocols_.begin(); it!=browseprotocols_.end(); ++it) + for (TQStringList::ConstIterator it=browseprotocols_.begin(); it!=browseprotocols_.end(); ++it) t << (*it).upper() << " "; t << endl; } @@ -426,7 +426,7 @@ bool CupsdConf::saveToFile(const QString& filename) t << endl << comments_["browseaddress"] << endl; if (browsing_) - for (QStringList::ConstIterator it=browseaddresses_.begin(); it!=browseaddresses_.end(); ++it) + for (TQStringList::ConstIterator it=browseaddresses_.begin(); it!=browseaddresses_.end(); ++it) if ((*it).startsWith("Send")) t << "BrowseAddress " << (*it).mid(5) << endl; else @@ -448,14 +448,14 @@ bool CupsdConf::saveToFile(const QString& filename) if (browsing_) t << "BrowseShortNames " << (useshortnames_ ? "Yes" : "No") << endl; t << endl << "# Unknown" << endl; - for (QValueList< QPair<QString,QString> >::ConstIterator it=unknown_.begin(); it!=unknown_.end(); ++it) + for (TQValueList< QPair<TQString,TQString> >::ConstIterator it=unknown_.begin(); it!=unknown_.end(); ++it) t << (*it).first << " " << (*it).second << endl; return true; } } -bool CupsdConf::parseLocation(CupsLocation *location, QTextStream& file) +bool CupsdConf::parseLocation(CupsLocation *location, TQTextStream& file) { QString line; bool done(false); @@ -479,10 +479,10 @@ bool CupsdConf::parseLocation(CupsLocation *location, QTextStream& file) return value; } -bool CupsdConf::parseOption(const QString& line) +bool CupsdConf::parseOption(const TQString& line) { int p(-1); - QString keyword, value, l(line.simplifyWhiteSpace()); + TQString keyword, value, l(line.simplifyWhiteSpace()); if ((p=l.find(' ')) != -1) { @@ -507,11 +507,11 @@ bool CupsdConf::parseOption(const QString& line) else if (keyword == "browseprotocols") { browseprotocols_.clear(); - QStringList prots = QStringList::split(QRegExp("\\s"), value, false); + TQStringList prots = TQStringList::split(TQRegExp("\\s"), value, false); if (prots.find("all") != prots.end()) browseprotocols_ << "CUPS" << "SLP"; else - for (QStringList::ConstIterator it=prots.begin(); it!=prots.end(); ++it) + for (TQStringList::ConstIterator it=prots.begin(); it!=prots.end(); ++it) browseprotocols_ << (*it).upper(); } else if (keyword == "browserelay") browseaddresses_.append("Relay "+value); @@ -540,12 +540,12 @@ bool CupsdConf::parseOption(const QString& line) else if (keyword == "documentroot") documentdir_ = value; else if (keyword == "errorlog") errorlog_ = value; else if (keyword == "filterlimit") filterlimit_ = value.toInt(); - else if (keyword == "fontpath") fontpath_ += QStringList::split(':', value, false); + else if (keyword == "fontpath") fontpath_ += TQStringList::split(':', value, false); else if (keyword == "group") group_ = value; else if (keyword == "hideimplicitmembers") hideimplicitmembers_ = (value.lower() != "no"); else if (keyword == "hostnamelookups") { - QString h = value.lower(); + TQString h = value.lower(); if (h == "on") hostnamelookup_ = HOSTNAME_ON; else if (h == "double") hostnamelookup_ = HOSTNAME_DOUBLE; else hostnamelookup_ = HOSTNAME_OFF; @@ -557,7 +557,7 @@ bool CupsdConf::parseOption(const QString& line) else if (keyword == "listen") listenaddresses_.append("Listen "+value); else if (keyword == "loglevel") { - QString ll = value.lower(); + TQString ll = value.lower(); if (ll == "none") loglevel_ = LOGLEVEL_NONE; else if (ll == "error") loglevel_ = LOGLEVEL_ERROR; else if (ll == "warn") loglevel_ = LOGLEVEL_WARN; @@ -600,7 +600,7 @@ bool CupsdConf::parseOption(const QString& line) else { // unrecognized option - unknown_ << QPair<QString,QString>(keyword, value); + unknown_ << QPair<TQString,TQString>(keyword, value); } return true; } @@ -695,7 +695,7 @@ CupsLocation::CupsLocation() resourcename_ = ""; authtype_ = AUTHTYPE_NONE; authclass_ = AUTHCLASS_ANONYMOUS; - authname_ = QString::null; + authname_ = TQString::null; encryption_ = ENCRYPT_IFREQUESTED; satisfy_ = SATISFY_ALL; order_ = ORDER_ALLOW_DENY; @@ -715,7 +715,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc) { } -bool CupsLocation::parseResource(const QString& line) +bool CupsLocation::parseResource(const TQString& line) { QString str = line.simplifyWhiteSpace(); int p1 = line.find(' '), p2 = line.find('>'); @@ -727,10 +727,10 @@ bool CupsLocation::parseResource(const QString& line) else return false; } -bool CupsLocation::parseOption(const QString& line) +bool CupsLocation::parseOption(const TQString& line) { int p(-1); - QString keyword, value, l(line.simplifyWhiteSpace()); + TQString keyword, value, l(line.simplifyWhiteSpace()); if ((p=l.find(' ')) != -1) { @@ -744,14 +744,14 @@ bool CupsLocation::parseOption(const QString& line) if (keyword == "authtype") { - QString a = value.lower(); + TQString a = value.lower(); if (a == "basic") authtype_ = AUTHTYPE_BASIC; else if (a == "digest") authtype_ = AUTHTYPE_DIGEST; else authtype_ = AUTHTYPE_NONE; } else if (keyword == "authclass") { - QString a = value.lower(); + TQString a = value.lower(); if (a == "user") authclass_ = AUTHCLASS_USER; else if (a == "system") authclass_ = AUTHCLASS_SYSTEM; else if (a == "group") authclass_ = AUTHCLASS_GROUP; @@ -764,7 +764,7 @@ bool CupsLocation::parseOption(const QString& line) if (p != -1) { authname_ = value.mid(p+1); - QString cl = value.left(p).lower(); + TQString cl = value.left(p).lower(); if (cl == "user") authclass_ = AUTHCLASS_USER; else if (cl == "group") @@ -776,7 +776,7 @@ bool CupsLocation::parseOption(const QString& line) else if (keyword == "order") order_ = (value.lower() == "deny,allow" ? ORDER_DENY_ALLOW : ORDER_ALLOW_DENY); else if (keyword == "encryption") { - QString e = value.lower(); + TQString e = value.lower(); if (e == "always") encryption_ = ENCRYPT_ALWAYS; else if (e == "never") encryption_ = ENCRYPT_NEVER; else if (e == "required") encryption_ = ENCRYPT_REQUIRED; @@ -794,19 +794,19 @@ CupsResource::CupsResource() type_ = RESOURCE_GLOBAL; } -CupsResource::CupsResource(const QString& path) +CupsResource::CupsResource(const TQString& path) { setPath(path); } -void CupsResource::setPath(const QString& path) +void CupsResource::setPath(const TQString& path) { path_ = path; type_ = typeFromPath(path_); text_ = pathToText(path_); } -int CupsResource::typeFromText(const QString& text) +int CupsResource::typeFromText(const TQString& text) { if (text == i18n("Base", "Root") || text == i18n("All printers") || text == i18n("All classes") || text == i18n("Print jobs")) return RESOURCE_GLOBAL; else if (text == i18n("Administration")) return RESOURCE_ADMIN; @@ -815,7 +815,7 @@ int CupsResource::typeFromText(const QString& text) else return RESOURCE_PRINTER; } -int CupsResource::typeFromPath(const QString& path) +int CupsResource::typeFromPath(const TQString& path) { if (path == "/admin") return RESOURCE_ADMIN; else if (path == "/printers" || path == "/classes" || path == "/" || path == "/jobs") return RESOURCE_GLOBAL; @@ -824,7 +824,7 @@ int CupsResource::typeFromPath(const QString& path) else return RESOURCE_GLOBAL; } -QString CupsResource::textToPath(const QString& text) +TQString CupsResource::textToPath(const TQString& text) { QString path("/"); if (text == i18n("Administration")) path = "/admin"; @@ -845,7 +845,7 @@ QString CupsResource::textToPath(const QString& text) return path; } -QString CupsResource::pathToText(const QString& path) +TQString CupsResource::pathToText(const TQString& path) { QString text(i18n("Base", "Root")); if (path == "/admin") text = i18n("Administration"); @@ -868,17 +868,17 @@ QString CupsResource::pathToText(const QString& path) return text; } -QString CupsResource::typeToIconName(int type) +TQString CupsResource::typeToIconName(int type) { switch (type) { case RESOURCE_ADMIN: case RESOURCE_GLOBAL: - return QString("folder"); + return TQString("folder"); case RESOURCE_PRINTER: - return QString("kdeprint_printer"); + return TQString("kdeprint_printer"); case RESOURCE_CLASS: - return QString("kdeprint_printer_class"); + return TQString("kdeprint_printer_class"); } - return QString("folder"); + return TQString("folder"); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.h b/kdeprint/cups/cupsdconf2/cupsdconf.h index 3c53c5390..e58e52b31 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.h +++ b/kdeprint/cups/cupsdconf2/cupsdconf.h @@ -20,11 +20,11 @@ #ifndef CUPSDCONF_H #define CUPSDCONF_H -#include <qstring.h> -#include <qstringlist.h> -#include <qptrlist.h> -#include <qtextstream.h> -#include <qpair.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqptrlist.h> +#include <tqtextstream.h> +#include <tqpair.h> #include "cupsdcomment.h" @@ -50,10 +50,10 @@ struct CupsdConf CupsdConf(); ~CupsdConf(); - bool loadFromFile(const QString& filename); - bool saveToFile(const QString& filename); - bool parseOption(const QString& line); - bool parseLocation(CupsLocation *location, QTextStream& file); + bool loadFromFile(const TQString& filename); + bool saveToFile(const TQString& filename); + bool parseOption(const TQString& line); + bool parseLocation(CupsLocation *location, TQTextStream& file); bool loadAvailableResources(); @@ -67,35 +67,35 @@ struct CupsdConf QString servername_; QString serveradmin_; int classification_; - QString otherclassname_; + TQString otherclassname_; bool classoverride_; - QString charset_; - QString language_; - QString printcap_; + TQString charset_; + TQString language_; + TQString printcap_; int printcapformat_; // Security - QString remoteroot_; - QString systemgroup_; - QString encryptcert_; - QString encryptkey_; - QPtrList<CupsLocation> locations_; - QPtrList<CupsResource> resources_; + TQString remoteroot_; + TQString systemgroup_; + TQString encryptcert_; + TQString encryptkey_; + TQPtrList<CupsLocation> locations_; + TQPtrList<CupsResource> resources_; // Network int hostnamelookup_; bool keepalive_; int keepalivetimeout_; int maxclients_; - QString maxrequestsize_; + TQString maxrequestsize_; int clienttimeout_; - QStringList listenaddresses_; + TQStringList listenaddresses_; // Log - QString accesslog_; - QString errorlog_; - QString pagelog_; - QString maxlogsize_; + TQString accesslog_; + TQString errorlog_; + TQString pagelog_; + TQString maxlogsize_; int loglevel_; // Jobs @@ -107,27 +107,27 @@ struct CupsdConf int maxjobsperuser_; // Filter - QString user_; - QString group_; - QString ripcache_; + TQString user_; + TQString group_; + TQString ripcache_; int filterlimit_; // Directories - QString datadir_; - QString documentdir_; - QStringList fontpath_; - QString requestdir_; - QString serverbin_; - QString serverfiles_; - QString tmpfiles_; + TQString datadir_; + TQString documentdir_; + TQStringList fontpath_; + TQString requestdir_; + TQString serverbin_; + TQString serverfiles_; + TQString tmpfiles_; // Browsing bool browsing_; - QStringList browseprotocols_; + TQStringList browseprotocols_; int browseport_; int browseinterval_; int browsetimeout_; - QStringList browseaddresses_; + TQStringList browseaddresses_; int browseorder_; bool useimplicitclasses_; bool hideimplicitmembers_; @@ -138,7 +138,7 @@ struct CupsdConf CupsdComment comments_; // unrecognized options - QValueList< QPair<QString,QString> > unknown_; + TQValueList< QPair<TQString,TQString> > unknown_; }; struct CupsLocation @@ -146,8 +146,8 @@ struct CupsLocation CupsLocation(); CupsLocation(const CupsLocation& loc); - bool parseOption(const QString& line); - bool parseResource(const QString& line); + bool parseOption(const TQString& line); + bool parseResource(const TQString& line); CupsResource *resource_; QString resourcename_; @@ -163,19 +163,19 @@ struct CupsLocation struct CupsResource { CupsResource(); - CupsResource(const QString& path); + CupsResource(const TQString& path); - void setPath(const QString& path); + void setPath(const TQString& path); int type_; QString path_; QString text_; - static QString textToPath(const QString& text); - static QString pathToText(const QString& path); - static int typeFromPath(const QString& path); - static int typeFromText(const QString& text); - static QString typeToIconName(int type); + static TQString textToPath(const TQString& text); + static TQString pathToText(const TQString& path); + static int typeFromPath(const TQString& path); + static int typeFromText(const TQString& text); + static TQString typeToIconName(int type); }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 92f8eef51..77f35e1e3 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -31,16 +31,16 @@ #include "cupsdbrowsingpage.h" #include "cupsdsecuritypage.h" -#include <qdir.h> -#include <qvbox.h> +#include <tqdir.h> +#include <tqvbox.h> #include <kmessagebox.h> #include <klocale.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> #include <kglobal.h> #include <kiconloader.h> -#include <qstringlist.h> -#include <qwhatsthis.h> +#include <tqstringlist.h> +#include <tqwhatsthis.h> #include <kio/passdlg.h> #include <kguiitem.h> #include <kprocess.h> @@ -54,14 +54,14 @@ static QString pass_string; extern "C" { #include "cups-util.h" - KDEPRINT_EXPORT bool restartServer(QString& msg) + KDEPRINT_EXPORT bool restartServer(TQString& msg) { return CupsdDialog::restartServer(msg); } - KDEPRINT_EXPORT bool configureServer(QWidget *parent, QString& msg) + KDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg) { dynamically_loaded = true; - bool result = CupsdDialog::configure(QString::null, parent, &msg); + bool result = CupsdDialog::configure(TQString::null, parent, &msg); dynamically_loaded = false; return result; } @@ -69,7 +69,7 @@ extern "C" int getServerPid() { - QDir dir("/proc",QString::null,QDir::Name,QDir::Dirs); + QDir dir("/proc",TQString::null,TQDir::Name,TQDir::Dirs); for (uint i=0;i<dir.count();i++) { if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue; @@ -94,7 +94,7 @@ const char* getPassword(const char*) QString user(cupsUser()); QString pass; - if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == QDialog::Accepted) + if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) { cupsSetUser(user.latin1()); pass_string = pass; @@ -109,7 +109,7 @@ const char* getPassword(const char*) //--------------------------------------------------- -CupsdDialog::CupsdDialog(QWidget *parent, const char *name) +CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { KGlobal::iconLoader()->addAppDir("kdeprint"); @@ -135,14 +135,14 @@ CupsdDialog::~CupsdDialog() void CupsdDialog::addConfPage(CupsdPage *page) { - QPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( page->pixmap(), KIcon::NoGroup, KIcon::SizeMedium ); QVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon); - page->reparent(box, QPoint(0,0)); + page->reparent(box, TQPoint(0,0)); pagelist_.append(page); } @@ -165,7 +165,7 @@ void CupsdDialog::constructDialog() } } -bool CupsdDialog::setConfigFile(const QString& filename) +bool CupsdDialog::setConfigFile(const TQString& filename) { filename_ = filename; if (!conf_->loadFromFile(filename_)) @@ -177,7 +177,7 @@ bool CupsdDialog::setConfigFile(const QString& filename) { // there were some unknown options, warn the user QString msg; - for (QValueList< QPair<QString,QString> >::ConstIterator it=conf_->unknown_.begin(); it!=conf_->unknown_.end(); ++it) + for (TQValueList< QPair<TQString,TQString> >::ConstIterator it=conf_->unknown_.begin(); it!=conf_->unknown_.end(); ++it) msg += ((*it).first + " = " + (*it).second + "<br>"); msg.prepend("<p>" + i18n("Some options were not recognized by this configuration tool. " "They will be left untouched and you won't be able to change them.") + "</p>"); @@ -195,7 +195,7 @@ bool CupsdDialog::setConfigFile(const QString& filename) return true; } -bool CupsdDialog::restartServer(QString& msg) +bool CupsdDialog::restartServer(TQString& msg) { int serverPid = getServerPid(); msg.truncate(0); @@ -215,10 +215,10 @@ bool CupsdDialog::restartServer(QString& msg) return (msg.isEmpty()); } -bool CupsdDialog::configure(const QString& filename, QWidget *parent, QString *msg) +bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString *msg) { bool needUpload(false); - QString errormsg; + TQString errormsg; bool result = true; // init password dialog if needed @@ -259,7 +259,7 @@ bool CupsdDialog::configure(const QString& filename, QWidget *parent, QString *m CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { - QCString encodedFn = QFile::encodeName(fn); + QCString encodedFn = TQFile::encodeName(fn); if (!needUpload) KMessageBox::information(parent, i18n("The config file has not been uploaded to the " @@ -276,7 +276,7 @@ bool CupsdDialog::configure(const QString& filename, QWidget *parent, QString *m } if (needUpload) - QFile::remove(fn); + TQFile::remove(fn); if ( msg ) *msg = errormsg; @@ -314,7 +314,7 @@ void CupsdDialog::slotOk() void CupsdDialog::slotUser1() { - QWhatsThis::enterWhatsThisMode(); + TQWhatsThis::enterWhatsThisMode(); } int CupsdDialog::serverPid() @@ -338,7 +338,7 @@ int CupsdDialog::serverOwner() str = t.readLine(); if (str.find("Uid:",0,false) == 0) { - QStringList list = QStringList::split('\t', str, false); + QStringList list = TQStringList::split('\t', str, false); if (list.count() >= 2) { bool ok; diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.h b/kdeprint/cups/cupsdconf2/cupsddialog.h index 4de5cd3dc..ed8a33613 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.h +++ b/kdeprint/cups/cupsdconf2/cupsddialog.h @@ -21,7 +21,7 @@ #define CUPSDDIALOG_H #include <kdialogbase.h> -#include <qptrlist.h> +#include <tqptrlist.h> class CupsdPage; struct CupsdConf; @@ -30,13 +30,13 @@ class CupsdDialog : public KDialogBase { Q_OBJECT public: - CupsdDialog(QWidget *parent = 0, const char *name = 0); + CupsdDialog(TQWidget *parent = 0, const char *name = 0); ~CupsdDialog(); - bool setConfigFile(const QString& filename); + bool setConfigFile(const TQString& filename); - static bool configure(const QString& filename = QString::null, QWidget *parent = 0, QString *errormsg = 0); - static bool restartServer(QString& msg); + static bool configure(const TQString& filename = TQString::null, TQWidget *parent = 0, TQString *errormsg = 0); + static bool restartServer(TQString& msg); static int serverPid(); static int serverOwner(); @@ -50,7 +50,7 @@ protected: void restartServer(); private: - QPtrList<CupsdPage> pagelist_; + TQPtrList<CupsdPage> pagelist_; CupsdConf *conf_; QString filename_; }; diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp index 04a94c30a..75b979d3d 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -22,13 +22,13 @@ #include "qdirlineedit.h" #include "qdirmultilineedit.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> -CupsdDirPage::CupsdDirPage(QWidget *parent, const char *name) +CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Folders")); @@ -43,15 +43,15 @@ CupsdDirPage::CupsdDirPage(QWidget *parent, const char *name) serverfiles_ = new QDirLineEdit(false, this); tmpfiles_ = new QDirLineEdit(false, this); - QLabel *l1 = new QLabel(i18n("Data folder:"), this); - QLabel *l2 = new QLabel(i18n("Document folder:"), this); - QLabel *l3 = new QLabel(i18n("Font path:"), this); - QLabel *l4 = new QLabel(i18n("Request folder:"), this); - QLabel *l5 = new QLabel(i18n("Server binaries:"), this); - QLabel *l6 = new QLabel(i18n("Server files:"), this); - QLabel *l7 = new QLabel(i18n("Temporary files:"), this); + TQLabel *l1 = new TQLabel(i18n("Data folder:"), this); + TQLabel *l2 = new TQLabel(i18n("Document folder:"), this); + TQLabel *l3 = new TQLabel(i18n("Font path:"), this); + TQLabel *l4 = new TQLabel(i18n("Request folder:"), this); + TQLabel *l5 = new TQLabel(i18n("Server binaries:"), this); + TQLabel *l6 = new TQLabel(i18n("Server files:"), this); + TQLabel *l7 = new TQLabel(i18n("Temporary files:"), this); - QGridLayout *m1 = new QGridLayout(this, 8, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -70,7 +70,7 @@ CupsdDirPage::CupsdDirPage(QWidget *parent, const char *name) m1->addWidget(tmpfiles_, 6, 1); } -bool CupsdDirPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdDirPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; datadir_->setURL(conf_->datadir_); @@ -84,7 +84,7 @@ bool CupsdDirPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdDirPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdDirPage::saveConfig(CupsdConf *conf, TQString&) { conf->datadir_ = datadir_->url(); conf->documentdir_ = documentdir_->url(); @@ -99,11 +99,11 @@ bool CupsdDirPage::saveConfig(CupsdConf *conf, QString&) void CupsdDirPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(datadir_, conf->comments_.toolTip("datadir")); - QWhatsThis::add(documentdir_, conf->comments_.toolTip("documentroot")); - QWhatsThis::add(fontpath_, conf->comments_.toolTip("fontpath")); - QWhatsThis::add(requestdir_, conf->comments_.toolTip("requestroot")); - QWhatsThis::add(serverbin_, conf->comments_.toolTip("serverbin")); - QWhatsThis::add(serverfiles_, conf->comments_.toolTip("serverroot")); - QWhatsThis::add(tmpfiles_, conf->comments_.toolTip("tempdir")); + TQWhatsThis::add(datadir_, conf->comments_.toolTip("datadir")); + TQWhatsThis::add(documentdir_, conf->comments_.toolTip("documentroot")); + TQWhatsThis::add(fontpath_, conf->comments_.toolTip("fontpath")); + TQWhatsThis::add(requestdir_, conf->comments_.toolTip("requestroot")); + TQWhatsThis::add(serverbin_, conf->comments_.toolTip("serverbin")); + TQWhatsThis::add(serverfiles_, conf->comments_.toolTip("serverroot")); + TQWhatsThis::add(tmpfiles_, conf->comments_.toolTip("tempdir")); } diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.h b/kdeprint/cups/cupsdconf2/cupsddirpage.h index ffce797e8..6056f79c4 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.h +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.h @@ -28,10 +28,10 @@ class QDirMultiLineEdit; class CupsdDirPage : public CupsdPage { public: - CupsdDirPage(QWidget *parent = 0, const char *name = 0); + CupsdDirPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); private: diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index 12270bc26..b8458c10c 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -21,24 +21,24 @@ #include "cupsdconf.h" #include "sizewidget.h" -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> -CupsdFilterPage::CupsdFilterPage(QWidget *parent, const char *name) +CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Filter")); setHeader(i18n("Filter Settings")); setPixmap("filter"); - user_ = new QLineEdit(this); - group_ = new QLineEdit(this); + user_ = new TQLineEdit(this); + group_ = new TQLineEdit(this); ripcache_ = new SizeWidget(this); filterlimit_ = new KIntNumInput(this); @@ -46,12 +46,12 @@ CupsdFilterPage::CupsdFilterPage(QWidget *parent, const char *name) filterlimit_->setSpecialValueText(i18n("Unlimited")); filterlimit_->setSteps(1, 10); - QLabel *l1 = new QLabel(i18n("User:"), this); - QLabel *l2 = new QLabel(i18n("Group:"), this); - QLabel *l3 = new QLabel(i18n("RIP cache:"), this); - QLabel *l4 = new QLabel(i18n("Filter limit:"), this); + TQLabel *l1 = new TQLabel(i18n("User:"), this); + TQLabel *l2 = new TQLabel(i18n("Group:"), this); + TQLabel *l3 = new TQLabel(i18n("RIP cache:"), this); + TQLabel *l4 = new TQLabel(i18n("Filter limit:"), this); - QGridLayout *m1 = new QGridLayout(this, 5, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); m1->setRowStretch(4, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -64,7 +64,7 @@ CupsdFilterPage::CupsdFilterPage(QWidget *parent, const char *name) m1->addWidget(filterlimit_, 3, 1); } -bool CupsdFilterPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdFilterPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; user_->setText(conf_->user_); @@ -75,7 +75,7 @@ bool CupsdFilterPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdFilterPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdFilterPage::saveConfig(CupsdConf *conf, TQString&) { conf->user_ = user_->text(); conf->group_ = group_->text(); @@ -87,8 +87,8 @@ bool CupsdFilterPage::saveConfig(CupsdConf *conf, QString&) void CupsdFilterPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(user_, conf->comments_.toolTip("user")); - QWhatsThis::add(group_, conf->comments_.toolTip("group")); - QWhatsThis::add(ripcache_, conf->comments_.toolTip("ripcache")); - QWhatsThis::add(filterlimit_, conf->comments_.toolTip("filterlimit")); + TQWhatsThis::add(user_, conf->comments_.toolTip("user")); + TQWhatsThis::add(group_, conf->comments_.toolTip("group")); + TQWhatsThis::add(ripcache_, conf->comments_.toolTip("ripcache")); + TQWhatsThis::add(filterlimit_, conf->comments_.toolTip("filterlimit")); } diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h index 894777520..858b5e011 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h @@ -30,10 +30,10 @@ class KIntNumInput; class CupsdFilterPage : public CupsdPage { public: - CupsdFilterPage(QWidget *parent = 0, const char *name = 0); + CupsdFilterPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); private: diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp index bfb2832eb..52d9eaf15 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -20,24 +20,24 @@ #include "cupsdjobspage.h" #include "cupsdconf.h" -#include <qlabel.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> -CupsdJobsPage::CupsdJobsPage(QWidget *parent, const char *name) +CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Jobs")); setHeader(i18n("Print Jobs Settings")); setPixmap("fileprint"); - keepjobhistory_ = new QCheckBox(i18n("Preserve job history"), this); - keepjobfiles_ = new QCheckBox(i18n("Preserve job files"), this); - autopurgejobs_ = new QCheckBox(i18n("Auto purge jobs"), this); + keepjobhistory_ = new TQCheckBox(i18n("Preserve job history"), this); + keepjobfiles_ = new TQCheckBox(i18n("Preserve job files"), this); + autopurgejobs_ = new TQCheckBox(i18n("Auto purge jobs"), this); maxjobs_ = new KIntNumInput(this); maxjobsperprinter_ = new KIntNumInput(this); maxjobsperuser_ = new KIntNumInput(this); @@ -52,11 +52,11 @@ CupsdJobsPage::CupsdJobsPage(QWidget *parent, const char *name) maxjobsperuser_->setSpecialValueText(i18n("Unlimited")); maxjobsperuser_->setSteps(1, 10); - QLabel *l1 = new QLabel(i18n("Max jobs:"), this); - QLabel *l2 = new QLabel(i18n("Max jobs per printer:"), this); - QLabel *l3 = new QLabel(i18n("Max jobs per user:"), this); + TQLabel *l1 = new TQLabel(i18n("Max jobs:"), this); + TQLabel *l2 = new TQLabel(i18n("Max jobs per printer:"), this); + TQLabel *l3 = new TQLabel(i18n("Max jobs per user:"), this); - QGridLayout *m1 = new QGridLayout(this, 7, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 7, 2, 10, 7); m1->setRowStretch(6, 1); m1->setColStretch(1, 1); m1->addWidget(keepjobhistory_, 0, 1); @@ -69,11 +69,11 @@ CupsdJobsPage::CupsdJobsPage(QWidget *parent, const char *name) m1->addWidget(maxjobsperprinter_, 4, 1); m1->addWidget(maxjobsperuser_, 5, 1); - connect(keepjobhistory_, SIGNAL(toggled(bool)), SLOT(historyChanged(bool))); + connect(keepjobhistory_, TQT_SIGNAL(toggled(bool)), TQT_SLOT(historyChanged(bool))); keepjobhistory_->setChecked(true); } -bool CupsdJobsPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdJobsPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; keepjobhistory_->setChecked(conf_->keepjobhistory_); @@ -89,7 +89,7 @@ bool CupsdJobsPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdJobsPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdJobsPage::saveConfig(CupsdConf *conf, TQString&) { conf->keepjobhistory_ = keepjobhistory_->isChecked(); if (conf->keepjobhistory_) @@ -106,12 +106,12 @@ bool CupsdJobsPage::saveConfig(CupsdConf *conf, QString&) void CupsdJobsPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(keepjobhistory_, conf->comments_.toolTip("preservejobhistory")); - QWhatsThis::add(keepjobfiles_, conf->comments_.toolTip("preservejobfiles")); - QWhatsThis::add(autopurgejobs_, conf->comments_.toolTip("autopurgejobs")); - QWhatsThis::add(maxjobs_, conf->comments_.toolTip("maxjobs")); - QWhatsThis::add(maxjobsperprinter_, conf->comments_.toolTip("maxjobsperprinter")); - QWhatsThis::add(maxjobsperuser_, conf->comments_.toolTip("maxjobsperuser")); + TQWhatsThis::add(keepjobhistory_, conf->comments_.toolTip("preservejobhistory")); + TQWhatsThis::add(keepjobfiles_, conf->comments_.toolTip("preservejobfiles")); + TQWhatsThis::add(autopurgejobs_, conf->comments_.toolTip("autopurgejobs")); + TQWhatsThis::add(maxjobs_, conf->comments_.toolTip("maxjobs")); + TQWhatsThis::add(maxjobsperprinter_, conf->comments_.toolTip("maxjobsperprinter")); + TQWhatsThis::add(maxjobsperuser_, conf->comments_.toolTip("maxjobsperuser")); } void CupsdJobsPage::historyChanged(bool on) diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.h b/kdeprint/cups/cupsdconf2/cupsdjobspage.h index 19e76a2aa..f29721516 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.h +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.h @@ -30,10 +30,10 @@ class CupsdJobsPage : public CupsdPage Q_OBJECT public: - CupsdJobsPage(QWidget *parent = 0, const char *name = 0); + CupsdJobsPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); protected slots: diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp index 49840050e..032af5526 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -22,15 +22,15 @@ #include "qdirlineedit.h" #include "sizewidget.h" -#include <qlabel.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kfiledialog.h> -CupsdLogPage::CupsdLogPage(QWidget *parent, const char *name) +CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Log")); @@ -41,7 +41,7 @@ CupsdLogPage::CupsdLogPage(QWidget *parent, const char *name) errorlog_ = new QDirLineEdit(true, this); pagelog_ = new QDirLineEdit(true, this); maxlogsize_ = new SizeWidget(this); - loglevel_ = new QComboBox(this); + loglevel_ = new TQComboBox(this); loglevel_->insertItem(i18n("Detailed Debugging")); loglevel_->insertItem(i18n("Debug Information")); @@ -55,15 +55,15 @@ CupsdLogPage::CupsdLogPage(QWidget *parent, const char *name) maxlogsize_->setSpecialValueText(i18n("Unlimited")); maxlogsize_->setSuffix(i18n("MB"));*/ - QLabel *l1 = new QLabel(i18n("Access log:"), this); - QLabel *l2 = new QLabel(i18n("Error log:"), this); - QLabel *l3 = new QLabel(i18n("Page log:"), this); - QLabel *l4 = new QLabel(i18n("Max log size:"), this); - QLabel *l5 = new QLabel(i18n("Log level:"), this); + TQLabel *l1 = new TQLabel(i18n("Access log:"), this); + TQLabel *l2 = new TQLabel(i18n("Error log:"), this); + TQLabel *l3 = new TQLabel(i18n("Page log:"), this); + TQLabel *l4 = new TQLabel(i18n("Max log size:"), this); + TQLabel *l5 = new TQLabel(i18n("Log level:"), this); loglevel_->setCurrentItem(2); - QGridLayout *m1 = new QGridLayout(this, 6, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -78,7 +78,7 @@ CupsdLogPage::CupsdLogPage(QWidget *parent, const char *name) m1->addWidget(loglevel_, 4, 1); } -bool CupsdLogPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdLogPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; accesslog_->setURL(conf_->accesslog_); @@ -90,7 +90,7 @@ bool CupsdLogPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdLogPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdLogPage::saveConfig(CupsdConf *conf, TQString&) { conf->accesslog_ = accesslog_->url(); conf->errorlog_ = errorlog_->url(); @@ -103,9 +103,9 @@ bool CupsdLogPage::saveConfig(CupsdConf *conf, QString&) void CupsdLogPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(accesslog_, conf->comments_.toolTip("accesslog")); - QWhatsThis::add(errorlog_, conf->comments_.toolTip("errorlog")); - QWhatsThis::add(pagelog_, conf->comments_.toolTip("pagelog")); - QWhatsThis::add(maxlogsize_, conf->comments_.toolTip("maxlogsize")); - QWhatsThis::add(loglevel_, conf->comments_.toolTip("loglevel")); + TQWhatsThis::add(accesslog_, conf->comments_.toolTip("accesslog")); + TQWhatsThis::add(errorlog_, conf->comments_.toolTip("errorlog")); + TQWhatsThis::add(pagelog_, conf->comments_.toolTip("pagelog")); + TQWhatsThis::add(maxlogsize_, conf->comments_.toolTip("maxlogsize")); + TQWhatsThis::add(loglevel_, conf->comments_.toolTip("loglevel")); } diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.h b/kdeprint/cups/cupsdconf2/cupsdlogpage.h index 68e15ff45..de7826827 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.h @@ -29,10 +29,10 @@ class QComboBox; class CupsdLogPage : public CupsdPage { public: - CupsdLogPage(QWidget *parent = 0, const char *name = 0); + CupsdLogPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); private: diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index 6b0f196b5..3cc360150 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -23,28 +23,28 @@ #include "portdialog.h" #include "sizewidget.h" -#include <qlabel.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> -CupsdNetworkPage::CupsdNetworkPage(QWidget *parent, const char *name) +CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Network")); setHeader(i18n("Network Settings")); setPixmap("network"); - keepalive_ = new QCheckBox(i18n("Keep alive"), this); + keepalive_ = new TQCheckBox(i18n("Keep alive"), this); keepalivetimeout_ = new KIntNumInput(this); maxclients_ = new KIntNumInput(this); maxrequestsize_ = new SizeWidget(this); clienttimeout_ = new KIntNumInput(this); - hostnamelookup_ = new QComboBox(this); + hostnamelookup_ = new TQComboBox(this); listen_ = new EditList(this); keepalivetimeout_->setRange(0, 10000, 1, true); @@ -64,14 +64,14 @@ CupsdNetworkPage::CupsdNetworkPage(QWidget *parent, const char *name) hostnamelookup_->insertItem(i18n("On")); hostnamelookup_->insertItem(i18n("Double")); - QLabel *l1 = new QLabel(i18n("Hostname lookups:"), this); - QLabel *l2 = new QLabel(i18n("Keep-alive timeout:"), this); - QLabel *l3 = new QLabel(i18n("Max clients:"), this); - QLabel *l4 = new QLabel(i18n("Max request size:"), this); - QLabel *l5 = new QLabel(i18n("Client timeout:"), this); - QLabel *l6 = new QLabel(i18n("Listen to:"), this); + TQLabel *l1 = new TQLabel(i18n("Hostname lookups:"), this); + TQLabel *l2 = new TQLabel(i18n("Keep-alive timeout:"), this); + TQLabel *l3 = new TQLabel(i18n("Max clients:"), this); + TQLabel *l4 = new TQLabel(i18n("Max request size:"), this); + TQLabel *l5 = new TQLabel(i18n("Client timeout:"), this); + TQLabel *l6 = new TQLabel(i18n("Listen to:"), this); - QGridLayout *m1 = new QGridLayout(this, 8, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -88,14 +88,14 @@ CupsdNetworkPage::CupsdNetworkPage(QWidget *parent, const char *name) m1->addWidget(clienttimeout_, 5, 1); m1->addWidget(listen_, 6, 1); - connect(listen_, SIGNAL(add()), SLOT(slotAdd())); - connect(listen_, SIGNAL(edit(int)), SLOT(slotEdit(int))); - connect(listen_, SIGNAL(defaultList()), SLOT(slotDefaultList())); - connect(keepalive_, SIGNAL(toggled(bool)), keepalivetimeout_, SLOT(setEnabled(bool))); + connect(listen_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); + connect(listen_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); + connect(listen_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); + connect(keepalive_, TQT_SIGNAL(toggled(bool)), keepalivetimeout_, TQT_SLOT(setEnabled(bool))); keepalive_->setChecked(true); } -bool CupsdNetworkPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdNetworkPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; hostnamelookup_->setCurrentItem(conf_->hostnamelookup_); @@ -109,7 +109,7 @@ bool CupsdNetworkPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdNetworkPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdNetworkPage::saveConfig(CupsdConf *conf, TQString&) { conf->hostnamelookup_ = hostnamelookup_->currentItem(); conf->keepalive_ = keepalive_->isChecked(); @@ -124,13 +124,13 @@ bool CupsdNetworkPage::saveConfig(CupsdConf *conf, QString&) void CupsdNetworkPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(hostnamelookup_, conf->comments_.toolTip("hostnamelookups")); - QWhatsThis::add(keepalive_, conf->comments_.toolTip("keepalive")); - QWhatsThis::add(keepalivetimeout_, conf->comments_.toolTip("keepalivetimeout")); - QWhatsThis::add(maxclients_, conf->comments_.toolTip("maxclients")); - QWhatsThis::add(maxrequestsize_, conf->comments_.toolTip("maxrequestsize")); - QWhatsThis::add(clienttimeout_, conf->comments_.toolTip("timeout")); - QWhatsThis::add(listen_, conf->comments_.toolTip("listen")); + TQWhatsThis::add(hostnamelookup_, conf->comments_.toolTip("hostnamelookups")); + TQWhatsThis::add(keepalive_, conf->comments_.toolTip("keepalive")); + TQWhatsThis::add(keepalivetimeout_, conf->comments_.toolTip("keepalivetimeout")); + TQWhatsThis::add(maxclients_, conf->comments_.toolTip("maxclients")); + TQWhatsThis::add(maxrequestsize_, conf->comments_.toolTip("maxrequestsize")); + TQWhatsThis::add(clienttimeout_, conf->comments_.toolTip("timeout")); + TQWhatsThis::add(listen_, conf->comments_.toolTip("listen")); } void CupsdNetworkPage::slotAdd() @@ -142,7 +142,7 @@ void CupsdNetworkPage::slotAdd() void CupsdNetworkPage::slotEdit(int index) { - QString s = listen_->text(index); + TQString s = listen_->text(index); s = PortDialog::editListen(s, this, conf_); if (!s.isEmpty()) listen_->setText(index, s); diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h index c4c8bd450..82b728982 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h @@ -33,10 +33,10 @@ class CupsdNetworkPage : public CupsdPage Q_OBJECT public: - CupsdNetworkPage(QWidget *parent = 0, const char *name = 0); + CupsdNetworkPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); protected slots: diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.cpp b/kdeprint/cups/cupsdconf2/cupsdpage.cpp index 00798552c..e4a47bf1f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdpage.cpp @@ -19,8 +19,8 @@ #include "cupsdpage.h" -CupsdPage::CupsdPage(QWidget *parent, const char *name) - : QWidget(parent, name) +CupsdPage::CupsdPage(TQWidget *parent, const char *name) + : TQWidget(parent, name) { conf_ = 0; } diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.h b/kdeprint/cups/cupsdconf2/cupsdpage.h index dedd53ade..e503319ca 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdpage.h @@ -20,7 +20,7 @@ #ifndef CUPSDPAGE_H #define CUPSDPAGE_H -#include <qwidget.h> +#include <tqwidget.h> struct CupsdConf; @@ -28,21 +28,21 @@ class CupsdPage : public QWidget { Q_OBJECT public: - CupsdPage(QWidget *parent = 0, const char *name = 0); + CupsdPage(TQWidget *parent = 0, const char *name = 0); virtual ~CupsdPage(); - virtual bool loadConfig(CupsdConf *conf, QString& msg) = 0; - virtual bool saveConfig(CupsdConf *conf, QString& msg) = 0; + virtual bool loadConfig(CupsdConf *conf, TQString& msg) = 0; + virtual bool saveConfig(CupsdConf *conf, TQString& msg) = 0; virtual void setInfos(CupsdConf*) {} - QString pageLabel() const { return label_; } - QString header() const { return header_; } - QString pixmap() const { return pixmap_; } + TQString pageLabel() const { return label_; } + TQString header() const { return header_; } + TQString pixmap() const { return pixmap_; } protected: - void setPageLabel(const QString& s) { label_ = s; } - void setHeader(const QString& s) { header_ = s; } - void setPixmap(const QString& s) { pixmap_ = s; } + void setPageLabel(const TQString& s) { label_ = s; } + void setHeader(const TQString& s) { header_ = s; } + void setPixmap(const TQString& s) { pixmap_ = s; } protected: CupsdConf *conf_; diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index a77f21708..0bf290fb9 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -23,16 +23,16 @@ #include "editlist.h" #include "locationdialog.h" -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -CupsdSecurityPage::CupsdSecurityPage(QWidget *parent, const char *name) +CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Security")); @@ -40,19 +40,19 @@ CupsdSecurityPage::CupsdSecurityPage(QWidget *parent, const char *name) setPixmap("password"); locs_.setAutoDelete(true); - remoteroot_ = new QLineEdit(this); - systemgroup_ = new QLineEdit(this); + remoteroot_ = new TQLineEdit(this); + systemgroup_ = new TQLineEdit(this); encryptcert_ = new QDirLineEdit(true, this); encryptkey_ = new QDirLineEdit(true, this); locations_ = new EditList(this); - QLabel *l1 = new QLabel(i18n("Remote root user:"), this); - QLabel *l2 = new QLabel(i18n("System group:"), this); - QLabel *l3 = new QLabel(i18n("Encryption certificate:"), this); - QLabel *l4 = new QLabel(i18n("Encryption key:"), this); - QLabel *l5 = new QLabel(i18n("Locations:"), this); + TQLabel *l1 = new TQLabel(i18n("Remote root user:"), this); + TQLabel *l2 = new TQLabel(i18n("System group:"), this); + TQLabel *l3 = new TQLabel(i18n("Encryption certificate:"), this); + TQLabel *l4 = new TQLabel(i18n("Encryption key:"), this); + TQLabel *l5 = new TQLabel(i18n("Locations:"), this); - QGridLayout *m1 = new QGridLayout(this, 6, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -66,13 +66,13 @@ CupsdSecurityPage::CupsdSecurityPage(QWidget *parent, const char *name) m1->addWidget(encryptkey_, 3, 1); m1->addWidget(locations_, 4, 1); - connect(locations_, SIGNAL(add()), SLOT(slotAdd())); - connect(locations_, SIGNAL(edit(int)), SLOT(slotEdit(int))); - connect(locations_, SIGNAL(defaultList()), SLOT(slotDefaultList())); - connect(locations_, SIGNAL(deleted(int)), SLOT(slotDeleted(int))); + connect(locations_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); + connect(locations_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); + connect(locations_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); + connect(locations_, TQT_SIGNAL(deleted(int)), TQT_SLOT(slotDeleted(int))); } -bool CupsdSecurityPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdSecurityPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; remoteroot_->setText(conf_->remoteroot_); @@ -80,7 +80,7 @@ bool CupsdSecurityPage::loadConfig(CupsdConf *conf, QString&) encryptcert_->setURL(conf_->encryptcert_); encryptkey_->setURL(conf_->encryptkey_); locs_.clear(); - QPtrListIterator<CupsLocation> it(conf_->locations_); + TQPtrListIterator<CupsLocation> it(conf_->locations_); for (;it.current();++it) { locs_.append(new CupsLocation(*(it.current()))); @@ -93,14 +93,14 @@ bool CupsdSecurityPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdSecurityPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdSecurityPage::saveConfig(CupsdConf *conf, TQString&) { conf->remoteroot_ = remoteroot_->text(); conf->systemgroup_ = systemgroup_->text(); conf->encryptcert_ = encryptcert_->url(); conf->encryptkey_ = encryptkey_->url(); conf->locations_.clear(); - QPtrListIterator<CupsLocation> it(locs_); + TQPtrListIterator<CupsLocation> it(locs_); for (;it.current();++it) conf->locations_.append(new CupsLocation(*(it.current()))); @@ -109,11 +109,11 @@ bool CupsdSecurityPage::saveConfig(CupsdConf *conf, QString&) void CupsdSecurityPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(remoteroot_, conf->comments_.toolTip("remoteroot")); - QWhatsThis::add(systemgroup_, conf->comments_.toolTip("systemgroup")); - QWhatsThis::add(encryptcert_, conf->comments_.toolTip("servercertificate")); - QWhatsThis::add(encryptkey_, conf->comments_.toolTip("serverkey")); - QWhatsThis::add(locations_, conf->comments_.toolTip("locationsshort")); + TQWhatsThis::add(remoteroot_, conf->comments_.toolTip("remoteroot")); + TQWhatsThis::add(systemgroup_, conf->comments_.toolTip("systemgroup")); + TQWhatsThis::add(encryptcert_, conf->comments_.toolTip("servercertificate")); + TQWhatsThis::add(encryptkey_, conf->comments_.toolTip("serverkey")); + TQWhatsThis::add(locations_, conf->comments_.toolTip("locationsshort")); } void CupsdSecurityPage::slotAdd() @@ -125,7 +125,7 @@ void CupsdSecurityPage::slotAdd() for (locs_.first(); locs_.current(); locs_.next()) if (locs_.current()->resource_ == loc->resource_) { - if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),QString::null,i18n("Replace")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { index = locs_.at(); locs_.remove(); diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h index 56a9e2e45..e0bcfc6da 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h @@ -21,7 +21,7 @@ #define CUPSDSECURITYPAGE_H #include "cupsdpage.h" -#include <qptrlist.h> +#include <tqptrlist.h> class QLineEdit; class EditList; @@ -33,10 +33,10 @@ class CupsdSecurityPage : public CupsdPage Q_OBJECT public: - CupsdSecurityPage(QWidget *parent = 0, const char *name = 0); + CupsdSecurityPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); protected slots: @@ -50,7 +50,7 @@ private: QDirLineEdit *encryptcert_, *encryptkey_; EditList *locations_; - QPtrList<CupsLocation> locs_; + TQPtrList<CupsLocation> locs_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp index 861dad9de..cc0804f5b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -20,16 +20,16 @@ #include "cupsdserverpage.h" #include "cupsdconf.h" -#include <qlineedit.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> -int findComboItem(QComboBox *cb, const QString& str) +int findComboItem(TQComboBox *cb, const TQString& str) { for (int i=0; i<cb->count(); i++) if (cb->text(i) == str) @@ -37,22 +37,22 @@ int findComboItem(QComboBox *cb, const QString& str) return (-1); } -CupsdServerPage::CupsdServerPage(QWidget *parent, const char *name) +CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setPageLabel(i18n("Server")); setHeader(i18n("Server Settings")); setPixmap("gear"); - servername_ = new QLineEdit(this); - serveradmin_ = new QLineEdit(this); - otherclassname_ = new QLineEdit(this); - language_ = new QLineEdit(this); - printcap_ = new QLineEdit(this); - classification_ = new QComboBox(this); - charset_ = new QComboBox(this); - printcapformat_ = new QComboBox(this); - classoverride_ = new QCheckBox(i18n("Allow overrides"), this); + servername_ = new TQLineEdit(this); + serveradmin_ = new TQLineEdit(this); + otherclassname_ = new TQLineEdit(this); + language_ = new TQLineEdit(this); + printcap_ = new TQLineEdit(this); + classification_ = new TQComboBox(this); + charset_ = new TQComboBox(this); + printcapformat_ = new TQComboBox(this); + classoverride_ = new TQCheckBox(i18n("Allow overrides"), this); classification_->insertItem(i18n("None")); classification_->insertItem(i18n("Classified")); @@ -80,21 +80,21 @@ CupsdServerPage::CupsdServerPage(QWidget *parent, const char *name) printcapformat_->insertItem("BSD"); printcapformat_->insertItem("SOLARIS"); - QLabel *l1 = new QLabel(i18n("Server name:"), this); - QLabel *l2 = new QLabel(i18n("Server administrator:"), this); - QLabel *l3 = new QLabel(i18n("Classification:"), this); - QLabel *l4 = new QLabel(i18n("Default character set:"), this); - QLabel *l5 = new QLabel(i18n("Default language:"), this); - QLabel *l6 = new QLabel(i18n("Printcap file:"), this); - QLabel *l7 = new QLabel(i18n("Printcap format:"), this); + TQLabel *l1 = new TQLabel(i18n("Server name:"), this); + TQLabel *l2 = new TQLabel(i18n("Server administrator:"), this); + TQLabel *l3 = new TQLabel(i18n("Classification:"), this); + TQLabel *l4 = new TQLabel(i18n("Default character set:"), this); + TQLabel *l5 = new TQLabel(i18n("Default language:"), this); + TQLabel *l6 = new TQLabel(i18n("Printcap file:"), this); + TQLabel *l7 = new TQLabel(i18n("Printcap format:"), this); - connect(classification_, SIGNAL(activated(int)), SLOT(classChanged(int))); + connect(classification_, TQT_SIGNAL(activated(int)), TQT_SLOT(classChanged(int))); classification_->setCurrentItem(0); charset_->setCurrentItem(0); printcapformat_->setCurrentItem(0); classChanged(0); - QGridLayout *m1 = new QGridLayout(this, 9, 2, 10, 7); + QGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); m1->setRowStretch(8, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -110,19 +110,19 @@ CupsdServerPage::CupsdServerPage(QWidget *parent, const char *name) m1->addWidget(language_, 5, 1); m1->addWidget(printcap_, 6, 1); m1->addWidget(printcapformat_, 7, 1); - QHBoxLayout *m2 = new QHBoxLayout(0, 0, 5); + QHBoxLayout *m2 = new TQHBoxLayout(0, 0, 5); m1->addLayout(m2, 2, 1); m2->addWidget(classification_); m2->addWidget(otherclassname_); - QWidget *w = new QWidget(this); + QWidget *w = new TQWidget(this); w->setFixedWidth(20); - QHBoxLayout *m3 = new QHBoxLayout(0, 0, 0); + QHBoxLayout *m3 = new TQHBoxLayout(0, 0, 0); m1->addLayout(m3, 3, 1); m3->addWidget(w); m3->addWidget(classoverride_); } -bool CupsdServerPage::loadConfig(CupsdConf *conf, QString&) +bool CupsdServerPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; servername_->setText(conf_->servername_); @@ -143,7 +143,7 @@ bool CupsdServerPage::loadConfig(CupsdConf *conf, QString&) return true; } -bool CupsdServerPage::saveConfig(CupsdConf *conf, QString&) +bool CupsdServerPage::saveConfig(CupsdConf *conf, TQString&) { conf->servername_ = servername_->text(); conf->serveradmin_ = serveradmin_->text(); @@ -162,14 +162,14 @@ bool CupsdServerPage::saveConfig(CupsdConf *conf, QString&) void CupsdServerPage::setInfos(CupsdConf *conf) { - QWhatsThis::add(servername_, conf->comments_.toolTip("servername")); - QWhatsThis::add(serveradmin_, conf->comments_.toolTip("serveradmin")); - QWhatsThis::add(classification_, conf->comments_.toolTip("classification")); - QWhatsThis::add(classoverride_, conf->comments_.toolTip("classifyoverride")); - QWhatsThis::add(charset_, conf->comments_.toolTip("defaultcharset")); - QWhatsThis::add(language_, conf->comments_.toolTip("defaultlanguage")); - QWhatsThis::add(printcap_, conf->comments_.toolTip("printcap")); - QWhatsThis::add(printcapformat_, conf->comments_.toolTip("printcapformat")); + TQWhatsThis::add(servername_, conf->comments_.toolTip("servername")); + TQWhatsThis::add(serveradmin_, conf->comments_.toolTip("serveradmin")); + TQWhatsThis::add(classification_, conf->comments_.toolTip("classification")); + TQWhatsThis::add(classoverride_, conf->comments_.toolTip("classifyoverride")); + TQWhatsThis::add(charset_, conf->comments_.toolTip("defaultcharset")); + TQWhatsThis::add(language_, conf->comments_.toolTip("defaultlanguage")); + TQWhatsThis::add(printcap_, conf->comments_.toolTip("printcap")); + TQWhatsThis::add(printcapformat_, conf->comments_.toolTip("printcapformat")); } void CupsdServerPage::classChanged(int index) diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.h b/kdeprint/cups/cupsdconf2/cupsdserverpage.h index d82367c30..e7aeee196 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.h @@ -31,10 +31,10 @@ class CupsdServerPage : public CupsdPage Q_OBJECT public: - CupsdServerPage(QWidget *parent = 0, const char *name = 0); + CupsdServerPage(TQWidget *parent = 0, const char *name = 0); - bool loadConfig(CupsdConf*, QString&); - bool saveConfig(CupsdConf*, QString&); + bool loadConfig(CupsdConf*, TQString&); + bool saveConfig(CupsdConf*, TQString&); void setInfos(CupsdConf*); protected slots: diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index 7a623e972..9dd7581a8 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -19,33 +19,33 @@ #include "cupsdsplash.h" -#include <qlabel.h> -#include <qpixmap.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqlayout.h> #include <klocale.h> #include <kstandarddirs.h> -CupsdSplash::CupsdSplash(QWidget *parent, const char *name) +CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) : CupsdPage(parent, name) { setHeader(i18n("Welcome to the CUPS Server Configuration Tool")); setPageLabel(i18n("Welcome")); setPixmap("go"); - QVBoxLayout *main_ = new QVBoxLayout(this, 10, 10); - QHBoxLayout *sub_ = new QHBoxLayout(0, 0, 10); + QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 10); + QHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10); main_->addLayout(sub_); - QLabel *cupslogo_ = new QLabel(this); - QString logopath = locate("data", QString("kdeprint/cups_logo.png")); - cupslogo_->setPixmap(logopath.isEmpty() ? QPixmap() : QPixmap(logopath)); + QLabel *cupslogo_ = new TQLabel(this); + QString logopath = locate("data", TQString("kdeprint/cups_logo.png")); + cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); cupslogo_->setAlignment(Qt::AlignCenter); - QLabel *kupslogo_ = new QLabel(this); - logopath = locate("data", QString("kdeprint/kde_logo.png")); - kupslogo_->setPixmap(logopath.isEmpty() ? QPixmap() : QPixmap(logopath)); + QLabel *kupslogo_ = new TQLabel(this); + logopath = locate("data", TQString("kdeprint/kde_logo.png")); + kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); kupslogo_->setAlignment(Qt::AlignCenter); - QLabel *helptxt_ = new QLabel(this); + QLabel *helptxt_ = new TQLabel(this); helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. " "The available options are grouped into sets of related topics and can be accessed " "quickly through the icon view located on the left. Each option has a default value that is " @@ -62,12 +62,12 @@ CupsdSplash::~CupsdSplash() { } -bool CupsdSplash::loadConfig(CupsdConf*, QString&) +bool CupsdSplash::loadConfig(CupsdConf*, TQString&) { return true; } -bool CupsdSplash::saveConfig(CupsdConf*, QString&) +bool CupsdSplash::saveConfig(CupsdConf*, TQString&) { return true; } diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.h b/kdeprint/cups/cupsdconf2/cupsdsplash.h index ed548948d..9acf27395 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.h +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.h @@ -25,11 +25,11 @@ class CupsdSplash : public CupsdPage { public: - CupsdSplash(QWidget *parent = 0, const char *name = 0); + CupsdSplash(TQWidget *parent = 0, const char *name = 0); ~CupsdSplash(); - bool loadConfig(CupsdConf *conf, QString& msg); - bool saveConfig(CupsdConf *conf, QString& msg); + bool loadConfig(CupsdConf *conf, TQString& msg); + bool saveConfig(CupsdConf *conf, TQString& msg); }; #endif diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index 4c924dbb4..a91fdc3d3 100644 --- a/kdeprint/cups/cupsdconf2/editlist.cpp +++ b/kdeprint/cups/cupsdconf2/editlist.cpp @@ -21,13 +21,13 @@ #include <klistbox.h> #include <kpushbutton.h> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kiconloader.h> #include <kguiitem.h> -EditList::EditList(QWidget *parent, const char *name) - : QWidget(parent, name) +EditList::EditList(TQWidget *parent, const char *name) + : TQWidget(parent, name) { list_ = new KListBox(this); addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this); @@ -35,7 +35,7 @@ EditList::EditList(QWidget *parent, const char *name) delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this); defbtn_ = new KPushButton(KGuiItem(i18n("Default List"), "history"), this); - QGridLayout *m1 = new QGridLayout(this, 4, 2, 0, 0); + TQGridLayout *m1 = new TQGridLayout(this, 4, 2, 0, 0); m1->setColStretch(0, 1); m1->addMultiCellWidget(list_, 0, 3, 0, 1); m1->addWidget(addbtn_, 0, 1); @@ -43,11 +43,11 @@ EditList::EditList(QWidget *parent, const char *name) m1->addWidget(delbtn_, 2, 1); m1->addWidget(defbtn_, 3, 1); - connect(addbtn_, SIGNAL(clicked()), SIGNAL(add())); - connect(editbtn_, SIGNAL(clicked()), SLOT(slotEdit())); - connect(delbtn_, SIGNAL(clicked()), SLOT(slotDelete())); - connect(defbtn_, SIGNAL(clicked()), SIGNAL(defaultList())); - connect(list_, SIGNAL(highlighted(int)), SLOT(slotSelected(int))); + connect(addbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(add())); + connect(editbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); + connect(delbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); + connect(defbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(defaultList())); + connect(list_, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSelected(int))); slotSelected(-1); } @@ -72,12 +72,12 @@ void EditList::slotSelected(int index) delbtn_->setEnabled(index >= 0); } -QString EditList::text(int index) +TQString EditList::text(int index) { return list_->text(index); } -void EditList::setText(int index, const QString& s) +void EditList::setText(int index, const TQString& s) { if (list_->text(index) != s) { @@ -95,27 +95,27 @@ void EditList::clear() slotSelected(-1); } -void EditList::insertItem(const QString& s) +void EditList::insertItem(const TQString& s) { if (!list_->findItem(s, Qt::ExactMatch)) list_->insertItem(s); } -void EditList::insertItem(const QPixmap& icon, const QString& s) +void EditList::insertItem(const TQPixmap& icon, const TQString& s) { if (!list_->findItem(s, Qt::ExactMatch)) list_->insertItem(icon, s); } -void EditList::insertItems(const QStringList& l) +void EditList::insertItems(const TQStringList& l) { - for (QStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) + for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) insertItem(*it); } -QStringList EditList::items() +TQStringList EditList::items() { - QStringList l; + TQStringList l; for (uint i=0; i<list_->count(); i++) l << list_->text(i); return l; diff --git a/kdeprint/cups/cupsdconf2/editlist.h b/kdeprint/cups/cupsdconf2/editlist.h index 773667304..30c31d731 100644 --- a/kdeprint/cups/cupsdconf2/editlist.h +++ b/kdeprint/cups/cupsdconf2/editlist.h @@ -20,8 +20,8 @@ #ifndef EDITLIST_H #define EDITLIST_H -#include <qwidget.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpixmap.h> class KListBox; class QPushButton; @@ -31,14 +31,14 @@ class EditList : public QWidget Q_OBJECT public: - EditList(QWidget *parent = 0, const char *name = 0); - - QString text(int); - void setText(int, const QString&); - void insertItem(const QString&); - void insertItem(const QPixmap&, const QString&); - void insertItems(const QStringList&); - QStringList items(); + EditList(TQWidget *parent = 0, const char *name = 0); + + TQString text(int); + void setText(int, const TQString&); + void insertItem(const TQString&); + void insertItem(const TQPixmap&, const TQString&); + void insertItems(const TQStringList&); + TQStringList items(); void clear(); signals: diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index fc5c55076..d360d62e2 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -22,28 +22,28 @@ #include "editlist.h" #include "addressdialog.h" -#include <qlineedit.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kiconloader.h> -LocationDialog::LocationDialog(QWidget *parent, const char *name) - : KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok, true) +LocationDialog::LocationDialog(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new QWidget(this); + QWidget *dummy = new TQWidget(this); setMainWidget(dummy); - resource_ = new QComboBox(dummy); - authtype_ = new QComboBox(dummy); - authclass_ = new QComboBox(dummy); - authname_ = new QLineEdit(dummy); - encryption_ = new QComboBox(dummy); - satisfy_ = new QComboBox(dummy); - order_ = new QComboBox(dummy); + resource_ = new TQComboBox(dummy); + authtype_ = new TQComboBox(dummy); + authclass_ = new TQComboBox(dummy); + authname_ = new TQLineEdit(dummy); + encryption_ = new TQComboBox(dummy); + satisfy_ = new TQComboBox(dummy); + order_ = new TQComboBox(dummy); addresses_ = new EditList(dummy); authtype_->insertItem(i18n("None")); @@ -66,19 +66,19 @@ LocationDialog::LocationDialog(QWidget *parent, const char *name) order_->insertItem(i18n("Allow, Deny")); order_->insertItem(i18n("Deny, Allow")); - connect(authclass_, SIGNAL(activated(int)), SLOT(slotClassChanged(int))); - connect(authtype_, SIGNAL(activated(int)), SLOT(slotTypeChanged(int))); + connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int))); + connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - QLabel *l1 = new QLabel(i18n("Resource:"), dummy); - QLabel *l2 = new QLabel(i18n("Authentication:"), dummy); - QLabel *l3 = new QLabel(i18n("Class:"), dummy); - QLabel *l4 = new QLabel(i18n("Names:"), dummy); - QLabel *l5 = new QLabel(i18n("Encryption:"), dummy); - QLabel *l6 = new QLabel(i18n("Satisfy:"), dummy); - QLabel *l7 = new QLabel(i18n("ACL order:"), dummy); - QLabel *l8 = new QLabel(i18n("ACL addresses:"),dummy); + QLabel *l1 = new TQLabel(i18n("Resource:"), dummy); + QLabel *l2 = new TQLabel(i18n("Authentication:"), dummy); + QLabel *l3 = new TQLabel(i18n("Class:"), dummy); + QLabel *l4 = new TQLabel(i18n("Names:"), dummy); + QLabel *l5 = new TQLabel(i18n("Encryption:"), dummy); + QLabel *l6 = new TQLabel(i18n("Satisfy:"), dummy); + QLabel *l7 = new TQLabel(i18n("ACL order:"), dummy); + QLabel *l8 = new TQLabel(i18n("ACL addresses:"),dummy); - QGridLayout *m1 = new QGridLayout(dummy, 8, 2, 0, 5); + QGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, Qt::AlignRight); @@ -104,26 +104,26 @@ LocationDialog::LocationDialog(QWidget *parent, const char *name) slotClassChanged(AUTHCLASS_ANONYMOUS); encryption_->setCurrentItem(ENCRYPT_IFREQUESTED); - connect(addresses_, SIGNAL(add()), SLOT(slotAdd())); - connect(addresses_, SIGNAL(edit(int)), SLOT(slotEdit(int))); - connect(addresses_, SIGNAL(defaultList()), SLOT(slotDefaultList())); + connect(addresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); + connect(addresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); + connect(addresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); } void LocationDialog::setInfos(CupsdConf *conf) { conf_ = conf; - QPtrListIterator<CupsResource> it(conf->resources_); + TQPtrListIterator<CupsResource> it(conf->resources_); for (; it.current(); ++it) resource_->insertItem(SmallIcon(it.current()->typeToIconName(it.current()->type_)), it.current()->text_); - QWhatsThis::add(encryption_, conf_->comments_.toolTip("encryption")); - QWhatsThis::add(order_, conf_->comments_.toolTip("order")); - QWhatsThis::add(authclass_, conf_->comments_.toolTip("authclass")); - QWhatsThis::add(authtype_, conf_->comments_.toolTip("authtype")); - QWhatsThis::add(authname_, conf_->comments_.toolTip("authname")); - QWhatsThis::add(satisfy_, conf_->comments_.toolTip("satisfy")); - QWhatsThis::add(addresses_, conf_->comments_.toolTip("allowdeny")); + TQWhatsThis::add(encryption_, conf_->comments_.toolTip("encryption")); + TQWhatsThis::add(order_, conf_->comments_.toolTip("order")); + TQWhatsThis::add(authclass_, conf_->comments_.toolTip("authclass")); + TQWhatsThis::add(authtype_, conf_->comments_.toolTip("authtype")); + TQWhatsThis::add(authname_, conf_->comments_.toolTip("authname")); + TQWhatsThis::add(satisfy_, conf_->comments_.toolTip("satisfy")); + TQWhatsThis::add(addresses_, conf_->comments_.toolTip("allowdeny")); } void LocationDialog::fillLocation(CupsLocation *loc) @@ -132,7 +132,7 @@ void LocationDialog::fillLocation(CupsLocation *loc) loc->resourcename_ = loc->resource_->path_; loc->authtype_ = authtype_->currentItem(); loc->authclass_ = (loc->authtype_ == AUTHTYPE_NONE ? AUTHCLASS_ANONYMOUS : authclass_->currentItem()); - loc->authname_ = (loc->authclass_ == AUTHCLASS_USER || loc->authclass_ == AUTHCLASS_GROUP ? authname_->text() : QString::null); + loc->authname_ = (loc->authclass_ == AUTHCLASS_USER || loc->authclass_ == AUTHCLASS_GROUP ? authname_->text() : TQString::null); loc->encryption_ = encryption_->currentItem(); loc->satisfy_ = satisfy_->currentItem(); loc->order_ = order_->currentItem(); @@ -169,7 +169,7 @@ void LocationDialog::slotClassChanged(int index) authname_->setEnabled((index == AUTHCLASS_USER || index == AUTHCLASS_GROUP)); } -bool LocationDialog::newLocation(CupsLocation *loc, QWidget *parent, CupsdConf *conf) +bool LocationDialog::newLocation(CupsLocation *loc, TQWidget *parent, CupsdConf *conf) { LocationDialog dlg(parent); if (conf) @@ -183,7 +183,7 @@ bool LocationDialog::newLocation(CupsLocation *loc, QWidget *parent, CupsdConf * return false; } -bool LocationDialog::editLocation(CupsLocation *loc, QWidget *parent, CupsdConf *conf) +bool LocationDialog::editLocation(CupsLocation *loc, TQWidget *parent, CupsdConf *conf) { LocationDialog dlg(parent); if (conf) @@ -201,14 +201,14 @@ bool LocationDialog::editLocation(CupsLocation *loc, QWidget *parent, CupsdConf void LocationDialog::slotAdd() { - QString addr = AddressDialog::newAddress(this); + TQString addr = AddressDialog::newAddress(this); if (!addr.isEmpty()) addresses_->insertItem(addr); } void LocationDialog::slotEdit(int index) { - QString addr = addresses_->text(index); + TQString addr = addresses_->text(index); addr = AddressDialog::editAddress(addr, this); if (!addr.isEmpty()) addresses_->insertItem(addr); diff --git a/kdeprint/cups/cupsdconf2/locationdialog.h b/kdeprint/cups/cupsdconf2/locationdialog.h index 5ca8c4d53..fef270405 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.h +++ b/kdeprint/cups/cupsdconf2/locationdialog.h @@ -32,14 +32,14 @@ class LocationDialog : public KDialogBase { Q_OBJECT public: - LocationDialog(QWidget *parent = 0, const char *name = 0); + LocationDialog(TQWidget *parent = 0, const char *name = 0); void setInfos(CupsdConf*); void fillLocation(CupsLocation*); void setLocation(CupsLocation*); - static bool newLocation(CupsLocation*, QWidget *parent = 0, CupsdConf *conf = 0); - static bool editLocation(CupsLocation*, QWidget *parent = 0, CupsdConf *conf = 0); + static bool newLocation(CupsLocation*, TQWidget *parent = 0, CupsdConf *conf = 0); + static bool editLocation(CupsLocation*, TQWidget *parent = 0, CupsdConf *conf = 0); protected slots: void slotTypeChanged(int); diff --git a/kdeprint/cups/cupsdconf2/main.cpp b/kdeprint/cups/cupsdconf2/main.cpp index e8fd3df6a..cc0918f41 100644 --- a/kdeprint/cups/cupsdconf2/main.cpp +++ b/kdeprint/cups/cupsdconf2/main.cpp @@ -19,7 +19,7 @@ #include "cupsddialog.h" -#include <qfile.h> +#include <tqfile.h> #include <klocale.h> #include <kcmdlineargs.h> #include <kapplication.h> diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index f866450b8..e17e2b081 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -20,31 +20,31 @@ #include "portdialog.h" #include "cupsdconf.h" -#include <qlineedit.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> -PortDialog::PortDialog(QWidget *parent, const char *name) - : KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok, true) +PortDialog::PortDialog(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new QWidget(this); + QWidget *dummy = new TQWidget(this); setMainWidget(dummy); - address_ = new QLineEdit(dummy); - port_ = new QSpinBox(0, 9999, 1, dummy); + address_ = new TQLineEdit(dummy); + port_ = new TQSpinBox(0, 9999, 1, dummy); port_->setValue(631); - usessl_ = new QCheckBox(i18n("Use SSL encryption"), dummy); + usessl_ = new TQCheckBox(i18n("Use SSL encryption"), dummy); - QLabel *l1 = new QLabel(i18n("Address:"), dummy); - QLabel *l2 = new QLabel(i18n("Port:"), dummy); + QLabel *l1 = new TQLabel(i18n("Address:"), dummy); + QLabel *l2 = new TQLabel(i18n("Port:"), dummy); - QVBoxLayout *m1 = new QVBoxLayout(dummy, 0, 10); - QGridLayout *m2 = new QGridLayout(0, 3, 2, 0, 5); + QVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); + QGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); m1->addLayout(m2); m2->addWidget(l1, 0, 0, Qt::AlignRight); m2->addWidget(l2, 1, 0, Qt::AlignRight); @@ -56,9 +56,9 @@ PortDialog::PortDialog(QWidget *parent, const char *name) resize(250, 100); } -QString PortDialog::listenString() +TQString PortDialog::listenString() { - QString s; + TQString s; if (usessl_->isChecked()) s.append("SSLListen "); else @@ -73,12 +73,12 @@ QString PortDialog::listenString() void PortDialog::setInfos(CupsdConf *conf) { - QWhatsThis::add(address_, conf->comments_.toolTip("address")); - QWhatsThis::add(port_, conf->comments_.toolTip("port")); - QWhatsThis::add(usessl_, conf->comments_.toolTip("usessl")); + TQWhatsThis::add(address_, conf->comments_.toolTip("address")); + TQWhatsThis::add(port_, conf->comments_.toolTip("port")); + TQWhatsThis::add(usessl_, conf->comments_.toolTip("usessl")); } -QString PortDialog::newListen(QWidget *parent, CupsdConf *conf) +TQString PortDialog::newListen(TQWidget *parent, CupsdConf *conf) { PortDialog dlg(parent); dlg.setInfos(conf); @@ -86,10 +86,10 @@ QString PortDialog::newListen(QWidget *parent, CupsdConf *conf) { return dlg.listenString(); } - return QString::null; + return TQString::null; } -QString PortDialog::editListen(const QString& s, QWidget *parent, CupsdConf *conf) +TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf *conf) { PortDialog dlg(parent); dlg.setInfos(conf); @@ -114,5 +114,5 @@ QString PortDialog::editListen(const QString& s, QWidget *parent, CupsdConf *con { return dlg.listenString(); } - return QString::null; + return TQString::null; } diff --git a/kdeprint/cups/cupsdconf2/portdialog.h b/kdeprint/cups/cupsdconf2/portdialog.h index 8f0b9f3e9..44ab5bb72 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.h +++ b/kdeprint/cups/cupsdconf2/portdialog.h @@ -30,12 +30,12 @@ struct CupsdConf; class PortDialog : public KDialogBase { public: - PortDialog(QWidget *parent = 0, const char *name = 0); + PortDialog(TQWidget *parent = 0, const char *name = 0); - QString listenString(); + TQString listenString(); void setInfos(CupsdConf*); - static QString newListen(QWidget *parent = 0, CupsdConf *conf = 0); - static QString editListen(const QString& s, QWidget *parent = 0, CupsdConf *conf = 0); + static TQString newListen(TQWidget *parent = 0, CupsdConf *conf = 0); + static TQString editListen(const TQString& s, TQWidget *parent = 0, CupsdConf *conf = 0); private: QLineEdit *address_; diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp index 931d6ac4a..66df30652 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -19,21 +19,21 @@ #include "qdirlineedit.h" -#include <qlineedit.h> -#include <qlayout.h> +#include <tqlineedit.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <kfiledialog.h> #include <kiconloader.h> -QDirLineEdit::QDirLineEdit(bool file, QWidget *parent, const char *name) - : QWidget(parent, name) +QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) + : TQWidget(parent, name) { - edit_ = new QLineEdit(this); + edit_ = new TQLineEdit(this); button_ = new KPushButton(this); button_->setPixmap(SmallIcon("fileopen")); - connect(button_,SIGNAL(clicked()),SLOT(buttonClicked())); + connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); - QHBoxLayout *main_ = new QHBoxLayout(this, 0, 3); + QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); main_->addWidget(edit_); main_->addWidget(button_); @@ -44,12 +44,12 @@ QDirLineEdit::~QDirLineEdit() { } -void QDirLineEdit::setURL(const QString& txt) +void QDirLineEdit::setURL(const TQString& txt) { edit_->setText(txt); } -QString QDirLineEdit::url() +TQString QDirLineEdit::url() { return edit_->text(); } @@ -60,7 +60,7 @@ void QDirLineEdit::buttonClicked() if (!fileedit_) dirname = KFileDialog::getExistingDirectory(edit_->text(), this); else - dirname = KFileDialog::getOpenFileName(edit_->text(), QString::null, this); + dirname = KFileDialog::getOpenFileName(edit_->text(), TQString::null, this); if (!dirname.isEmpty()) edit_->setText(dirname); } diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.h b/kdeprint/cups/cupsdconf2/qdirlineedit.h index b4b977b75..ff554d91c 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.h @@ -20,8 +20,8 @@ #ifndef QDIRLINEEDIT_H #define QDIRLINEEDIT_H -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> class QLineEdit; class QPushButton; @@ -30,11 +30,11 @@ class QDirLineEdit : public QWidget { Q_OBJECT public: - QDirLineEdit(bool file, QWidget *parent = 0, const char *name = 0); + QDirLineEdit(bool file, TQWidget *parent = 0, const char *name = 0); ~QDirLineEdit(); - void setURL(const QString& txt); - QString url(); + void setURL(const TQString& txt); + TQString url(); void setFileEdit(bool on = true); private slots: diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 31a544e91..1daca81cb 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -19,35 +19,35 @@ #include "qdirmultilineedit.h" -#include <qlayout.h> -#include <qheader.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqpushbutton.h> #include <klistview.h> #include <klocale.h> #include <kfiledialog.h> #include <kiconloader.h> -QDirMultiLineEdit::QDirMultiLineEdit(QWidget *parent, const char *name) -: QWidget(parent, name) +QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) +: TQWidget(parent, name) { m_view = new KListView(this); m_view->header()->hide(); m_view->addColumn(""); m_view->setFullWidth(true); - connect(m_view, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotSelected(QListViewItem*))); + connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); - m_add = new QPushButton(this); + m_add = new TQPushButton(this); m_add->setPixmap(SmallIcon("folder_new")); - connect(m_add, SIGNAL(clicked()), SLOT(slotAddClicked())); - m_remove = new QPushButton(this); + connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); + m_remove = new TQPushButton(this); m_remove->setPixmap(SmallIcon("editdelete")); - connect(m_remove, SIGNAL(clicked()), SLOT(slotRemoveClicked())); + connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2)); - QHBoxLayout *l0 = new QHBoxLayout(this, 0, 3); - QVBoxLayout *l1 = new QVBoxLayout(0, 0, 0); + QHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); + QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); l0->addWidget(m_view); l0->addLayout(l1); l1->addWidget(m_add); @@ -59,14 +59,14 @@ QDirMultiLineEdit::~QDirMultiLineEdit() { } -void QDirMultiLineEdit::setURLs(const QStringList& urls) +void QDirMultiLineEdit::setURLs(const TQStringList& urls) { m_view->clear(); - for (QStringList::ConstIterator it=urls.begin(); it!=urls.end(); ++it) + for (TQStringList::ConstIterator it=urls.begin(); it!=urls.end(); ++it) addURL(*it); } -QStringList QDirMultiLineEdit::urls() +TQStringList QDirMultiLineEdit::urls() { QListViewItem *item = m_view->firstChild(); QStringList l; @@ -78,15 +78,15 @@ QStringList QDirMultiLineEdit::urls() return l; } -void QDirMultiLineEdit::addURL(const QString& url) +void QDirMultiLineEdit::addURL(const TQString& url) { - QListViewItem *item = new QListViewItem(m_view, url); + QListViewItem *item = new TQListViewItem(m_view, url); item->setRenameEnabled(0, true); } void QDirMultiLineEdit::slotAddClicked() { - QString dirname = KFileDialog::getExistingDirectory(QString::null, this); + QString dirname = KFileDialog::getExistingDirectory(TQString::null, this); if (!dirname.isEmpty()) addURL(dirname); } @@ -101,7 +101,7 @@ void QDirMultiLineEdit::slotRemoveClicked() } } -void QDirMultiLineEdit::slotSelected(QListViewItem *item) +void QDirMultiLineEdit::slotSelected(TQListViewItem *item) { m_remove->setEnabled((item != NULL)); } diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h index 963292985..95cdc8241 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -20,7 +20,7 @@ #ifndef QDIRMULTILINEEDIT_H #define QDIRMULTILINEEDIT_H -#include <qwidget.h> +#include <tqwidget.h> class KListView; class QListViewItem; @@ -31,19 +31,19 @@ class QDirMultiLineEdit : public QWidget Q_OBJECT public: - QDirMultiLineEdit(QWidget *parent = 0, const char *name = 0); + QDirMultiLineEdit(TQWidget *parent = 0, const char *name = 0); ~QDirMultiLineEdit(); - void setURLs(const QStringList&); - QStringList urls(); + void setURLs(const TQStringList&); + TQStringList urls(); protected: - void addURL(const QString&); + void addURL(const TQString&); private slots: void slotAddClicked(); void slotRemoveClicked(); - void slotSelected(QListViewItem*); + void slotSelected(TQListViewItem*); private: KListView *m_view; diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index c61996282..d77fe5aaa 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp @@ -19,17 +19,17 @@ #include "sizewidget.h" -#include <qcombobox.h> -#include <qspinbox.h> -#include <qlayout.h> -#include <qregexp.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqlayout.h> +#include <tqregexp.h> #include <klocale.h> -SizeWidget::SizeWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +SizeWidget::SizeWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - m_size = new QSpinBox( 0, 9999, 1, this ); - m_unit = new QComboBox( this ); + m_size = new TQSpinBox( 0, 9999, 1, this ); + m_unit = new TQComboBox( this ); m_unit->insertItem( i18n( "KB" ) ); m_unit->insertItem( i18n( "MB" ) ); @@ -38,14 +38,14 @@ SizeWidget::SizeWidget( QWidget *parent, const char *name ) m_unit->setCurrentItem( 1 ); m_size->setSpecialValueText( i18n( "Unlimited" ) ); - QHBoxLayout *l0 = new QHBoxLayout( this, 0, 5 ); + TQHBoxLayout *l0 = new TQHBoxLayout( this, 0, 5 ); l0->addWidget( m_size, 1 ); l0->addWidget( m_unit, 0 ); } -void SizeWidget::setSizeString( const QString& sz ) +void SizeWidget::setSizeString( const TQString& sz ) { - int p = sz.find( QRegExp( "\\D" ) ); + int p = sz.find( TQRegExp( "\\D" ) ); m_size->setValue( sz.left( p ).toInt() ); switch( sz[ p ].latin1() ) { @@ -58,9 +58,9 @@ void SizeWidget::setSizeString( const QString& sz ) m_unit->setCurrentItem( p ); } -QString SizeWidget::sizeString() const +TQString SizeWidget::sizeString() const { - QString result = QString::number( m_size->value() ); + TQString result = TQString::number( m_size->value() ); switch ( m_unit->currentItem() ) { case 0: result.append( "k" ); break; diff --git a/kdeprint/cups/cupsdconf2/sizewidget.h b/kdeprint/cups/cupsdconf2/sizewidget.h index c7f6557df..7bee0283b 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.h +++ b/kdeprint/cups/cupsdconf2/sizewidget.h @@ -20,7 +20,7 @@ #ifndef SIZEWIDGET_H #define SIZEWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> class QSpinBox; class QComboBox; @@ -28,16 +28,16 @@ class QComboBox; class SizeWidget : public QWidget { public: - SizeWidget( QWidget *parent = 0, const char *name = 0 ); + SizeWidget( TQWidget *parent = 0, const char *name = 0 ); - void setSizeString( const QString& sizeString ); - QString sizeString() const; + void setSizeString( const TQString& sizeString ); + TQString sizeString() const; void setValue( int sz ); int value() const; private: - QSpinBox *m_size; - QComboBox *m_unit; + TQSpinBox *m_size; + TQComboBox *m_unit; }; #endif diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp index f96451d76..839f83612 100644 --- a/kdeprint/cups/cupsinfos.cpp +++ b/kdeprint/cups/cupsinfos.cpp @@ -58,9 +58,9 @@ CupsInfos::CupsInfos() load(); /* host_ = cupsServer(); login_ = cupsUser(); - if (login_.isEmpty()) login_ = QString::null; + if (login_.isEmpty()) login_ = TQString::null; port_ = ippPort(); - password_ = QString::null;*/ + password_ = TQString::null;*/ cupsSetPasswordCB(cupsGetPasswordCB); } @@ -69,14 +69,14 @@ CupsInfos::~CupsInfos() { } -QString CupsInfos::hostaddr() const +TQString CupsInfos::hostaddr() const { if (host_[0] != '/') - return host_ + ":" + QString::number(port_); + return host_ + ":" + TQString::number(port_); return "localhost"; } -void CupsInfos::setHost(const QString& s) +void CupsInfos::setHost(const TQString& s) { host_ = s; cupsSetServer(s.latin1()); @@ -88,13 +88,13 @@ void CupsInfos::setPort(int p) ippSetPort(p); } -void CupsInfos::setLogin(const QString& s) +void CupsInfos::setLogin(const TQString& s) { login_ = s; cupsSetUser(s.latin1()); } -void CupsInfos::setPassword(const QString& s) +void CupsInfos::setPassword(const TQString& s) { password_ = s; } @@ -106,7 +106,7 @@ void CupsInfos::setSavePassword( bool on ) const char* CupsInfos::getPasswordCB() { - QPair<QString,QString> pwd = KMFactory::self()->requestPassword( count_, login_, host_, port_ ); + QPair<TQString,TQString> pwd = KMFactory::self()->requestPassword( count_, login_, host_, port_ ); if ( pwd.first.isEmpty() && pwd.second.isEmpty() ) return NULL; @@ -119,9 +119,9 @@ void CupsInfos::load() { KConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); - host_ = conf_->readEntry("Host",QString::fromLatin1(cupsServer())); + host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer())); port_ = conf_->readNumEntry("Port",ippPort()); - login_ = conf_->readEntry("Login",QString::fromLatin1(cupsUser())); + login_ = conf_->readEntry("Login",TQString::fromLatin1(cupsUser())); savepwd_ = conf_->readBoolEntry( "SavePassword", false ); if ( savepwd_ ) { @@ -129,8 +129,8 @@ void CupsInfos::load() KMFactory::self()->initPassword( login_, password_, host_, port_ ); } else - password_ = QString::null; - if (login_.isEmpty()) login_ = QString::null; + password_ = TQString::null; + if (login_.isEmpty()) login_ = TQString::null; reallogin_ = cupsUser(); // synchronize with CUPS diff --git a/kdeprint/cups/cupsinfos.h b/kdeprint/cups/cupsinfos.h index 429970b9d..b62329d4b 100644 --- a/kdeprint/cups/cupsinfos.h +++ b/kdeprint/cups/cupsinfos.h @@ -20,7 +20,7 @@ #ifndef CUPSINFOS_H #define CUPSINFOS_H -#include <qstring.h> +#include <tqstring.h> #include "kpreloadobject.h" class CupsInfos : public KPReloadObject @@ -31,18 +31,18 @@ public: CupsInfos(); ~CupsInfos(); - const QString& host() const; - QString hostaddr() const; + const TQString& host() const; + TQString hostaddr() const; int port() const; - const QString& login() const; - const QString& password() const; - const QString& realLogin() const; + const TQString& login() const; + const TQString& password() const; + const TQString& realLogin() const; bool savePassword() const; - void setHost(const QString& s); + void setHost(const TQString& s); void setPort(int p); - void setLogin(const QString& s); - void setPassword(const QString& s); + void setLogin(const TQString& s); + void setPassword(const TQString& s); void setSavePassword( bool on ); const char* getPasswordCB(); @@ -67,19 +67,19 @@ private: int count_; }; -inline const QString& CupsInfos::host() const +inline const TQString& CupsInfos::host() const { return host_; } inline int CupsInfos::port() const { return port_; } -inline const QString& CupsInfos::login() const +inline const TQString& CupsInfos::login() const { return login_; } -inline const QString& CupsInfos::password() const +inline const TQString& CupsInfos::password() const { return password_; } -inline const QString& CupsInfos::realLogin() const +inline const TQString& CupsInfos::realLogin() const { return reallogin_; } inline bool CupsInfos::savePassword() const diff --git a/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp index 7ec0ed7a6..4fe214bc1 100644 --- a/kdeprint/cups/image.cpp +++ b/kdeprint/cups/image.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. **/ -#include <qimage.h> +#include <tqimage.h> #include <math.h> void @@ -245,7 +245,7 @@ bright(float mat[3][3], //---------------------------------------------------------------------------------------------------- -QImage convertImage(const QImage& image, int hue, int saturation, int brightness, int gamma) +TQImage convertImage(const TQImage& image, int hue, int saturation, int brightness, int gamma) { float mat[3][3] = {{1.0,0.0,0.0},{0.0,1.0,0.0},{0.0,0.0,1.0}}; int lut[3][3][256]; diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp index 0489b5079..bc2b207fd 100644 --- a/kdeprint/cups/imageposition.cpp +++ b/kdeprint/cups/imageposition.cpp @@ -19,10 +19,10 @@ #include "imageposition.h" -#include <qpainter.h> +#include <tqpainter.h> #include <kstandarddirs.h> -static void draw3DPage(QPainter *p, QRect r) +static void draw3DPage(TQPainter *p, TQRect r) { // draw white page p->fillRect(r,Qt::white); @@ -40,12 +40,12 @@ static void draw3DPage(QPainter *p, QRect r) p->lineTo(r.right()-1,r.top()+1); } -ImagePosition::ImagePosition(QWidget *parent, const char *name) - : QWidget(parent,name) +ImagePosition::ImagePosition(TQWidget *parent, const char *name) + : TQWidget(parent,name) { position_ = Center; setMinimumSize(sizeHint()); - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); pix_.load(locate("data", "kdeprint/preview-mini.png")); } @@ -82,7 +82,7 @@ void ImagePosition::setPosition(int horiz, int vert) setPosition((PositionType)type); } -QString ImagePosition::positionString() const +TQString ImagePosition::positionString() const { switch (position_) { case TopLeft: return "top-left"; @@ -98,7 +98,7 @@ QString ImagePosition::positionString() const return "center"; } -void ImagePosition::paintEvent(QPaintEvent*) +void ImagePosition::paintEvent(TQPaintEvent*) { int horiz, vert, x, y; int margin = 5; @@ -131,7 +131,7 @@ void ImagePosition::paintEvent(QPaintEvent*) case 1: y = (page.top()+page.bottom()-img.height())/2; break; case 2: y = page.bottom()-margin-img.height(); break; } - img.moveTopLeft(QPoint(x,y)); + img.moveTopLeft(TQPoint(x,y)); // draw page QPainter p(this); @@ -147,7 +147,7 @@ void ImagePosition::paintEvent(QPaintEvent*) p.end(); } -QSize ImagePosition::sizeHint() const +TQSize ImagePosition::sizeHint() const { - return QSize(60, 80); + return TQSize(60, 80); } diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h index 64a105db7..caaa63ca2 100644 --- a/kdeprint/cups/imageposition.h +++ b/kdeprint/cups/imageposition.h @@ -20,9 +20,9 @@ #ifndef IMAGEPOSITION_H #define IMAGEPOSITION_H -#include <qwidget.h> -#include <qstring.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqpixmap.h> class ImagePosition : public QWidget { @@ -37,18 +37,18 @@ public: Bottom, BottomRight}; - ImagePosition(QWidget *parent = 0, const char *name = 0); + ImagePosition(TQWidget *parent = 0, const char *name = 0); ~ImagePosition(); void setPosition(const char *type = "center"); void setPosition(PositionType type = Center); void setPosition(int horiz = 1, int vert = 1); PositionType position() const { return (PositionType)position_; } - QString positionString() const; - QSize sizeHint() const; + TQString positionString() const; + TQSize sizeHint() const; protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); private: int position_; diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp index a7badd09b..7ae5dabf0 100644 --- a/kdeprint/cups/imagepreview.cpp +++ b/kdeprint/cups/imagepreview.cpp @@ -19,14 +19,14 @@ #include "imagepreview.h" -#include <qpainter.h> -#include <qpixmap.h> -#include <qpaintdevice.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpaintdevice.h> // forward definition -QImage convertImage(const QImage& image, int hue, int saturation, int brightness, int gamma); +TQImage convertImage(const TQImage& image, int hue, int saturation, int brightness, int gamma); -ImagePreview::ImagePreview(QWidget *parent, const char *name ) : QWidget(parent,name) { +ImagePreview::ImagePreview(TQWidget *parent, const char *name ) : TQWidget(parent,name) { brightness_ = 100; hue_ = 0; saturation_ = 100; @@ -39,7 +39,7 @@ ImagePreview::ImagePreview(QWidget *parent, const char *name ) : QWidget(parent, ImagePreview::~ImagePreview(){ } -void ImagePreview::setImage(const QImage& image){ +void ImagePreview::setImage(const TQImage& image){ image_ = image.convertDepth(32); image_.detach(); resize(image_.size()); @@ -54,7 +54,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga repaint(); } -void ImagePreview::paintEvent(QPaintEvent*){ +void ImagePreview::paintEvent(TQPaintEvent*){ QImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_); int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; @@ -64,7 +64,7 @@ void ImagePreview::paintEvent(QPaintEvent*){ p.drawImage(x,y,tmpImage); p.end(); - bitBlt(this, QPoint(0, 0), &buffer, buffer.rect(), Qt::CopyROP); + bitBlt(this, TQPoint(0, 0), &buffer, buffer.rect(), Qt::CopyROP); } void ImagePreview::setBlackAndWhite(bool on){ @@ -72,7 +72,7 @@ void ImagePreview::setBlackAndWhite(bool on){ update(); } -QSize ImagePreview::minimumSizeHint() const +TQSize ImagePreview::minimumSizeHint() const { return image_.size(); } diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h index e709490fb..1967efdc2 100644 --- a/kdeprint/cups/imagepreview.h +++ b/kdeprint/cups/imagepreview.h @@ -20,19 +20,19 @@ #ifndef IMAGEPREVIEW_H #define IMAGEPREVIEW_H -#include <qwidget.h> -#include <qimage.h> +#include <tqwidget.h> +#include <tqimage.h> class ImagePreview : public QWidget { public: - ImagePreview(QWidget *parent=0, const char *name=0); + ImagePreview(TQWidget *parent=0, const char *name=0); ~ImagePreview(); void setParameters(int brightness, int hue, int saturation, int gamma); - void setImage(const QImage& image); + void setImage(const TQImage& image); void setBlackAndWhite(bool on); - QSize minimumSizeHint() const; + TQSize minimumSizeHint() const; private: // Private attributes int brightness_; @@ -40,10 +40,10 @@ private: // Private attributes int saturation_; int gamma_; bool bw_; - QImage image_; + TQImage image_; protected: // Protected methods - void paintEvent(QPaintEvent*); + void paintEvent(TQPaintEvent*); }; #endif diff --git a/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp index 71256ce39..343cd4118 100644 --- a/kdeprint/cups/ippreportdlg.cpp +++ b/kdeprint/cups/ippreportdlg.cpp @@ -26,11 +26,11 @@ #include <kmessagebox.h> #include <kdebug.h> #include <ktextedit.h> -#include <qsimplerichtext.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> +#include <tqsimplerichtext.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> -IppReportDlg::IppReportDlg(QWidget *parent, const char *name) +IppReportDlg::IppReportDlg(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "fileprint")) { m_edit = new KTextEdit(this); @@ -60,7 +60,7 @@ void IppReportDlg::slotUser1() while (1) { rich.draw(&painter, margin, margin, r, colorGroup()); - QString s = caption() + ": " + QString::number(page); + QString s = caption() + ": " + TQString::number(page); QRect br = painter.fontMetrics().boundingRect(s); painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); r.moveBy(0, r.height()-10); @@ -76,7 +76,7 @@ void IppReportDlg::slotUser1() } } -void IppReportDlg::report(IppRequest *req, int group, const QString& caption) +void IppReportDlg::report(IppRequest *req, int group, const TQString& caption) { QString str_report; QTextStream t(&str_report, IO_WriteOnly); diff --git a/kdeprint/cups/ippreportdlg.h b/kdeprint/cups/ippreportdlg.h index fe3f36621..8e3eea8c5 100644 --- a/kdeprint/cups/ippreportdlg.h +++ b/kdeprint/cups/ippreportdlg.h @@ -29,8 +29,8 @@ class IppReportDlg : public KDialogBase { Q_OBJECT public: - IppReportDlg(QWidget *parent = 0, const char *name = 0); - static void report(IppRequest *req, int group, const QString& caption = QString::null); + IppReportDlg(TQWidget *parent = 0, const char *name = 0); + static void report(IppRequest *req, int group, const TQString& caption = TQString::null); protected slots: void slotUser1(); diff --git a/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp index b4812a171..0b32e45e7 100644 --- a/kdeprint/cups/ipprequest.cpp +++ b/kdeprint/cups/ipprequest.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> #include <kglobal.h> #include <klocale.h> -#include <qdatetime.h> -#include <qregexp.h> +#include <tqdatetime.h> +#include <tqregexp.h> #include <cups/cups.h> #ifdef HAVE_CONFIG_H @@ -34,11 +34,11 @@ #endif #ifdef HAVE_CUPS_NO_PWD_CACHE -#include <qcstring.h> -static QCString cups_authstring = ""; +#include <tqcstring.h> +static TQCString cups_authstring = ""; #endif -void dumpRequest(ipp_t *req, bool answer = false, const QString& s = QString::null) +void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::null) { kdDebug(500) << "==========" << endl; if (s.isEmpty()) @@ -51,29 +51,29 @@ void dumpRequest(ipp_t *req, bool answer = false, const QString& s = QString::nu kdDebug(500) << "Null request" << endl; return; } - kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl; - kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl; + kdDebug(500) << "State = 0x" << TQString::number(req->state, 16) << endl; + kdDebug(500) << "ID = 0x" << TQString::number(req->request.status.request_id, 16) << endl; if (answer) { - kdDebug(500) << "Status = 0x" << QString::number(req->request.status.status_code, 16) << endl; + kdDebug(500) << "Status = 0x" << TQString::number(req->request.status.status_code, 16) << endl; kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl; } else - kdDebug(500) << "Operation = 0x" << QString::number(req->request.op.operation_id, 16) << endl; + kdDebug(500) << "Operation = 0x" << TQString::number(req->request.op.operation_id, 16) << endl; kdDebug(500) << "Version = " << (int)(req->request.status.version[0]) << "." << (int)(req->request.status.version[1]) << endl; kdDebug(500) << endl; ipp_attribute_t *attr = req->attrs; while (attr) { - QString s = QString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); + TQString s = TQString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); for (int i=0;i<attr->num_values;i++) { switch (attr->value_tag) { case IPP_TAG_INTEGER: case IPP_TAG_ENUM: - s += ("0x"+QString::number(attr->values[i].integer, 16)); + s += ("0x"+TQString::number(attr->values[i].integer, 16)); break; case IPP_TAG_BOOLEAN: s += (attr->values[i].boolean ? "true" : "false"); @@ -101,7 +101,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const QString& s = QString::nu } } -QString errorString(int status) +TQString errorString(int status) { QString str; switch (status) @@ -122,7 +122,7 @@ QString errorString(int status) str = i18n("The target printer is not accepting print jobs."); break; default: - str = QString::fromLocal8Bit(ippErrorString((ipp_status_t)status)); + str = TQString::fromLocal8Bit(ippErrorString((ipp_status_t)status)); break; } return str; @@ -134,7 +134,7 @@ IppRequest::IppRequest() { request_ = 0; port_ = -1; - host_ = QString::null; + host_ = TQString::null; dump_ = 0; init(); } @@ -155,7 +155,7 @@ void IppRequest::init() } request_ = ippNew(); //kdDebug(500) << "kdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; - QCString langstr = KGlobal::locale()->language().latin1(); + TQCString langstr = KGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) lang->encoding = CUPS_UTF8; @@ -164,51 +164,51 @@ void IppRequest::init() cupsLangFree(lang); } -void IppRequest::addString_p(int group, int type, const QString& name, const QString& value) +void IppRequest::addString_p(int group, int type, const TQString& name, const TQString& value) { if (!name.isEmpty()) ippAddString(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),NULL,(value.isEmpty() ? "" : value.local8Bit().data())); } -void IppRequest::addStringList_p(int group, int type, const QString& name, const QStringList& values) +void IppRequest::addStringList_p(int group, int type, const TQString& name, const TQStringList& values) { if (!name.isEmpty()) { ipp_attribute_t *attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL); int i(0); - for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++) + for (TQStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++) attr->values[i].string.text = strdup((*it).local8Bit()); } } -void IppRequest::addInteger_p(int group, int type, const QString& name, int value) +void IppRequest::addInteger_p(int group, int type, const TQString& name, int value) { if (!name.isEmpty()) ippAddInteger(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),value); } -void IppRequest::addIntegerList_p(int group, int type, const QString& name, const QValueList<int>& values) +void IppRequest::addIntegerList_p(int group, int type, const TQString& name, const TQValueList<int>& values) { if (!name.isEmpty()) { ipp_attribute_t *attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL); int i(0); - for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) + for (TQValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) attr->values[i].integer = *it; } } -void IppRequest::addBoolean(int group, const QString& name, bool value) +void IppRequest::addBoolean(int group, const TQString& name, bool value) { if (!name.isEmpty()) ippAddBoolean(request_,(ipp_tag_t)group,name.latin1(),(char)value); } -void IppRequest::addBoolean(int group, const QString& name, const QValueList<bool>& values) +void IppRequest::addBoolean(int group, const TQString& name, const TQValueList<bool>& values) { if (!name.isEmpty()) { ipp_attribute_t *attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL); int i(0); - for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) + for (TQValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) attr->values[i].boolean = (char)(*it); } } @@ -224,7 +224,7 @@ int IppRequest::status() return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2)); } -QString IppRequest::statusMessage() +TQString IppRequest::statusMessage() { QString msg; switch (status()) @@ -242,7 +242,7 @@ QString IppRequest::statusMessage() return msg; } -bool IppRequest::integerValue_p(const QString& name, int& value, int type) +bool IppRequest::integerValue_p(const TQString& name, int& value, int type) { if (!request_ || name.isEmpty()) return false; ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); @@ -254,19 +254,19 @@ bool IppRequest::integerValue_p(const QString& name, int& value, int type) else return false; } -bool IppRequest::stringValue_p(const QString& name, QString& value, int type) +bool IppRequest::stringValue_p(const TQString& name, TQString& value, int type) { if (!request_ || name.isEmpty()) return false; ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); if (attr) { - value = QString::fromLocal8Bit(attr->values[0].string.text); + value = TQString::fromLocal8Bit(attr->values[0].string.text); return true; } else return false; } -bool IppRequest::stringListValue_p(const QString& name, QStringList& values, int type) +bool IppRequest::stringListValue_p(const TQString& name, TQStringList& values, int type) { if (!request_ || name.isEmpty()) return false; ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); @@ -274,13 +274,13 @@ bool IppRequest::stringListValue_p(const QString& name, QStringList& values, int if (attr) { for (int i=0;i<attr->num_values;i++) - values.append(QString::fromLocal8Bit(attr->values[i].string.text)); + values.append(TQString::fromLocal8Bit(attr->values[i].string.text)); return true; } else return false; } -bool IppRequest::boolean(const QString& name, bool& value) +bool IppRequest::boolean(const TQString& name, bool& value) { if (!request_ || name.isEmpty()) return false; ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN); @@ -292,7 +292,7 @@ bool IppRequest::boolean(const QString& name, bool& value) else return false; } -bool IppRequest::doFileRequest(const QString& res, const QString& filename) +bool IppRequest::doFileRequest(const TQString& res, const TQString& filename) { QString myHost = host_; int myPort = port_; @@ -319,7 +319,7 @@ bool IppRequest::doFileRequest(const QString& res, const QString& filename) if (dump_ > 0) { - dumpRequest(request_, false, "Request to "+myHost+":"+QString::number(myPort)); + dumpRequest(request_, false, "Request to "+myHost+":"+TQString::number(myPort)); } request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1())); @@ -348,7 +348,7 @@ bool IppRequest::doFileRequest(const QString& res, const QString& filename) return true; } -bool IppRequest::htmlReport(int group, QTextStream& output) +bool IppRequest::htmlReport(int group, TQTextStream& output) { if (!request_) return false; // start table @@ -430,9 +430,9 @@ bool IppRequest::htmlReport(int group, QTextStream& output) return true; } -QMap<QString,QString> IppRequest::toMap(int group) +TQMap<TQString,TQString> IppRequest::toMap(int group) { - QMap<QString,QString> opts; + TQMap<TQString,TQString> opts; if (request_) { ipp_attribute_t *attr = first(); @@ -450,19 +450,19 @@ QMap<QString,QString> IppRequest::toMap(int group) { case IPP_TAG_INTEGER: case IPP_TAG_ENUM: - value.append(QString::number(attr->values[i].integer)).append(","); + value.append(TQString::number(attr->values[i].integer)).append(","); break; case IPP_TAG_BOOLEAN: value.append((attr->values[i].boolean ? "true" : "false")).append(","); break; case IPP_TAG_RANGE: if (attr->values[i].range.lower > 0) - value.append(QString::number(attr->values[i].range.lower)); + value.append(TQString::number(attr->values[i].range.lower)); if (attr->values[i].range.lower != attr->values[i].range.upper) { value.append("-"); if (attr->values[i].range.upper > 0) - value.append(QString::number(attr->values[i].range.upper)); + value.append(TQString::number(attr->values[i].range.upper)); } value.append(","); break; @@ -476,7 +476,7 @@ QMap<QString,QString> IppRequest::toMap(int group) case IPP_TAG_TEXTLANG: case IPP_TAG_CHARSET: case IPP_TAG_LANGUAGE: - value.append(QString::fromLocal8Bit(attr->values[i].string.text)).append(","); + value.append(TQString::fromLocal8Bit(attr->values[i].string.text)).append(","); break; default: break; @@ -484,14 +484,14 @@ QMap<QString,QString> IppRequest::toMap(int group) } if (!value.isEmpty()) value.truncate(value.length()-1); - opts[QString::fromLocal8Bit(attr->name)] = value; + opts[TQString::fromLocal8Bit(attr->name)] = value; attr = attr->next; } } return opts; } -void IppRequest::setMap(const QMap<QString,QString>& opts) +void IppRequest::setMap(const TQMap<TQString,TQString>& opts) { if (!request_) return; @@ -499,7 +499,7 @@ void IppRequest::setMap(const QMap<QString,QString>& opts) QRegExp re("^\"|\"$"); cups_option_t *options = NULL; int n = 0; - for (QMap<QString,QString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) + for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) { if (it.key().startsWith("kde-") || it.key().startsWith("app-")) continue; diff --git a/kdeprint/cups/ipprequest.h b/kdeprint/cups/ipprequest.h index 68fe3ec0b..1265ee966 100644 --- a/kdeprint/cups/ipprequest.h +++ b/kdeprint/cups/ipprequest.h @@ -20,10 +20,10 @@ #ifndef IPPREQUEST_H #define IPPREQUEST_H -#include <qstring.h> -#include <qstringlist.h> -#include <qtextstream.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtextstream.h> +#include <tqmap.h> #include <cups/ipp.h> @@ -36,64 +36,64 @@ public: void init(); // re-initializes the request // request building functions - void addMime(int group, const QString& name, const QString& mime); - void addKeyword(int group, const QString& name, const QString& key); - void addKeyword(int group, const QString& name, const QStringList& keys); - void addURI(int group, const QString& name, const QString& uri); - void addURI(int group, const QString& name, const QStringList& uris); - void addText(int group, const QString& name, const QString& txt); - void addText(int group, const QString& name, const QStringList& txts); - void addName(int group, const QString& name, const QString& nm); - void addName(int group, const QString& name, const QStringList& nms); - void addInteger(int group, const QString& name, int value); - void addInteger(int group, const QString& name, const QValueList<int>& values); - void addEnum(int group, const QString& name, int value); - void addEnum(int group, const QString& name, const QValueList<int>& values); - void addBoolean(int group, const QString& name, bool value); - void addBoolean(int group, const QString& name, const QValueList<bool>& values); + void addMime(int group, const TQString& name, const TQString& mime); + void addKeyword(int group, const TQString& name, const TQString& key); + void addKeyword(int group, const TQString& name, const TQStringList& keys); + void addURI(int group, const TQString& name, const TQString& uri); + void addURI(int group, const TQString& name, const TQStringList& uris); + void addText(int group, const TQString& name, const TQString& txt); + void addText(int group, const TQString& name, const TQStringList& txts); + void addName(int group, const TQString& name, const TQString& nm); + void addName(int group, const TQString& name, const TQStringList& nms); + void addInteger(int group, const TQString& name, int value); + void addInteger(int group, const TQString& name, const TQValueList<int>& values); + void addEnum(int group, const TQString& name, int value); + void addEnum(int group, const TQString& name, const TQValueList<int>& values); + void addBoolean(int group, const TQString& name, bool value); + void addBoolean(int group, const TQString& name, const TQValueList<bool>& values); void setOperation(int op); - void setHost(const QString& host); + void setHost(const TQString& host); void setPort(int p); // request answer functions int status(); - QString statusMessage(); - bool integer(const QString& name, int& value); - bool boolean(const QString& name, bool& value); - bool enumvalue(const QString& name, int& value); - bool name(const QString& name, QString& value); - bool name(const QString& name, QStringList& value); - bool text(const QString& name, QString& value); - bool text(const QString& name, QStringList& value); - bool uri(const QString& name, QString& value); - bool uri(const QString& name, QStringList& value); - bool keyword(const QString& name, QString& value); - bool keyword(const QString& name, QStringList& value); - bool mime(const QString& name, QString& value); + TQString statusMessage(); + bool integer(const TQString& name, int& value); + bool boolean(const TQString& name, bool& value); + bool enumvalue(const TQString& name, int& value); + bool name(const TQString& name, TQString& value); + bool name(const TQString& name, TQStringList& value); + bool text(const TQString& name, TQString& value); + bool text(const TQString& name, TQStringList& value); + bool uri(const TQString& name, TQString& value); + bool uri(const TQString& name, TQStringList& value); + bool keyword(const TQString& name, TQString& value); + bool keyword(const TQString& name, TQStringList& value); + bool mime(const TQString& name, TQString& value); ipp_attribute_t* first(); ipp_attribute_t* last(); - QMap<QString,QString> toMap(int group = -1); - void setMap(const QMap<QString,QString>& opts); + TQMap<TQString,TQString> toMap(int group = -1); + void setMap(const TQMap<TQString,TQString>& opts); // processing functions - bool doRequest(const QString& res); - bool doFileRequest(const QString& res, const QString& filename = QString::null); + bool doRequest(const TQString& res); + bool doFileRequest(const TQString& res, const TQString& filename = TQString::null); // report functions - bool htmlReport(int group, QTextStream& output); + bool htmlReport(int group, TQTextStream& output); // debug function void dump(int state); protected: - void addString_p(int group, int type, const QString& name, const QString& value); - void addStringList_p(int group, int type, const QString& name, const QStringList& values); - void addInteger_p(int group, int type, const QString& name, int value); - void addIntegerList_p(int group, int type, const QString& name, const QValueList<int>& values); - bool stringValue_p(const QString& name, QString& value, int type); - bool stringListValue_p(const QString& name, QStringList& values, int type); - bool integerValue_p(const QString& name, int& value, int type); + void addString_p(int group, int type, const TQString& name, const TQString& value); + void addStringList_p(int group, int type, const TQString& name, const TQStringList& values); + void addInteger_p(int group, int type, const TQString& name, int value); + void addIntegerList_p(int group, int type, const TQString& name, const TQValueList<int>& values); + bool stringValue_p(const TQString& name, TQString& value, int type); + bool stringListValue_p(const TQString& name, TQStringList& values, int type); + bool integerValue_p(const TQString& name, int& value, int type); private: ipp_t *request_; @@ -103,79 +103,79 @@ private: int dump_; }; -inline void IppRequest::addMime(int group, const QString& name, const QString& mime) +inline void IppRequest::addMime(int group, const TQString& name, const TQString& mime) { addString_p(group, IPP_TAG_MIMETYPE, name, mime); } -inline void IppRequest::addKeyword(int group, const QString& name, const QString& key) +inline void IppRequest::addKeyword(int group, const TQString& name, const TQString& key) { addString_p(group, IPP_TAG_KEYWORD, name, key); } -inline void IppRequest::addKeyword(int group, const QString& name, const QStringList& keys) +inline void IppRequest::addKeyword(int group, const TQString& name, const TQStringList& keys) { addStringList_p(group, IPP_TAG_KEYWORD, name, keys); } -inline void IppRequest::addURI(int group, const QString& name, const QString& uri) +inline void IppRequest::addURI(int group, const TQString& name, const TQString& uri) { addString_p(group, IPP_TAG_URI, name, uri); } -inline void IppRequest::addURI(int group, const QString& name, const QStringList& uris) +inline void IppRequest::addURI(int group, const TQString& name, const TQStringList& uris) { addStringList_p(group, IPP_TAG_URI, name, uris); } -inline void IppRequest::addText(int group, const QString& name, const QString& txt) +inline void IppRequest::addText(int group, const TQString& name, const TQString& txt) { addString_p(group, IPP_TAG_TEXT, name, txt); } -inline void IppRequest::addText(int group, const QString& name, const QStringList& txts) +inline void IppRequest::addText(int group, const TQString& name, const TQStringList& txts) { addStringList_p(group, IPP_TAG_TEXT, name, txts); } -inline void IppRequest::addName(int group, const QString& name, const QString& nm) +inline void IppRequest::addName(int group, const TQString& name, const TQString& nm) { addString_p(group, IPP_TAG_NAME, name, nm); } -inline void IppRequest::addName(int group, const QString& name, const QStringList& nms) +inline void IppRequest::addName(int group, const TQString& name, const TQStringList& nms) { addStringList_p(group, IPP_TAG_NAME, name, nms); } -inline void IppRequest::addInteger(int group, const QString& name, int value) +inline void IppRequest::addInteger(int group, const TQString& name, int value) { addInteger_p(group, IPP_TAG_INTEGER, name, value); } -inline void IppRequest::addInteger(int group, const QString& name, const QValueList<int>& values) +inline void IppRequest::addInteger(int group, const TQString& name, const TQValueList<int>& values) { addIntegerList_p(group, IPP_TAG_INTEGER, name, values); } -inline void IppRequest::addEnum(int group, const QString& name, int value) +inline void IppRequest::addEnum(int group, const TQString& name, int value) { addInteger_p(group, IPP_TAG_ENUM, name, value); } -inline void IppRequest::addEnum(int group, const QString& name, const QValueList<int>& values) +inline void IppRequest::addEnum(int group, const TQString& name, const TQValueList<int>& values) { addIntegerList_p(group, IPP_TAG_ENUM, name, values); } -inline bool IppRequest::integer(const QString& name, int& value) +inline bool IppRequest::integer(const TQString& name, int& value) { return integerValue_p(name, value, IPP_TAG_INTEGER); } -inline bool IppRequest::enumvalue(const QString& name, int& value) +inline bool IppRequest::enumvalue(const TQString& name, int& value) { return integerValue_p(name, value, IPP_TAG_ENUM); } -inline bool IppRequest::name(const QString& name, QString& value) +inline bool IppRequest::name(const TQString& name, TQString& value) { return stringValue_p(name, value, IPP_TAG_NAME); } -inline bool IppRequest::name(const QString& name, QStringList& values) +inline bool IppRequest::name(const TQString& name, TQStringList& values) { return stringListValue_p(name, values, IPP_TAG_NAME); } -inline bool IppRequest::text(const QString& name, QString& value) +inline bool IppRequest::text(const TQString& name, TQString& value) { return stringValue_p(name, value, IPP_TAG_TEXT); } -inline bool IppRequest::text(const QString& name, QStringList& values) +inline bool IppRequest::text(const TQString& name, TQStringList& values) { return stringListValue_p(name, values, IPP_TAG_TEXT); } -inline bool IppRequest::uri(const QString& name, QString& value) +inline bool IppRequest::uri(const TQString& name, TQString& value) { return stringValue_p(name, value, IPP_TAG_URI); } -inline bool IppRequest::uri(const QString& name, QStringList& values) +inline bool IppRequest::uri(const TQString& name, TQStringList& values) { return stringListValue_p(name, values, IPP_TAG_URI); } -inline bool IppRequest::keyword(const QString& name, QString& value) +inline bool IppRequest::keyword(const TQString& name, TQString& value) { return stringValue_p(name, value, IPP_TAG_KEYWORD); } -inline bool IppRequest::keyword(const QString& name, QStringList& values) +inline bool IppRequest::keyword(const TQString& name, TQStringList& values) { return stringListValue_p(name, values, IPP_TAG_KEYWORD); } -inline bool IppRequest::mime(const QString& name, QString& value) +inline bool IppRequest::mime(const TQString& name, TQString& value) { return stringValue_p(name, value, IPP_TAG_MIMETYPE); } -inline bool IppRequest::doRequest(const QString& res) +inline bool IppRequest::doRequest(const TQString& res) { return doFileRequest(res); } inline ipp_attribute_t* IppRequest::first() @@ -184,7 +184,7 @@ inline ipp_attribute_t* IppRequest::first() inline ipp_attribute_t* IppRequest::last() { return (request_ ? request_->last : NULL); } -inline void IppRequest::setHost(const QString& host) +inline void IppRequest::setHost(const TQString& host) { host_ = host; } inline void IppRequest::setPort(int p) diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp index 665183063..1bf6d55bf 100644 --- a/kdeprint/cups/kcupsprinterimpl.cpp +++ b/kdeprint/cups/kcupsprinterimpl.cpp @@ -24,14 +24,14 @@ #include "kmmanager.h" #include "cupsinfos.h" -#include <qfile.h> +#include <tqfile.h> #include <cups/cups.h> #include <stdlib.h> #include <kprocess.h> -static void mapToCupsOptions(const QMap<QString,QString>& opts, QString& cmd); +static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd); -QSize rangeToSize(const QString& s) +TQSize rangeToSize(const TQString& s) { QString range = s; int p(-1); @@ -49,11 +49,11 @@ QSize rangeToSize(const QString& s) else from = to = 0; - return QSize(from,to); + return TQSize(from,to); } //****************************************************************************************************** -KCupsPrinterImpl::KCupsPrinterImpl(QObject *parent, const char *name, const QStringList & /*args*/) +KCupsPrinterImpl::KCupsPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) { } @@ -62,13 +62,13 @@ KCupsPrinterImpl::~KCupsPrinterImpl() { } -bool KCupsPrinterImpl::setupCommand(QString& cmd, KPrinter *printer) +bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { // check printer object if (!printer) return false; - QString hoststr = QString::fromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); - cmd = QString::fromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); + QString hoststr = TQString::fromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); + cmd = TQString::fromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); if (!CupsInfos::self()->login().isEmpty()) { QString userstr(CupsInfos::self()->login()); @@ -107,12 +107,12 @@ void KCupsPrinterImpl::preparePrinting(KPrinter *printer) } else { // No translation needed (but range => (from,to)) - QString range = printer->option("kde-range"); + TQString range = printer->option("kde-range"); if (!range.isEmpty()) { QSize s = rangeToSize(range); - printer->setOption("kde-from",QString::number(s.width())); - printer->setOption("kde-to",QString::number(s.height())); + printer->setOption("kde-from",TQString::number(s.width())); + printer->setOption("kde-to",TQString::number(s.height())); } } @@ -120,14 +120,14 @@ void KCupsPrinterImpl::preparePrinting(KPrinter *printer) KPrinterImpl::preparePrinting(printer); } -void KCupsPrinterImpl::broadcastOption(const QString& key, const QString& value) +void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& value) { KPrinterImpl::broadcastOption(key,value); if (key == "kde-orientation") KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3")); else if (key == "kde-pagesize") { - QString pagename = QString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); // simple hack for classes KPrinterImpl::broadcastOption("media",pagename); @@ -136,15 +136,15 @@ void KCupsPrinterImpl::broadcastOption(const QString& key, const QString& value) //****************************************************************************************************** -static void mapToCupsOptions(const QMap<QString,QString>& opts, QString& cmd) +static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd) { QString optstr; - for (QMap<QString,QString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) + for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) { // only encode those options that doesn't start with "kde-" or "app-". if (!it.key().startsWith("kde-") && !it.key().startsWith("app-") && !it.key().startsWith("_kde")) { - QString key = it.key(); + TQString key = it.key(); if (key.startsWith("KDEPrint-")) /* Those are keys added by the "Additional Tags" page. * * Strip the prefix to build valid a CUPS option. */ diff --git a/kdeprint/cups/kcupsprinterimpl.h b/kdeprint/cups/kcupsprinterimpl.h index 81b0a364a..f2eeab88f 100644 --- a/kdeprint/cups/kcupsprinterimpl.h +++ b/kdeprint/cups/kcupsprinterimpl.h @@ -25,12 +25,12 @@ class KCupsPrinterImpl : public KPrinterImpl { public: - KCupsPrinterImpl(QObject *parent, const char *name, const QStringList & /*args*/ = QStringList()); + KCupsPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/ = TQStringList()); ~KCupsPrinterImpl(); - bool setupCommand(QString&, KPrinter*); + bool setupCommand(TQString&, KPrinter*); void preparePrinting(KPrinter*); - void broadcastOption(const QString& key, const QString& value); + void broadcastOption(const TQString& key, const TQString& value); }; #endif diff --git a/kdeprint/cups/kmconfigcups.cpp b/kdeprint/cups/kmconfigcups.cpp index 3d5ece0ab..c23f5d54c 100644 --- a/kdeprint/cups/kmconfigcups.cpp +++ b/kdeprint/cups/kmconfigcups.cpp @@ -24,9 +24,9 @@ #include <kconfig.h> #include <kdialog.h> -#include <qlayout.h> +#include <tqlayout.h> -KMConfigCups::KMConfigCups(QWidget *parent) +KMConfigCups::KMConfigCups(TQWidget *parent) : KMConfigPage(parent,"ConfigCups") { setPageName(i18n("CUPS Server")); @@ -35,7 +35,7 @@ KMConfigCups::KMConfigCups(QWidget *parent) m_widget = new KMCupsConfigWidget(this); - QVBoxLayout *lay0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_widget); lay0->addStretch(1); } diff --git a/kdeprint/cups/kmconfigcups.h b/kdeprint/cups/kmconfigcups.h index 3f0afa2bb..52dac657c 100644 --- a/kdeprint/cups/kmconfigcups.h +++ b/kdeprint/cups/kmconfigcups.h @@ -27,7 +27,7 @@ class KMCupsConfigWidget; class KMConfigCups : public KMConfigPage { public: - KMConfigCups(QWidget *parent = 0); + KMConfigCups(TQWidget *parent = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/cups/kmconfigcupsdir.cpp b/kdeprint/cups/kmconfigcupsdir.cpp index 31005752d..5e6958565 100644 --- a/kdeprint/cups/kmconfigcupsdir.cpp +++ b/kdeprint/cups/kmconfigcupsdir.cpp @@ -19,36 +19,36 @@ #include "kmconfigcupsdir.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kurlrequester.h> #include <klocale.h> #include <kdialog.h> #include <kconfig.h> -#include <qgroupbox.h> -#include <qlayout.h> +#include <tqgroupbox.h> +#include <tqlayout.h> #include <kcursor.h> -KMConfigCupsDir::KMConfigCupsDir(QWidget *parent) +KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) : KMConfigPage(parent,"ConfigCupsDir") { setPageName(i18n("Folder")); setPageHeader(i18n("CUPS Folder Settings")); setPagePixmap("folder"); - QGroupBox *m_dirbox = new QGroupBox(0, Qt::Vertical, i18n("Installation Folder"), this); + TQGroupBox *m_dirbox = new TQGroupBox(0, Qt::Vertical, i18n("Installation Folder"), this); m_installdir = new KURLRequester(m_dirbox); m_installdir->setMode((KFile::Mode)(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly)); - m_stddir = new QCheckBox(i18n("Standard installation (/)"), m_dirbox); + m_stddir = new TQCheckBox(i18n("Standard installation (/)"), m_dirbox); m_stddir->setCursor(KCursor::handCursor()); - QVBoxLayout *lay0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_dirbox); lay0->addStretch(1); - QVBoxLayout *lay1 = new QVBoxLayout(m_dirbox->layout(), 10); + TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10); lay1->addWidget(m_stddir); lay1->addWidget(m_installdir); - connect(m_stddir,SIGNAL(toggled(bool)),m_installdir,SLOT(setDisabled(bool))); + connect(m_stddir,TQT_SIGNAL(toggled(bool)),m_installdir,TQT_SLOT(setDisabled(bool))); m_stddir->setChecked(true); } @@ -63,5 +63,5 @@ void KMConfigCupsDir::loadConfig(KConfig *conf) void KMConfigCupsDir::saveConfig(KConfig *conf) { conf->setGroup("CUPS"); - conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? QString::null : m_installdir->url())); + conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? TQString::null : m_installdir->url())); } diff --git a/kdeprint/cups/kmconfigcupsdir.h b/kdeprint/cups/kmconfigcupsdir.h index 253b2bd2d..ca365ba19 100644 --- a/kdeprint/cups/kmconfigcupsdir.h +++ b/kdeprint/cups/kmconfigcupsdir.h @@ -28,7 +28,7 @@ class QCheckBox; class KMConfigCupsDir : public KMConfigPage { public: - KMConfigCupsDir(QWidget *parent = 0); + KMConfigCupsDir(TQWidget *parent = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp index 9c3fa7516..684d8b850 100644 --- a/kdeprint/cups/kmcupsconfigwidget.cpp +++ b/kdeprint/cups/kmcupsconfigwidget.cpp @@ -20,13 +20,13 @@ #include "kmcupsconfigwidget.h" #include "cupsinfos.h" -#include <qlabel.h> -#include <qgroupbox.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qvalidator.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqvalidator.h> #include <klocale.h> #include <kcursor.h> @@ -36,64 +36,64 @@ class PortValidator : public QIntValidator { public: - PortValidator(QWidget *parent, const char *name = 0); - virtual QValidator::State validate(QString&, int&) const; + PortValidator(TQWidget *parent, const char *name = 0); + virtual TQValidator::State validate(TQString&, int&) const; }; -PortValidator::PortValidator(QWidget *parent, const char *name) -: QIntValidator(1, 65535, parent, name) +PortValidator::PortValidator(TQWidget *parent, const char *name) +: TQIntValidator(1, 65535, parent, name) { } -QValidator::State PortValidator::validate(QString& txt, int&) const +TQValidator::State PortValidator::validate(TQString& txt, int&) const { bool ok(false); int p = txt.toInt(&ok); if (txt.isEmpty()) - return QValidator::Intermediate; + return TQValidator::Intermediate; else if (ok && p >= bottom() && p <= top()) - return QValidator::Acceptable; - return QValidator::Invalid; + return TQValidator::Acceptable; + return TQValidator::Invalid; } //****************************************************************************************** -KMCupsConfigWidget::KMCupsConfigWidget(QWidget *parent, const char *name) -: QWidget(parent,name) +KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) +: TQWidget(parent,name) { // widget creation - QGroupBox *m_hostbox = new QGroupBox(0, Qt::Vertical, i18n("Server Information"), this); - QGroupBox *m_loginbox = new QGroupBox(0, Qt::Vertical, i18n("Account Information"), this); - QLabel *m_hostlabel = new QLabel(i18n("&Host:"), m_hostbox); - QLabel *m_portlabel = new QLabel(i18n("&Port:"), m_hostbox); - m_host = new QLineEdit(m_hostbox); - m_port = new QLineEdit(m_hostbox); + QGroupBox *m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this); + QGroupBox *m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this); + QLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox); + QLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox); + m_host = new TQLineEdit(m_hostbox); + m_port = new TQLineEdit(m_hostbox); m_hostlabel->setBuddy(m_host); m_portlabel->setBuddy(m_port); m_port->setValidator(new PortValidator(m_port)); - m_login = new QLineEdit(m_loginbox); - QLabel *m_loginlabel = new QLabel(i18n("&User:"), m_loginbox); - QLabel *m_passwordlabel = new QLabel(i18n("Pass&word:"), m_loginbox); - m_password = new QLineEdit(m_loginbox); - m_password->setEchoMode(QLineEdit::Password); - m_savepwd = new QCheckBox( i18n( "&Store password in configuration file" ), m_loginbox ); + m_login = new TQLineEdit(m_loginbox); + QLabel *m_loginlabel = new TQLabel(i18n("&User:"), m_loginbox); + QLabel *m_passwordlabel = new TQLabel(i18n("Pass&word:"), m_loginbox); + m_password = new TQLineEdit(m_loginbox); + m_password->setEchoMode(TQLineEdit::Password); + m_savepwd = new TQCheckBox( i18n( "&Store password in configuration file" ), m_loginbox ); m_savepwd->setCursor( KCursor::handCursor() ); - m_anonymous = new QCheckBox(i18n("Use &anonymous access"), m_loginbox); + m_anonymous = new TQCheckBox(i18n("Use &anonymous access"), m_loginbox); m_anonymous->setCursor(KCursor::handCursor()); m_loginlabel->setBuddy(m_login); m_passwordlabel->setBuddy(m_password); // layout creation - QVBoxLayout *lay0 = new QVBoxLayout(this, 0, 10); + QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); lay0->addWidget(m_hostbox,1); lay0->addWidget(m_loginbox,1); - QGridLayout *lay2 = new QGridLayout(m_hostbox->layout(), 2, 2, 10); + QGridLayout *lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10); lay2->setColStretch(1,1); lay2->addWidget(m_hostlabel,0,0); lay2->addWidget(m_portlabel,1,0); lay2->addWidget(m_host,0,1); lay2->addWidget(m_port,1,1); - QGridLayout *lay3 = new QGridLayout(m_loginbox->layout(), 4, 2, 10); + QGridLayout *lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10); lay3->setColStretch(1,1); lay3->addWidget(m_loginlabel,0,0); lay3->addWidget(m_passwordlabel,1,0); @@ -103,16 +103,16 @@ KMCupsConfigWidget::KMCupsConfigWidget(QWidget *parent, const char *name) lay3->addMultiCellWidget(m_anonymous,3,3,0,1); // connections - connect(m_anonymous,SIGNAL(toggled(bool)),m_login,SLOT(setDisabled(bool))); - connect(m_anonymous,SIGNAL(toggled(bool)),m_password,SLOT(setDisabled(bool))); - connect(m_anonymous,SIGNAL(toggled(bool)),m_savepwd,SLOT(setDisabled(bool))); + connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setDisabled(bool))); + connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setDisabled(bool))); + connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_savepwd,TQT_SLOT(setDisabled(bool))); } void KMCupsConfigWidget::load() { CupsInfos *inf = CupsInfos::self(); m_host->setText(inf->host()); - m_port->setText(QString::number(inf->port())); + m_port->setText(TQString::number(inf->port())); if (inf->login().isEmpty()) m_anonymous->setChecked(true); else @@ -130,8 +130,8 @@ void KMCupsConfigWidget::save(bool sync) inf->setPort(m_port->text().toInt()); if (m_anonymous->isChecked()) { - inf->setLogin(QString::null); - inf->setPassword(QString::null); + inf->setLogin(TQString::null); + inf->setPassword(TQString::null); inf->setSavePassword( false ); } else @@ -148,10 +148,10 @@ void KMCupsConfigWidget::saveConfig(KConfig *conf) conf->setGroup("CUPS"); conf->writeEntry("Host",m_host->text()); conf->writeEntry("Port",m_port->text().toInt()); - conf->writeEntry("Login",(m_anonymous->isChecked() ? QString::null : m_login->text())); + conf->writeEntry("Login",(m_anonymous->isChecked() ? TQString::null : m_login->text())); conf->writeEntry( "SavePassword", ( m_anonymous->isChecked() ? false : m_savepwd->isChecked() ) ); if ( m_savepwd->isChecked() && !m_anonymous->isChecked() ) - conf->writeEntry( "Password", ( m_anonymous->isChecked() ? QString::null : KStringHandler::obscure( m_password->text() ) ) ); + conf->writeEntry( "Password", ( m_anonymous->isChecked() ? TQString::null : KStringHandler::obscure( m_password->text() ) ) ); else conf->deleteEntry( "Password" ); // synchronize CupsInfos object diff --git a/kdeprint/cups/kmcupsconfigwidget.h b/kdeprint/cups/kmcupsconfigwidget.h index 34c488290..ef493166a 100644 --- a/kdeprint/cups/kmcupsconfigwidget.h +++ b/kdeprint/cups/kmcupsconfigwidget.h @@ -20,7 +20,7 @@ #ifndef KMCUPSCONFIGWIDGET_H #define KMCUPSCONFIGWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> class QLineEdit; class QCheckBox; @@ -29,7 +29,7 @@ class KConfig; class KMCupsConfigWidget : public QWidget { public: - KMCupsConfigWidget(QWidget *parent = 0, const char *name = 0); + KMCupsConfigWidget(TQWidget *parent = 0, const char *name = 0); void load(); void save(bool sync = true); diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp index 73f6005d9..011256cd6 100644 --- a/kdeprint/cups/kmcupsjobmanager.cpp +++ b/kdeprint/cups/kmcupsjobmanager.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <kurl.h> -KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/) +KMCupsJobManager::KMCupsJobManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMJobManager(parent,name) { } @@ -50,13 +50,13 @@ int KMCupsJobManager::actions() return KMJob::All; } -bool KMCupsJobManager::sendCommandSystemJob(const QPtrList<KMJob>& jobs, int action, const QString& argstr) +bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int action, const TQString& argstr) { IppRequest req; QString uri; bool value(true); - QPtrListIterator<KMJob> it(jobs); + TQPtrListIterator<KMJob> it(jobs); for (;it.current() && value;++it) { // hypothesis: job operation are always done on local jobs. The only operation @@ -93,7 +93,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const QPtrList<KMJob>& jobs, int act if (argstr.isEmpty()) return false; req.setOperation(CUPS_MOVE_JOB); uri = - QString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), + TQString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), argstr); req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); break; @@ -108,7 +108,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const QPtrList<KMJob>& jobs, int act return value; } -bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit) +bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType type, int limit) { IppRequest req; QStringList keys; @@ -144,13 +144,13 @@ bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType typ */ } else - req.addURI(IPP_TAG_OPERATION, "printer-uri", QString("ipp://%1/%2/%3").arg(infos->hostaddr(), + req.addURI(IPP_TAG_OPERATION, "printer-uri", TQString("ipp://%1/%2/%3").arg(infos->hostaddr(), (mp&&mp->isClass())?"classes":"printers", prname)); // other attributes req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); if (type == KMJobManager::CompletedJobs) - req.addKeyword(IPP_TAG_OPERATION,"which-jobs",QString::fromLatin1("completed")); + req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::fromLatin1("completed")); if (limit > 0) req.addInteger(IPP_TAG_OPERATION,"limit",limit); @@ -172,8 +172,8 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) { QString name(attr->name); if (name == "job-id") job->setId(attr->values[0].integer); - else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text)); - else if (name == "job-name") job->setName(QString::fromLocal8Bit(attr->values[0].string.text)); + else if (name == "job-uri") job->setUri(TQString::fromLocal8Bit(attr->values[0].string.text)); + else if (name == "job-name") job->setName(TQString::fromLocal8Bit(attr->values[0].string.text)); else if (name == "job-state") { switch (attr->values[0].integer) @@ -205,7 +205,7 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) } } else if (name == "job-k-octets") job->setSize(attr->values[0].integer); - else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(attr->values[0].string.text)); + else if (name == "job-originating-user-name") job->setOwner(TQString::fromLocal8Bit(attr->values[0].string.text)); else if (name == "job-k-octets-completed") job->setProcessedSize(attr->values[0].integer); else if (name == "job-media-sheets") job->setPages(attr->values[0].integer); else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer); @@ -218,12 +218,12 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) } else if (name == "job-priority") { - job->setAttribute(0, QString::fromLatin1("%1").arg(attr->values[0].integer, 3)); + job->setAttribute(0, TQString::fromLatin1("%1").arg(attr->values[0].integer, 3)); } else if (name == "job-billing") { job->setAttributeCount(2); - job->setAttribute(1, QString::fromLocal8Bit(attr->values[0].string.text)); + job->setAttribute(1, TQString::fromLocal8Bit(attr->values[0].string.text)); } if (name.isEmpty() || attr == req.last()) @@ -240,7 +240,7 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) delete job; } -bool KMCupsJobManager::doPluginAction(int ID, const QPtrList<KMJob>& jobs) +bool KMCupsJobManager::doPluginAction(int ID, const TQPtrList<KMJob>& jobs) { switch (ID) { @@ -280,9 +280,9 @@ bool KMCupsJobManager::jobIppReport(KMJob *j) return result; } -QValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *coll) +TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *coll) { - QValueList<KAction*> list; + TQValueList<KAction*> list; KAction *act(0); list << (act = new PluginAction(0, i18n("&Job IPP Report"), "kdeprint_report", 0, coll, "plugin_ipp")); @@ -297,9 +297,9 @@ QValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *co return list; } -void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const QPtrList<KMJob>& joblist) +void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPtrList<KMJob>& joblist) { - QPtrListIterator<KMJob> it(joblist); + TQPtrListIterator<KMJob> it(joblist); bool flag(true); for (; it.current(); ++it) { @@ -319,9 +319,9 @@ void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const QPtr a->setEnabled( flag && ( joblist.count() == 1 ) ); } -bool KMCupsJobManager::changePriority(const QPtrList<KMJob>& jobs, bool up) +bool KMCupsJobManager::changePriority(const TQPtrList<KMJob>& jobs, bool up) { - QPtrListIterator<KMJob> it(jobs); + TQPtrListIterator<KMJob> it(jobs); bool result(true); for (; it.current() && result; ++it) { @@ -349,11 +349,11 @@ bool KMCupsJobManager::changePriority(const QPtrList<KMJob>& jobs, bool up) return result; } -static QString processRange(const QString& range) +static TQString processRange(const TQString& range) { - QStringList l = QStringList::split(',', range, false); + QStringList l = TQStringList::split(',', range, false); QString s; - for (QStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) + for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { s.append(*it); if ((*it).find('-') == -1) @@ -385,7 +385,7 @@ bool KMCupsJobManager::editJobAttributes(KMJob *j) return false; } - QMap<QString,QString> opts = req.toMap(IPP_TAG_JOB); + TQMap<TQString,TQString> opts = req.toMap(IPP_TAG_JOB); // translate the "Copies" option to non-CUPS syntax if (opts.contains("copies")) opts["kde-copies"] = opts["copies"]; diff --git a/kdeprint/cups/kmcupsjobmanager.h b/kdeprint/cups/kmcupsjobmanager.h index 27f3073aa..cba3371dc 100644 --- a/kdeprint/cups/kmcupsjobmanager.h +++ b/kdeprint/cups/kmcupsjobmanager.h @@ -22,7 +22,7 @@ #include "kmjobmanager.h" #include "ipprequest.h" -#include <qstringlist.h> +#include <tqstringlist.h> class KMPrinter; @@ -31,22 +31,22 @@ class KMCupsJobManager : public KMJobManager Q_OBJECT public: - KMCupsJobManager(QObject *parent, const char *name, const QStringList &/*args*/); + KMCupsJobManager(TQObject *parent, const char *name, const TQStringList &/*args*/); virtual ~KMCupsJobManager(); int actions(); - QValueList<KAction*> createPluginActions(KActionCollection*); - void validatePluginActions(KActionCollection*, const QPtrList<KMJob>&); - bool doPluginAction(int, const QPtrList<KMJob>&); + TQValueList<KAction*> createPluginActions(KActionCollection*); + void validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&); + bool doPluginAction(int, const TQPtrList<KMJob>&); protected: bool jobIppReport(KMJob*); - bool changePriority(const QPtrList<KMJob>&, bool); + bool changePriority(const TQPtrList<KMJob>&, bool); bool editJobAttributes(KMJob*); protected: - bool listJobs(const QString&, JobType, int = 0); - bool sendCommandSystemJob(const QPtrList<KMJob>& jobs, int action, const QString& arg = QString::null); + bool listJobs(const TQString&, JobType, int = 0); + bool sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int action, const TQString& arg = TQString::null); void parseListAnswer(IppRequest& req, KMPrinter *pr); }; diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index 003d408fc..63513ba55 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -33,12 +33,12 @@ #include "foomatic2loader.h" #include "ppdloader.h" -#include <qfile.h> -#include <qtextstream.h> -#include <qregexp.h> -#include <qtimer.h> -#include <qsocket.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqregexp.h> +#include <tqtimer.h> +#include <tqsocket.h> +#include <tqdatetime.h> #include <kdebug.h> #include <kapplication.h> @@ -58,17 +58,17 @@ #include <cups/ppd.h> #include <math.h> -#define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) +#define ppdi18n(s) i18n(TQString::fromLocal8Bit(s).utf8()) -static void extractMaticData(QString& buf, const QString& filename); -static QString printerURI(KMPrinter *p, bool useExistingURI); -static QString downloadDriver(KMPrinter *p); +static void extractMaticData(TQString& buf, const TQString& filename); +static TQString printerURI(KMPrinter *p, bool useExistingURI); +static TQString downloadDriver(KMPrinter *p); static int trials = 5; //***************************************************************************************************** - KMCupsManager::KMCupsManager(QObject *parent, const char *name, const QStringList & /*args*/) + KMCupsManager::KMCupsManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMManager(parent,name) { // be sure to create the CupsInfos object -> password @@ -93,12 +93,12 @@ KMCupsManager::~KMCupsManager() delete m_socket; } -QString KMCupsManager::driverDbCreationProgram() +TQString KMCupsManager::driverDbCreationProgram() { - return QString::fromLatin1("/opt/kde3/bin/make_driver_db_cups"); + return TQString::fromLatin1("/opt/kde3/bin/make_driver_db_cups"); } -QString KMCupsManager::driverDirectory() +TQString KMCupsManager::driverDirectory() { QString d = cupsInstallDir(); if (d.isEmpty()) @@ -109,7 +109,7 @@ QString KMCupsManager::driverDirectory() return d; } -QString KMCupsManager::cupsInstallDir() +TQString KMCupsManager::cupsInstallDir() { KConfig *conf= KMFactory::self()->printConfig(); conf->setGroup("CUPS"); @@ -138,8 +138,8 @@ bool KMCupsManager::createPrinter(KMPrinter *p) req.setOperation(CUPS_ADD_CLASS); QStringList members = p->members(), uris; QString s; - s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); - for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) + s = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) uris.append(s+(*it)); req.addURI(IPP_TAG_PRINTER,"member-uris",uris); } @@ -152,7 +152,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p) if (!otherP || otherP->device() != p->device()) { /** - * As now the device is a QString instead of KURL, special encoding + * As now the device is a TQString instead of KURL, special encoding * required for SMB is not needed anymore. Use a unique mechanism * for all backends. */ @@ -160,7 +160,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p) } if (!p->option("kde-banners").isEmpty()) { - QStringList bans = QStringList::split(',',p->option("kde-banners"),false); + QStringList bans = TQStringList::split(',',p->option("kde-banners"),false); while (bans.count() < 2) bans.append("none"); req.addName(IPP_TAG_PRINTER,"job-sheets-default",bans); @@ -169,11 +169,11 @@ bool KMCupsManager::createPrinter(KMPrinter *p) req.addInteger(IPP_TAG_PRINTER,"job-k-limit",p->option("job-k-limit").toInt()); req.addInteger(IPP_TAG_PRINTER,"job-page-limit",p->option("job-page-limit").toInt()); if (!p->option("requesting-user-name-denied").isEmpty()) - req.addName(IPP_TAG_PRINTER,"requesting-user-name-denied",QStringList::split(",",p->option("requesting-user-name-denied"),false)); + req.addName(IPP_TAG_PRINTER,"requesting-user-name-denied",TQStringList::split(",",p->option("requesting-user-name-denied"),false)); else if (!p->option("requesting-user-name-allowed").isEmpty()) - req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",QStringList::split(",",p->option("requesting-user-name-allowed"),false)); + req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQStringList::split(",",p->option("requesting-user-name-allowed"),false)); else - req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",QString::fromLatin1("all")); + req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::fromLatin1("all")); } req.addText(IPP_TAG_PRINTER,"printer-info",p->description()); req.addText(IPP_TAG_PRINTER,"printer-location",p->location()); @@ -247,11 +247,11 @@ bool KMCupsManager::completePrinter(KMPrinter *p) // update the KMPrinter object p->setManufacturer(entry.manufacturer); p->setModel(entry.model); - p->setDriverInfo(QString::fromLocal8Bit(ppd->nickname)); + p->setDriverInfo(TQString::fromLocal8Bit(ppd->nickname)); ppdClose(ppd); } if (!ppdname.isEmpty()) - QFile::remove(ppdname); + TQFile::remove(ppdname); return true; } @@ -281,14 +281,14 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // Give 2 seconds to connect to the printer, or abort KExtendedSocket *kes = new KExtendedSocket(p->uri().host(), p->uri().port()); - connect(kes, SIGNAL(connectionSuccess()), this, SLOT(hostPingSlot())); - connect(kes, SIGNAL(connectionFailed(int)), this, SLOT(hostPingFailedSlot())); + connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot())); + connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot())); if (kes->startAsyncConnect() != 0) { delete kes; m_hostSuccess = false; } else { - QDateTime tm = QDateTime::currentDateTime().addSecs(2); - while (!m_lookupDone && (QDateTime::currentDateTime() < tm)) + TQDateTime tm = TQDateTime::currentDateTime().addSecs(2); + while (!m_lookupDone && (TQDateTime::currentDateTime() < tm)) qApp->processEvents(); kes->cancelAsyncConnect(); @@ -337,7 +337,7 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) { /** * No specific treatment required as the device is - * a normal QString instead of a KURL + * a normal TQString instead of a KURL */ p->setDevice( value ); } @@ -345,7 +345,7 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) /* if (req.uri("member-uris",values)) { QStringList members; - for (QStringList::ConstIterator it=values.begin(); it!=values.end(); ++it) + for (TQStringList::ConstIterator it=values.begin(); it!=values.end(); ++it) { int p = (*it).findRev('/'); if (p != -1) @@ -358,14 +358,14 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // banners req.name("job-sheets-default",values); while (values.count() < 2) values.append("none"); - p->setOption("kde-banners",values.join(QString::fromLatin1(","))); - if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(QString::fromLatin1(","))); + p->setOption("kde-banners",values.join(TQString::fromLatin1(","))); + if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::fromLatin1(","))); // quotas int ival; - if (req.integer("job-quota-period",ival)) p->setOption("job-quota-period",QString::number(ival)); - if (req.integer("job-k-limit",ival)) p->setOption("job-k-limit",QString::number(ival)); - if (req.integer("job-page-limit",ival)) p->setOption("job-page-limit",QString::number(ival)); + if (req.integer("job-quota-period",ival)) p->setOption("job-quota-period",TQString::number(ival)); + if (req.integer("job-k-limit",ival)) p->setOption("job-k-limit",TQString::number(ival)); + if (req.integer("job-page-limit",ival)) p->setOption("job-page-limit",TQString::number(ival)); // access permissions (allow and deny are mutually exclusives) if (req.name("requesting-user-name-allowed",values) && values.count() > 0) @@ -405,7 +405,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p) req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addMime(IPP_TAG_OPERATION,"document-format","application/postscript"); if (!CupsInfos::self()->login().isEmpty()) req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login()); - req.addName(IPP_TAG_OPERATION,"job-name",QString::fromLatin1("KDE Print Test")); + req.addName(IPP_TAG_OPERATION,"job-name",TQString::fromLatin1("KDE Print Test")); if (req.doFileRequest("/printers/",testpage)) return true; reportIppError(&req); @@ -435,7 +435,7 @@ void KMCupsManager::loadServerPrinters() req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",keys); // filtering by username (hides printers user doesn't have allowance to use) - req.addName(IPP_TAG_OPERATION, "requesting-user-name", QString(cupsUser())); + req.addName(IPP_TAG_OPERATION, "requesting-user-name", TQString(cupsUser())); if (req.doRequest("/printers/")) { @@ -453,10 +453,10 @@ void KMCupsManager::loadServerPrinters() // load default req.init(); req.setOperation(CUPS_GET_DEFAULT); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name")); if (req.doRequest("/printers/")) { - QString s = QString::null; + QString s = TQString::null; req.name("printer-name",s); setHardDefault(findPrinter(s)); } @@ -482,7 +482,7 @@ void KMCupsManager::processRequest(IppRequest* req) QString attrname(attr->name); if (attrname == "printer-name") { - QString value = QString::fromLocal8Bit(attr->values[0].string.text); + QString value = TQString::fromLocal8Bit(attr->values[0].string.text); printer->setName(value); printer->setPrinterName(value); } @@ -512,7 +512,7 @@ void KMCupsManager::processRequest(IppRequest* req) } else if (attrname == "printer-location") { - printer->setLocation(QString::fromLocal8Bit(attr->values[0].string.text)); + printer->setLocation(TQString::fromLocal8Bit(attr->values[0].string.text)); } else if (attrname == "printer-is-accepting-jobs") { @@ -562,7 +562,7 @@ DrMain* KMCupsManager::loadPrinterDriver(KMPrinter *p, bool) return driver; } -DrMain* KMCupsManager::loadFileDriver(const QString& filename) +DrMain* KMCupsManager::loadFileDriver(const TQString& filename) { if (filename.startsWith("ppd:")) return loadDriverFile(filename.mid(4)); @@ -572,11 +572,11 @@ DrMain* KMCupsManager::loadFileDriver(const QString& filename) return loadDriverFile(filename); } -DrMain* KMCupsManager::loadMaticDriver(const QString& drname) +DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { - QStringList comps = QStringList::split('/', drname, false); + QStringList comps = TQStringList::split('/', drname, false); QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - QString PATH = getenv("PATH") + QString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { @@ -587,7 +587,7 @@ DrMain* KMCupsManager::loadMaticDriver(const QString& drname) KPipeProcess in; QFile out(tmpFile); - QString cmd = KProcess::quote(exe); + TQString cmd = KProcess::quote(exe); cmd += " -t cups -d "; cmd += KProcess::quote(comps[2]); cmd += " -p "; @@ -615,15 +615,15 @@ DrMain* KMCupsManager::loadMaticDriver(const QString& drname) setErrorMsg(i18n("Unable to create the Foomatic driver [%1,%2]. " "Either that driver does not exist, or you don't have " "the required permissions to perform that operation.").arg(comps[1]).arg(comps[2])); - QFile::remove(tmpFile); + TQFile::remove(tmpFile); return NULL; } -DrMain* KMCupsManager::loadDriverFile(const QString& fname) +DrMain* KMCupsManager::loadDriverFile(const TQString& fname) { - if (QFile::exists(fname)) + if (TQFile::exists(fname)) { - QString msg; /* possible error message */ + TQString msg; /* possible error message */ DrMain *driver = PPDLoader::loadDriver( fname, &msg ); if ( driver ) { @@ -637,10 +637,10 @@ DrMain* KMCupsManager::loadDriverFile(const QString& fname) return NULL; } -void KMCupsManager::saveDriverFile(DrMain *driver, const QString& filename) +void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) { kdDebug( 500 ) << "Saving PPD file with template=" << driver->get( "template" ) << endl; - QIODevice *in = KFilterDev::deviceForFile( driver->get( "template" ) ); + TQIODevice *in = KFilterDev::deviceForFile( driver->get( "template" ) ); QFile out(filename); if (in && in->open(IO_ReadOnly) && out.open(IO_WriteOnly)) { @@ -691,7 +691,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const QString& filename) keyword = line.mid(8,p-8); DrBase *bopt = 0; if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" ) - bopt = driver->findOption( QString::fromLatin1( "PageSize" ) ); + bopt = driver->findOption( TQString::fromLatin1( "PageSize" ) ); else bopt = driver->findOption( keyword ); if (bopt) @@ -751,7 +751,7 @@ bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d) result = req.doFileRequest("/admin/",tmpfilename); // remove temporary file - QFile::remove(tmpfilename); + TQFile::remove(tmpfilename); if (!result) reportIppError(&req); @@ -787,7 +787,7 @@ void KMCupsManager::unloadCupsdConf() bool KMCupsManager::restartServer() { QString msg; - bool (*f1)(QString&) = (bool(*)(QString&))loadCupsdConfFunction("restartServer"); + bool (*f1)(TQString&) = (bool(*)(TQString&))loadCupsdConfFunction("restartServer"); bool result(false); if (f1) { @@ -798,10 +798,10 @@ bool KMCupsManager::restartServer() return result; } -bool KMCupsManager::configureServer(QWidget *parent) +bool KMCupsManager::configureServer(TQWidget *parent) { - QString msg; - bool (*f2)(QWidget*, QString&) = (bool(*)(QWidget*, QString&))loadCupsdConfFunction("configureServer"); + TQString msg; + bool (*f2)(TQWidget*, TQString&) = (bool(*)(TQWidget*, TQString&))loadCupsdConfFunction("configureServer"); bool result(false); if (f2) { @@ -813,7 +813,7 @@ bool KMCupsManager::configureServer(QWidget *parent) return result; } -QStringList KMCupsManager::detectLocalPrinters() +TQStringList KMCupsManager::detectLocalPrinters() { QStringList list; IppRequest req; @@ -833,10 +833,10 @@ QStringList KMCupsManager::detectLocalPrinters() { if (!uri.isEmpty()) { - if (printer == "Unknown") printer = QString::null; + if (printer == "Unknown") printer = TQString::null; list << cl << uri << desc << printer; } - uri = desc = printer = cl = QString::null; + uri = desc = printer = cl = TQString::null; } attr = attr->next; } @@ -846,9 +846,9 @@ QStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(KActionCollection *coll) { - KAction *act = new KAction(i18n("&Export Driver..."), "kdeprint_uploadsmb", 0, this, SLOT(exportDriver()), coll, "plugin_export_driver"); + KAction *act = new KAction(i18n("&Export Driver..."), "kdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new KAction(i18n("&Printer IPP Report"), "kdeprint_report", 0, this, SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new KAction(i18n("&Printer IPP Report"), "kdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } @@ -903,17 +903,17 @@ void KMCupsManager::printerIppReport() } } -void KMCupsManager::ippReport(IppRequest& req, int group, const QString& caption) +void KMCupsManager::ippReport(IppRequest& req, int group, const TQString& caption) { IppReportDlg::report(&req, group, caption); } -QString KMCupsManager::stateInformation() +TQString KMCupsManager::stateInformation() { - return QString("%1: %2") + return TQString("%1: %2") .arg(i18n("Server")) .arg(CupsInfos::self()->host()[0] != '/' ? - QString("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()) + TQString("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()) : CupsInfos::self()->host()); } @@ -923,12 +923,12 @@ void KMCupsManager::checkUpdatePossibleInternal() delete m_socket; m_socket = new KNetwork::KBufferedSocket; m_socket->setTimeout( 1500 ); - connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), - SLOT( slotConnectionSuccess() ) ); - connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) ); + connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), + TQT_SLOT( slotConnectionSuccess() ) ); + connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); trials = 5; - QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) ); } void KMCupsManager::slotConnectionSuccess() @@ -938,7 +938,7 @@ void KMCupsManager::slotConnectionSuccess() IppRequest req; req.setOperation( CUPS_GET_PRINTERS ); - req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", QString::fromLatin1( "printer-name" ) ); + req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::fromLatin1( "printer-name" ) ); if ( req.doRequest( "/printers/" ) ) setUpdatePossible( true ); else @@ -947,7 +947,7 @@ void KMCupsManager::slotConnectionSuccess() if ( trials > 0 ) { trials--; - QTimer::singleShot( 1000, this, SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); } else { @@ -963,7 +963,7 @@ void KMCupsManager::slotAsyncConnect() kdDebug(500) << "Starting async connect to " << CupsInfos::self()->hostaddr() << endl; //m_socket->startAsyncConnect(); if (CupsInfos::self()->host().startsWith("/")) - m_socket->connect( QString(), CupsInfos::self()->host()); + m_socket->connect( TQString(), CupsInfos::self()->host()); else m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() ); } @@ -977,19 +977,19 @@ void KMCupsManager::slotConnectionFailed( int errcode ) //m_socket->cancelAsyncConnect(); trials--; m_socket->close(); - QTimer::singleShot( 1000, this, SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); return; } - QString einfo; + TQString einfo; switch (errcode) { case KNetwork::KSocketBase::ConnectionRefused: case KNetwork::KSocketBase::ConnectionTimedOut: - einfo = i18n("connection refused") + QString(" (%1)").arg(errcode); + einfo = i18n("connection refused") + TQString(" (%1)").arg(errcode); break; case KNetwork::KSocketBase::LookupFailure: - einfo = i18n("host not found") + QString(" (%1)").arg(errcode); + einfo = i18n("host not found") + TQString(" (%1)").arg(errcode); break; case KNetwork::KSocketBase::WouldBlock: default: @@ -1014,7 +1014,7 @@ void KMCupsManager::hostPingFailedSlot() { //***************************************************************************************************** -static void extractMaticData(QString& buf, const QString& filename) +static void extractMaticData(TQString& buf, const TQString& filename) { QFile f(filename); if (f.exists() && f.open(IO_ReadOnly)) @@ -1030,17 +1030,17 @@ static void extractMaticData(QString& buf, const QString& filename) } } -static QString printerURI(KMPrinter *p, bool use) +static TQString printerURI(KMPrinter *p, bool use) { QString uri; if (use && !p->uri().isEmpty()) uri = p->uri().prettyURL(); else - uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); + uri = TQString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); return uri; } -static QString downloadDriver(KMPrinter *p) +static TQString downloadDriver(KMPrinter *p) { QString driverfile, prname = p->printerName(); bool changed(false); @@ -1056,7 +1056,7 @@ static QString downloadDriver(KMPrinter *p) cupsSetServer(p->uri().host().local8Bit()); ippSetPort(p->uri().port()); // strip any "@..." from the printer name - prname = prname.replace(QRegExp("@.*"), ""); + prname = prname.replace(TQRegExp("@.*"), ""); changed = true; } */ diff --git a/kdeprint/cups/kmcupsmanager.h b/kdeprint/cups/kmcupsmanager.h index 54307fc86..132decb34 100644 --- a/kdeprint/cups/kmcupsmanager.h +++ b/kdeprint/cups/kmcupsmanager.h @@ -37,7 +37,7 @@ class KMCupsManager : public KMManager Q_OBJECT public: - KMCupsManager(QObject *parent, const char *name, const QStringList & /*args*/); + KMCupsManager(TQObject *parent, const char *name, const TQStringList & /*args*/); virtual ~KMCupsManager(); // printer management functions @@ -52,20 +52,20 @@ public: // printer listing functions // driver DB functions - QString driverDbCreationProgram(); - QString driverDirectory(); + TQString driverDbCreationProgram(); + TQString driverDirectory(); DrMain* loadPrinterDriver(KMPrinter *p, bool config = false); - DrMain* loadFileDriver(const QString& filename); + DrMain* loadFileDriver(const TQString& filename); bool savePrinterDriver(KMPrinter *p, DrMain *d); bool restartServer(); - bool configureServer(QWidget *parent = 0); - QStringList detectLocalPrinters(); + bool configureServer(TQWidget *parent = 0); + TQStringList detectLocalPrinters(); void createPluginActions(KActionCollection*); void validatePluginActions(KActionCollection*, KMPrinter*); - QString stateInformation(); + TQString stateInformation(); public slots: void exportDriver(); @@ -85,14 +85,14 @@ protected: void loadServerPrinters(); void processRequest(IppRequest*); bool setPrinterState(KMPrinter *p, int st); - DrMain* loadDriverFile(const QString& filename); - DrMain* loadMaticDriver(const QString& drname); - void saveDriverFile(DrMain *driver, const QString& filename); + DrMain* loadDriverFile(const TQString& filename); + DrMain* loadMaticDriver(const TQString& drname); + void saveDriverFile(DrMain *driver, const TQString& filename); void reportIppError(IppRequest*); void* loadCupsdConfFunction(const char*); void unloadCupsdConf(); - QString cupsInstallDir(); - void ippReport(IppRequest&, int, const QString&); + TQString cupsInstallDir(); + void ippReport(IppRequest&, int, const TQString&); void checkUpdatePossibleInternal(); private: diff --git a/kdeprint/cups/kmcupsuimanager.cpp b/kdeprint/cups/kmcupsuimanager.cpp index 897199f88..9cefccac3 100644 --- a/kdeprint/cups/kmcupsuimanager.cpp +++ b/kdeprint/cups/kmcupsuimanager.cpp @@ -53,14 +53,14 @@ #include "ipprequest.h" #include "cupsinfos.h" -#include <qlistview.h> -#include <qwhatsthis.h> +#include <tqlistview.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kdebug.h> #include <kaction.h> #include <kmessagebox.h> -KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/) +KMCupsUiManager::KMCupsUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/) : KMUiManager(parent,name) { } @@ -81,28 +81,28 @@ void KMCupsUiManager::setupPropertyPages(KMPropertyPage *p) void KMCupsUiManager::setupWizard(KMWizard *wizard) { - QString whatsThisRemoteCUPSIPPBackend = + TQString whatsThisRemoteCUPSIPPBackend = i18n( "<qt><p>Print queue on remote CUPS server</p>" "<p>Use this for a print queue installed on a remote " "machine running a CUPS server. This allows to use " "remote printers when CUPS browsing is turned off.</p></qt>" ); - QString whatsThisRemotePrinterIPPBackend = + TQString whatsThisRemotePrinterIPPBackend = i18n( "<qt><p>Network IPP printer</p>" "<p>Use this for a network-enabled printer using the " "IPP protocol. Modern high-end printers can use this mode. " "Use this mode instead of TCP if your printer can do both.</p></qt>" ); - QString whatsThisSerialFaxModemBackend = + TQString whatsThisSerialFaxModemBackend = i18n( "<qt><p>Fax/Modem printer</p>" "<p>Use this for a fax/modem printer. This requires the installation " "of the <a href=\"http://vigna.dsi.unimi.it/fax4CUPS/\">fax4CUPS</a> backend. Documents sent on this printer will be faxed " "to the given target fax number.</p></qt>" ); - QString whatsThisOtherPrintertypeBackend = + TQString whatsThisOtherPrintertypeBackend = i18n( "<qt><p>Other printer</p>" "<p>Use this for any printer type. To use this option, you must know " "the URI of the printer you want to install. Refer to the CUPS documentation " @@ -110,7 +110,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard) "printer types using 3rd party backends not covered by the other possibilities.</p></qt>" ); - QString whatsThisClassOfPrinters = + TQString whatsThisClassOfPrinters = i18n( "<qt><p>Class of printers</p>" "<p>Use this to create a class of printers. When sending a document to a class, " "the document is actually sent to the first available (idle) printer in the class. " @@ -135,7 +135,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard) QString uri; req.setOperation(CUPS_GET_DEVICES); - uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + uri = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) @@ -204,13 +204,13 @@ int KMCupsUiManager::pluginPageCap() return (KMUiManager::CopyAll & ~KMUiManager::Current); } -void KMCupsUiManager::setupPrintDialogPages(QPtrList<KPrintDialogPage>* pages) +void KMCupsUiManager::setupPrintDialogPages(TQPtrList<KPrintDialogPage>* pages) { pages->append(new KPSchedulePage()); pages->append(new KPTagsPage()); } -void KMCupsUiManager::setupJobViewer(QListView *lv) +void KMCupsUiManager::setupJobViewer(TQListView *lv) { lv->addColumn(i18n("Priority")); lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); diff --git a/kdeprint/cups/kmcupsuimanager.h b/kdeprint/cups/kmcupsuimanager.h index 15ab8684d..88c2c962a 100644 --- a/kdeprint/cups/kmcupsuimanager.h +++ b/kdeprint/cups/kmcupsuimanager.h @@ -25,7 +25,7 @@ class KMCupsUiManager : public KMUiManager { public: - KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/); + KMCupsUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/); ~KMCupsUiManager(); void setupPropertyPages(KMPropertyPage*); @@ -33,8 +33,8 @@ public: void setupPrinterPropertyDialog(KPrinterPropertyDialog*); void setupConfigDialog(KMConfigDialog*); int pluginPageCap(); - void setupPrintDialogPages(QPtrList<KPrintDialogPage>*); - void setupJobViewer(QListView*); + void setupPrintDialogPages(TQPtrList<KPrintDialogPage>*); + void setupJobViewer(TQListView*); }; #endif diff --git a/kdeprint/cups/kmpropbanners.cpp b/kdeprint/cups/kmpropbanners.cpp index 3826de708..7be161f6d 100644 --- a/kdeprint/cups/kmpropbanners.cpp +++ b/kdeprint/cups/kmpropbanners.cpp @@ -22,23 +22,23 @@ #include "kmwizard.h" #include "kmwbanners.h" -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> -KMPropBanners::KMPropBanners(QWidget *parent, const char *name) +KMPropBanners::KMPropBanners(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_startbanner = new QLabel(this); - m_stopbanner = new QLabel(this); + m_startbanner = new TQLabel(this); + m_stopbanner = new TQLabel(this); - QLabel *l1 = new QLabel(i18n("&Starting banner:"), this); - QLabel *l2 = new QLabel(i18n("&Ending banner:"), this); + QLabel *l1 = new TQLabel(i18n("&Starting banner:"), this); + QLabel *l2 = new TQLabel(i18n("&Ending banner:"), this); l1->setBuddy(m_startbanner); l2->setBuddy(m_stopbanner); - QGridLayout *main_ = new QGridLayout(this, 3, 2, 10, 10); + QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 10); main_->setColStretch(1,1); main_->setRowStretch(2,1); main_->addWidget(l1,0,0); @@ -59,7 +59,7 @@ void KMPropBanners::setPrinter(KMPrinter *p) { if (p && p->isPrinter()) { - QStringList l = QStringList::split(',',p->option("kde-banners"),false); + QStringList l = TQStringList::split(',',p->option("kde-banners"),false); while ( l.count() < 2 ) l.append( "none" ); m_startbanner->setText(i18n(mapBanner(l[0]).utf8())); diff --git a/kdeprint/cups/kmpropbanners.h b/kdeprint/cups/kmpropbanners.h index eb8d85204..1b5b51115 100644 --- a/kdeprint/cups/kmpropbanners.h +++ b/kdeprint/cups/kmpropbanners.h @@ -27,7 +27,7 @@ class QLabel; class KMPropBanners : public KMPropWidget { public: - KMPropBanners(QWidget *parent = 0, const char *name = 0); + KMPropBanners(TQWidget *parent = 0, const char *name = 0); ~KMPropBanners(); void setPrinter(KMPrinter*); diff --git a/kdeprint/cups/kmpropquota.cpp b/kdeprint/cups/kmpropquota.cpp index ffce459e0..12e360746 100644 --- a/kdeprint/cups/kmpropquota.cpp +++ b/kdeprint/cups/kmpropquota.cpp @@ -21,30 +21,30 @@ #include "kmprinter.h" #include "kmwizard.h" -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> // some forward declarations (see kmwquota.cpp) const char* unitKeyword(int); int findUnit(int&); -KMPropQuota::KMPropQuota(QWidget *parent, const char *name) +KMPropQuota::KMPropQuota(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_period = new QLabel(this); - m_sizelimit = new QLabel(this); - m_pagelimit = new QLabel(this); + m_period = new TQLabel(this); + m_sizelimit = new TQLabel(this); + m_pagelimit = new TQLabel(this); - QLabel *l1 = new QLabel(i18n("&Period:"), this); - QLabel *l2 = new QLabel(i18n("&Size limit (KB):"), this); - QLabel *l3 = new QLabel(i18n("&Page limit:"), this); + QLabel *l1 = new TQLabel(i18n("&Period:"), this); + QLabel *l2 = new TQLabel(i18n("&Size limit (KB):"), this); + QLabel *l3 = new TQLabel(i18n("&Page limit:"), this); l1->setBuddy(m_period); l2->setBuddy(m_sizelimit); l3->setBuddy(m_pagelimit); - QGridLayout *main_ = new QGridLayout(this, 4, 2, 10, 10); + QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 10); main_->setColStretch(1,1); main_->setRowStretch(3,1); main_->addWidget(l1,0,0); @@ -75,9 +75,9 @@ void KMPropQuota::setPrinter(KMPrinter *p) qu = -1; if (qu > 0) un = findUnit(qu); - m_period->setText(qu == -1 ? i18n("No quota") : QString::number(qu).append(" ").append(i18n(unitKeyword(un)))); - m_sizelimit->setText(si ? QString::number(si) : i18n("None")); - m_pagelimit->setText(pa ? QString::number(pa) : i18n("None")); + m_period->setText(qu == -1 ? i18n("No quota") : TQString::number(qu).append(" ").append(i18n(unitKeyword(un)))); + m_sizelimit->setText(si ? TQString::number(si) : i18n("None")); + m_pagelimit->setText(pa ? TQString::number(pa) : i18n("None")); emit enable(true); emit enableChange(p->isLocal()); } diff --git a/kdeprint/cups/kmpropquota.h b/kdeprint/cups/kmpropquota.h index 53ed8c59c..b7845894d 100644 --- a/kdeprint/cups/kmpropquota.h +++ b/kdeprint/cups/kmpropquota.h @@ -27,7 +27,7 @@ class QLabel; class KMPropQuota : public KMPropWidget { public: - KMPropQuota(QWidget *parent = 0, const char *name = 0); + KMPropQuota(TQWidget *parent = 0, const char *name = 0); ~KMPropQuota(); void setPrinter(KMPrinter*); diff --git a/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp index 58b3301de..3f0792d9c 100644 --- a/kdeprint/cups/kmpropusers.cpp +++ b/kdeprint/cups/kmpropusers.cpp @@ -21,18 +21,18 @@ #include "kmprinter.h" #include "kmwizard.h" -#include <qtextview.h> -#include <qlayout.h> +#include <tqtextview.h> +#include <tqlayout.h> #include <klocale.h> -KMPropUsers::KMPropUsers(QWidget *parent, const char *name) +KMPropUsers::KMPropUsers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_text = new QTextView(this); + m_text = new TQTextView(this); m_text->setPaper(colorGroup().background()); - m_text->setFrameStyle(QFrame::NoFrame); + m_text->setFrameStyle(TQFrame::NoFrame); - QVBoxLayout *l0 = new QVBoxLayout(this, 10, 0); + QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0); l0->addWidget(m_text, 1); m_title = i18n("Users"); @@ -53,21 +53,21 @@ void KMPropUsers::setPrinter(KMPrinter *p) if (!p->option("requesting-user-name-denied").isEmpty()) { txt = txt.arg(i18n("Denied users")); - users = QStringList::split(",", p->option("requesting-user-name-denied"), false); + users = TQStringList::split(",", p->option("requesting-user-name-denied"), false); if (users.count() == 1 && users[0] == "none") users.clear(); } else if (!p->option("requesting-user-name-allowed").isEmpty()) { txt = txt.arg(i18n("Allowed users")); - users = QStringList::split(",", p->option("requesting-user-name-allowed"), false); + users = TQStringList::split(",", p->option("requesting-user-name-allowed"), false); if (users.count() == 1 && users[0] == "all") users.clear(); } if (users.count() > 0) { QString s; - for (QStringList::ConstIterator it=users.begin(); it!=users.end(); ++it) + for (TQStringList::ConstIterator it=users.begin(); it!=users.end(); ++it) s.append("<li>").append(*it).append("</li>"); txt = txt.arg(s); m_text->setText(txt); diff --git a/kdeprint/cups/kmpropusers.h b/kdeprint/cups/kmpropusers.h index 2d007baf8..6421006c9 100644 --- a/kdeprint/cups/kmpropusers.h +++ b/kdeprint/cups/kmpropusers.h @@ -27,7 +27,7 @@ class QTextView; class KMPropUsers : public KMPropWidget { public: - KMPropUsers(QWidget *parent = 0, const char *name = 0); + KMPropUsers(TQWidget *parent = 0, const char *name = 0); ~KMPropUsers(); void setPrinter(KMPrinter*); diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp index 0572d0e34..80a21a37c 100644 --- a/kdeprint/cups/kmwbanners.cpp +++ b/kdeprint/cups/kmwbanners.cpp @@ -23,24 +23,24 @@ #include "kmfactory.h" #include "kmmanager.h" -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmap.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqmap.h> #include <klocale.h> -QStringList defaultBanners() +TQStringList defaultBanners() { QStringList bans; - QPtrList<KMPrinter> *list = KMFactory::self()->manager()->printerList(false); + TQPtrList<KMPrinter> *list = KMFactory::self()->manager()->printerList(false); if (list && list->count() > 0) { - QPtrListIterator<KMPrinter> it(*list); + TQPtrListIterator<KMPrinter> it(*list); for (;it.current() && !it.current()->isPrinter(); ++it) ; if (it.current() && KMFactory::self()->manager()->completePrinter(it.current())) { QString s = list->getFirst()->option("kde-banners-supported"); - bans = QStringList::split(',',s,false); + bans = TQStringList::split(',',s,false); } } if (bans.count() == 0) @@ -64,13 +64,13 @@ static struct { 0, 0 } }; -QString mapBanner( const QString& ban ) +TQString mapBanner( const TQString& ban ) { - static QMap<QString,QString> map; + static TQMap<TQString,TQString> map; if ( map.size() == 0 ) for ( int i=0; bannermap[ i ].banner; i++ ) map[ bannermap[ i ].banner ] = bannermap[ i ].name; - QMap<QString,QString>::ConstIterator it = map.find( ban ); + TQMap<TQString,TQString>::ConstIterator it = map.find( ban ); if ( it == map.end() ) return ban; else @@ -79,28 +79,28 @@ QString mapBanner( const QString& ban ) //************************************************************************************************************** -KMWBanners::KMWBanners(QWidget *parent, const char *name) +KMWBanners::KMWBanners(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Banners; m_title = i18n("Banner Selection"); m_nextpage = KMWizard::Custom+3; - m_start = new QComboBox(this); - m_end = new QComboBox(this); + m_start = new TQComboBox(this); + m_end = new TQComboBox(this); - QLabel *l1 = new QLabel(i18n("&Starting banner:"),this); - QLabel *l2 = new QLabel(i18n("&Ending banner:"),this); + QLabel *l1 = new TQLabel(i18n("&Starting banner:"),this); + QLabel *l2 = new TQLabel(i18n("&Ending banner:"),this); l1->setBuddy(m_start); l2->setBuddy(m_end); - QLabel *l0 = new QLabel(this); + QLabel *l0 = new TQLabel(this); l0->setText(i18n("<p>Select the default banners associated with this printer. These " "banners will be inserted before and/or after each print job sent " "to the printer. If you don't want to use banners, select <b>No Banner</b>.</p>")); - QGridLayout *lay = new QGridLayout(this, 5, 2, 0, 10); + QGridLayout *lay = new TQGridLayout(this, 5, 2, 0, 10); lay->setColStretch(1,1); lay->addRowSpacing(1,20); lay->setRowStretch(4,1); @@ -117,18 +117,18 @@ void KMWBanners::initPrinter(KMPrinter *p) { if (m_start->count() == 0) { - m_bans = QStringList::split(',',p->option("kde-banners-supported"),false); + m_bans = TQStringList::split(',',p->option("kde-banners-supported"),false); if (m_bans.count() == 0) m_bans = defaultBanners(); if (m_bans.find("none") == m_bans.end()) m_bans.prepend("none"); - for ( QStringList::Iterator it=m_bans.begin(); it!=m_bans.end(); ++it ) + for ( TQStringList::Iterator it=m_bans.begin(); it!=m_bans.end(); ++it ) { m_start->insertItem( i18n( mapBanner(*it).utf8() ) ); m_end->insertItem( i18n( mapBanner(*it).utf8() ) ); } } - QStringList l = QStringList::split(',',p->option("kde-banners"),false); + QStringList l = TQStringList::split(',',p->option("kde-banners"),false); while (l.count() < 2) l.append("none"); m_start->setCurrentItem(m_bans.findIndex(l[0])); diff --git a/kdeprint/cups/kmwbanners.h b/kdeprint/cups/kmwbanners.h index 2fa820767..ce3bdca31 100644 --- a/kdeprint/cups/kmwbanners.h +++ b/kdeprint/cups/kmwbanners.h @@ -21,14 +21,14 @@ #define KMWBANNERS_H #include "kmwizardpage.h" -#include <qstringlist.h> +#include <tqstringlist.h> class QComboBox; class KMWBanners : public KMWizardPage { public: - KMWBanners(QWidget *parent = 0, const char *name = 0); + KMWBanners(TQWidget *parent = 0, const char *name = 0); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); @@ -38,6 +38,6 @@ private: QStringList m_bans; }; -QString mapBanner( const QString& ); +TQString mapBanner( const TQString& ); #endif diff --git a/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp index da42b8400..ea5b98f3b 100644 --- a/kdeprint/cups/kmwfax.cpp +++ b/kdeprint/cups/kmwfax.cpp @@ -23,32 +23,32 @@ #include "ipprequest.h" #include "cupsinfos.h" -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klistbox.h> #include <klocale.h> #include <kiconloader.h> #include <kurl.h> -KMWFax::KMWFax(QWidget *parent, const char *name) +KMWFax::KMWFax(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Custom+2; m_title = i18n("Fax Serial Device"); m_nextpage = KMWizard::Driver; - QLabel *lab = new QLabel(this); + QLabel *lab = new TQLabel(this); lab->setText(i18n("<p>Select the device which your serial Fax/Modem is connected to.</p>")); m_list = new KListBox(this); - QVBoxLayout *l1 = new QVBoxLayout(this,0,10); + QVBoxLayout *l1 = new TQVBoxLayout(this,0,10); l1->addWidget(lab,0); l1->addWidget(m_list,1); // initialize IppRequest req; req.setOperation(CUPS_GET_DEVICES); - QString uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + QString uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) { @@ -57,14 +57,14 @@ KMWFax::KMWFax(QWidget *parent, const char *name) { if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0) { - m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("blockdevice"),TQString::fromLatin1(attr->values[0].string.text)); } attr = attr->next; } } } -bool KMWFax::isValid(QString& msg) +bool KMWFax::isValid(TQString& msg) { if (m_list->currentItem() == -1) { diff --git a/kdeprint/cups/kmwfax.h b/kdeprint/cups/kmwfax.h index 4a46bc29b..8fc846a7b 100644 --- a/kdeprint/cups/kmwfax.h +++ b/kdeprint/cups/kmwfax.h @@ -27,9 +27,9 @@ class KListBox; class KMWFax : public KMWizardPage { public: - KMWFax(QWidget *parent = 0, const char *name = 0); + KMWFax(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); private: diff --git a/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp index fbef937cf..c0d30c452 100644 --- a/kdeprint/cups/kmwipp.cpp +++ b/kdeprint/cups/kmwipp.cpp @@ -21,30 +21,30 @@ #include "kmwizard.h" #include "kmprinter.h" -#include <qlabel.h> -#include <qlineedit.h> +#include <tqlabel.h> +#include <tqlineedit.h> #include <klocale.h> -#include <qvalidator.h> +#include <tqvalidator.h> #include <cups/http.h> -KMWIpp::KMWIpp(QWidget *parent, const char *name) +KMWIpp::KMWIpp(TQWidget *parent, const char *name) : KMWInfoBase(2,parent,name) { m_ID = KMWizard::IPP; m_title = i18n("Remote IPP server"); m_nextpage = KMWizard::IPPSelect; - lineEdit( 1 )->setValidator( new QIntValidator( this ) ); + lineEdit( 1 )->setValidator( new TQIntValidator( this ) ); setInfo(i18n("<p>Enter the information concerning the remote IPP server " "owning the targeted printer. This wizard will poll the server " "before continuing.</p>")); setLabel(0,i18n("Host:")); setLabel(1,i18n("Port:")); - setText( 1, QString::fromLatin1( "631" ) ); + setText( 1, TQString::fromLatin1( "631" ) ); } -bool KMWIpp::isValid(QString& msg) +bool KMWIpp::isValid(TQString& msg) { // check informations if (text(0).isEmpty()) diff --git a/kdeprint/cups/kmwipp.h b/kdeprint/cups/kmwipp.h index 81856c8cd..42e36814e 100644 --- a/kdeprint/cups/kmwipp.h +++ b/kdeprint/cups/kmwipp.h @@ -25,9 +25,9 @@ class KMWIpp : public KMWInfoBase { public: - KMWIpp(QWidget *parent = 0, const char *name = 0); + KMWIpp(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); }; diff --git a/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp index de636ea8c..4900a584b 100644 --- a/kdeprint/cups/kmwippprinter.cpp +++ b/kdeprint/cups/kmwippprinter.cpp @@ -25,21 +25,21 @@ #include "networkscanner.h" #include <klistview.h> -#include <qheader.h> +#include <tqheader.h> #include <kpushbutton.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include <kmessagebox.h> -#include <qtextview.h> -#include <qlayout.h> -#include <qregexp.h> +#include <tqtextview.h> +#include <tqlayout.h> +#include <tqregexp.h> #include <kseparator.h> #include <klocale.h> #include <kiconloader.h> #include <kguiitem.h> #include <kurl.h> -KMWIppPrinter::KMWIppPrinter(QWidget *parent, const char *name) +KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_title = i18n("IPP Printer Information"); @@ -49,16 +49,16 @@ KMWIppPrinter::KMWIppPrinter(QWidget *parent, const char *name) m_list = new KListView(this); m_list->addColumn(""); m_list->header()->hide(); - m_list->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_list->setLineWidth(1); - QLabel *l1 = new QLabel(i18n("&Printer URI:"),this); + QLabel *l1 = new TQLabel(i18n("&Printer URI:"),this); - m_uri = new QLineEdit(this); + m_uri = new TQLineEdit(this); l1->setBuddy(m_uri); - m_info = new QTextView(this); + m_info = new TQTextView(this); m_info->setPaper(colorGroup().background()); m_info->setMinimumHeight(100); m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>")); @@ -70,17 +70,17 @@ KMWIppPrinter::KMWIppPrinter(QWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(20); - connect(m_list,SIGNAL(selectionChanged(QListViewItem*)),SLOT(slotPrinterSelected(QListViewItem*))); - connect( m_scanner, SIGNAL( scanStarted() ), SLOT( slotScanStarted() ) ); - connect( m_scanner, SIGNAL( scanFinished() ), SLOT( slotScanFinished() ) ); - connect( m_scanner, SIGNAL( scanStarted() ), parent, SLOT( disableWizard() ) ); - connect( m_scanner, SIGNAL( scanFinished() ), parent, SLOT( enableWizard() ) ); - connect(m_ippreport, SIGNAL(clicked()), SLOT(slotIppReport())); + connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); + connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); + connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport())); // layout - QHBoxLayout *lay3 = new QHBoxLayout(this, 0, 10); - QVBoxLayout *lay2 = new QVBoxLayout(0, 0, 0); - QHBoxLayout *lay4 = new QHBoxLayout(0, 0, 0); + QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); + QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0); + QHBoxLayout *lay4 = new TQHBoxLayout(0, 0, 0); lay3->addWidget(m_list,1); lay3->addLayout(lay2,1); @@ -105,7 +105,7 @@ void KMWIppPrinter::updatePrinter(KMPrinter *p) p->setDevice(m_uri->text()); } -bool KMWIppPrinter::isValid(QString& msg) +bool KMWIppPrinter::isValid(TQString& msg) { if (m_uri->text().isEmpty()) { @@ -130,8 +130,8 @@ void KMWIppPrinter::slotScanStarted() void KMWIppPrinter::slotScanFinished() { m_ippreport->setEnabled(false); - const QPtrList<NetworkScanner::SocketInfo> *list = m_scanner->printerList(); - QPtrListIterator<NetworkScanner::SocketInfo> it(*list); + const TQPtrList<NetworkScanner::SocketInfo> *list = m_scanner->printerList(); + TQPtrListIterator<NetworkScanner::SocketInfo> it(*list); for (;it.current();++it) { QString name; @@ -139,12 +139,12 @@ void KMWIppPrinter::slotScanFinished() name = i18n("Unknown host - 1 is the IP", "<Unknown> (%1)").arg(it.current()->IP); else name = it.current()->Name; - QListViewItem *item = new QListViewItem(m_list,name,it.current()->IP,QString::number(it.current()->Port)); + QListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); item->setPixmap(0,SmallIcon("kdeprint_printer")); } } -void KMWIppPrinter::slotPrinterSelected(QListViewItem *item) +void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item) { m_ippreport->setEnabled(item != 0); if (!item) return; @@ -157,7 +157,7 @@ void KMWIppPrinter::slotPrinterSelected(QListViewItem *item) req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); req.setHost(item->text(1)); req.setPort(item->text(2).toInt()); - uri = QString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); + uri = TQString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); keys.append("printer-name"); keys.append("printer-state"); @@ -172,11 +172,11 @@ void KMWIppPrinter::slotPrinterSelected(QListViewItem *item) int state; if (req.name("printer-name",value)) txt.append(i18n("<b>Name</b>: %1<br>").arg(value)); if (req.text("printer-location",value) && !value.isEmpty()) txt.append(i18n("<b>Location</b>: %1<br>").arg(value)); - if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("<b>Description</b>: %1<br>").arg(value.replace(QRegExp(";"),"<br>"))); + if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("<b>Description</b>: %1<br>").arg(value.replace(TQRegExp(";"),"<br>"))); if (req.uri("printer-uri-supported",value)) { if (value[0] == '/') - value.prepend(QString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); + value.prepend(TQString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); m_uri->setText(value); } if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); diff --git a/kdeprint/cups/kmwippprinter.h b/kdeprint/cups/kmwippprinter.h index f928c3e68..627a28f7d 100644 --- a/kdeprint/cups/kmwippprinter.h +++ b/kdeprint/cups/kmwippprinter.h @@ -33,16 +33,16 @@ class KMWIppPrinter : public KMWizardPage { Q_OBJECT public: - KMWIppPrinter(QWidget *parent = 0, const char *name = 0); + KMWIppPrinter(TQWidget *parent = 0, const char *name = 0); ~KMWIppPrinter(); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); protected slots: void slotScanStarted(); void slotScanFinished(); - void slotPrinterSelected(QListViewItem*); + void slotPrinterSelected(TQListViewItem*); void slotIppReport(); private: diff --git a/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp index d70c8603d..fbfa597c7 100644 --- a/kdeprint/cups/kmwippselect.cpp +++ b/kdeprint/cups/kmwippselect.cpp @@ -24,12 +24,12 @@ #include "ipprequest.h" #include <klistbox.h> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> -KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name) +KMWIppSelect::KMWIppSelect(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::IPPSelect; @@ -38,11 +38,11 @@ KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name) m_list = new KListBox(this); - QVBoxLayout *lay = new QVBoxLayout(this, 0, 0); + QVBoxLayout *lay = new TQVBoxLayout(this, 0, 0); lay->addWidget(m_list); } -bool KMWIppSelect::isValid(QString& msg) +bool KMWIppSelect::isValid(TQString& msg) { if (m_list->currentItem() == -1) { @@ -75,16 +75,16 @@ void KMWIppSelect::initPrinter(KMPrinter *p) IppRequest req; QString uri; req.setOperation(CUPS_GET_PRINTERS); - uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name")); if (req.doRequest("/printers/")) { ipp_attribute_t *attr = req.first(); while (attr) { if (attr->name && strcmp(attr->name,"printer-name") == 0) - m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::fromLatin1(attr->values[0].string.text)); attr = attr->next; } m_list->sort(); diff --git a/kdeprint/cups/kmwippselect.h b/kdeprint/cups/kmwippselect.h index 5bf12e0c8..26ce6e563 100644 --- a/kdeprint/cups/kmwippselect.h +++ b/kdeprint/cups/kmwippselect.h @@ -27,9 +27,9 @@ class KListBox; class KMWIppSelect : public KMWizardPage { public: - KMWIppSelect(QWidget *parent = 0, const char *name = 0); + KMWIppSelect(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp index 034c88bb2..36e80c76d 100644 --- a/kdeprint/cups/kmwother.cpp +++ b/kdeprint/cups/kmwother.cpp @@ -23,40 +23,40 @@ #include "kmmanager.h" #include "cupsinfos.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qheader.h> -#include <qdict.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqheader.h> +#include <tqdict.h> #include <klocale.h> #include <klistview.h> #include <kiconloader.h> #include <kdebug.h> -KMWOther::KMWOther(QWidget *parent, const char *name) +KMWOther::KMWOther(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Custom+5; m_title = i18n("URI Selection"); m_nextpage = KMWizard::Driver; - m_uri = new QLineEdit(this); - QLabel *l1 = new QLabel(this); + m_uri = new TQLineEdit(this); + QLabel *l1 = new TQLabel(this); l1->setText(i18n("<p>Enter the URI corresponding to the printer to be installed. " "Examples:</p><ul>" "<li>smb://[login[:passwd]@]server/printer</li>" "<li>lpd://server/queue</li>" "<li>parallel:/dev/lp0</li></ul>")); - QLabel *l2 = new QLabel(i18n("URI:"), this); + QLabel *l2 = new TQLabel(i18n("URI:"), this); m_uriview = new KListView( this ); m_uriview->addColumn( "" ); m_uriview->header()->hide(); m_uriview->setSorting( -1 ); - connect( m_uriview, SIGNAL( pressed( QListViewItem* ) ), SLOT( slotPressed( QListViewItem* ) ) ); + connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) ); - QVBoxLayout *lay1 = new QVBoxLayout(this, 0, 15); - QVBoxLayout *lay2 = new QVBoxLayout(0, 0, 5); + QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); + QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); lay1->addWidget(l1); lay1->addLayout(lay2); lay1->addWidget( m_uriview ); @@ -70,29 +70,29 @@ void KMWOther::initPrinter(KMPrinter *p) if ( m_uriview->childCount() == 0 ) { - QStringList l = KMManager::self()->detectLocalPrinters(); + TQStringList l = KMManager::self()->detectLocalPrinters(); if ( l.isEmpty() || l.count() % 4 != 0 ) return; - QListViewItem *item = 0, *lastparent = 0, *root; - root = new QListViewItem( m_uriview, i18n( "CUPS Server %1:%2" ).arg( CupsInfos::self()->host() ).arg( CupsInfos::self()->port() ) ); + TQListViewItem *item = 0, *lastparent = 0, *root; + root = new TQListViewItem( m_uriview, i18n( "CUPS Server %1:%2" ).arg( CupsInfos::self()->host() ).arg( CupsInfos::self()->port() ) ); root->setPixmap( 0, SmallIcon( "gear" ) ); root->setOpen( true ); - QDict<QListViewItem> parents, last; + TQDict<TQListViewItem> parents, last; parents.setAutoDelete( false ); last.setAutoDelete( false ); - for ( QStringList::Iterator it=l.begin(); it!=l.end(); ++it ) + for ( TQStringList::Iterator it=l.begin(); it!=l.end(); ++it ) { - QString cl = *it; - QString uri = *( ++it ); - QString desc = *( ++it ); - QString prt = *( ++it ); + TQString cl = *it; + TQString uri = *( ++it ); + TQString desc = *( ++it ); + TQString prt = *( ++it ); if ( !prt.isEmpty() ) desc.append( " [" + prt + "]" ); - QListViewItem *parent = parents.find( cl ); + TQListViewItem *parent = parents.find( cl ); if ( !parent ) { - parent = new QListViewItem( root, lastparent, cl ); + parent = new TQListViewItem( root, lastparent, cl ); parent->setOpen( true ); if ( cl == "network" ) parent->setPixmap( 0, SmallIcon( "network" ) ); @@ -105,7 +105,7 @@ void KMWOther::initPrinter(KMPrinter *p) lastparent = parent; parents.insert( cl, parent ); } - item = new QListViewItem( parent, last.find( cl ), desc, uri); + item = new TQListViewItem( parent, last.find( cl ), desc, uri); last.insert( cl, item ); } } @@ -116,7 +116,7 @@ void KMWOther::updatePrinter(KMPrinter *p) p->setDevice( m_uri->text() ); } -void KMWOther::slotPressed( QListViewItem *item ) +void KMWOther::slotPressed( TQListViewItem *item ) { if ( item && !item->text( 1 ).isEmpty() ) m_uri->setText( item->text( 1 ) ); diff --git a/kdeprint/cups/kmwother.h b/kdeprint/cups/kmwother.h index 211a670e9..68f13077f 100644 --- a/kdeprint/cups/kmwother.h +++ b/kdeprint/cups/kmwother.h @@ -30,13 +30,13 @@ class KMWOther : public KMWizardPage { Q_OBJECT public: - KMWOther(QWidget *parent = 0, const char *name = 0); + KMWOther(TQWidget *parent = 0, const char *name = 0); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); protected slots: - void slotPressed( QListViewItem* ); + void slotPressed( TQListViewItem* ); private: QLineEdit *m_uri; diff --git a/kdeprint/cups/kmwquota.cpp b/kdeprint/cups/kmwquota.cpp index e0b5d5f27..f9c34c04a 100644 --- a/kdeprint/cups/kmwquota.cpp +++ b/kdeprint/cups/kmwquota.cpp @@ -23,10 +23,10 @@ #include "kmwizard.h" #include "kmprinter.h" -#include <qspinbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qlayout.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqlayout.h> #include <klocale.h> #ifdef HAVE_LIMITS_H @@ -72,41 +72,41 @@ int findUnit(int& period) const char* unitKeyword(int i) { return time_keywords[i]; } -KMWQuota::KMWQuota(QWidget *parent, const char *name) +KMWQuota::KMWQuota(TQWidget *parent, const char *name) : KMWizardPage(parent, name) { m_ID = KMWizard::Custom+3; m_title = i18n("Printer Quota Settings"); m_nextpage = KMWizard::Custom+4; - m_period = new QSpinBox(this); + m_period = new TQSpinBox(this); m_period->setRange(-1, INT_MAX); m_period->setSpecialValueText(i18n("No quota")); - m_sizelimit = new QSpinBox(this); + m_sizelimit = new TQSpinBox(this); m_sizelimit->setRange(0, INT_MAX); m_sizelimit->setSpecialValueText(i18n("None")); - m_pagelimit = new QSpinBox(this); + m_pagelimit = new TQSpinBox(this); m_pagelimit->setRange(0, INT_MAX); m_pagelimit->setSpecialValueText(i18n("None")); - m_timeunit = new QComboBox(this); + m_timeunit = new TQComboBox(this); for (int i=0;i<N_TIME_LIMITS;i++) m_timeunit->insertItem(i18n(time_keywords[i])); m_timeunit->setCurrentItem(3); - QLabel *lab1 = new QLabel(i18n("&Period:"), this); - QLabel *lab2 = new QLabel(i18n("&Size limit (KB):"), this); - QLabel *lab3 = new QLabel(i18n("&Page limit:"), this); + QLabel *lab1 = new TQLabel(i18n("&Period:"), this); + QLabel *lab2 = new TQLabel(i18n("&Size limit (KB):"), this); + QLabel *lab3 = new TQLabel(i18n("&Page limit:"), this); lab1->setBuddy(m_period); lab2->setBuddy(m_sizelimit); lab3->setBuddy(m_pagelimit); - QLabel *lab4 = new QLabel(i18n("<p>Set here the quota for this printer. Using limits of <b>0</b> means " + QLabel *lab4 = new TQLabel(i18n("<p>Set here the quota for this printer. Using limits of <b>0</b> means " "that no quota will be used. This is equivalent to set quota period to " "<b><nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and " "applied to all users.</p>"), this); - QGridLayout *l0 = new QGridLayout(this, 5, 3, 0, 10); + QGridLayout *l0 = new TQGridLayout(this, 5, 3, 0, 10); l0->setRowStretch(4, 1); l0->setColStretch(1, 1); l0->addMultiCellWidget(lab4, 0, 0, 0, 2); @@ -123,7 +123,7 @@ KMWQuota::~KMWQuota() { } -bool KMWQuota::isValid(QString& msg) +bool KMWQuota::isValid(TQString& msg) { if (m_period->value() >= 0 && m_sizelimit->value() == 0 && m_pagelimit->value() == 0) { @@ -164,8 +164,8 @@ void KMWQuota::updatePrinter(KMPrinter *p) } qu *= time_periods[m_timeunit->currentItem()]; - p->setOption("job-quota-period", QString::number(qu)); - p->setOption("job-k-limit", QString::number(si)); - p->setOption("job-page-limit", QString::number(pa)); + p->setOption("job-quota-period", TQString::number(qu)); + p->setOption("job-k-limit", TQString::number(si)); + p->setOption("job-page-limit", TQString::number(pa)); } #include "kmwquota.moc" diff --git a/kdeprint/cups/kmwquota.h b/kdeprint/cups/kmwquota.h index 88b6359c9..8261546b9 100644 --- a/kdeprint/cups/kmwquota.h +++ b/kdeprint/cups/kmwquota.h @@ -29,10 +29,10 @@ class KMWQuota : public KMWizardPage { Q_OBJECT public: - KMWQuota(QWidget *parent = 0, const char *name = 0); + KMWQuota(TQWidget *parent = 0, const char *name = 0); virtual ~KMWQuota(); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); diff --git a/kdeprint/cups/kmwusers.cpp b/kdeprint/cups/kmwusers.cpp index 3dedddd47..4466c4223 100644 --- a/kdeprint/cups/kmwusers.cpp +++ b/kdeprint/cups/kmwusers.cpp @@ -23,13 +23,13 @@ #include "kmwizard.h" #include "kmprinter.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcombobox.h> #include <klocale.h> #include <keditlistbox.h> -KMWUsers::KMWUsers(QWidget *parent, const char *name) +KMWUsers::KMWUsers(TQWidget *parent, const char *name) : KMWizardPage(parent, name) { m_ID = KMWizard::Custom+4; @@ -37,17 +37,17 @@ KMWUsers::KMWUsers(QWidget *parent, const char *name) m_nextpage = KMWizard::Name; m_users = new KEditListBox(i18n("Users"), this, 0, false, KEditListBox::Add|KEditListBox::Remove); - m_type = new QComboBox(this); + m_type = new TQComboBox(this); m_type->insertItem(i18n("Allowed Users")); m_type->insertItem(i18n("Denied Users")); - QLabel *lab1 = new QLabel(i18n("Define here a group of allowed/denied users for this printer."), this); - QLabel *lab2 = new QLabel(i18n("&Type:"), this); + QLabel *lab1 = new TQLabel(i18n("Define here a group of allowed/denied users for this printer."), this); + QLabel *lab2 = new TQLabel(i18n("&Type:"), this); lab2->setBuddy(m_type); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, 10); - QHBoxLayout *l1 = new QHBoxLayout(0, 0, 10); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); + QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); l0->addWidget(lab1, 0); l0->addLayout(l1, 0); l1->addWidget(lab2, 0); @@ -65,14 +65,14 @@ void KMWUsers::initPrinter(KMPrinter *p) int i(1); if (!p->option("requesting-user-name-denied").isEmpty()) { - l = QStringList::split(",", p->option("requesting-user-name-denied"), false); + l = TQStringList::split(",", p->option("requesting-user-name-denied"), false); if (l.count() == 1 && l[0] == "none") l.clear(); } else if (!p->option("requesting-user-name-allowed").isEmpty()) { i = 0; - l = QStringList::split(",", p->option("requesting-user-name-allowed"), false); + l = TQStringList::split(",", p->option("requesting-user-name-allowed"), false); if (l.count() && l[0] == "all") l.clear(); } diff --git a/kdeprint/cups/kmwusers.h b/kdeprint/cups/kmwusers.h index 9c970bb54..cb269cd76 100644 --- a/kdeprint/cups/kmwusers.h +++ b/kdeprint/cups/kmwusers.h @@ -29,7 +29,7 @@ class KMWUsers : public KMWizardPage { Q_OBJECT public: - KMWUsers(QWidget *parent = 0, const char *name = 0); + KMWUsers(TQWidget *parent = 0, const char *name = 0); virtual ~KMWUsers(); void initPrinter(KMPrinter*); diff --git a/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp index c6672aeaf..7ec413e52 100644 --- a/kdeprint/cups/kphpgl2page.cpp +++ b/kdeprint/cups/kphpgl2page.cpp @@ -19,18 +19,18 @@ #include "kphpgl2page.h" -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> -KPHpgl2Page::KPHpgl2Page(QWidget *parent, const char *name) +KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) { //WhatsThis strings.... (added by pfeifle@kde.org) - QString whatsThisBlackplotHpgl2Page = i18n( " <qt> " + TQString whatsThisBlackplotHpgl2Page = i18n( " <qt> " " <b>Print in Black Only (Blackplot)</b> " " <p>The \'blackplot\' option specifies that all pens should plot in black-only:" " The default is to use the colors defined in the plot file, or the standard " @@ -45,7 +45,7 @@ KPHpgl2Page::KPHpgl2Page(QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisFitplotHpgl2Page = i18n( " <qt> " + TQString whatsThisFitplotHpgl2Page = i18n( " <qt> " " <b>Scale Print Image to Page Size</b> " " <p>The 'fitplot' option specifies that the HP-GL image should be scaled to fill " " exactly the page with the (elsewhere selected) media size. </p> " @@ -65,7 +65,7 @@ KPHpgl2Page::KPHpgl2Page(QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPenwidthHpgl2Page = i18n( " <qt> " + TQString whatsThisPenwidthHpgl2Page = i18n( " <qt> " " <b>Set Pen Width for HP-GL (if not defined in file)</b>. " " <p>The pen width value can be set here in case the original HP-GL file does not have it " " set. The pen width specifies the value in micrometers. The default value of 1000 produces " @@ -82,7 +82,7 @@ KPHpgl2Page::KPHpgl2Page(QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisAllOptionsHpgl2Page = i18n( " <qt> " + TQString whatsThisAllOptionsHpgl2Page = i18n( " <qt> " " <b>HP-GL Print Options</b> " " <p>All options on this page are only applicable if you use KDEPrint to send HP-GL and " " HP-GL/2 files to one of your printers. </p> " @@ -110,36 +110,36 @@ KPHpgl2Page::KPHpgl2Page(QWidget *parent, const char *name) setTitle("HP-GL/2"); - QGroupBox *box = new QGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this); + QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this); - m_blackplot = new QCheckBox(i18n("&Use only black pen"), box); - QWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page); + m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box); + TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page); - m_fitplot = new QCheckBox(i18n("&Fit plot to page"), box); - QWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page); + m_fitplot = new TQCheckBox(i18n("&Fit plot to page"), box); + TQWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page); m_penwidth = new KIntNumInput(1000, box); m_penwidth->setLabel(i18n("&Pen width:"), Qt::AlignLeft|Qt::AlignVCenter); m_penwidth->setSuffix(" [um]"); m_penwidth->setRange(0, 10000, 100, true); - QWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page); + TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, 10); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); l0->addWidget(box); l0->addStretch(1); - QVBoxLayout *l1 = new QVBoxLayout(box->layout(), 10); + QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10); l1->addWidget(m_blackplot); l1->addWidget(m_fitplot); l1->addWidget(m_penwidth); - QWhatsThis::add(this, whatsThisAllOptionsHpgl2Page); + TQWhatsThis::add(this, whatsThisAllOptionsHpgl2Page); } KPHpgl2Page::~KPHpgl2Page() { } -void KPHpgl2Page::setOptions(const QMap<QString,QString>& opts) +void KPHpgl2Page::setOptions(const TQMap<TQString,TQString>& opts) { QString value; if (opts.contains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true")) @@ -150,10 +150,10 @@ void KPHpgl2Page::setOptions(const QMap<QString,QString>& opts) m_penwidth->setValue(value.toInt()); } -void KPHpgl2Page::getOptions(QMap<QString,QString>& opts, bool incldef) +void KPHpgl2Page::getOptions(TQMap<TQString,TQString>& opts, bool incldef) { if (incldef || m_penwidth->value() != 1000) - opts["penwidth"] = QString::number(m_penwidth->value()); + opts["penwidth"] = TQString::number(m_penwidth->value()); if (m_blackplot->isChecked()) opts["blackplot"] = "true"; else if (incldef) diff --git a/kdeprint/cups/kphpgl2page.h b/kdeprint/cups/kphpgl2page.h index 206c409d8..cc77e8ab8 100644 --- a/kdeprint/cups/kphpgl2page.h +++ b/kdeprint/cups/kphpgl2page.h @@ -28,11 +28,11 @@ class QCheckBox; class KPHpgl2Page : public KPrintDialogPage { public: - KPHpgl2Page(QWidget *parent = 0, const char *name = 0); + KPHpgl2Page(TQWidget *parent = 0, const char *name = 0); ~KPHpgl2Page(); - void setOptions(const QMap<QString,QString>& opts); - void getOptions(QMap<QString,QString>& opts, bool incldef = false); + void setOptions(const TQMap<TQString,TQString>& opts); + void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); private: KIntNumInput *m_penwidth; diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index 9ebdc9548..c4cf50e48 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -22,26 +22,26 @@ #include "imagepreview.h" #include "driver.h" -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qapplication.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqapplication.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> #include <kseparator.h> #include <kstandarddirs.h> -KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) +KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) { //WhatsThis strings.... (added by pfeifle@kde.org) - QString whatsThisBrightnessImagePage = i18n( " <qt> " + TQString whatsThisBrightnessImagePage = i18n( " <qt> " " <p><b>Brightness:</b> Slider to control the brightness value of all colors used.</p>" " <p> The brightness value can range from 0 to 200. Values greater than 100 will " " lighten the print. Values less than 100 will darken the print. </p> " @@ -55,7 +55,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisHueImagePage = i18n( " <qt> " + TQString whatsThisHueImagePage = i18n( " <qt> " " <p><b>Hue (Tint):</b> Slider to control the hue value for color rotation.</p>" " <p> The hue value is a number from -360 to 360 and represents the color hue rotation. " " The following table summarizes the change you will see for the base colors: " @@ -80,7 +80,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisSaturationImagePage = i18n( " <qt> " + TQString whatsThisSaturationImagePage = i18n( " <qt> " " <p><b>Saturation:</b> Slider to control the saturation value for all colors used.</p>" " <p> The saturation value adjusts the saturation of the colors in an image, similar to " " the color knob on your television. The color saturation value.can range from 0 to 200." @@ -98,7 +98,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisGammaImagePage = i18n( " <qt> " + TQString whatsThisGammaImagePage = i18n( " <qt> " " <p><b>Gamma:</b> Slider to control the gamma value for color correction.</p>" " <p> The gamma value can range from 1 to 3000. " " A gamma values greater than 1000 lightens the print. A gamma value less than 1000 " @@ -115,7 +115,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisImagePage = i18n( " <qt> " + TQString whatsThisImagePage = i18n( " <qt> " " <p><b>Image Printing Options</b></p> " " <p>All options controlled on this page only apply to printing images. " " Most image file formats are supported. To name a few: JPEG, TIFF, PNG, GIF, " @@ -133,7 +133,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisColorationPreviewImagePage = i18n( " <qt> " + TQString whatsThisColorationPreviewImagePage = i18n( " <qt> " " <p><b>Coloration Preview Thumbnail</b></p> " " <p>The coloration preview thumbnail indicates change of image coloration by different settings. " " Options to influence output are: " @@ -149,7 +149,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisSizeImagePage = i18n( " <qt> " + TQString whatsThisSizeImagePage = i18n( " <qt> " " <p><b>Image Size:</b> Dropdown menu to control the image size on the printed paper. Dropdown " " works in conjunction with slider below. Dropdown options are:.</p>" " <ul> " @@ -189,7 +189,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPreviewPositionImagePage = i18n( " <qt> " + TQString whatsThisPreviewPositionImagePage = i18n( " <qt> " " <p><b>Position Preview Thumbnail</b></p> " " <p>This position preview thumbnail indicates the position of the image on the paper sheet. " " <p>Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: " @@ -207,7 +207,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisResetButtonImagePage = i18n( " <qt> " + TQString whatsThisResetButtonImagePage = i18n( " <qt> " " <p><b>Reset to Default Values</b> </p> " " <p> Reset all coloration settings to default values. Default values are: " " <ul> " @@ -219,7 +219,7 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPositionImagePage = i18n( " <qt> " + TQString whatsThisPositionImagePage = i18n( " <qt> " " <p><b>Image Positioning:</b></p> " " <p>Select a pair of radiobuttons to " " move image to the position you want on the paper printout. Default " @@ -236,42 +236,42 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) setTitle(i18n("Image")); - QGroupBox *colorbox = new QGroupBox(0, Qt::Vertical, i18n("Color Settings"), this); - QWhatsThis::add(this, whatsThisImagePage); - QGroupBox *sizebox = new QGroupBox(0, Qt::Vertical, i18n("Image Size"), this); - QWhatsThis::add(sizebox, whatsThisSizeImagePage); - QGroupBox *positionbox = new QGroupBox(0, Qt::Vertical, i18n("Image Position"), this); - QWhatsThis::add(positionbox, whatsThisPositionImagePage); + QGroupBox *colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this); + TQWhatsThis::add(this, whatsThisImagePage); + QGroupBox *sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this); + TQWhatsThis::add(sizebox, whatsThisSizeImagePage); + QGroupBox *positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this); + TQWhatsThis::add(positionbox, whatsThisPositionImagePage); m_brightness = new KIntNumInput(100, colorbox); m_brightness->setLabel(i18n("&Brightness:")); m_brightness->setRange(0, 200, 20, true); - QWhatsThis::add(m_brightness, whatsThisBrightnessImagePage); + TQWhatsThis::add(m_brightness, whatsThisBrightnessImagePage); m_hue = new KIntNumInput(m_brightness, 0, colorbox); m_hue->setLabel(i18n("&Hue (Color rotation):")); m_hue->setRange(-360, 360, 36, true); - QWhatsThis::add(m_hue, whatsThisHueImagePage); + TQWhatsThis::add(m_hue, whatsThisHueImagePage); m_saturation = new KIntNumInput(m_brightness, 100, colorbox); m_saturation->setLabel(i18n("&Saturation:")); m_saturation->setRange(0, 200, 20, true); - QWhatsThis::add(m_saturation, whatsThisSaturationImagePage); + TQWhatsThis::add(m_saturation, whatsThisSaturationImagePage); m_gamma = new KIntNumInput(m_saturation, 1000, colorbox); m_gamma->setLabel(i18n("&Gamma (Color correction):")); m_gamma->setRange(1, 3000, 100, true); - QWhatsThis::add(m_gamma, whatsThisGammaImagePage); + TQWhatsThis::add(m_gamma, whatsThisGammaImagePage); - connect(m_brightness, SIGNAL(valueChanged(int)), SLOT(slotImageSettingsChanged())); - connect(m_hue, SIGNAL(valueChanged(int)), SLOT(slotImageSettingsChanged())); - connect(m_saturation, SIGNAL(valueChanged(int)), SLOT(slotImageSettingsChanged())); - //connect(m_gamma, SIGNAL(valueChanged(int)), SLOT(slotImageSettingsChanged())); + connect(m_brightness, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); + connect(m_hue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); + connect(m_saturation, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); + //connect(m_gamma, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); m_preview = new ImagePreview(colorbox); bool useColor = (driver ? driver->get("colordevice") == "1" : true); m_preview->setBlackAndWhite(!useColor); - QWhatsThis::add(m_preview, whatsThisColorationPreviewImagePage); + TQWhatsThis::add(m_preview, whatsThisColorationPreviewImagePage); m_hue->setEnabled(useColor); m_saturation->setEnabled(useColor); @@ -280,12 +280,12 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); - QPushButton *defbtn = new QPushButton(i18n("&Default Settings"), colorbox); - QWhatsThis::add(defbtn, whatsThisResetButtonImagePage); - connect(defbtn, SIGNAL(clicked()), SLOT(slotDefaultClicked())); + QPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox); + TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage); + connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked())); slotDefaultClicked(); - m_sizetype = new QComboBox(sizebox); + m_sizetype = new TQComboBox(sizebox); m_sizetype->insertItem(i18n("Natural Image Size")); m_sizetype->insertItem(i18n("Resolution (ppi)")); // xgettext:no-c-format @@ -297,22 +297,22 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) m_size->setRange(1, 1200, 20, true); m_size->setValue(72); - connect(m_sizetype, SIGNAL(activated(int)), SLOT(slotSizeTypeChanged(int))); + connect(m_sizetype, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeTypeChanged(int))); m_sizetype->setCurrentItem(0); slotSizeTypeChanged(0); - QLabel *lab = new QLabel(i18n("&Image size type:"), sizebox); + QLabel *lab = new TQLabel(i18n("&Image size type:"), sizebox); lab->setBuddy(m_sizetype); m_position = new ImagePosition(positionbox); - QWhatsThis::add(m_position, whatsThisPreviewPositionImagePage); - - QRadioButton *bottom = new QRadioButton(positionbox); - QRadioButton *top = new QRadioButton(positionbox); - QRadioButton *vcenter = new QRadioButton(positionbox); - QRadioButton *left = new QRadioButton(positionbox); - QRadioButton *right = new QRadioButton(positionbox); - QRadioButton *hcenter = new QRadioButton(positionbox); + TQWhatsThis::add(m_position, whatsThisPreviewPositionImagePage); + + QRadioButton *bottom = new TQRadioButton(positionbox); + QRadioButton *top = new TQRadioButton(positionbox); + QRadioButton *vcenter = new TQRadioButton(positionbox); + QRadioButton *left = new TQRadioButton(positionbox); + QRadioButton *right = new TQRadioButton(positionbox); + QRadioButton *hcenter = new TQRadioButton(positionbox); QSize sz = bottom->sizeHint(); bottom->setFixedSize(sz); vcenter->setFixedSize(sz); @@ -321,16 +321,16 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) hcenter->setFixedSize(sz); right->setFixedSize(sz); - m_vertgrp = new QButtonGroup(positionbox); + m_vertgrp = new TQButtonGroup(positionbox); m_vertgrp->hide(); - m_horizgrp = new QButtonGroup(positionbox); + m_horizgrp = new TQButtonGroup(positionbox); m_horizgrp->hide(); m_vertgrp->insert(top, 0); m_vertgrp->insert(vcenter, 1); m_vertgrp->insert(bottom, 2); - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) { m_horizgrp->insert(left, 2); m_horizgrp->insert(hcenter, 1); @@ -342,18 +342,18 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) m_horizgrp->insert(hcenter, 1); m_horizgrp->insert(right, 2); } - connect(m_vertgrp, SIGNAL(clicked(int)), SLOT(slotPositionChanged())); - connect(m_horizgrp, SIGNAL(clicked(int)), SLOT(slotPositionChanged())); + connect(m_vertgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); + connect(m_horizgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); m_vertgrp->setButton(1); m_horizgrp->setButton(1); slotPositionChanged(); - QGridLayout *l0 = new QGridLayout(this, 2, 2, 0, 10); + QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 10); l0->addMultiCellWidget(colorbox, 0, 0, 0, 1); l0->addWidget(sizebox, 1, 0); l0->addWidget(positionbox, 1, 1); l0->setColStretch(0, 1); - QGridLayout *l1 = new QGridLayout(colorbox->layout(), 5, 2, 10); + QGridLayout *l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10); l1->addWidget(m_brightness, 0, 0); l1->addWidget(m_hue, 1, 0); l1->addWidget(m_saturation, 2, 0); @@ -361,16 +361,16 @@ KPImagePage::KPImagePage(DrMain *driver, QWidget *parent, const char *name) l1->addWidget(m_gamma, 4, 0); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addWidget(defbtn, 4, 1); - QVBoxLayout *l2 = new QVBoxLayout(sizebox->layout(), 3); + QVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); l2->addSpacing(10); l2->addWidget(m_size); l2->addStretch(1); - QGridLayout *l3 = new QGridLayout(positionbox->layout(), 2, 2, 10); - QHBoxLayout *l4 = new QHBoxLayout(0, 0, 10); - QVBoxLayout *l5 = new QVBoxLayout(0, 0, 10); + QGridLayout *l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10); + QHBoxLayout *l4 = new TQHBoxLayout(0, 0, 10); + QVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10); l3->addLayout(l4, 0, 1); l3->addLayout(l5, 1, 0); l3->addWidget(m_position, 1, 1); @@ -386,7 +386,7 @@ KPImagePage::~KPImagePage() { } -void KPImagePage::setOptions(const QMap<QString,QString>& opts) +void KPImagePage::setOptions(const TQMap<TQString,TQString>& opts) { QString value; if (!(value=opts["brightness"]).isEmpty()) @@ -420,19 +420,19 @@ void KPImagePage::setOptions(const QMap<QString,QString>& opts) } } -void KPImagePage::getOptions(QMap<QString,QString>& opts, bool incldef) +void KPImagePage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) { if (incldef || m_brightness->value() != 100) - opts["brightness"] = QString::number(m_brightness->value()); + opts["brightness"] = TQString::number(m_brightness->value()); if (m_hue->isEnabled()) { if (incldef || m_hue->value() != 0) - opts["hue"] = QString::number(m_hue->value()); + opts["hue"] = TQString::number(m_hue->value()); if (incldef || m_saturation->value() != 100) - opts["saturation"] = QString::number(m_saturation->value()); + opts["saturation"] = TQString::number(m_saturation->value()); } if (incldef || m_gamma->value() != 1000) - opts["gamma"] = QString::number(m_gamma->value()); + opts["gamma"] = TQString::number(m_gamma->value()); QString name; if (incldef) @@ -449,7 +449,7 @@ void KPImagePage::getOptions(QMap<QString,QString>& opts, bool incldef) case 3: name = "natural-scaling"; break; } if (!name.isEmpty()) - opts[name] = QString::number(m_size->value()); + opts[name] = TQString::number(m_size->value()); if (incldef || m_position->position() != ImagePosition::Center) opts["position"] = m_position->positionString(); diff --git a/kdeprint/cups/kpimagepage.h b/kdeprint/cups/kpimagepage.h index 9ec623686..49b7ec0ea 100644 --- a/kdeprint/cups/kpimagepage.h +++ b/kdeprint/cups/kpimagepage.h @@ -32,11 +32,11 @@ class KPImagePage : public KPrintDialogPage { Q_OBJECT public: - KPImagePage(DrMain *driver = 0, QWidget *parent = 0, const char *name = 0); + KPImagePage(DrMain *driver = 0, TQWidget *parent = 0, const char *name = 0); ~KPImagePage(); - void setOptions(const QMap<QString,QString>& opts); - void getOptions(QMap<QString,QString>& opts, bool incldef = false); + void setOptions(const TQMap<TQString,TQString>& opts); + void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); protected slots: void slotSizeTypeChanged(int); diff --git a/kdeprint/cups/kpschedulepage.cpp b/kdeprint/cups/kpschedulepage.cpp index a698b1d51..3c2edaf0f 100644 --- a/kdeprint/cups/kpschedulepage.cpp +++ b/kdeprint/cups/kpschedulepage.cpp @@ -19,25 +19,25 @@ #include "kpschedulepage.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qregexp.h> -#include <qdatetimeedit.h> -#include <qdatetime.h> -#include <qlineedit.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqregexp.h> +#include <tqdatetimeedit.h> +#include <tqdatetime.h> +#include <tqlineedit.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kseparator.h> #include <knuminput.h> #include <time.h> -KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) +KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) { //WhatsThis strings.... (added by pfeifle@kde.org) - QString whatsThisBillingInfo = i18n( " <qt> <p><b>Print Job Billing and Accounting</b></p> " + TQString whatsThisBillingInfo = i18n( " <qt> <p><b>Print Job Billing and Accounting</b></p> " " <p>Insert a meaningful string here to associate" " the current print job with a certain account. This" " string will appear in the CUPS \"page_log\" to help" @@ -57,7 +57,7 @@ KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisScheduledPrinting = i18n(" <qt> <p><b>Scheduled Printing</b></p> " + TQString whatsThisScheduledPrinting = i18n(" <qt> <p><b>Scheduled Printing</b></p> " " <p>Scheduled printing lets you control the time" " of the actual printout, while you can still send away your" " job <b>now</b> and have it out of your way." @@ -84,7 +84,7 @@ KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPageLabel = i18n( " <qt> <p><b>Page Labels</b></p> " + TQString whatsThisPageLabel = i18n( " <qt> <p><b>Page Labels</b></p> " " <p>Page Labels are printed by CUPS at the top and bottom" " of each page. They appear on the pages surrounded by a little" " frame box." @@ -99,7 +99,7 @@ KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisJobPriority = i18n( " <qt> <p><b>Job Priority</b></p> " + TQString whatsThisJobPriority = i18n( " <qt> <p><b>Job Priority</b></p> " " <p>Usually CUPS prints all jobs per queue according to" " the \"FIFO\" principle: <em>First In, First Out</em>." " <p> The" @@ -133,7 +133,7 @@ KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) ts = localtime(&ct); m_gmtdiff -= ts->tm_hour; - m_time = new QComboBox(this); + m_time = new TQComboBox(this); m_time->insertItem(i18n("Immediately")); m_time->insertItem(i18n("Never (hold indefinitely)")); m_time->insertItem(i18n("Daytime (6 am - 6 pm)")); @@ -143,38 +143,38 @@ KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) m_time->insertItem(i18n("Second Shift (4 pm - 12 am)")); m_time->insertItem(i18n("Third Shift (12 am - 8 am)")); m_time->insertItem(i18n("Specified Time")); - QWhatsThis::add(m_time, whatsThisScheduledPrinting); + TQWhatsThis::add(m_time, whatsThisScheduledPrinting); m_tedit = new QTimeEdit(this); m_tedit->setAutoAdvance(true); - m_tedit->setTime(QTime::currentTime()); + m_tedit->setTime(TQTime::currentTime()); m_tedit->setEnabled(false); - QWhatsThis::add(m_tedit, whatsThisScheduledPrinting); - m_billing = new QLineEdit(this); - QWhatsThis::add(m_billing, whatsThisBillingInfo); - m_pagelabel = new QLineEdit(this); - QWhatsThis::add(m_pagelabel, whatsThisPageLabel); + TQWhatsThis::add(m_tedit, whatsThisScheduledPrinting); + m_billing = new TQLineEdit(this); + TQWhatsThis::add(m_billing, whatsThisBillingInfo); + m_pagelabel = new TQLineEdit(this); + TQWhatsThis::add(m_pagelabel, whatsThisPageLabel); m_priority = new KIntNumInput(50, this); - QWhatsThis::add(m_priority, whatsThisJobPriority); + TQWhatsThis::add(m_priority, whatsThisJobPriority); m_priority->setRange(1, 100, 10, true); - QLabel *lab = new QLabel(i18n("&Scheduled printing:"), this); + QLabel *lab = new TQLabel(i18n("&Scheduled printing:"), this); lab->setBuddy(m_time); - QWhatsThis::add(lab, whatsThisScheduledPrinting); - QLabel *lab1 = new QLabel(i18n("&Billing information:"), this); - QWhatsThis::add(lab1, whatsThisBillingInfo); + TQWhatsThis::add(lab, whatsThisScheduledPrinting); + QLabel *lab1 = new TQLabel(i18n("&Billing information:"), this); + TQWhatsThis::add(lab1, whatsThisBillingInfo); lab1->setBuddy(m_billing); - QLabel *lab2 = new QLabel(i18n("T&op/Bottom page label:"), this); - QWhatsThis::add(lab2, whatsThisPageLabel); + QLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this); + TQWhatsThis::add(lab2, whatsThisPageLabel); lab2->setBuddy(m_pagelabel); m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft); - QWhatsThis::add(m_priority, whatsThisJobPriority); + TQWhatsThis::add(m_priority, whatsThisJobPriority); KSeparator *sep0 = new KSeparator(this); sep0->setFixedHeight(10); - QGridLayout *l0 = new QGridLayout(this, 6, 2, 0, 7); + QGridLayout *l0 = new TQGridLayout(this, 6, 2, 0, 7); l0->addWidget(lab, 0, 0); - QHBoxLayout *l1 = new QHBoxLayout(0, 0, 5); + QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5); l0->addLayout(l1, 0, 1); l1->addWidget(m_time); l1->addWidget(m_tedit); @@ -186,14 +186,14 @@ KPSchedulePage::KPSchedulePage(QWidget *parent, const char *name) l0->addMultiCellWidget(m_priority, 4, 4, 0, 1); l0->setRowStretch(5, 1); - connect(m_time, SIGNAL(activated(int)), SLOT(slotTimeChanged())); + connect(m_time, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeChanged())); } KPSchedulePage::~KPSchedulePage() { } -bool KPSchedulePage::isValid(QString& msg) +bool KPSchedulePage::isValid(TQString& msg) { if (m_time->currentItem() == 8 && !m_tedit->time().isValid()) { @@ -203,7 +203,7 @@ bool KPSchedulePage::isValid(QString& msg) return true; } -void KPSchedulePage::setOptions(const QMap<QString,QString>& opts) +void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts) { QString t = opts["job-hold-until"]; if (!t.isEmpty()) @@ -220,7 +220,7 @@ void KPSchedulePage::setOptions(const QMap<QString,QString>& opts) else if (t == "third-shift") item = 7; else { - QTime qt = QTime::fromString(t); + QTime qt = TQTime::fromString(t); m_tedit->setTime(qt.addSecs(-3600 * m_gmtdiff)); item = 8; } @@ -243,7 +243,7 @@ void KPSchedulePage::setOptions(const QMap<QString,QString>& opts) m_priority->setValue(val); } -void KPSchedulePage::getOptions(QMap<QString,QString>& opts, bool incldef) +void KPSchedulePage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) { if (incldef || m_time->currentItem() != 0) { @@ -269,7 +269,7 @@ void KPSchedulePage::getOptions(QMap<QString,QString>& opts, bool incldef) if (incldef || !m_pagelabel->text().isEmpty()) opts["page-label"] = "\"" + m_pagelabel->text() + "\""; if (incldef || m_priority->value() != 50) - opts["job-priority"] = QString::number(m_priority->value()); + opts["job-priority"] = TQString::number(m_priority->value()); } void KPSchedulePage::slotTimeChanged() diff --git a/kdeprint/cups/kpschedulepage.h b/kdeprint/cups/kpschedulepage.h index b8a5946fe..5753747c9 100644 --- a/kdeprint/cups/kpschedulepage.h +++ b/kdeprint/cups/kpschedulepage.h @@ -31,12 +31,12 @@ class KPSchedulePage : public KPrintDialogPage { Q_OBJECT public: - KPSchedulePage(QWidget *parent = 0, const char *name = 0); + KPSchedulePage(TQWidget *parent = 0, const char *name = 0); ~KPSchedulePage(); - void getOptions(QMap<QString,QString>& opts, bool incldef = false); - void setOptions(const QMap<QString,QString>& opts); - bool isValid(QString& msg); + void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); + void setOptions(const TQMap<TQString,TQString>& opts); + bool isValid(TQString& msg); protected slots: void slotTimeChanged(); diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp index ec7e451b7..7a1fd0924 100644 --- a/kdeprint/cups/kptagspage.cpp +++ b/kdeprint/cups/kptagspage.cpp @@ -19,21 +19,21 @@ #include "kptagspage.h" -#include <qtable.h> -#include <qheader.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qregexp.h> -#include <qwhatsthis.h> +#include <tqtable.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqregexp.h> +#include <tqwhatsthis.h> #include <klocale.h> -KPTagsPage::KPTagsPage(bool ro, QWidget *parent, const char *name) +KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) { //WhatsThis strings.... (added by pfeifle@kde.org) - QString whatsThisAdditionalTagsTable = i18n(" <qt><p><b>Additional Tags</b></p>" + TQString whatsThisAdditionalTagsTable = i18n(" <qt><p><b>Additional Tags</b></p>" " You may send additional commands to the CUPS server via this editable list. " " There are 3 purposes for this:" " <ul>" @@ -77,19 +77,19 @@ KPTagsPage::KPTagsPage(bool ro, QWidget *parent, const char *name) setTitle(i18n("Additional Tags")); setOnlyRealPrinters(true); - m_tags = new QTable(10, 2, this); + m_tags = new TQTable(10, 2, this); m_tags->horizontalHeader()->setStretchEnabled(true); m_tags->horizontalHeader()->setLabel(0, i18n("Name")); m_tags->horizontalHeader()->setLabel(1, i18n("Value")); m_tags->setReadOnly(ro); - QWhatsThis::add(m_tags, whatsThisAdditionalTagsTable); + TQWhatsThis::add(m_tags, whatsThisAdditionalTagsTable); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, 5); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 5); l0->addWidget(m_tags); if (ro) { - QLabel *lab = new QLabel(i18n("Read-Only"), this); + QLabel *lab = new TQLabel(i18n("Read-Only"), this); QFont f = lab->font(); f.setBold(true); lab->setFont(f); @@ -102,7 +102,7 @@ KPTagsPage::~KPTagsPage() { } -bool KPTagsPage::isValid(QString& msg) +bool KPTagsPage::isValid(TQString& msg) { QRegExp re("\\s"); for (int r=0; r<m_tags->numCols(); r++) @@ -119,11 +119,11 @@ bool KPTagsPage::isValid(QString& msg) return true; } -void KPTagsPage::setOptions(const QMap<QString,QString>& opts) +void KPTagsPage::setOptions(const TQMap<TQString,TQString>& opts) { int r(0); QRegExp re("^\"|\"$"); - for (QMap<QString,QString>::ConstIterator it=opts.begin(); it!=opts.end() && r<m_tags->numRows(); ++it) + for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end() && r<m_tags->numRows(); ++it) { if (it.key().startsWith("KDEPrint-")) { @@ -135,12 +135,12 @@ void KPTagsPage::setOptions(const QMap<QString,QString>& opts) } for (; r<m_tags->numRows(); r++) { - m_tags->setText(r, 0, QString::null); - m_tags->setText(r, 1, QString::null); + m_tags->setText(r, 0, TQString::null); + m_tags->setText(r, 1, TQString::null); } } -void KPTagsPage::getOptions(QMap<QString,QString>& opts, bool) +void KPTagsPage::getOptions(TQMap<TQString,TQString>& opts, bool) { for (int r=0; r<m_tags->numRows(); r++) { @@ -153,12 +153,12 @@ void KPTagsPage::getOptions(QMap<QString,QString>& opts, bool) } } -QSize KPTagsPage::sizeHint() const +TQSize KPTagsPage::sizeHint() const { - return QSize(-1, -1); + return TQSize(-1, -1); } -QSize KPTagsPage::minimumSizeHint() const +TQSize KPTagsPage::minimumSizeHint() const { - return QSize(-1, -1); + return TQSize(-1, -1); } diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h index 2dd55c8d8..800f7ddc6 100644 --- a/kdeprint/cups/kptagspage.h +++ b/kdeprint/cups/kptagspage.h @@ -27,15 +27,15 @@ class QTable; class KPTagsPage : public KPrintDialogPage { public: - KPTagsPage(bool ro = false, QWidget *parent = 0, const char *name = 0); + KPTagsPage(bool ro = false, TQWidget *parent = 0, const char *name = 0); ~KPTagsPage(); - void getOptions(QMap<QString,QString>& opts, bool incldef = false); - void setOptions(const QMap<QString,QString>& opts); - bool isValid(QString& msg); + void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); + void setOptions(const TQMap<TQString,TQString>& opts); + bool isValid(TQString& msg); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; private: QTable *m_tags; diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp index b896606e0..75fc838cc 100644 --- a/kdeprint/cups/kptextpage.cpp +++ b/kdeprint/cups/kptextpage.cpp @@ -22,23 +22,23 @@ #include "driver.h" #include "kprinter.h" -#include <qbuttongroup.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> #include <knuminput.h> #include <klocale.h> #include <kiconloader.h> #include <kseparator.h> #include <kdebug.h> -KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) +KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) : KPrintDialogPage(0, driver, parent, name) { //WhatsThis strings.... (added by pfeifle@kde.org) - QString whatsThisCPITextPage = i18n( " <qt> " + TQString whatsThisCPITextPage = i18n( " <qt> " " <p><b>Characters Per Inch</b></p> " " <p>This setting controls the horizontal size of characters when printing a text file. </p>" " <p>The default value is 10, meaning that the font is scaled in a way that 10 characters " @@ -52,7 +52,7 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisLPITextPage = i18n( " <qt> " + TQString whatsThisLPITextPage = i18n( " <qt> " " <p><b>Lines Per Inch</b></p> " " <p>This setting controls the vertical size of characters when printing a text file. </p>" " <p>The default value is 6, meaning that the font is scaled in a way that 6 lines " @@ -66,7 +66,7 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisColumnsTextPage = i18n( " <qt> " + TQString whatsThisColumnsTextPage = i18n( " <qt> " " <p><b>Columns</b></p> " " <p>This setting controls how many columns of text will be printed on each page when." " printing text files. </p> " @@ -81,10 +81,10 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPrettyprintPreviewIconTextPage = i18n( " <qt> " + TQString whatsThisPrettyprintPreviewIconTextPage = i18n( " <qt> " " Preview icon changes when you turn on or off prettyprint. " " </qt>" ); - QString whatsThisFormatTextPage = i18n( " <qt> " + TQString whatsThisFormatTextPage = i18n( " <qt> " " <p><b>Text Formats</b></p> " " <p>These settings control the appearance of text on printouts. They are only valid for " " printing text files or input directly through kprinter. </p> " @@ -105,7 +105,7 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisMarginsTextPage = i18n( " <qt> " + TQString whatsThisMarginsTextPage = i18n( " <qt> " " <p><b>Margins</b></p> " " <p>These settings control the margins of printouts on the paper. They are not valid for " " jobs originating from applications which define their own page layout internally and " @@ -131,7 +131,7 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPrettyprintButtonOnTextPage = i18n( " <qt> " + TQString whatsThisPrettyprintButtonOnTextPage = i18n( " <qt> " " <p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) On!</b></p> " " <p>ASCII text file printouts can be 'prettyfied' by enabling this option. If you do so, " " a header is printed at the top of each page. The header contains " @@ -150,7 +150,7 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPrettyprintButtonOffTextPage = i18n( " <qt> " + TQString whatsThisPrettyprintButtonOffTextPage = i18n( " <qt> " " <p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) Off! </b></p> " " <p>ASCII text file printing with this option turned off are appearing without a page " " header and without syntax highlighting. (You can still set the page margins, though.) </p> " @@ -164,7 +164,7 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) " </p> " " </qt>" ); - QString whatsThisPrettyprintFrameTextPage = i18n( " <qt> " + TQString whatsThisPrettyprintFrameTextPage = i18n( " <qt> " " <p><b>Print Text with Syntax Highlighting (Prettyprint)</b></p> " " <p>ASCII file printouts can be 'prettyfied' by enabling this option. If you do so, " " a header is printed at the top of each page. The header contains " @@ -188,61 +188,61 @@ KPTextPage::KPTextPage(DrMain *driver, QWidget *parent, const char *name) setTitle(i18n("Text")); m_block = false; - QGroupBox *formatbox = new QGroupBox(0, Qt::Vertical, i18n("Text Format"), this); - QWhatsThis::add(formatbox, whatsThisFormatTextPage); - QGroupBox *prettybox = new QGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this); - QWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage); - QGroupBox *marginbox = new QGroupBox(0, Qt::Vertical, i18n("Margins"), this); - QWhatsThis::add(marginbox, whatsThisMarginsTextPage); + QGroupBox *formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this); + TQWhatsThis::add(formatbox, whatsThisFormatTextPage); + QGroupBox *prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this); + TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage); + QGroupBox *marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this); + TQWhatsThis::add(marginbox, whatsThisMarginsTextPage); m_cpi = new KIntNumInput(10, formatbox); - QWhatsThis::add(m_cpi, whatsThisCPITextPage); + TQWhatsThis::add(m_cpi, whatsThisCPITextPage); m_cpi->setLabel(i18n("&Chars per inch:"), Qt::AlignLeft|Qt::AlignVCenter); m_cpi->setRange(1, 999, 1, false); m_lpi = new KIntNumInput(m_cpi, 6, formatbox); - QWhatsThis::add(m_lpi, whatsThisLPITextPage); + TQWhatsThis::add(m_lpi, whatsThisLPITextPage); m_lpi->setLabel(i18n("&Lines per inch:"), Qt::AlignLeft|Qt::AlignVCenter); m_lpi->setRange(1, 999, 1, false); m_columns = new KIntNumInput(m_lpi, 1, formatbox); - QWhatsThis::add(m_columns, whatsThisColumnsTextPage); + TQWhatsThis::add(m_columns, whatsThisColumnsTextPage); m_columns->setLabel(i18n("C&olumns:"), Qt::AlignLeft|Qt::AlignVCenter); m_columns->setRange(1, 10, 1, false); KSeparator *sep = new KSeparator(Qt::Horizontal, formatbox); - connect(m_columns, SIGNAL(valueChanged(int)), SLOT(slotColumnsChanged(int))); + connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int))); - m_prettypix = new QLabel(prettybox); - QWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); + m_prettypix = new TQLabel(prettybox); + TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); m_prettypix->setAlignment(Qt::AlignCenter); - QRadioButton *off = new QRadioButton(i18n("&Disabled"), prettybox); - QWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); - QRadioButton *on = new QRadioButton(i18n("&Enabled"), prettybox); - QWhatsThis::add(on, whatsThisPrettyprintButtonOnTextPage); - m_prettyprint = new QButtonGroup(prettybox); + QRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); + TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); + QRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); + TQWhatsThis::add(on, whatsThisPrettyprintButtonOnTextPage); + m_prettyprint = new TQButtonGroup(prettybox); m_prettyprint->hide(); m_prettyprint->insert(off, 0); m_prettyprint->insert(on, 1); m_prettyprint->setButton(0); - connect(m_prettyprint, SIGNAL(clicked(int)), SLOT(slotPrettyChanged(int))); + connect(m_prettyprint, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPrettyChanged(int))); slotPrettyChanged(0); m_margin = new MarginWidget(marginbox); - QWhatsThis::add(m_margin, whatsThisMarginsTextPage); + TQWhatsThis::add(m_margin, whatsThisMarginsTextPage); m_margin->setPageSize(595, 842); - QGridLayout *l0 = new QGridLayout(this, 2, 2, 0, 10); + QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 10); l0->addWidget(formatbox, 0, 0); l0->addWidget(prettybox, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); - QVBoxLayout *l1 = new QVBoxLayout(formatbox->layout(), 5); + QVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5); l1->addWidget(m_cpi); l1->addWidget(m_lpi); l1->addWidget(sep); l1->addWidget(m_columns); - QGridLayout *l2 = new QGridLayout(prettybox->layout(), 2, 2, 10); + QGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10); l2->addWidget(off, 0, 0); l2->addWidget(on, 1, 0); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); - QVBoxLayout *l3 = new QVBoxLayout(marginbox->layout(), 10); + QVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10); l3->addWidget(m_margin); } @@ -250,7 +250,7 @@ KPTextPage::~KPTextPage() { } -void KPTextPage::setOptions(const QMap<QString,QString>& opts) +void KPTextPage::setOptions(const TQMap<TQString,TQString>& opts) { QString value; @@ -296,22 +296,22 @@ void KPTextPage::setOptions(const QMap<QString,QString>& opts) m_margin->setCustomEnabled(marginset); } -void KPTextPage::getOptions(QMap<QString,QString>& opts, bool incldef) +void KPTextPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) { if (incldef || m_cpi->value() != 10) - opts["cpi"] = QString::number(m_cpi->value()); + opts["cpi"] = TQString::number(m_cpi->value()); if (incldef || m_lpi->value() != 6) - opts["lpi"] = QString::number(m_lpi->value()); + opts["lpi"] = TQString::number(m_lpi->value()); if (incldef || m_columns->value() != 1) - opts["columns"] = QString::number(m_columns->value()); + opts["columns"] = TQString::number(m_columns->value()); //if (m_margin->isCustomEnabled() || incldef) if (m_margin->isCustomEnabled()) { - opts["page-top"] = QString::number(( int )( m_margin->top()+0.5 )); - opts["page-bottom"] = QString::number(( int )( m_margin->bottom()+0.5 )); - opts["page-left"] = QString::number(( int )( m_margin->left()+0.5 )); - opts["page-right"] = QString::number(( int )( m_margin->right()+0.5 )); + opts["page-top"] = TQString::number(( int )( m_margin->top()+0.5 )); + opts["page-bottom"] = TQString::number(( int )( m_margin->bottom()+0.5 )); + opts["page-left"] = TQString::number(( int )( m_margin->left()+0.5 )); + opts["page-right"] = TQString::number(( int )( m_margin->right()+0.5 )); } else { diff --git a/kdeprint/cups/kptextpage.h b/kdeprint/cups/kptextpage.h index 72029f4af..b2550afa0 100644 --- a/kdeprint/cups/kptextpage.h +++ b/kdeprint/cups/kptextpage.h @@ -32,11 +32,11 @@ class KPTextPage : public KPrintDialogPage { Q_OBJECT public: - KPTextPage(DrMain *driver, QWidget *parent = 0, const char *name = 0); + KPTextPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0); ~KPTextPage(); - void setOptions(const QMap<QString,QString>& opts); - void getOptions(QMap<QString,QString>& opts, bool incldef = false); + void setOptions(const TQMap<TQString,TQString>& opts); + void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); protected slots: void slotPrettyChanged(int); |