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/kprinterimpl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdeprint/kprinterimpl.cpp') diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 171daf45d..9c62d25f8 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -158,9 +158,9 @@ bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag) } else { - KProcess proc; + TDEProcess proc; proc << (flag?"mv":"cp") << f[0] << p->outputFileName(); - if (!proc.start(KProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) + if (!proc.start(TDEProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) { p->setErrorMessage(i18n("Cannot save print file to %1. Check that you have write access to it.").arg(p->outputFileName())); return false; @@ -573,7 +573,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin } TQString KPrinterImpl::quote(const TQString& s) -{ return KProcess::quote(s); } +{ return TDEProcess::quote(s); } void KPrinterImpl::saveOptions(const TQMap& opts) { @@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap& opts) void KPrinterImpl::loadAppOptions() { - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); TQStringList opts = conf->readListEntry("ApplicationOptions"); for (uint i=0; isetGroup("KPrinter Settings"); conf->writeEntry("ApplicationOptions", optlist); } -- cgit v1.2.1