summaryrefslogtreecommitdiffstats
path: root/tdeprint/lpr
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint/lpr')
-rw-r--r--tdeprint/lpr/apshandler.cpp4
-rw-r--r--tdeprint/lpr/editentrydialog.cpp6
-rw-r--r--tdeprint/lpr/klprprinterimpl.cpp2
-rw-r--r--tdeprint/lpr/kmconfiglpr.cpp8
-rw-r--r--tdeprint/lpr/kmconfiglpr.h4
-rw-r--r--tdeprint/lpr/kmlprjobmanager.cpp2
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp18
-rw-r--r--tdeprint/lpr/kmlprmanager.h4
-rw-r--r--tdeprint/lpr/kmlpruimanager.cpp2
-rw-r--r--tdeprint/lpr/lpchelper.cpp14
-rw-r--r--tdeprint/lpr/lpqhelper.cpp4
-rw-r--r--tdeprint/lpr/lprhandler.cpp2
-rw-r--r--tdeprint/lpr/lprngtoolhandler.cpp2
-rw-r--r--tdeprint/lpr/lprsettings.cpp4
-rw-r--r--tdeprint/lpr/matichandler.cpp26
15 files changed, 51 insertions, 51 deletions
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index f6eb1f8aa..acb0e0c2d 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -31,7 +31,7 @@
#include <tqtextstream.h>
#include <tqvaluestack.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <sys/types.h>
@@ -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/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index 6c4ecc30c..9a8f9caa2 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -25,10 +25,10 @@
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqlayout.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name)
@@ -39,7 +39,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
TQLabel *lab0 = new TQLabel(i18n("Aliases:"), w);
m_aliases = new TQLineEdit(w);
- m_view = new KListView(w);
+ m_view = new TDEListView(w);
m_view->addColumn("");
m_view->header()->hide();
m_type = new TQComboBox(w);
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/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index f43a8da2d..fed1dd17d 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -24,8 +24,8 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
: KMConfigPage(parent, name)
@@ -45,12 +45,12 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
l0->addStretch(1);
}
-void KMConfigLpr::loadConfig(KConfig*)
+void KMConfigLpr::loadConfig(TDEConfig*)
{
m_mode->setCurrentItem(LprSettings::self()->mode());
}
-void KMConfigLpr::saveConfig(KConfig *conf)
+void KMConfigLpr::saveConfig(TDEConfig *conf)
{
LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem()));
diff --git a/tdeprint/lpr/kmconfiglpr.h b/tdeprint/lpr/kmconfiglpr.h
index 7f3d50857..fa7a0ae26 100644
--- a/tdeprint/lpr/kmconfiglpr.h
+++ b/tdeprint/lpr/kmconfiglpr.h
@@ -29,8 +29,8 @@ class KMConfigLpr : public KMConfigPage
public:
KMConfigLpr(TQWidget *parent = 0, const char *name = 0);
- void loadConfig(KConfig*);
- void saveConfig(KConfig*);
+ void loadConfig(TDEConfig*);
+ void saveConfig(TDEConfig*);
private:
TQComboBox *m_mode;
diff --git a/tdeprint/lpr/kmlprjobmanager.cpp b/tdeprint/lpr/kmlprjobmanager.cpp
index 851663664..0738d17c1 100644
--- a/tdeprint/lpr/kmlprjobmanager.cpp
+++ b/tdeprint/lpr/kmlprjobmanager.cpp
@@ -25,7 +25,7 @@
#include "lprsettings.h"
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMLprJobManager::KMLprJobManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMJobManager(parent, name)
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 54f987c58..046f082f7 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -30,13 +30,13 @@
#include <tqfileinfo.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kprinter.h>
#include <kprocess.h>
-#include <kaction.h>
-#include <kmessagebox.h>
+#include <tdeaction.h>
+#include <tdemessagebox.h>
#include <klibloader.h>
#include <stdlib.h>
@@ -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));
@@ -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));
@@ -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 "
@@ -453,13 +453,13 @@ TQString KMLprManager::printOptions(KPrinter *prt)
return TQString::null;
}
-void KMLprManager::createPluginActions(KActionCollection *coll)
+void KMLprManager::createPluginActions(TDEActionCollection *coll)
{
- KAction *act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
+ TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
act->setGroup("plugin");
}
-void KMLprManager::validatePluginActions(KActionCollection *coll, KMPrinter *prt)
+void KMLprManager::validatePluginActions(TDEActionCollection *coll, KMPrinter *prt)
{
m_currentprinter = prt;
// FIXME: disabled until completion
diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h
index 34d38340f..d26af4d77 100644
--- a/tdeprint/lpr/kmlprmanager.h
+++ b/tdeprint/lpr/kmlprmanager.h
@@ -54,8 +54,8 @@ public:
LpcHelper* lpcHelper() { return m_lpchelper; }
TQString printOptions(KPrinter*);
- void createPluginActions(KActionCollection*);
- void validatePluginActions(KActionCollection*, KMPrinter*);
+ void createPluginActions(TDEActionCollection*);
+ void validatePluginActions(TDEActionCollection*, KMPrinter*);
TQString stateInformation();
protected slots:
diff --git a/tdeprint/lpr/kmlpruimanager.cpp b/tdeprint/lpr/kmlpruimanager.cpp
index 655309e0c..b7d23bb42 100644
--- a/tdeprint/lpr/kmlpruimanager.cpp
+++ b/tdeprint/lpr/kmlpruimanager.cpp
@@ -29,7 +29,7 @@
#include "kmwbackend.h"
#include "kmconfiglpr.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMLprUiManager::KMLprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMUiManager(parent,name)
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index 05d09c40a..b366537e5 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -26,7 +26,7 @@
#include <tqtextstream.h>
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <stdlib.h>
@@ -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()
@@ -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..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()
@@ -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/lprhandler.cpp b/tdeprint/lpr/lprhandler.cpp
index fcb838bb9..767b55382 100644
--- a/tdeprint/lpr/lprhandler.cpp
+++ b/tdeprint/lpr/lprhandler.cpp
@@ -27,7 +27,7 @@
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqvaluestack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <unistd.h>
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index d3e283123..960f5adb8 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -28,7 +28,7 @@
#include <tqfile.h>
#include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp
index 0c1cec2a9..a539f4160 100644
--- a/tdeprint/lpr/lprsettings.cpp
+++ b/tdeprint/lpr/lprsettings.cpp
@@ -21,7 +21,7 @@
#include "kmmanager.h"
#include "kmfactory.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -53,7 +53,7 @@ LprSettings* LprSettings::self()
void LprSettings::init()
{
// LPR/LPRng mode
- KConfig *conf = KMFactory::self()->printConfig();
+ TDEConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("LPR");
TQString modestr = conf->readEntry("Mode");
if (modestr == "LPRng")
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 49c33822d..826867cd2 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -29,9 +29,9 @@
#include "util.h"
#include "foomatic2loader.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kprocess.h>
#include <tqfile.h>
@@ -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)
@@ -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)
{
@@ -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 "
@@ -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);
@@ -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 "
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-01 13:54:56 +0000