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/cups/kmcupsmanager.cpp | 2 +- tdeprint/foomatic/kfoomaticprinterimpl.cpp | 2 +- tdeprint/kmvirtualmanager.cpp | 2 +- tdeprint/kprintpreview.cpp | 2 +- tdeprint/lpd/klpdprinterimpl.cpp | 2 +- tdeprint/lpd/kmlpdmanager.cpp | 4 ++-- tdeprint/lpdunix/klpdunixprinterimpl.cpp | 4 ++-- tdeprint/lpdunix/kmlpdunixmanager.cpp | 2 +- tdeprint/lpr/apshandler.cpp | 2 +- tdeprint/lpr/klprprinterimpl.cpp | 2 +- tdeprint/lpr/kmlprmanager.cpp | 2 +- tdeprint/lpr/lpchelper.cpp | 6 +++--- tdeprint/lpr/lpqhelper.cpp | 2 +- tdeprint/lpr/matichandler.cpp | 12 ++++++------ tdeprint/management/kmdbcreator.cpp | 2 +- tdeprint/rlpr/krlprprinterimpl.cpp | 2 +- tdeprint/tdeprintcheck.cpp | 4 ++-- tdeprint/tools/escputil/escpwidget.cpp | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) (limited to 'tdeprint') diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index d444db1f2..5b99c88d9 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -628,7 +628,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) TQStringList comps = TQStringList::split('/', drname, false); 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()) { setErrorMsg(i18n("Unable to find the executable foomatic-datafile " diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp index b628ac6d9..aacf6be8d 100644 --- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -35,7 +35,7 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl() // look for executable TQString KFoomaticPrinterImpl::executable() { - QString exe = KStandardDirs::findExe("foomatic-printjob"); + QString exe = TDEStandardDirs::findExe("foomatic-printjob"); return exe; } diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp index 2f1d80e54..b13637904 100644 --- a/tdeprint/kmvirtualmanager.cpp +++ b/tdeprint/kmvirtualmanager.cpp @@ -297,7 +297,7 @@ void KMVirtualManager::triggerSave() QString filename; if (getuid() == 0) { - if (KStandardDirs::makeDir(TQFile::decodeName("/etc/cups"))) + if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups"))) filename = TQFile::decodeName("/etc/cups/lpoptions"); } else diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index e81a23b08..0d7b7913c 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -273,7 +273,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId if (externalPreview && isPS ) { exe = conf->readPathEntry("PreviewCommand", "gv"); - if (KStandardDirs::findExe(exe).isEmpty()) + if (TDEStandardDirs::findExe(exe).isEmpty()) { QString msg = i18n("The preview program %1 cannot be found. " "Check that the program is correctly installed and " diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp index 2704cc46a..e81b3a8cd 100644 --- a/tdeprint/lpd/klpdprinterimpl.cpp +++ b/tdeprint/lpd/klpdprinterimpl.cpp @@ -35,7 +35,7 @@ KLpdPrinterImpl::~KLpdPrinterImpl() TQString KLpdPrinterImpl::executable() { - return KStandardDirs::findExe("lpr"); + return TDEStandardDirs::findExe("lpr"); } bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index a11f79304..23c0422d0 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -620,9 +620,9 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) if (entry->arg("sd").isEmpty()) entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name; QString sd = entry->arg("sd"); - if (!KStandardDirs::exists(sd)) + if (!TDEStandardDirs::exists(sd)) { - if (!KStandardDirs::makeDir(sd,0750)) + if (!TDEStandardDirs::makeDir(sd,0750)) return false; struct passwd *lp_pw = getpwnam("lp"); if (lp_pw && chown(TQFile::encodeName(sd),lp_pw->pw_uid,lp_pw->pw_gid) != 0) diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp index e8ee34fd5..4237bda59 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -47,9 +47,9 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer) // look for executable, starting with "lpr" TQString KLpdUnixPrinterImpl::executable() { - QString exe = KStandardDirs::findExe("lpr"); + QString exe = TDEStandardDirs::findExe("lpr"); if (exe.isEmpty()) - exe = KStandardDirs::findExe("lp"); + exe = TDEStandardDirs::findExe("lp"); return exe; } diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp index 577575e7f..232a49eb0 100644 --- a/tdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp @@ -230,7 +230,7 @@ void KMLpdUnixManager::parseEtcPrintcap() TQString getEtcPrintersConfName() { TQString printersconf("/etc/printers.conf"); - if (!TQFile::exists(printersconf) && !KStandardDirs::findExe( "ypcat" ).isEmpty()) + if (!TQFile::exists(printersconf) && !TDEStandardDirs::findExe( "ypcat" ).isEmpty()) { // standard file not found, try NIS printersconf = locateLocal("tmp","printers.conf"); diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp index f6eb1f8aa..3d144644a 100644 --- a/tdeprint/lpr/apshandler.cpp +++ b/tdeprint/lpr/apshandler.cpp @@ -216,7 +216,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt) return NULL; } TQString path = sysconfDir() + "/" + prt->printerName(); - if (!KStandardDirs::makeDir(path, 0755)) + if (!TDEStandardDirs::makeDir(path, 0755)) { manager()->setErrorMsg(i18n("Unable to create directory %1.").arg(path)); return NULL; diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp index 92928a0cc..4dbe5e378 100644 --- a/tdeprint/lpr/klprprinterimpl.cpp +++ b/tdeprint/lpr/klprprinterimpl.cpp @@ -28,7 +28,7 @@ KLprPrinterImpl::KLprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) : KPrinterImpl(parent,name) { - m_exepath = KStandardDirs::findExe("lpr"); + m_exepath = TDEStandardDirs::findExe("lpr"); } KLprPrinterImpl::~KLprPrinterImpl() diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 7ea114382..5d73d4d54 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -345,7 +345,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt) return false; } sd.append("/").append(prt->printerName()); - if (!KStandardDirs::makeDir(sd, 0755)) + if (!TDEStandardDirs::makeDir(sd, 0755)) { setErrorMsg(i18n("Unable to create the spool directory %1. Check that you " "have the required permissions for that operation.").arg(sd)); diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 2723eb842..f72901865 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -51,9 +51,9 @@ LpcHelper::LpcHelper(TQObject *parent, const char *name) // add some specific dirs. TQString PATH = getenv("PATH"); PATH.append(":/usr/sbin:/usr/local/sbin:/sbin:/opt/sbin:/opt/local/sbin"); - m_exepath = KStandardDirs::findExe("lpc", PATH); - m_checkpcpath = KStandardDirs::findExe("checkpc", PATH); - m_lprmpath = KStandardDirs::findExe("lprm"); + m_exepath = TDEStandardDirs::findExe("lpc", PATH); + m_checkpcpath = TDEStandardDirs::findExe("checkpc", PATH); + m_lprmpath = TDEStandardDirs::findExe("lprm"); } LpcHelper::~LpcHelper() diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 52a8d06c5..1c02cafc7 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -29,7 +29,7 @@ LpqHelper::LpqHelper(TQObject *parent, const char *name) : TQObject(parent, name) { - m_exepath = KStandardDirs::findExe("lpq"); + m_exepath = TDEStandardDirs::findExe("lpq"); } LpqHelper::~LpqHelper() 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 " diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 9c315402f..c101bb270 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -91,7 +91,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena if (exestr.isEmpty()) msg = i18n("No executable defined for the creation of the " "driver database. This operation is not implemented."); - else if (KStandardDirs::findExe(exestr).isEmpty()) + else if (TDEStandardDirs::findExe(exestr).isEmpty()) msg = i18n("The executable %1 could not be found in your " "PATH. Check that this program exists and is " "accessible in your PATH variable.").arg(exestr); diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 5e927a940..8ca1c6569 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -47,7 +47,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) QString host(rpr->option("host")), queue(rpr->option("queue")); if (!host.isEmpty() && !queue.isEmpty()) { - QString exestr = KStandardDirs::findExe("rlpr"); + QString exestr = TDEStandardDirs::findExe("rlpr"); if (exestr.isEmpty()) { printer->setErrorMessage(i18n("The %1 executable could not be found in your path. Check your installation.").arg("rlpr")); diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index 92178f0f4..a1985e804 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -80,7 +80,7 @@ bool KdeprintChecker::checkURL(const KURL& url) else if (prot == "exec") return checkExec(url); else if (prot == "file" || prot == "dir") - return KStandardDirs::exists(url.url()); + return TDEStandardDirs::exists(url.url()); else if (prot == "service") return checkService(url); return false; @@ -117,7 +117,7 @@ bool KdeprintChecker::checkConfig(const KURL& url) bool KdeprintChecker::checkExec(const KURL& url) { QString execname(url.path().mid(1)); - return !(KStandardDirs::findExe(execname).isEmpty()); + return !(TDEStandardDirs::findExe(execname).isEmpty()); } bool KdeprintChecker::checkService(const KURL& url) diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index d9a1e2a72..de54f2de1 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -173,7 +173,7 @@ void EscpWidget::startCommand(const TQString& arg) return; } - TQString exestr = KStandardDirs::findExe("escputil"); + TQString exestr = TDEStandardDirs::findExe("escputil"); if (exestr.isEmpty()) { KMessageBox::error(this, i18n("The executable escputil cannot be found in your " -- cgit v1.2.1