diff options
Diffstat (limited to 'kdeprint/lpd')
| -rw-r--r-- | kdeprint/lpd/gschecker.cpp | 2 | ||||
| -rw-r--r-- | kdeprint/lpd/kmlpdmanager.cpp | 16 | ||||
| -rw-r--r-- | kdeprint/lpd/lpdtools.cpp | 14 |
3 files changed, 16 insertions, 16 deletions
diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp index 012d3cd4d..23f6be0a6 100644 --- a/kdeprint/lpd/gschecker.cpp +++ b/kdeprint/lpd/gschecker.cpp @@ -48,7 +48,7 @@ void GsChecker::loadDriverList() line = t.readLine().stripWhiteSpace(); if (ok) { - if (line.tqfind(':') != -1) + if (line.find(':') != -1) break; else buffer.append(line).append(" "); diff --git a/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp index e5e641b68..54f6c312a 100644 --- a/kdeprint/lpd/kmlpdmanager.cpp +++ b/kdeprint/lpd/kmlpdmanager.cpp @@ -80,7 +80,7 @@ bool KMLpdManager::completePrinter(KMPrinter *printer) bool KMLpdManager::completePrinterShort(KMPrinter *printer) { - PrintcapEntry *entry = m_entries.tqfind(printer->name()); + PrintcapEntry *entry = m_entries.find(printer->name()); if (entry) { QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); @@ -299,11 +299,11 @@ void KMLpdManager::checkStatus() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - if ((p=line.tqfind(':')) != -1) + if ((p=line.find(':')) != -1) printer = findPrinter(line.left(p)); else if (line.startsWith("printing") && printer) - printer->setState(line.tqfind("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped); - else if (line.tqfind("entries") != -1 && printer) + printer->setState(line.find("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped); + else if (line.find("entries") != -1 && printer) if (!line.startsWith("no") && printer->state() == KMPrinter::Idle) printer->setState(KMPrinter::Processing); } @@ -367,7 +367,7 @@ PrinttoolEntry* KMLpdManager::findPrinttoolEntry(const TQString& name) { if (m_ptentries.count() == 0) loadPrinttoolDb(driverDirectory()+"/printerdb"); - PrinttoolEntry *ent = m_ptentries.tqfind(name); + PrinttoolEntry *ent = m_ptentries.find(name); if (!ent) setErrorMsg(i18n("Couldn't find driver <b>%1</b> in printtool database.").arg(name)); return ent; @@ -406,7 +406,7 @@ DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry) PrintcapEntry* KMLpdManager::findPrintcapEntry(const TQString& name) { - PrintcapEntry *ent = m_entries.tqfind(name); + PrintcapEntry *ent = m_entries.find(name); if (!ent) setErrorMsg(i18n("Couldn't find printer <b>%1</b> in printcap file.").arg(name)); return ent; @@ -471,7 +471,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file break; if (line.startsWith("export ")) line.replace(0,7,""); - if ((p=line.tqfind('=')) != -1) + if ((p=line.find('=')) != -1) { name = line.left(p); val = line.right(line.length()-p-1); @@ -510,7 +510,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt tout << "export "; line.replace(0,7,TQString::tqfromLatin1("")); } - if ((p=line.tqfind('=')) != -1) + if ((p=line.find('=')) != -1) { name = line.left(p); tout << name << '=' << options[name] << endl; diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp index ee919ff95..ba96f31a0 100644 --- a/kdeprint/lpd/lpdtools.cpp +++ b/kdeprint/lpd/lpdtools.cpp @@ -60,7 +60,7 @@ TQString nextWord(const TQString& s, int& pos) if (s[p1] == '{') { p1++; - p2 = s.tqfind('}',p1); + p2 = s.find('}',p1); } else { @@ -81,12 +81,12 @@ bool PrintcapEntry::readLine(const TQString& line) m_name = l[0]; int p(-1); // discard aliases - if ((p=m_name.tqfind('|')) != -1) + if ((p=m_name.find('|')) != -1) m_name = m_name.left(p); m_args.clear(); for (uint i=1; i<l.count(); i++) { - int p = l[i].tqfind('='); + int p = l[i].find('='); if (p == -1) p = 2; QString key = l[i].left(p); QString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p)); @@ -140,22 +140,22 @@ KMPrinter* PrintcapEntry::createPrinter() TQStringList splitPrinttoolLine(const TQString& line) { QStringList l; - int p = line.tqfind(':'); + int p = line.find(':'); if (p != -1) { l.append(line.left(p)); - p = line.tqfind('{',p); + p = line.find('{',p); if (p == -1) l.append(line.right(line.length()-l[0].length()-1).stripWhiteSpace()); else { while (p != -1) { - int q = line.tqfind('}',p); + int q = line.find('}',p); if (q != -1) { l.append(line.mid(p+1,q-p-1)); - p = line.tqfind('{',q); + p = line.find('{',q); } else break; } |