summaryrefslogtreecommitdiffstats
path: root/kdeprint/lpdunix/kmlpdunixmanager.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeprint/lpdunix/kmlpdunixmanager.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint/lpdunix/kmlpdunixmanager.cpp')
-rw-r--r--kdeprint/lpdunix/kmlpdunixmanager.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp
index 0985a487c..f288702eb 100644
--- a/kdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -114,12 +114,12 @@ TQMap<TQString,TQString> readEntry(KTextBuffer& t)
if (l.count() > 0)
{
int p(-1);
- if ((p=l[0].tqfind('|')) != -1)
+ if ((p=l[0].find('|')) != -1)
entry["printer-name"] = l[0].left(p); // only keep first name (discard aliases
else
entry["printer-name"] = l[0];
for (uint i=1; i<l.count(); i++)
- if ((p=l[i].tqfind('=')) != -1)
+ if ((p=l[i].find('=')) != -1)
entry[l[i].left(p).stripWhiteSpace()] = l[i].right(l[i].length()-p-1).stripWhiteSpace();
else
entry[l[i].stripWhiteSpace()] = TQString::null;
@@ -168,7 +168,7 @@ TQString getPrintcapFileName()
if (pcentry[0] == '|')
{ // printcap through pipe
printcap = locateLocal("tmp","printcap");
- QString cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
+ QString cmd = TQString::fromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl;
::system(cmd.local8Bit());
}
@@ -192,14 +192,14 @@ void KMLpdUnixManager::parseEtcPrintcap()
while (!t.eof())
{
entry = readEntry(t);
- if (entry.isEmpty() || !entry.tqcontains("printer-name") || entry.tqcontains("server"))
+ if (entry.isEmpty() || !entry.contains("printer-name") || entry.contains("server"))
continue;
if (entry["printer-name"] == "all")
{
- if (entry.tqcontains("all"))
+ if (entry.contains("all"))
{
- // tqfind separator
- int p = entry["all"].tqfind(TQRegExp("[^a-zA-Z0-9_\\s-]"));
+ // find separator
+ int p = entry["all"].find(TQRegExp("[^a-zA-Z0-9_\\s-]"));
if (p != -1)
{
QChar c = entry["all"][p];
@@ -216,7 +216,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
else
{
KMPrinter *printer = ::createPrinter(entry);
- if (entry.tqcontains("rm"))
+ if (entry.contains("rm"))
printer->setDescription(i18n("Remote printer queue on %1").arg(entry["rm"]));
else
printer->setDescription(i18n("Local printer"));
@@ -234,7 +234,7 @@ TQString getEtcPrintersConfName()
{
// standard file not found, try NIS
printersconf = locateLocal("tmp","printers.conf");
- QString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
+ QString cmd = TQString::fromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl;
::system(TQFile::encodeName(cmd));
}
@@ -254,18 +254,18 @@ void KMLpdUnixManager::parseEtcPrintersConf()
while (!t.eof())
{
entry = readEntry(t);
- if (entry.isEmpty() || !entry.tqcontains("printer-name"))
+ if (entry.isEmpty() || !entry.contains("printer-name"))
continue;
QString prname = entry["printer-name"];
if (prname == "_default")
{
- if (entry.tqcontains("use"))
+ if (entry.contains("use"))
default_printer = entry["use"];
}
else if (prname != "_all")
{
KMPrinter *printer = ::createPrinter(entry);
- if (entry.tqcontains("bsdaddr"))
+ if (entry.contains("bsdaddr"))
{
QStringList l = TQStringList::split(',',entry["bsdaddr"],false);
printer->setDescription(i18n("Remote printer queue on %1").arg(l[0]));
@@ -277,7 +277,7 @@ void KMLpdUnixManager::parseEtcPrintersConf()
}
if (!default_printer.isEmpty())
- setSoftDefault(tqfindPrinter(default_printer));
+ setSoftDefault(findPrinter(default_printer));
}
}