diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeprint/foomatic | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-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/foomatic')
| -rw-r--r-- | kdeprint/foomatic/kfoomaticprinterimpl.cpp | 2 | ||||
| -rw-r--r-- | kdeprint/foomatic/kmfoomaticmanager.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp index 7e47a505f..b72fbd191 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/kdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -44,7 +44,7 @@ bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) QString exe = executable(); if (!exe.isEmpty()) { - cmd = exe + TQString::tqfromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); return true; } else diff --git a/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp index 76ca31a4e..57edf07c9 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.cpp +++ b/kdeprint/foomatic/kmfoomaticmanager.cpp @@ -97,10 +97,10 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem) printer->setName(e.text()); printer->setPrinterName(e.text()); printer->setState(KMPrinter::Idle); - /*if (printer->name().tqfind('/') != -1) + /*if (printer->name().find('/') != -1) { QString s(printer->name()); - int p = s.tqfind('/'); + int p = s.find('/'); printer->setPrinterName(s.left(p)); printer->setInstanceName(s.mid(p+1)); printer->addType(KMPrinter::Virtual); @@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { driver->set("manufacturer", pelem.namedItem("make").toElement().text()); driver->set("model", pelem.namedItem("model").toElement().text()); - QString s = TQString::tqfromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); + QString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); driver->set("description", s); driver->set("text", s); |