diff options
Diffstat (limited to 'tdeprint/cups/kmcupsmanager.cpp')
| -rw-r--r-- | tdeprint/cups/kmcupsmanager.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index ee1c62728..8dffc7125 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -44,14 +44,14 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdesocketbase.h> #include <klibloader.h> #include <tdemessagebox.h> #include <tdeaction.h> #include <kdialogbase.h> #include <kextendedsocket.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kbufferedsocket.h> #include <kfilterdev.h> #include <cups/cups.h> @@ -292,8 +292,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // Give 2 seconds to connect to the printer, or abort KExtendedSocket *kes = new KExtendedSocket(p->uri().host(), p->uri().port()); - connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot())); - connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot())); + connect(kes, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(hostPingSlot())); + connect(kes, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(hostPingFailedSlot())); if (kes->startAsyncConnect() != 0) { delete kes; m_hostSuccess = false; @@ -639,7 +639,7 @@ DrMain* KMCupsManager::loadFileDriver(const TQString& filename) DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { TQStringList comps = TQStringList::split('/', drname, false); - TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); + TQString tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)); #if defined(__OpenBSD__) || defined(__FreeBSD__) TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); #else @@ -807,7 +807,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d) { - TQString tmpfilename = locateLocal("tmp","print_") + kapp->randomString(8); + TQString tmpfilename = locateLocal("tmp","print_") + tdeApp->randomString(8); // first save the driver in a temporary file saveDriverFile(d,tmpfilename); @@ -938,9 +938,9 @@ TQStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQ_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQ_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } @@ -1020,12 +1020,12 @@ void KMCupsManager::checkUpdatePossibleInternal() delete m_socket; m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); - connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), - TQT_SLOT( slotConnectionSuccess() ) ); - connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( m_socket, TQ_SIGNAL( connected(const KResolverEntry&) ), + TQ_SLOT( slotConnectionSuccess() ) ); + connect( m_socket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); trials = 5; - TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotAsyncConnect() ) ); } void KMCupsManager::slotConnectionSuccess() @@ -1044,7 +1044,7 @@ void KMCupsManager::slotConnectionSuccess() if ( trials > 0 ) { trials--; - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); } else { @@ -1074,7 +1074,7 @@ void KMCupsManager::slotConnectionFailed( int errcode ) //m_socket->cancelAsyncConnect(); trials--; m_socket->close(); - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); return; } |