From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/cups/cupsdconf2/addressdialog.cpp | 2 +- kdeprint/cups/cupsdconf2/cups-util.c | 2 +- kdeprint/cups/cupsdconf2/cupsd.conf.template | 6 ++-- kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp | 4 +-- kdeprint/cups/cupsdconf2/cupsdcomment.cpp | 8 +++--- kdeprint/cups/cupsdconf2/cupsdconf.cpp | 40 +++++++++++++------------- kdeprint/cups/cupsdconf2/cupsddialog.cpp | 4 +-- kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp | 2 +- kdeprint/cups/cupsdconf2/cupsdserverpage.cpp | 4 +-- kdeprint/cups/cupsdconf2/cupsdsplash.cpp | 4 +-- kdeprint/cups/cupsdconf2/editlist.cpp | 6 ++-- kdeprint/cups/cupsdconf2/locationdialog.cpp | 2 +- kdeprint/cups/cupsdconf2/portdialog.cpp | 4 +-- kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 2 +- kdeprint/cups/cupsdconf2/sizewidget.cpp | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-) (limited to 'kdeprint/cups/cupsdconf2') diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index 1811abf68..d4f5b900f 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -76,7 +76,7 @@ TQString AddressDialog::newAddress(TQWidget *parent) TQString AddressDialog::editAddress(const TQString& addr, TQWidget *parent) { AddressDialog dlg(parent); - int p = addr.find(' '); + int p = addr.tqfind(' '); if (p != -1) { dlg.type_->setCurrentItem(addr.left(p).lower() == "deny" ? 1 : 0); diff --git a/kdeprint/cups/cupsdconf2/cups-util.c b/kdeprint/cups/cupsdconf2/cups-util.c index cb6ddcf92..f568d1bdc 100644 --- a/kdeprint/cups/cupsdconf2/cups-util.c +++ b/kdeprint/cups/cupsdconf2/cups-util.c @@ -250,7 +250,7 @@ cupsGetConf(void) return (filename); } -int /* O - Status of operation */ +int /* O - tqStatus of operation */ cupsPutConf(const char *name) /* I - Name of the config file to send */ { int fd; /* PPD file */ diff --git a/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template index ae1a4c362..bd8f5f573 100644 --- a/kdeprint/cups/cupsdconf2/cupsd.conf.template +++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template @@ -450,7 +450,7 @@ $$ # default browsing information is broadcast to all active interfaces.

#

# Note: HP-UX 10.20 and earlier do not properly handle broadcast unless -# you have a Class A, B, C, or D netmask (i.e. no CIDR support).

+# you have a Class A, B, C, or D nettqmask (i.e. no CIDR support).

#

# ex: x.y.z.255, x.y.255.255

$$ @@ -462,10 +462,10 @@ $$ %%browseallow # Browse allow/deny (BrowseAllow/BrowseDeny) #

-# BrowseAllow: specifies an address mask to allow for incoming browser +# BrowseAllow: specifies an address tqmask to allow for incoming browser # packets. The default is to allow packets from all addresses.

#

-# BrowseDeny: specifies an address mask to deny for incoming browser +# BrowseDeny: specifies an address tqmask to deny for incoming browser # packets. The default is to deny packets from no addresses.

#

# Both "BrowseAllow" and "BrowseDeny" accept the following notations for diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 7c2b6276a..a93a05e5e 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -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_); diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index 43847299b..fbef47b16 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -27,7 +27,7 @@ TQString Comment::comment() { TQString str = comment_; - str.replace(TQRegExp("<[^>]*>"), ""); + str.tqreplace(TQRegExp("<[^>]*>"), ""); str += ("#\n" + example_); return str; } @@ -35,7 +35,7 @@ TQString Comment::comment() TQString Comment::toolTip() { TQString str = comment_; - str.replace(TQRegExp("^#[\\s]*"), "").replace(TQRegExp("\n#[\\s]*"), "\n"); + str.tqreplace(TQRegExp("^#[\\s]*"), "").tqreplace(TQRegExp("\n#[\\s]*"), "\n"); return i18n("Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)", str.utf8()); } @@ -92,7 +92,7 @@ TQString CupsdComment::comment(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.find(key); + Comment *comm = comments_.tqfind(key); if (comm) return comm->comment(); } @@ -103,7 +103,7 @@ TQString CupsdComment::toolTip(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.find(key); + Comment *comm = comments_.tqfind(key); if (comm) return comm->toolTip(); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index f500d219c..3742656a5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -31,7 +31,7 @@ #include #include -TQString findDir(const TQStringList& list) +TQString tqfindDir(const TQStringList& list) { for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) if (TQFile::exists(*it)) @@ -42,7 +42,7 @@ TQString findDir(const TQStringList& list) void splitSizeSpec(const TQString& s, int& sz, int& suff) { - int p = s.find(TQRegExp("\\D")); + int p = s.tqfind(TQRegExp("\\D")); sz = s.mid(0, p).toInt(); if (p != -1) { @@ -61,21 +61,21 @@ void splitSizeSpec(const TQString& s, int& sz, int& suff) CupsdConf::CupsdConf() { - // start by trying to find CUPS directories (useful later) - datadir_ = findDir(TQStringList("/usr/share/cups") + // start by trying to tqfind CUPS directories (useful later) + datadir_ = tqfindDir(TQStringList("/usr/share/cups") << "/usr/local/share/cups" << "/opt/share/cups" << "/opt/local/share/cups"); - documentdir_ = findDir(TQStringList(datadir_+"/doc-root") + documentdir_ = tqfindDir(TQStringList(datadir_+"/doc-root") << datadir_.left(datadir_.length()-5)+"/doc/cups"); //fontpath_ << (datadir_+"/fonts"); - requestdir_ = findDir(TQStringList("/var/spool/cups") + requestdir_ = tqfindDir(TQStringList("/var/spool/cups") << "/var/cups"); - serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups") + serverbin_ = tqfindDir(TQStringList("/usr/lib" KDELIBSUFF "/cups") << "/usr/local/lib" KDELIBSUFF "/cups" << "/opt/lib" KDELIBSUFF "/cups" << "/opt/local/lib" KDELIBSUFF "/cups"); - serverfiles_ = findDir(TQStringList("/etc/cups") + serverfiles_ = tqfindDir(TQStringList("/etc/cups") << "/usr/local/etc/cups"); tmpfiles_ = requestdir_+"/tmp"; @@ -100,7 +100,7 @@ CupsdConf::CupsdConf() maxrequestsize_ = "0"; clienttimeout_ = 300; // listenaddresses_ - QString logdir = findDir(TQStringList("/var/log/cups") + QString logdir = tqfindDir(TQStringList("/var/log/cups") << "/var/spool/cups/log" << "/var/cups/log"); accesslog_ = logdir+"/access_log"; @@ -484,7 +484,7 @@ bool CupsdConf::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.find(' ')) != -1) + if ((p=l.tqfind(' ')) != -1) { keyword = l.left(p).lower(); value = l.mid(p+1); @@ -508,7 +508,7 @@ bool CupsdConf::parseOption(const TQString& line) { browseprotocols_.clear(); TQStringList prots = TQStringList::split(TQRegExp("\\s"), value, false); - if (prots.find("all") != prots.end()) + if (prots.tqfind("all") != prots.end()) browseprotocols_ << "CUPS" << "SLP"; else for (TQStringList::ConstIterator it=prots.begin(); it!=prots.end(); ++it) @@ -718,7 +718,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc) bool CupsLocation::parseResource(const TQString& line) { QString str = line.simplifyWhiteSpace(); - int p1 = line.find(' '), p2 = line.find('>'); + int p1 = line.tqfind(' '), p2 = line.tqfind('>'); if (p1 != -1 && p2 != -1) { resourcename_ = str.mid(p1+1,p2-p1-1); @@ -732,7 +732,7 @@ bool CupsLocation::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.find(' ')) != -1) + if ((p=l.tqfind(' ')) != -1) { keyword = l.left(p).lower(); value = l.mid(p+1); @@ -760,7 +760,7 @@ bool CupsLocation::parseOption(const TQString& line) else if (keyword == "authgroupname") authname_ = value; else if (keyword == "require") { - int p = value.find(' '); + int p = value.tqfind(' '); if (p != -1) { authname_ = value.mid(p+1); @@ -810,8 +810,8 @@ 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; - else if (text.find(i18n("Class")) == 0) return RESOURCE_CLASS; - else if (text.find(i18n("Printer")) == 0) return RESOURCE_PRINTER; + else if (text.tqfind(i18n("Class")) == 0) return RESOURCE_CLASS; + else if (text.tqfind(i18n("Printer")) == 0) return RESOURCE_PRINTER; else return RESOURCE_PRINTER; } @@ -832,12 +832,12 @@ TQString CupsResource::textToPath(const TQString& text) else if (text == i18n("All classes")) path = "/classes"; else if (text == i18n("Print jobs")) path = "/jobs"; else if (text == i18n("Base", "Root")) path = "/"; - else if (text.find(i18n("Printer")) == 0) + else if (text.tqfind(i18n("Printer")) == 0) { path = "/printers/"; path.append(text.right(text.length()-i18n("Printer").length()-1)); } - else if (text.find(i18n("Class")) == 0) + else if (text.tqfind(i18n("Class")) == 0) { path = "/classes/"; path.append(text.right(text.length()-i18n("Class").length()-1)); @@ -853,13 +853,13 @@ TQString CupsResource::pathToText(const TQString& path) else if (path == "/classes") text = i18n("All classes"); else if (path == "/") text = i18n("Root"); else if (path == "/jobs") text = i18n("Print jobs"); - else if (path.find("/printers/") == 0) + else if (path.tqfind("/printers/") == 0) { text = i18n("Printer"); text.append(" "); text.append(path.right(path.length()-10)); } - else if (path.find("/classes/") == 0) + else if (path.tqfind("/classes/") == 0) { text = i18n("Class"); text.append(" "); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 8023aeef7..65d7aca0c 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -202,7 +202,7 @@ bool CupsdDialog::restartServer(TQString& msg) msg.truncate(0); if (serverPid <= 0) { - msg = i18n("Unable to find a running CUPS server"); + msg = i18n("Unable to tqfind a running CUPS server"); } else { @@ -337,7 +337,7 @@ int CupsdDialog::serverOwner() while (!t.eof()) { str = t.readLine(); - if (str.find("Uid:",0,false) == 0) + if (str.tqfind("Uid:",0,false) == 0) { QStringList list = TQStringList::split('\t', str, false); if (list.count() >= 2) diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 0bf290fb9..dc16f9b36 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -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?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to tqreplace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { index = locs_.at(); locs_.remove(); diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp index cc0804f5b..2ef255c76 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -29,7 +29,7 @@ #include -int findComboItem(TQComboBox *cb, const TQString& str) +int tqfindComboItem(TQComboBox *cb, const TQString& str) { for (int i=0; icount(); i++) if (cb->text(i) == str) @@ -133,7 +133,7 @@ bool CupsdServerPage::loadConfig(CupsdConf *conf, TQString&) classoverride_->setChecked(conf_->classoverride_); if (conf->classification_ == CLASS_OTHER) otherclassname_->setText(conf_->otherclassname_); - int index = findComboItem(charset_, conf_->charset_.upper()); + int index = tqfindComboItem(charset_, conf_->charset_.upper()); if (index != -1) charset_->setCurrentItem(index); language_->setText(conf_->language_); diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index 9dd7581a8..754e7cbd5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) 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); + cupslogo_->tqsetAlignment(Qt::AlignCenter); QLabel *kupslogo_ = new TQLabel(this); logopath = locate("data", TQString("kdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - kupslogo_->setAlignment(Qt::AlignCenter); + kupslogo_->tqsetAlignment(Qt::AlignCenter); QLabel *helptxt_ = new TQLabel(this); helptxt_->setText(i18n( "

This tool will help you to configure graphically the server of the CUPS printing system. " diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index a91fdc3d3..d65edaeff 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); + QListBoxItem *it = list_->tqfindItem(s, Qt::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, Qt::ExactMatch)) list_->insertItem(s); } void EditList::insertItem(const TQPixmap& icon, const TQString& s) { - if (!list_->findItem(s, Qt::ExactMatch)) + if (!list_->tqfindItem(s, Qt::ExactMatch)) list_->insertItem(icon, s); } diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index d360d62e2..1ea94d66f 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -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/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index e17e2b081..184005c13 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -93,12 +93,12 @@ TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf * { PortDialog dlg(parent); dlg.setInfos(conf); - int p = s.find(' '); + int p = s.tqfind(' '); if (p != -1) { dlg.usessl_->setChecked(s.left(p).startsWith("SSL")); QString addr = s.mid(p+1).stripWhiteSpace(); - int p1 = addr.find(':'); + int p1 = addr.tqfind(':'); if (p1 == -1) { dlg.address_->setText(addr); diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 1daca81cb..7b96d4ef9 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -44,7 +44,7 @@ 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->sizeHint().height()*2)); + m_view->setFixedHeight(QMAX(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); diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index d77fe5aaa..5920c30a9 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp @@ -45,7 +45,7 @@ SizeWidget::SizeWidget( TQWidget *parent, const char *name ) void SizeWidget::setSizeString( const TQString& sz ) { - int p = sz.find( TQRegExp( "\\D" ) ); + int p = sz.tqfind( TQRegExp( "\\D" ) ); m_size->setValue( sz.left( p ).toInt() ); switch( sz[ p ].latin1() ) { -- cgit v1.2.1