From 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/cups/cupsaddsmb2.cpp | 2 +- kdeprint/cups/cupsdconf2/addressdialog.cpp | 2 +- kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp | 4 ++-- kdeprint/cups/cupsdconf2/cupsdcomment.cpp | 4 ++-- kdeprint/cups/cupsdconf2/cupsdconf.cpp | 24 ++++++++++++------------ kdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 +- kdeprint/cups/cupsdconf2/editlist.cpp | 6 +++--- kdeprint/cups/cupsdconf2/locationdialog.cpp | 2 +- kdeprint/cups/cupsdconf2/portdialog.cpp | 4 ++-- kdeprint/cups/cupsdconf2/sizewidget.cpp | 2 +- kdeprint/cups/kcupsprinterimpl.cpp | 4 ++-- kdeprint/cups/kmcupsjobmanager.cpp | 14 +++++++------- kdeprint/cups/kmcupsmanager.cpp | 18 +++++++++--------- kdeprint/cups/kmwbanners.cpp | 8 ++++---- kdeprint/cups/kmwother.cpp | 4 ++-- kdeprint/cups/kphpgl2page.cpp | 4 ++-- kdeprint/cups/kptagspage.cpp | 2 +- kdeprint/cups/kptextpage.cpp | 2 +- 18 files changed, 54 insertions(+), 54 deletions(-) (limited to 'kdeprint/cups') diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index 2737cfd71..f12653cbb 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -231,7 +231,7 @@ void CupsAddSmb::checkActionStatus() m_status = (m_buffer.count() == 0); break; case MkDir: - m_status = (m_buffer.count() == 1 || m_buffer[1].tqfind("ERRfilexists") != -1); + m_status = (m_buffer.count() == 1 || m_buffer[1].find("ERRfilexists") != -1); break; case AddDriver: case AddPrinter: diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index 325d3c7d5..7e4f1bdd9 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.tqfind(' '); + int p = addr.find(' '); if (p != -1) { dlg.type_->setCurrentItem(addr.left(p).lower() == "deny" ? 1 : 0); diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index edd55d30e..5ae671092 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_.tqfindIndex("CUPS") != -1); - slp_->setChecked(conf_->browseprotocols_.tqfindIndex("SLP") != -1); + cups_->setChecked(conf_->browseprotocols_.findIndex("CUPS") != -1); + slp_->setChecked(conf_->browseprotocols_.findIndex("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 4813f504d..0e761378c 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -92,7 +92,7 @@ TQString CupsdComment::comment(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.tqfind(key); + Comment *comm = comments_.find(key); if (comm) return comm->comment(); } @@ -103,7 +103,7 @@ TQString CupsdComment::toolTip(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.tqfind(key); + Comment *comm = comments_.find(key); if (comm) return comm->toolTip(); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index 72e76edca..78ec9ec78 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -42,7 +42,7 @@ TQString findDir(const TQStringList& list) void splitSizeSpec(const TQString& s, int& sz, int& suff) { - int p = s.tqfind(TQRegExp("\\D")); + int p = s.find(TQRegExp("\\D")); sz = s.mid(0, p).toInt(); if (p != -1) { @@ -484,7 +484,7 @@ bool CupsdConf::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.tqfind(' ')) != -1) + if ((p=l.find(' ')) != -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.tqfind("all") != prots.end()) + if (prots.find("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) { TQString str = line.simplifyWhiteSpace(); - int p1 = line.tqfind(' '), p2 = line.tqfind('>'); + int p1 = line.find(' '), p2 = line.find('>'); 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.tqfind(' ')) != -1) + if ((p=l.find(' ')) != -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.tqfind(' '); + int p = value.find(' '); 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.tqfind(i18n("Class")) == 0) return RESOURCE_CLASS; - else if (text.tqfind(i18n("Printer")) == 0) return RESOURCE_PRINTER; + else if (text.find(i18n("Class")) == 0) return RESOURCE_CLASS; + else if (text.find(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.tqfind(i18n("Printer")) == 0) + else if (text.find(i18n("Printer")) == 0) { path = "/printers/"; path.append(text.right(text.length()-i18n("Printer").length()-1)); } - else if (text.tqfind(i18n("Class")) == 0) + else if (text.find(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.tqfind("/printers/") == 0) + else if (path.find("/printers/") == 0) { text = i18n("Printer"); text.append(" "); text.append(path.right(path.length()-10)); } - else if (path.tqfind("/classes/") == 0) + else if (path.find("/classes/") == 0) { text = i18n("Class"); text.append(" "); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 8dfa9c41a..fb59986c5 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -337,7 +337,7 @@ int CupsdDialog::serverOwner() while (!t.eof()) { str = t.readLine(); - if (str.tqfind("Uid:",0,false) == 0) + if (str.find("Uid:",0,false) == 0) { TQStringList list = TQStringList::split('\t', str, false); if (list.count() >= 2) diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index d0420be32..9acbb23a2 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) { - TQListBoxItem *it = list_->tqfindItem(s, TQt::ExactMatch); + TQListBoxItem *it = list_->findItem(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_->tqfindItem(s, TQt::ExactMatch)) + if (!list_->findItem(s, TQt::ExactMatch)) list_->insertItem(s); } void EditList::insertItem(const TQPixmap& icon, const TQString& s) { - if (!list_->tqfindItem(s, TQt::ExactMatch)) + if (!list_->findItem(s, TQt::ExactMatch)) list_->insertItem(icon, s); } diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index a4d550d0e..416efa249 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_.tqfindRef(loc->resource_); + int index = conf_->resources_.findRef(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 d3dd2f0a5..18f27db5b 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.tqfind(' '); + int p = s.find(' '); if (p != -1) { dlg.usessl_->setChecked(s.left(p).startsWith("SSL")); TQString addr = s.mid(p+1).stripWhiteSpace(); - int p1 = addr.tqfind(':'); + int p1 = addr.find(':'); if (p1 == -1) { dlg.address_->setText(addr); diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index 5920c30a9..d77fe5aaa 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.tqfind( TQRegExp( "\\D" ) ); + int p = sz.find( TQRegExp( "\\D" ) ); m_size->setValue( sz.left( p ).toInt() ); switch( sz[ p ].latin1() ) { diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp index 132ddc136..4bcf96e6e 100644 --- a/kdeprint/cups/kcupsprinterimpl.cpp +++ b/kdeprint/cups/kcupsprinterimpl.cpp @@ -37,9 +37,9 @@ TQSize rangeToSize(const TQString& s) int p(-1); int from, to; - if ((p=range.tqfind(',')) != -1) + if ((p=range.find(',')) != -1) range.truncate(p); - if ((p=range.tqfind('-')) != -1) + if ((p=range.find('-')) != -1) { from = range.left(p).toInt(); to = range.right(range.length()-p-1).toInt(); diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp index 76bf2202f..1daa22b42 100644 --- a/kdeprint/cups/kmcupsjobmanager.cpp +++ b/kdeprint/cups/kmcupsjobmanager.cpp @@ -212,7 +212,7 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) else if (name == "job-printer-uri" && !pr->isRemote()) { TQString str(attr->values[0].string.text); - int p = str.tqfindRev('/'); + int p = str.findRev('/'); if (p != -1) job->setPrinter(str.mid(p+1)); } @@ -356,7 +356,7 @@ static TQString processRange(const TQString& range) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { s.append(*it); - if ((*it).tqfind('-') == -1) + if ((*it).find('-') == -1) s.append("-").append(*it); s.append(","); } @@ -387,15 +387,15 @@ bool KMCupsJobManager::editJobAttributes(KMJob *j) TQMap opts = req.toMap(IPP_TAG_JOB); // translate the "Copies" option to non-CUPS syntax - if (opts.tqcontains("copies")) + if (opts.contains("copies")) opts["kde-copies"] = opts["copies"]; - if (opts.tqcontains("page-set")) + if (opts.contains("page-set")) opts["kde-pageset"] = (opts["page-set"] == "even" ? "2" : (opts["page-set"] == "odd" ? "1" : "0")); - if (opts.tqcontains("OutputOrder")) + if (opts.contains("OutputOrder")) opts["kde-pageorder"] = opts["OutputOrder"]; - if (opts.tqcontains("multiple-document-handling")) + if (opts.contains("multiple-document-handling")) opts["kde-collate"] = (opts["multiple-document-handling"] == "separate-documents-collated-copies" ? "Collate" : "Uncollate"); - if (opts.tqcontains("page-ranges")) + if (opts.contains("page-ranges")) opts["kde-range"] = opts["page-ranges"]; // find printer and construct dialog diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index 42ca37cf9..6dd1f32d5 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -655,10 +655,10 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) if (line.startsWith("*% COMDATA #")) { int p(-1), q(-1); - if ((p=line.tqfind("'name'")) != -1) + if ((p=line.find("'name'")) != -1) { - p = line.tqfind('\'',p+6)+1; - q = line.tqfind('\'',p); + p = line.find('\'',p+6)+1; + q = line.find('\'',p); keyword = line.mid(p,q-p); opt = driver->findOption(keyword); if (opt && (opt->type() == DrBase::Integer || opt->type() == DrBase::Float)) @@ -666,19 +666,19 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) else isnumeric = false; } - /*else if ((p=line.tqfind("'type'")) != -1) + /*else if ((p=line.find("'type'")) != -1) { - p = line.tqfind('\'',p+6)+1; - if (line.tqfind("float",p) != -1 || line.tqfind("int",p) != -1) + p = line.find('\'',p+6)+1; + if (line.find("float",p) != -1 || line.find("int",p) != -1) isnumeric = true; else isnumeric = false; }*/ - else if ((p=line.tqfind("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) + else if ((p=line.find("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) { TQString prefix = line.left(p+9); tout << prefix << " => '" << opt->valueText() << '\''; - if (line.tqfind(',',p) != -1) + if (line.find(',',p) != -1) tout << ','; tout << endl; continue; @@ -687,7 +687,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) } else if (line.startsWith("*Default")) { - int p = line.tqfind(':',8); + int p = line.find(':',8); keyword = line.mid(8,p-8); DrBase *bopt = 0; if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" ) diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp index 72964c697..9e930ac0e 100644 --- a/kdeprint/cups/kmwbanners.cpp +++ b/kdeprint/cups/kmwbanners.cpp @@ -70,7 +70,7 @@ TQString mapBanner( const TQString& ban ) if ( map.size() == 0 ) for ( int i=0; bannermap[ i ].banner; i++ ) map[ bannermap[ i ].banner ] = bannermap[ i ].name; - TQMap::ConstIterator it = map.tqfind( ban ); + TQMap::ConstIterator it = map.find( ban ); if ( it == map.end() ) return ban; else @@ -120,7 +120,7 @@ void KMWBanners::initPrinter(KMPrinter *p) m_bans = TQStringList::split(',',p->option("kde-banners-supported"),false); if (m_bans.count() == 0) m_bans = defaultBanners(); - if (m_bans.tqfind("none") == m_bans.end()) + if (m_bans.find("none") == m_bans.end()) m_bans.prepend("none"); for ( TQStringList::Iterator it=m_bans.begin(); it!=m_bans.end(); ++it ) { @@ -131,8 +131,8 @@ void KMWBanners::initPrinter(KMPrinter *p) TQStringList l = TQStringList::split(',',p->option("kde-banners"),false); while (l.count() < 2) l.append("none"); - m_start->setCurrentItem(m_bans.tqfindIndex(l[0])); - m_end->setCurrentItem(m_bans.tqfindIndex(l[1])); + m_start->setCurrentItem(m_bans.findIndex(l[0])); + m_end->setCurrentItem(m_bans.findIndex(l[1])); } } diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp index 947b884d1..68a6c4532 100644 --- a/kdeprint/cups/kmwother.cpp +++ b/kdeprint/cups/kmwother.cpp @@ -89,7 +89,7 @@ void KMWOther::initPrinter(KMPrinter *p) TQString prt = *( ++it ); if ( !prt.isEmpty() ) desc.append( " [" + prt + "]" ); - TQListViewItem *parent = parents.tqfind( cl ); + TQListViewItem *parent = parents.find( cl ); if ( !parent ) { parent = new TQListViewItem( root, lastparent, cl ); @@ -105,7 +105,7 @@ void KMWOther::initPrinter(KMPrinter *p) lastparent = parent; parents.insert( cl, parent ); } - item = new TQListViewItem( parent, last.tqfind( cl ), desc, uri); + item = new TQListViewItem( parent, last.find( cl ), desc, uri); last.insert( cl, item ); } } diff --git a/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp index 94816af1a..0d15a838d 100644 --- a/kdeprint/cups/kphpgl2page.cpp +++ b/kdeprint/cups/kphpgl2page.cpp @@ -142,9 +142,9 @@ KPHpgl2Page::~KPHpgl2Page() void KPHpgl2Page::setOptions(const TQMap& opts) { TQString value; - if (opts.tqcontains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true")) + if (opts.contains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true")) m_blackplot->setChecked(true); - if (opts.tqcontains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true")) + if (opts.contains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true")) m_fitplot->setChecked(true); if (!(value=opts["penwidth"]).isEmpty()) m_penwidth->setValue(value.toInt()); diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp index d9f5a0686..0e2d93ea3 100644 --- a/kdeprint/cups/kptagspage.cpp +++ b/kdeprint/cups/kptagspage.cpp @@ -110,7 +110,7 @@ bool KPTagsPage::isValid(TQString& msg) TQString tag(m_tags->text(r, 0)); if (tag.isEmpty()) continue; - else if (tag.tqfind(re) != -1) + else if (tag.find(re) != -1) { msg = i18n("The tag name must not contain any spaces, tabs or quotes: %1.").arg(tag); return false; diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp index 25cfb888d..cec0f6c23 100644 --- a/kdeprint/cups/kptextpage.cpp +++ b/kdeprint/cups/kptextpage.cpp @@ -261,7 +261,7 @@ void KPTextPage::setOptions(const TQMap& opts) if (!(value=opts["columns"]).isEmpty()) m_columns->setValue(value.toInt()); int ID(0); - if (opts.tqcontains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true")) + if (opts.contains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true")) ID = 1; m_prettyprint->setButton(ID); slotPrettyChanged(ID); -- cgit v1.2.1