summaryrefslogtreecommitdiffstats
path: root/kdeprint/lpd
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /kdeprint/lpd
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint/lpd')
-rw-r--r--kdeprint/lpd/gschecker.cpp4
-rw-r--r--kdeprint/lpd/gschecker.h2
-rw-r--r--kdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--kdeprint/lpd/kmlpdmanager.cpp68
-rw-r--r--kdeprint/lpd/lpdtools.cpp24
5 files changed, 50 insertions, 50 deletions
diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp
index 8f23fcc32..012d3cd4d 100644
--- a/kdeprint/lpd/gschecker.cpp
+++ b/kdeprint/lpd/gschecker.cpp
@@ -48,12 +48,12 @@ void GsChecker::loadDriverList()
line = t.readLine().stripWhiteSpace();
if (ok)
{
- if (line.find(':') != -1)
+ if (line.tqfind(':') != -1)
break;
else
buffer.append(line).append(" ");
}
- else if (line.startsWith(TQString::fromLatin1("Available devices:")))
+ else if (line.startsWith(TQString::tqfromLatin1("Available devices:")))
ok = true;
}
m_driverlist = TQStringList::split(' ',buffer,false);
diff --git a/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h
index 65f247380..1814ca1d7 100644
--- a/kdeprint/lpd/gschecker.h
+++ b/kdeprint/lpd/gschecker.h
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqobject.h>
-class GsChecker : public QObject
+class GsChecker : public TQObject
{
public:
GsChecker(TQObject *parent = 0, const char *name = 0);
diff --git a/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp
index 8a04927e6..8b365cbd1 100644
--- a/kdeprint/lpd/klpdprinterimpl.cpp
+++ b/kdeprint/lpd/klpdprinterimpl.cpp
@@ -46,6 +46,6 @@ bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr"));
return false;
}
- cmd = TQString::fromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies());
+ cmd = TQString::tqfromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies());
return true;
}
diff --git a/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp
index 95623a56f..e5e641b68 100644
--- a/kdeprint/lpd/kmlpdmanager.cpp
+++ b/kdeprint/lpd/kmlpdmanager.cpp
@@ -65,12 +65,12 @@ KMLpdManager::~KMLpdManager()
TQString KMLpdManager::driverDbCreationProgram()
{
- return TQString::fromLatin1("make_driver_db_lpd");
+ return TQString::tqfromLatin1("make_driver_db_lpd");
}
TQString KMLpdManager::driverDirectory()
{
- return TQString::fromLatin1("/usr/lib/rhs/rhs-printfilters");
+ return TQString::tqfromLatin1("/usr/lib/rhs/rhs-printfilters");
}
bool KMLpdManager::completePrinter(KMPrinter *printer)
@@ -80,7 +80,7 @@ bool KMLpdManager::completePrinter(KMPrinter *printer)
bool KMLpdManager::completePrinterShort(KMPrinter *printer)
{
- PrintcapEntry *entry = m_entries.find(printer->name());
+ PrintcapEntry *entry = m_entries.tqfind(printer->name());
if (entry)
{
QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
@@ -91,11 +91,11 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
KURL url;
if (!entry->arg("rm").isEmpty())
{
- url = TQString::fromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp"));
+ url = TQString::tqfromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp"));
printer->setDescription(i18n("Remote LPD queue %1@%2").arg(entry->arg("rp")).arg(entry->arg("rm")));
}
else if (!lp.isEmpty() && lp != "/dev/null")
- url = TQString::fromLatin1("parallel:%1").arg(lp);
+ url = TQString::tqfromLatin1("parallel:%1").arg(lp);
else if (TQFile::exists(entry->arg("sd")+"/.config"))
{
TQMap<TQString,TQString> map = loadPrinttoolCfgFile(entry->arg("sd")+"/.config");
@@ -103,17 +103,17 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
{
QStringList l = TQStringList::split('\\',map["share"],false);
if (map["workgroup"].isEmpty())
- url = TQString::fromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]);
+ url = TQString::tqfromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]);
else
- url = TQString::fromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]);
+ url = TQString::tqfromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]);
url.setUser(map["user"]);
url.setPass(map["password"]);
}
else if (type == "DIRECT")
- url = TQString::fromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]);
+ url = TQString::tqfromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]);
else if (type == "NCP")
{
- url = TQString::fromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]);
+ url = TQString::tqfromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]);
url.setUser(map["user"]);
url.setPass(map["password"]);
}
@@ -146,9 +146,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer)
{
// remote lpd queue
ent->m_args["rm"] = printer->device().host();
- ent->m_args["rp"] = printer->device().path().replace("/",TQString::fromLatin1(""));
+ ent->m_args["rp"] = printer->device().path().replace("/",TQString::tqfromLatin1(""));
ent->m_args["lpd_bounce"] = "true";
- ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## REMOTE");
+ ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## REMOTE");
}
ent->m_args["mx"] = (printer->option("mx").isEmpty() ? "#0" : printer->option("mx"));
ent->m_args["sh"] = TQString::null;
@@ -259,7 +259,7 @@ bool KMLpdManager::disablePrinter(KMPrinter *printer)
void KMLpdManager::listPrinters()
{
m_entries.clear();
- loadPrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix));
+ loadPrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix));
TQDictIterator<PrintcapEntry> it(m_entries);
for (;it.current();++it)
@@ -299,11 +299,11 @@ void KMLpdManager::checkStatus()
line = t.readLine().stripWhiteSpace();
if (line.isEmpty())
continue;
- if ((p=line.find(':')) != -1)
+ if ((p=line.tqfind(':')) != -1)
printer = findPrinter(line.left(p));
else if (line.startsWith("printing") && printer)
- printer->setState(line.find("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped);
- else if (line.find("entries") != -1 && printer)
+ printer->setState(line.tqfind("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped);
+ else if (line.tqfind("entries") != -1 && printer)
if (!line.startsWith("no") && printer->state() == KMPrinter::Idle)
printer->setState(KMPrinter::Processing);
}
@@ -312,7 +312,7 @@ void KMLpdManager::checkStatus()
bool KMLpdManager::writePrinters()
{
- if (!writePrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix)))
+ if (!writePrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix)))
{
setErrorMsg(i18n("Unable to write printcap file."));
return false;
@@ -367,7 +367,7 @@ PrinttoolEntry* KMLpdManager::findPrinttoolEntry(const TQString& name)
{
if (m_ptentries.count() == 0)
loadPrinttoolDb(driverDirectory()+"/printerdb");
- PrinttoolEntry *ent = m_ptentries.find(name);
+ PrinttoolEntry *ent = m_ptentries.tqfind(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.find(name);
+ PrintcapEntry *ent = m_entries.tqfind(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.find('=')) != -1)
+ if ((p=line.tqfind('=')) != -1)
{
name = line.left(p);
val = line.right(line.length()-p-1);
@@ -489,7 +489,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt
{
// defines input and output file
QString fname = TQFileInfo(templatefile).fileName();
- fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1(""));
+ fname.replace(TQRegExp("\\.in$"),TQString::tqfromLatin1(""));
QFile fin(templatefile);
QFile fout(dirname + "/" + fname);
if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly))
@@ -508,9 +508,9 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt
if (line.startsWith("export "))
{
tout << "export ";
- line.replace(0,7,TQString::fromLatin1(""));
+ line.replace(0,7,TQString::tqfromLatin1(""));
}
- if ((p=line.find('=')) != -1)
+ if ((p=line.tqfind('=')) != -1)
{
name = line.left(p);
tout << name << '=' << options[name] << endl;
@@ -543,8 +543,8 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
return false;
QString resol(options["RESOLUTION"]), color(options["COLOR"]);
// update entry comment to make printtool happy and save printcap file
- ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15)));
- ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter");
+ ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::tqfromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::tqfromLatin1("Default") : color.right(color.length()-15)));
+ ent->m_args["if"] = spooldir+TQString::tqfromLatin1("/filter");
if (!writePrinters())
return false;
// write various driver files using templates
@@ -566,11 +566,11 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
{
KURL dev(printer->device());
QString prot = dev.protocol(), sd(entry->arg("sd"));
- entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
+ entry->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
if (prot == "smb" || prot == "ncp" || prot == "socket")
{
- entry->m_args["af"] = sd+TQString::fromLatin1("/acct");
- QFile f(sd+TQString::fromLatin1("/.config"));
+ entry->m_args["af"] = sd+TQString::tqfromLatin1("/acct");
+ QFile f(sd+TQString::tqfromLatin1("/.config"));
if (f.open(IO_WriteOnly))
{
QTextStream t(&f);
@@ -578,7 +578,7 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
{
t << "printer_ip=" << dev.host() << endl;
t << "port=" << dev.port() << endl;
- entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/directprint");
+ entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/directprint");
}
else if (prot == "smb")
{
@@ -594,20 +594,20 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
t << "hostip=" << endl;
t << "user='" << dev.user() << '\'' << endl;
t << "password='" << dev.pass() << '\'' << endl;
- t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::fromLatin1("")) << '\'' << endl;
- entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/smbprint");
+ t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::tqfromLatin1("")) << '\'' << endl;
+ entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/smbprint");
}
else if (prot == "ncp")
{
t << "server=" << dev.host() << endl;
- t << "queue=" << dev.path().replace("/",TQString::fromLatin1("")) << endl;
+ t << "queue=" << dev.path().replace("/",TQString::tqfromLatin1("")) << endl;
t << "user=" << dev.user() << endl;
t << "password=" << dev.pass() << endl;
- entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/ncpprint");
+ entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/ncpprint");
}
}
else return false;
- entry->m_args["lp"] = TQString::fromLatin1("/dev/null");
+ entry->m_args["lp"] = TQString::tqfromLatin1("/dev/null");
}
else if (prot != "lpd")
entry->m_args["lp"] = dev.path();
@@ -618,7 +618,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
{
// first check if it has a "sd" defined
if (entry->arg("sd").isEmpty())
- entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
+ entry->m_args["sd"] = TQString::tqfromLatin1("/var/spool/lpd/")+entry->m_name;
QString sd = entry->arg("sd");
if (!KStandardDirs::exists(sd))
{
diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp
index 3b1651337..ee919ff95 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.find('}',p1);
+ p2 = s.tqfind('}',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.find('|')) != -1)
+ if ((p=m_name.tqfind('|')) != -1)
m_name = m_name.left(p);
m_args.clear();
for (uint i=1; i<l.count(); i++)
{
- int p = l[i].find('=');
+ int p = l[i].tqfind('=');
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.find(':');
+ int p = line.tqfind(':');
if (p != -1)
{
l.append(line.left(p));
- p = line.find('{',p);
+ p = line.tqfind('{',p);
if (p == -1)
l.append(line.right(line.length()-l[0].length()-1).stripWhiteSpace());
else
{
while (p != -1)
{
- int q = line.find('}',p);
+ int q = line.tqfind('}',p);
if (q != -1)
{
l.append(line.mid(p+1,q-p-1));
- p = line.find('{',q);
+ p = line.tqfind('{',q);
}
else break;
}
@@ -257,11 +257,11 @@ DrMain* PrinttoolEntry::createDriver()
for (int i=0;it.current();++it,i++)
{
ch = new DrBase;
- ch->setName(TQString::fromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi));
+ ch->setName(TQString::tqfromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi));
if (it.current()->comment.isEmpty())
- ch->set("text",TQString::fromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi));
+ ch->set("text",TQString::tqfromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi));
else
- ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
+ ch->set("text",TQString::tqfromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
lopt->addChoice(ch);
}
QString defval = lopt->choices()->first()->name();
@@ -281,13 +281,13 @@ DrMain* PrinttoolEntry::createDriver()
{
ch = new DrBase;
if (m_gsdriver != "uniprint")
- ch->setName(TQString::fromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp));
+ ch->setName(TQString::tqfromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp));
else
ch->setName(it.current()->bpp);
if (it.current()->comment.isEmpty())
ch->set("text",it.current()->bpp);
else
- ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
+ ch->set("text",TQString::tqfromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
lopt->addChoice(ch);
}
QString defval = lopt->choices()->first()->name();