summaryrefslogtreecommitdiffstats
path: root/tdeprint/lpr
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint/lpr')
-rw-r--r--tdeprint/lpr/CMakeLists.txt2
-rw-r--r--tdeprint/lpr/apshandler.cpp2
-rw-r--r--tdeprint/lpr/editentrydialog.cpp12
-rw-r--r--tdeprint/lpr/editentrydialog.h2
-rw-r--r--tdeprint/lpr/klprprinterimpl.cpp6
-rw-r--r--tdeprint/lpr/klprprinterimpl.h2
-rw-r--r--tdeprint/lpr/kmconfiglpr.cpp2
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp6
-rw-r--r--tdeprint/lpr/kmlprmanager.h2
-rw-r--r--tdeprint/lpr/lpchelper.cpp4
-rw-r--r--tdeprint/lpr/lpqhelper.cpp4
-rw-r--r--tdeprint/lpr/lprngtoolhandler.cpp2
-rw-r--r--tdeprint/lpr/lprsettings.h4
-rw-r--r--tdeprint/lpr/matichandler.cpp10
-rw-r--r--tdeprint/lpr/printcapreader.cpp2
15 files changed, 31 insertions, 31 deletions
diff --git a/tdeprint/lpr/CMakeLists.txt b/tdeprint/lpr/CMakeLists.txt
index dfd932150..a6f9efafc 100644
--- a/tdeprint/lpr/CMakeLists.txt
+++ b/tdeprint/lpr/CMakeLists.txt
@@ -80,6 +80,6 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK driverparse-static tdefakes-shared ${DL_LIBRARIES}
+ LINK driverparse-static tdefakes-shared ${CMAKE_DL_LIBS}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index acb0e0c2d..dd4c3a72e 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -30,7 +30,7 @@
#include <tqdir.h>
#include <tqtextstream.h>
#include <tqvaluestack.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index bf61919c3..e70e85907 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -86,12 +86,12 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
slotTypeChanged(0);
m_block = false;
- connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotItemSelected(TQListViewItem*)));
- connect(m_string, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
- connect(m_boolean, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
- connect(m_number, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
- connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
- connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
+ connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(m_string, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+ connect(m_boolean, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+ connect(m_number, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
+ connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
+ connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
resize(500,400);
}
diff --git a/tdeprint/lpr/editentrydialog.h b/tdeprint/lpr/editentrydialog.h
index f4359dd89..888f87eed 100644
--- a/tdeprint/lpr/editentrydialog.h
+++ b/tdeprint/lpr/editentrydialog.h
@@ -33,7 +33,7 @@ class TQWidgetStack;
class EditEntryDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
EditEntryDialog(PrintcapEntry *entry, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 4dbe5e378..3de216f22 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -21,7 +21,7 @@
#include "kprinter.h"
#include "kmlprmanager.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <stdlib.h>
@@ -42,7 +42,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
return false;
cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
- QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
+ TQString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
if (!opts.isEmpty())
cmd += (" " + opts);
return true;
@@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value
KPrinterImpl::broadcastOption(key,value);
if (key == "kde-pagesize")
{
- QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+ TQString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
KPrinterImpl::broadcastOption("PageSize",pagename);
}
}
diff --git a/tdeprint/lpr/klprprinterimpl.h b/tdeprint/lpr/klprprinterimpl.h
index 508173f1d..3d3e9a080 100644
--- a/tdeprint/lpr/klprprinterimpl.h
+++ b/tdeprint/lpr/klprprinterimpl.h
@@ -32,7 +32,7 @@ public:
void broadcastOption(const TQString& key, const TQString& value);
private:
- QString m_exepath;
+ TQString m_exepath;
};
#endif
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index fed1dd17d..ffd8db77a 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -34,7 +34,7 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
setPageHeader(i18n("Spooler Settings"));
setPagePixmap("gear");
- TQGroupBox *m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this);
+ TQGroupBox *m_modebox = new TQGroupBox(1, TQt::Vertical, i18n("Spooler"), this);
m_mode = new TQComboBox(m_modebox);
m_mode->insertItem("LPR (BSD compatible)");
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 046f082f7..da6a571e3 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -31,10 +31,10 @@
#include <tqfileinfo.h>
#include <tqptrlist.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kprinter.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeaction.h>
#include <tdemessagebox.h>
#include <klibloader.h>
@@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt)
void KMLprManager::createPluginActions(TDEActionCollection *coll)
{
- TDEAction *act = new TDEAction(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, TQ_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
act->setGroup("plugin");
}
diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h
index d26af4d77..c4be757b1 100644
--- a/tdeprint/lpr/kmlprmanager.h
+++ b/tdeprint/lpr/kmlprmanager.h
@@ -34,7 +34,7 @@ class KPrinter;
class KMLprManager : public KMManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMLprManager(TQObject *parent, const char *name, const TQStringList & /*args*/);
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index b366537e5..64e78397a 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -22,12 +22,12 @@
#include "kmjob.h"
#include "lprsettings.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqtextstream.h>
#include <tqregexp.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <stdlib.h>
static TQString execute(const TQString& cmd)
diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp
index 1c02cafc7..aca879833 100644
--- a/tdeprint/lpr/lpqhelper.cpp
+++ b/tdeprint/lpr/lpqhelper.cpp
@@ -22,8 +22,8 @@
#include "kpipeprocess.h"
#include "lprsettings.h"
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
#include <kdebug.h>
LpqHelper::LpqHelper(TQObject *parent, const char *name)
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index 960f5adb8..5732b6808 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -30,7 +30,7 @@
#include <tqtextstream.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
LPRngToolHandler::LPRngToolHandler(KMManager *mgr)
: LprHandler("lprngtool", mgr)
diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h
index 590eafdff..2545993fc 100644
--- a/tdeprint/lpr/lprsettings.h
+++ b/tdeprint/lpr/lprsettings.h
@@ -58,9 +58,9 @@ protected:
private:
static LprSettings* m_self;
Mode m_mode;
- QString m_printcapfile;
+ TQString m_printcapfile;
bool m_local;
- QString m_spooldir;
+ TQString m_spooldir;
TQString m_defaultremotehost;
};
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 07fee1260..74c3c62c6 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -30,10 +30,10 @@
#include "foomatic2loader.h"
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqregexp.h>
@@ -224,7 +224,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
// is not self-contained. If the printer is removed (when
// changing printer name), the template would be also removed
TQString origfilename = maticFile(entry);
- TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+ TQString filename = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename)));
DrMain *driver = Foomatic2Loader::loadDriver(filename);
if (driver)
@@ -246,7 +246,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
return NULL;
}
- TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+ TQString tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty())
@@ -291,7 +291,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain *driver, bool*)
{
- TQFile tmpFile(locateLocal("tmp", "foomatic_" + kapp->randomString(8)));
+ TQFile tmpFile(locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)));
TQFile inFile(driver->get("template"));
TQString outFile = maticFile(entry);
bool result(false);
diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp
index 718ffca21..8a1e1ee9a 100644
--- a/tdeprint/lpr/printcapreader.cpp
+++ b/tdeprint/lpr/printcapreader.cpp
@@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f)
{
if (f->isOpen())
{
- m_stream.setDevice(TQT_TQIODEVICE(f));
+ m_stream.setDevice(f);
m_buffer = TQString::null;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-16 06:38:58 +0000