summaryrefslogtreecommitdiffstats
path: root/tdeprint/lpr
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint/lpr')
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp4
-rw-r--r--tdeprint/lpr/lpchelper.cpp6
-rw-r--r--tdeprint/lpr/lpqhelper.cpp2
-rw-r--r--tdeprint/lpr/matichandler.cpp10
4 files changed, 11 insertions, 11 deletions
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 54f987c58..7ea114382 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -137,7 +137,7 @@ void KMLprManager::initHandlers()
insertHandler(new LPRngToolHandler(this));
// now load external handlers
- TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la");
+ TQStringList l = TDEGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la");
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{
KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it));
@@ -405,7 +405,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt)
{
// printcap file saved, entry can be deleted now
delete entry;
- status = (::system(TQFile::encodeName("rm -rf " + KProcess::quote(sd))) == 0);
+ status = (::system(TQFile::encodeName("rm -rf " + TDEProcess::quote(sd))) == 0);
if (!status)
setErrorMsg(i18n("Unable to remove spool directory %1. "
"Check that you have write permissions "
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index 05d09c40a..2723eb842 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin
msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc");
return false;
}
- TQString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer));
+ TQString result = execute(m_exepath + " " + op + " " + TDEProcess::quote(printer));
int status;
switch (LprSettings::self()->mode())
@@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg)
msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm");
return false;
}
- TQString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
+ TQString result = execute(m_lprmpath + " -P " + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id()));
if (result.find("dequeued") != -1)
return true;
else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1)
@@ -291,7 +291,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg)
msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc");
return false;
}
- TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
+ TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id()));
TQString answer = lprngAnswer(result, job->printer());
if (answer == "no")
{
diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp
index 30348f591..52a8d06c5 100644
--- a/tdeprint/lpr/lpqhelper.cpp
+++ b/tdeprint/lpr/lpqhelper.cpp
@@ -83,7 +83,7 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line)
void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int limit)
{
KPipeProcess proc;
- if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname)))
+ if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + TDEProcess::quote(prname)))
{
TQTextStream t(&proc);
TQString line;
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 49c33822d..4cabeae98 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -225,7 +225,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
// changing printer name), the template would be also removed
TQString origfilename = maticFile(entry);
TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
- ::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename)));
+ ::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename)));
DrMain *driver = Foomatic2Loader::loadDriver(filename);
if (driver)
{
@@ -258,11 +258,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
KPipeProcess in;
TQFile out(tmpFile);
- TQString cmd = KProcess::quote(exe);
+ TQString cmd = TDEProcess::quote(exe);
cmd += " -t lpd -d ";
- cmd += KProcess::quote(comps[2]);
+ cmd += TDEProcess::quote(comps[2]);
cmd += " -p ";
- cmd += KProcess::quote(comps[1]);
+ cmd += TDEProcess::quote(comps[1]);
if (in.open(cmd) && out.open(IO_WriteOnly))
{
TQTextStream tin(&in), tout(&out);
@@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai
inFile.close();
tmpFile.close();
- TQString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile);
+ TQString cmd = "mv " + TDEProcess::quote(tmpFile.name()) + " " + TDEProcess::quote(outFile);
int status = ::system(TQFile::encodeName(cmd).data());
TQFile::remove(tmpFile.name());
result = (status != -1 && WEXITSTATUS(status) == 0);