diff options
Diffstat (limited to 'kdeprint/cups/cupsdconf2')
34 files changed, 134 insertions, 134 deletions
diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index d4f5b900f..325d3c7d5 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -36,10 +36,10 @@ AddressDialog::AddressDialog(TQWidget *parent, const char *name) type_->insertItem(i18n("Allow")); type_->insertItem(i18n("Deny")); - QLabel *l1 = new TQLabel(i18n("Type:"), w); - QLabel *l2 = new TQLabel(i18n("Address:"), w); + TQLabel *l1 = new TQLabel(i18n("Type:"), w); + TQLabel *l2 = new TQLabel(i18n("Address:"), w); - QGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5); + TQGridLayout *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); diff --git a/kdeprint/cups/cupsdconf2/addressdialog.h b/kdeprint/cups/cupsdconf2/addressdialog.h index 5fb9125e6..7d241a080 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.h +++ b/kdeprint/cups/cupsdconf2/addressdialog.h @@ -35,8 +35,8 @@ public: static TQString editAddress(const TQString& s, TQWidget *parent = 0); private: - QComboBox *type_; - QLineEdit *address_; + TQComboBox *type_; + TQLineEdit *address_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/browsedialog.cpp b/kdeprint/cups/cupsdconf2/browsedialog.cpp index 0856df11a..4cfc6099c 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/kdeprint/cups/cupsdconf2/browsedialog.cpp @@ -33,7 +33,7 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new TQWidget(this); + TQWidget *dummy = new TQWidget(this); setMainWidget(dummy); type_ = new TQComboBox(dummy); from_ = new TQLineEdit(dummy); @@ -44,11 +44,11 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) type_->insertItem(i18n("Relay")); type_->insertItem(i18n("Poll")); - QLabel *l1 = new TQLabel(i18n("Type:"), dummy); - QLabel *l2 = new TQLabel(i18n("From:"), dummy); - QLabel *l3 = new TQLabel(i18n("To:"), dummy); + TQLabel *l1 = new TQLabel(i18n("Type:"), dummy); + TQLabel *l2 = new TQLabel(i18n("From:"), dummy); + TQLabel *l3 = new TQLabel(i18n("To:"), dummy); - QGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5); + TQGridLayout *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); @@ -111,7 +111,7 @@ TQString BrowseDialog::editAddress(const TQString& s, TQWidget *parent, CupsdCon { BrowseDialog dlg(parent); dlg.setInfos(conf); - QStringList l = TQStringList::split(TQRegExp("\\s"), s, false); + TQStringList l = TQStringList::split(TQRegExp("\\s"), s, false); if (l.count() > 1) { if (l[0] == "Send") dlg.type_->setCurrentItem(0); diff --git a/kdeprint/cups/cupsdconf2/browsedialog.h b/kdeprint/cups/cupsdconf2/browsedialog.h index 97d71e6dd..e75357e1d 100644 --- a/kdeprint/cups/cupsdconf2/browsedialog.h +++ b/kdeprint/cups/cupsdconf2/browsedialog.h @@ -42,8 +42,8 @@ protected slots: void slotTypeChanged(int); private: - QComboBox *type_; - QLineEdit *from_, *to_; + TQComboBox *type_; + TQLineEdit *from_, *to_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 7c2b6276a..edd55d30e 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -70,10 +70,10 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) TQLabel *l5 = new TQLabel(i18n("Browse order:"), this); TQLabel *l6 = new TQLabel(i18n("Browse options:"), this); - QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); - QHBoxLayout *m2 = new TQHBoxLayout(0, 0, 10); + TQHBoxLayout *m2 = new TQHBoxLayout(0, 0, 10); m1->addMultiCellLayout(m2, 0, 0, 0, 1); m2->addWidget(browsing_); m2->addWidget(cups_); @@ -90,7 +90,7 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) m1->addWidget(browsetimeout_, 3, 1); m1->addWidget(browseaddresses_, 4, 1); m1->addWidget(browseorder_, 5, 1); - QGridLayout *m3 = new TQGridLayout(0, 2, 2, 0, 5); + TQGridLayout *m3 = new TQGridLayout(0, 2, 2, 0, 5); m1->addLayout(m3, 6, 1); m3->addWidget(useimplicitclasses_, 0, 0); m3->addWidget(useanyclasses_, 0, 1); @@ -127,8 +127,8 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; browsing_->setChecked(conf_->browsing_); - cups_->setChecked(conf_->browseprotocols_.findIndex("CUPS") != -1); - slp_->setChecked(conf_->browseprotocols_.findIndex("SLP") != -1); + cups_->setChecked(conf_->browseprotocols_.tqfindIndex("CUPS") != -1); + slp_->setChecked(conf_->browseprotocols_.tqfindIndex("SLP") != -1); browseport_->setValue(conf_->browseport_); browseinterval_->setValue(conf_->browseinterval_); browsetimeout_->setValue(conf_->browsetimeout_); @@ -145,7 +145,7 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&) bool CupsdBrowsingPage::saveConfig(CupsdConf *conf, TQString&) { conf->browsing_ = browsing_->isChecked(); - QStringList l; + TQStringList l; if (cups_->isChecked()) l << "CUPS"; if (slp_->isChecked()) l << "SLP"; conf->browseprotocols_ = l; @@ -196,7 +196,7 @@ void CupsdBrowsingPage::slotEdit(int index) void CupsdBrowsingPage::slotDefaultList() { browseaddresses_->clear(); - QStringList l; + TQStringList l; l << "Send 255.255.255.255"; browseaddresses_->insertItems(l); } diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h index 61bf8dd4f..6658e39cd 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h @@ -47,9 +47,9 @@ protected slots: private: KIntNumInput *browseport_, *browseinterval_, *browsetimeout_; EditList *browseaddresses_; - QComboBox *browseorder_; - QCheckBox *browsing_, *cups_, *slp_; - QCheckBox *useimplicitclasses_, *hideimplicitmembers_, *useshortnames_, *useanyclasses_; + TQComboBox *browseorder_; + TQCheckBox *browsing_, *cups_, *slp_; + TQCheckBox *useimplicitclasses_, *hideimplicitmembers_, *useshortnames_, *useanyclasses_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index 62c9a0c6f..4813f504d 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -114,7 +114,7 @@ bool CupsdComment::loadComments() { comments_.setAutoDelete(true); comments_.clear(); - QFile f(locate("data", "kdeprint/cupsd.conf.template")); + TQFile f(locate("data", "kdeprint/cupsd.conf.template")); if (f.exists() && f.open(IO_ReadOnly)) { Comment *comm; diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index 535866e4f..72e76edca 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -100,7 +100,7 @@ CupsdConf::CupsdConf() maxrequestsize_ = "0"; clienttimeout_ = 300; // listenaddresses_ - QString logdir = findDir(TQStringList("/var/log/cups") + TQString logdir = findDir(TQStringList("/var/log/cups") << "/var/spool/cups/log" << "/var/cups/log"); accesslog_ = logdir+"/access_log"; @@ -139,12 +139,12 @@ CupsdConf::~CupsdConf() bool CupsdConf::loadFromFile(const TQString& filename) { - QFile f(filename); + TQFile f(filename); if (!f.exists() || !f.open(IO_ReadOnly)) return false; else { - QTextStream t(&f); - QString line; + TQTextStream t(&f); + TQString line; bool done(false), value(true); while (!done && value) { @@ -175,12 +175,12 @@ bool CupsdConf::loadFromFile(const TQString& filename) bool CupsdConf::saveToFile(const TQString& filename) { - QFile f(filename); + TQFile f(filename); if (!f.open(IO_WriteOnly)) return false; else { - QTextStream t(&f); + TQTextStream t(&f); t << comments_["header"] << endl; t << "# Server" << endl << endl; @@ -448,7 +448,7 @@ bool CupsdConf::saveToFile(const TQString& filename) if (browsing_) t << "BrowseShortNames " << (useshortnames_ ? "Yes" : "No") << endl; t << endl << "# Unknown" << endl; - for (TQValueList< QPair<TQString,TQString> >::ConstIterator it=unknown_.begin(); it!=unknown_.end(); ++it) + for (TQValueList< TQPair<TQString,TQString> >::ConstIterator it=unknown_.begin(); it!=unknown_.end(); ++it) t << (*it).first << " " << (*it).second << endl; return true; @@ -457,7 +457,7 @@ bool CupsdConf::saveToFile(const TQString& filename) bool CupsdConf::parseLocation(CupsLocation *location, TQTextStream& file) { - QString line; + TQString line; bool done(false); bool value(true); while (!done && value) @@ -520,7 +520,7 @@ bool CupsdConf::parseOption(const TQString& line) else if (keyword == "browsing") browsing_ = (value.lower() != "off"); else if (keyword == "classification") { - QString cl = value.lower(); + TQString cl = value.lower(); if (cl == "none") classification_ = CLASS_NONE; else if (cl == "classified") classification_ = CLASS_CLASSIFIED; else if (cl == "confidential") classification_ = CLASS_CONFIDENTIAL; @@ -600,7 +600,7 @@ bool CupsdConf::parseOption(const TQString& line) else { // unrecognized option - unknown_ << QPair<TQString,TQString>(keyword, value); + unknown_ << TQPair<TQString,TQString>(keyword, value); } return true; } @@ -609,7 +609,7 @@ bool CupsdConf::loadAvailableResources() { KConfig conf("kdeprintrc"); conf.setGroup("CUPS"); - QString host = conf.readEntry("Host",cupsServer()); + TQString host = conf.readEntry("Host",cupsServer()); int port = conf.readNumEntry("Port",ippPort()); http_t *http_ = httpConnect(host.local8Bit(),port); @@ -633,7 +633,7 @@ bool CupsdConf::loadAvailableResources() request_ = cupsDoRequest(http_, request_, "/printers/"); if (request_) { - QString name; + TQString name; int type(0); ipp_attribute_t *attr = request_->attrs; while (attr) @@ -662,7 +662,7 @@ bool CupsdConf::loadAvailableResources() request_ = cupsDoRequest(http_, request_, "/classes/"); if (request_) { - QString name; + TQString name; int type(0); ipp_attribute_t *attr = request_->attrs; while (attr) @@ -717,7 +717,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc) bool CupsLocation::parseResource(const TQString& line) { - QString str = line.simplifyWhiteSpace(); + TQString str = line.simplifyWhiteSpace(); int p1 = line.tqfind(' '), p2 = line.tqfind('>'); if (p1 != -1 && p2 != -1) { @@ -826,7 +826,7 @@ int CupsResource::typeFromPath(const TQString& path) TQString CupsResource::textToPath(const TQString& text) { - QString path("/"); + TQString path("/"); if (text == i18n("Administration")) path = "/admin"; else if (text == i18n("All printers")) path = "/printers"; else if (text == i18n("All classes")) path = "/classes"; @@ -847,7 +847,7 @@ TQString CupsResource::textToPath(const TQString& text) TQString CupsResource::pathToText(const TQString& path) { - QString text(i18n("Base", "Root")); + TQString text(i18n("Base", "Root")); if (path == "/admin") text = i18n("Administration"); else if (path == "/printers") text = i18n("All printers"); else if (path == "/classes") text = i18n("All classes"); diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.h b/kdeprint/cups/cupsdconf2/cupsdconf.h index e58e52b31..33a2ecd79 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.h +++ b/kdeprint/cups/cupsdconf2/cupsdconf.h @@ -64,8 +64,8 @@ struct CupsdConf static CupsdConf *unique_; // Server - QString servername_; - QString serveradmin_; + TQString servername_; + TQString serveradmin_; int classification_; TQString otherclassname_; bool classoverride_; @@ -138,7 +138,7 @@ struct CupsdConf CupsdComment comments_; // unrecognized options - TQValueList< QPair<TQString,TQString> > unknown_; + TQValueList< TQPair<TQString,TQString> > unknown_; }; struct CupsLocation @@ -150,14 +150,14 @@ struct CupsLocation bool parseResource(const TQString& line); CupsResource *resource_; - QString resourcename_; + TQString resourcename_; int authtype_; int authclass_; - QString authname_; + TQString authname_; int encryption_; int satisfy_; int order_; - QStringList addresses_; + TQStringList addresses_; }; struct CupsResource @@ -168,8 +168,8 @@ struct CupsResource void setPath(const TQString& path); int type_; - QString path_; - QString text_; + TQString path_; + TQString text_; static TQString textToPath(const TQString& text); static TQString pathToText(const TQString& path); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 50f8a3858..8dfa9c41a 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -50,7 +50,7 @@ #include <cups/cups.h> static bool dynamically_loaded = false; -static QString pass_string; +static TQString pass_string; extern "C" { @@ -70,15 +70,15 @@ extern "C" int getServerPid() { - QDir dir("/proc",TQString::null,TQDir::Name,TQDir::Dirs); + TQDir 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; - QFile f("/proc/" + dir[i] + "/cmdline"); + TQFile f("/proc/" + dir[i] + "/cmdline"); if (f.exists() && f.open(IO_ReadOnly)) { - QTextStream t(&f); - QString line; + TQTextStream t(&f); + TQString line; t >> line; f.close(); if (line.right(5) == "cupsd" || @@ -92,8 +92,8 @@ int getServerPid() const char* getPassword(const char*) { - QString user(cupsUser()); - QString pass; + TQString user(cupsUser()); + TQString pass; if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) { @@ -142,7 +142,7 @@ void CupsdDialog::addConfPage(CupsdPage *page) KIcon::SizeMedium ); - QVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon); + TQVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon); page->reparent(box, TQPoint(0,0)); pagelist_.append(page); } @@ -177,15 +177,15 @@ bool CupsdDialog::setConfigFile(const TQString& filename) if (conf_->unknown_.count() > 0) { // there were some unknown options, warn the user - QString msg; - for (TQValueList< QPair<TQString,TQString> >::ConstIterator it=conf_->unknown_.begin(); it!=conf_->unknown_.end(); ++it) + TQString msg; + for (TQValueList< TQPair<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>"); KMessageBox::sorry(this, msg, i18n("Unrecognized Options")); } bool ok(true); - QString msg; + TQString msg; for (pagelist_.first();pagelist_.current() && ok;pagelist_.next()) ok = pagelist_.current()->loadConfig(conf_, msg); if (!ok) @@ -227,7 +227,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString cupsSetPasswordCB(getPassword); // load config file from server - QString fn(filename); + TQString fn(filename); if (fn.isEmpty()) { fn = cupsGetConf(); @@ -240,7 +240,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString // check read state (only if needed) if (!fn.isEmpty()) { - QFileInfo fi(fn); + TQFileInfo fi(fn); if (!fi.exists() || !fi.isReadable() || !fi.isWritable()) errormsg = i18n("Internal error: file '%1' not readable/writable!").arg(fn); // check file size @@ -260,7 +260,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { - QCString encodedFn = TQFile::encodeName(fn); + TQCString encodedFn = TQFile::encodeName(fn); if (!needUpload) KMessageBox::information(parent, i18n("The config file has not been uploaded to the " @@ -289,7 +289,7 @@ void CupsdDialog::slotOk() if (conf_ && !filename_.isEmpty()) { // try to save the file bool ok(true); - QString msg; + TQString msg; CupsdConf newconf_; for (pagelist_.first();pagelist_.current() && ok;pagelist_.next()) ok = pagelist_.current()->saveConfig(&newconf_, msg); @@ -328,18 +328,18 @@ int CupsdDialog::serverOwner() int pid = getServerPid(); if (pid > 0) { - QString str; + TQString str; str.sprintf("/proc/%d/status",pid); - QFile f(str); + TQFile f(str); if (f.exists() && f.open(IO_ReadOnly)) { - QTextStream t(&f); + TQTextStream t(&f); while (!t.eof()) { str = t.readLine(); if (str.tqfind("Uid:",0,false) == 0) { - QStringList list = TQStringList::split('\t', str, false); + TQStringList list = TQStringList::split('\t', str, false); if (list.count() >= 2) { bool ok; diff --git a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp index 75b979d3d..05d8314e5 100644 --- a/kdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -51,7 +51,7 @@ CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name) TQLabel *l6 = new TQLabel(i18n("Server files:"), this); TQLabel *l7 = new TQLabel(i18n("Temporary files:"), this); - QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index b8458c10c..a47fae05b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -51,7 +51,7 @@ CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name) TQLabel *l3 = new TQLabel(i18n("RIP cache:"), this); TQLabel *l4 = new TQLabel(i18n("Filter limit:"), this); - QGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); m1->setRowStretch(4, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); diff --git a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h index 9e524897e..1e32e92bd 100644 --- a/kdeprint/cups/cupsdconf2/cupsdfilterpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdfilterpage.h @@ -37,7 +37,7 @@ public: void setInfos(CupsdConf*); private: - QLineEdit *user_, *group_; + TQLineEdit *user_, *group_; KIntNumInput *filterlimit_; SizeWidget *ripcache_; }; diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 52d9eaf15..8cb20679f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -56,7 +56,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) TQLabel *l2 = new TQLabel(i18n("Max jobs per printer:"), this); TQLabel *l3 = new TQLabel(i18n("Max jobs per user:"), this); - QGridLayout *m1 = new TQGridLayout(this, 7, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 7, 2, 10, 7); m1->setRowStretch(6, 1); m1->setColStretch(1, 1); m1->addWidget(keepjobhistory_, 0, 1); diff --git a/kdeprint/cups/cupsdconf2/cupsdjobspage.h b/kdeprint/cups/cupsdconf2/cupsdjobspage.h index 0e5c38573..0b6f5dbf3 100644 --- a/kdeprint/cups/cupsdconf2/cupsdjobspage.h +++ b/kdeprint/cups/cupsdconf2/cupsdjobspage.h @@ -41,7 +41,7 @@ protected slots: private: KIntNumInput *maxjobs_, *maxjobsperprinter_, *maxjobsperuser_; - QCheckBox *keepjobhistory_, *keepjobfiles_, *autopurgejobs_; + TQCheckBox *keepjobhistory_, *keepjobfiles_, *autopurgejobs_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp index 032af5526..f7de36783 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -63,7 +63,7 @@ CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name) loglevel_->setCurrentItem(2); - QGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); diff --git a/kdeprint/cups/cupsdconf2/cupsdlogpage.h b/kdeprint/cups/cupsdconf2/cupsdlogpage.h index 068b4aa3d..bad889632 100644 --- a/kdeprint/cups/cupsdconf2/cupsdlogpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdlogpage.h @@ -37,7 +37,7 @@ public: private: QDirLineEdit *accesslog_, *errorlog_, *pagelog_; - QComboBox *loglevel_; + TQComboBox *loglevel_; SizeWidget *maxlogsize_; }; diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index 3cc360150..c56d5e145 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -71,7 +71,7 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) TQLabel *l5 = new TQLabel(i18n("Client timeout:"), this); TQLabel *l6 = new TQLabel(i18n("Listen to:"), this); - QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -135,7 +135,7 @@ void CupsdNetworkPage::setInfos(CupsdConf *conf) void CupsdNetworkPage::slotAdd() { - QString s = PortDialog::newListen(this, conf_); + TQString s = PortDialog::newListen(this, conf_); if (!s.isEmpty()) listen_->insertItem(s); } @@ -151,7 +151,7 @@ void CupsdNetworkPage::slotEdit(int index) void CupsdNetworkPage::slotDefaultList() { listen_->clear(); - QStringList l; + TQStringList l; l << "Listen *:631"; listen_->insertItems(l); } diff --git a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h index f93248018..62ed56626 100644 --- a/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h @@ -46,8 +46,8 @@ protected slots: private: KIntNumInput *keepalivetimeout_, *maxclients_, *clienttimeout_; - QComboBox *hostnamelookup_; - QCheckBox *keepalive_; + TQComboBox *hostnamelookup_; + TQCheckBox *keepalive_; EditList *listen_; SizeWidget *maxrequestsize_; }; diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 0bf290fb9..39da4d383 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -52,7 +52,7 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) TQLabel *l4 = new TQLabel(i18n("Encryption key:"), this); TQLabel *l5 = new TQLabel(i18n("Locations:"), this); - QGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h index de3ff9b8a..5f20b2dcf 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h @@ -46,7 +46,7 @@ protected slots: void slotDeleted(int); private: - QLineEdit *remoteroot_, *systemgroup_; + TQLineEdit *remoteroot_, *systemgroup_; QDirLineEdit *encryptcert_, *encryptkey_; EditList *locations_; diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp index cc0804f5b..bd99546ae 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -94,7 +94,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) printcapformat_->setCurrentItem(0); classChanged(0); - QGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); + TQGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); m1->setRowStretch(8, 1); m1->setColStretch(1, 1); m1->addWidget(l1, 0, 0, Qt::AlignRight); @@ -110,13 +110,13 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) m1->addWidget(language_, 5, 1); m1->addWidget(printcap_, 6, 1); m1->addWidget(printcapformat_, 7, 1); - QHBoxLayout *m2 = new TQHBoxLayout(0, 0, 5); + TQHBoxLayout *m2 = new TQHBoxLayout(0, 0, 5); m1->addLayout(m2, 2, 1); m2->addWidget(classification_); m2->addWidget(otherclassname_); - QWidget *w = new TQWidget(this); + TQWidget *w = new TQWidget(this); w->setFixedWidth(20); - QHBoxLayout *m3 = new TQHBoxLayout(0, 0, 0); + TQHBoxLayout *m3 = new TQHBoxLayout(0, 0, 0); m1->addLayout(m3, 3, 1); m3->addWidget(w); m3->addWidget(classoverride_); diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.h b/kdeprint/cups/cupsdconf2/cupsdserverpage.h index 212e6c5e5..50164f110 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.h @@ -41,9 +41,9 @@ protected slots: void classChanged(int); private: - QLineEdit *servername_, *serveradmin_, *language_, *printcap_, *otherclassname_; - QComboBox *classification_, *charset_, *printcapformat_; - QCheckBox *classoverride_; + TQLineEdit *servername_, *serveradmin_, *language_, *printcap_, *otherclassname_; + TQComboBox *classification_, *charset_, *printcapformat_; + TQCheckBox *classoverride_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index 754e7cbd5..a0a34db84 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -32,20 +32,20 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) setPageLabel(i18n("Welcome")); setPixmap("go"); - QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 10); - QHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10); + TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 10); + TQHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10); main_->addLayout(sub_); - QLabel *cupslogo_ = new TQLabel(this); - QString logopath = locate("data", TQString("kdeprint/cups_logo.png")); + TQLabel *cupslogo_ = new TQLabel(this); + TQString logopath = locate("data", TQString("kdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); cupslogo_->tqsetAlignment(Qt::AlignCenter); - QLabel *kupslogo_ = new TQLabel(this); + TQLabel *kupslogo_ = new TQLabel(this); logopath = locate("data", TQString("kdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); kupslogo_->tqsetAlignment(Qt::AlignCenter); - QLabel *helptxt_ = new TQLabel(this); + TQLabel *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 " diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index a91fdc3d3..d0420be32 100644 --- a/kdeprint/cups/cupsdconf2/editlist.cpp +++ b/kdeprint/cups/cupsdconf2/editlist.cpp @@ -81,7 +81,7 @@ void EditList::setText(int index, const TQString& s) { if (list_->text(index) != s) { - QListBoxItem *it = list_->findItem(s, Qt::ExactMatch); + TQListBoxItem *it = list_->tqfindItem(s, TQt::ExactMatch); if (!it) list_->changeItem(s, index); else @@ -97,13 +97,13 @@ void EditList::clear() void EditList::insertItem(const TQString& s) { - if (!list_->findItem(s, Qt::ExactMatch)) + if (!list_->tqfindItem(s, TQt::ExactMatch)) list_->insertItem(s); } void EditList::insertItem(const TQPixmap& icon, const TQString& s) { - if (!list_->findItem(s, Qt::ExactMatch)) + if (!list_->tqfindItem(s, TQt::ExactMatch)) list_->insertItem(icon, s); } diff --git a/kdeprint/cups/cupsdconf2/editlist.h b/kdeprint/cups/cupsdconf2/editlist.h index 9f4800c15..177cddceb 100644 --- a/kdeprint/cups/cupsdconf2/editlist.h +++ b/kdeprint/cups/cupsdconf2/editlist.h @@ -54,7 +54,7 @@ protected slots: private: KListBox *list_; - QPushButton *addbtn_, *editbtn_, *delbtn_, *defbtn_; + TQPushButton *addbtn_, *editbtn_, *delbtn_, *defbtn_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index d360d62e2..155d11388 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -35,7 +35,7 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new TQWidget(this); + TQWidget *dummy = new TQWidget(this); setMainWidget(dummy); resource_ = new TQComboBox(dummy); authtype_ = new TQComboBox(dummy); @@ -69,16 +69,16 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int))); connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - 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); + TQLabel *l1 = new TQLabel(i18n("Resource:"), dummy); + TQLabel *l2 = new TQLabel(i18n("Authentication:"), dummy); + TQLabel *l3 = new TQLabel(i18n("Class:"), dummy); + TQLabel *l4 = new TQLabel(i18n("Names:"), dummy); + TQLabel *l5 = new TQLabel(i18n("Encryption:"), dummy); + TQLabel *l6 = new TQLabel(i18n("Satisfy:"), dummy); + TQLabel *l7 = new TQLabel(i18n("ACL order:"), dummy); + TQLabel *l8 = new TQLabel(i18n("ACL addresses:"),dummy); - QGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5); + TQGridLayout *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); @@ -141,7 +141,7 @@ void LocationDialog::fillLocation(CupsLocation *loc) void LocationDialog::setLocation(CupsLocation *loc) { - int index = conf_->resources_.findRef(loc->resource_); + int index = conf_->resources_.tqfindRef(loc->resource_); resource_->setCurrentItem(index); authtype_->setCurrentItem(loc->authtype_); authclass_->setCurrentItem(loc->authclass_); diff --git a/kdeprint/cups/cupsdconf2/locationdialog.h b/kdeprint/cups/cupsdconf2/locationdialog.h index 03536adc8..26a4c43f8 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.h +++ b/kdeprint/cups/cupsdconf2/locationdialog.h @@ -49,8 +49,8 @@ protected slots: void slotDefaultList(); private: - QComboBox *resource_, *authtype_, *authclass_, *encryption_, *satisfy_, *order_; - QLineEdit *authname_; + TQComboBox *resource_, *authtype_, *authclass_, *encryption_, *satisfy_, *order_; + TQLineEdit *authname_; EditList *addresses_; CupsdConf *conf_; }; diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index 184005c13..d3dd2f0a5 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -33,19 +33,19 @@ PortDialog::PortDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new TQWidget(this); + TQWidget *dummy = new TQWidget(this); setMainWidget(dummy); address_ = new TQLineEdit(dummy); port_ = new TQSpinBox(0, 9999, 1, dummy); port_->setValue(631); usessl_ = new TQCheckBox(i18n("Use SSL encryption"), dummy); - QLabel *l1 = new TQLabel(i18n("Address:"), dummy); - QLabel *l2 = new TQLabel(i18n("Port:"), dummy); + TQLabel *l1 = new TQLabel(i18n("Address:"), dummy); + TQLabel *l2 = new TQLabel(i18n("Port:"), dummy); - QVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); - QGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); - m1->addLayout(m2); + TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); + TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); + m1->addLayout(TQT_TQLAYOUT(m2)); m2->addWidget(l1, 0, 0, Qt::AlignRight); m2->addWidget(l2, 1, 0, Qt::AlignRight); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); @@ -97,7 +97,7 @@ TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf * if (p != -1) { dlg.usessl_->setChecked(s.left(p).startsWith("SSL")); - QString addr = s.mid(p+1).stripWhiteSpace(); + TQString addr = s.mid(p+1).stripWhiteSpace(); int p1 = addr.tqfind(':'); if (p1 == -1) { diff --git a/kdeprint/cups/cupsdconf2/portdialog.h b/kdeprint/cups/cupsdconf2/portdialog.h index f57b4cd3d..44b91d134 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.h +++ b/kdeprint/cups/cupsdconf2/portdialog.h @@ -38,9 +38,9 @@ public: static TQString editListen(const TQString& s, TQWidget *parent = 0, CupsdConf *conf = 0); private: - QLineEdit *address_; - QSpinBox *port_; - QCheckBox *usessl_; + TQLineEdit *address_; + TQSpinBox *port_; + TQCheckBox *usessl_; }; #endif diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp index 66df30652..46e70a41f 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -33,7 +33,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) button_->setPixmap(SmallIcon("fileopen")); connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); - QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); + TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); main_->addWidget(edit_); main_->addWidget(button_); @@ -56,7 +56,7 @@ TQString QDirLineEdit::url() void QDirLineEdit::buttonClicked() { - QString dirname; + TQString dirname; if (!fileedit_) dirname = KFileDialog::getExistingDirectory(edit_->text(), this); else diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.h b/kdeprint/cups/cupsdconf2/qdirlineedit.h index 9d4a03b34..85e9603f8 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.h @@ -41,8 +41,8 @@ private slots: void buttonClicked(); private: - QLineEdit *edit_; - QPushButton *button_; + TQLineEdit *edit_; + TQPushButton *button_; bool fileedit_; }; diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 7b96d4ef9..b473d2a61 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -44,10 +44,10 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) 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->tqsizeHint().height()*2)); + m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2)); - QHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); - QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); + TQHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); + TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); l0->addWidget(m_view); l0->addLayout(l1); l1->addWidget(m_add); @@ -68,8 +68,8 @@ void QDirMultiLineEdit::setURLs(const TQStringList& urls) TQStringList QDirMultiLineEdit::urls() { - QListViewItem *item = m_view->firstChild(); - QStringList l; + TQListViewItem *item = m_view->firstChild(); + TQStringList l; while (item) { l << item->text(0); @@ -80,20 +80,20 @@ TQStringList QDirMultiLineEdit::urls() void QDirMultiLineEdit::addURL(const TQString& url) { - QListViewItem *item = new TQListViewItem(m_view, url); + TQListViewItem *item = new TQListViewItem(m_view, url); item->setRenameEnabled(0, true); } void QDirMultiLineEdit::slotAddClicked() { - QString dirname = KFileDialog::getExistingDirectory(TQString::null, this); + TQString dirname = KFileDialog::getExistingDirectory(TQString::null, this); if (!dirname.isEmpty()) addURL(dirname); } void QDirMultiLineEdit::slotRemoveClicked() { - QListViewItem *item = m_view->currentItem(); + TQListViewItem *item = m_view->currentItem(); if (item) { delete item; diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h index 66586d37f..f39293665 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -47,7 +47,7 @@ private slots: private: KListView *m_view; - QPushButton *m_add, *m_remove; + TQPushButton *m_add, *m_remove; }; #endif |