From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdeprint/lpr/matichandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdeprint/lpr/matichandler.cpp') 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); -- cgit v1.2.1 From d3afa6baf98ef5ac191996cc9b909ff9074c168c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:28:26 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- tdeprint/lpr/matichandler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tdeprint/lpr/matichandler.cpp') diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 4cabeae98..738f7e178 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -46,10 +46,10 @@ MaticHandler::MaticHandler(KMManager *mgr) { TQString PATH = getenv("PATH"); PATH.append(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - m_exematicpath = KStandardDirs::findExe("lpdomatic", PATH); - m_ncpath = KStandardDirs::findExe("nc"); - m_smbpath = KStandardDirs::findExe("smbclient"); - m_rlprpath = KStandardDirs::findExe("rlpr"); + m_exematicpath = TDEStandardDirs::findExe("lpdomatic", PATH); + m_ncpath = TDEStandardDirs::findExe("nc"); + m_smbpath = TDEStandardDirs::findExe("smbclient"); + m_rlprpath = TDEStandardDirs::findExe("rlpr"); } bool MaticHandler::validate(PrintcapEntry *entry) @@ -248,7 +248,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); + TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " @@ -352,7 +352,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) return true; TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); - TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); + TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- tdeprint/lpr/matichandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/lpr/matichandler.cpp') diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 738f7e178..e1242c5fc 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdeprint/lpr/matichandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/lpr/matichandler.cpp') diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index e1242c5fc..826867cd2 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -29,7 +29,7 @@ #include "util.h" #include "foomatic2loader.h" -#include +#include #include #include #include -- cgit v1.2.1