summaryrefslogtreecommitdiffstats
path: root/tdeprint/lpdunix
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint/lpdunix')
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.cpp6
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.h2
-rw-r--r--tdeprint/lpdunix/kmlpdunixmanager.cpp4
-rw-r--r--tdeprint/lpdunix/kmlpdunixuimanager.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index e8ee34fd5..e628a1c41 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmacroexpander.h>
KLpdUnixPrinterImpl::KLpdUnixPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
@@ -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/klpdunixprinterimpl.h b/tdeprint/lpdunix/klpdunixprinterimpl.h
index bbbda4104..c4a1ac671 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.h
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.h
@@ -22,7 +22,7 @@
#include "kprinterimpl.h"
-class KProcess;
+class TDEProcess;
class KLpdUnixPrinterImpl : public KPrinterImpl
{
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 577575e7f..7a291f6df 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -26,7 +26,7 @@
#include <tqfileinfo.h>
#include <tqtextstream.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@@ -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/lpdunix/kmlpdunixuimanager.cpp b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
index 686dfecbb..b7f059f1a 100644
--- a/tdeprint/lpdunix/kmlpdunixuimanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
@@ -21,7 +21,7 @@
#include "kpqtpage.h"
#include "kprinterpropertydialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMLpdUnixUiManager::KMLpdUnixUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMUiManager(parent,name)