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/cupsdconf2 | |
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/cupsdconf2')
43 files changed, 664 insertions, 664 deletions
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 |