summaryrefslogtreecommitdiffstats
path: root/tdeinit/tdelauncher.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdeinit/tdelauncher.cpp')
-rw-r--r--tdeinit/tdelauncher.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index 966a2ee45..371f1ba7b 100644
--- a/tdeinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
@@ -36,11 +36,11 @@
#include <tdeprotocolmanager.h>
#include <kprotocolinfo.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kurl.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
#include <tdestartupinfo.h> // schroder
#endif
@@ -52,8 +52,8 @@
#include "tdelauncher.h"
#include "tdelauncher_cmds.h"
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
//#undef K_WS_QTONLY
#include <X11/Xlib.h> // schroder
#endif
@@ -69,7 +69,7 @@ template class TQPtrList<IdleSlave>;
IdleSlave::IdleSlave(TDESocket *socket)
{
mConn.init(socket);
- mConn.connect(this, TQT_SLOT(gotInput()));
+ mConn.connect(this, TQ_SLOT(gotInput()));
mConn.send( CMD_SLAVE_STATUS );
mPid = 0;
mBirthDate = time(0);
@@ -164,20 +164,20 @@ IdleSlave::age(time_t now)
TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
// : TDEApplication( false, false ), // No Styles, No GUI
- : TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
+ : TDEApplication( false, true ), // TQClipboard tries to construct a TQWidget so a GUI is technically needed, even though it is not used
DCOPObject("tdelauncher"),
tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
dontBlockReading(false), newStartup( new_startup )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
mCached_dpy = NULL;
#endif
- connect(&mAutoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoStart()));
+ connect(&mAutoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoStart()));
requestList.setAutoDelete(true);
mSlaveWaitRequest.setAutoDelete(true);
dcopClient()->setNotifications( true );
- connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)),
- this, TQT_SLOT( slotAppRegistered( const TQCString &)));
+ connect(dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString &)),
+ this, TQ_SLOT( slotAppRegistered( const TQCString &)));
dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()",
objId(), "terminateTDE()", false );
@@ -195,14 +195,14 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
domainname.unlink();
#endif
mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
- connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
- TQT_SLOT(acceptSlave(TDESocket *)));
+ connect(mPoolSocket, TQ_SIGNAL(accepted( TDESocket *)),
+ TQ_SLOT(acceptSlave(TDESocket *)));
- connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
+ connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout()));
tdeinitNotifier = new TQSocketNotifier(tdeinitSocket, TQSocketNotifier::Read);
- connect(tdeinitNotifier, TQT_SIGNAL( activated( int )),
- this, TQT_SLOT( slotKDEInitData( int )));
+ connect(tdeinitNotifier, TQ_SIGNAL( activated( int )),
+ this, TQ_SLOT( slotKDEInitData( int )));
tdeinitNotifier->setEnabled( true );
lastRequest = 0;
bProcessingQueue = false;
@@ -236,8 +236,8 @@ void TDELauncher::close()
TQCString filename = TQFile::encodeName(mPoolSocketName);
unlink(filename.data());
}
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
if( mCached_dpy != NULL )
XCloseDisplay( mCached_dpy );
#endif
@@ -246,8 +246,8 @@ void TDELauncher::close()
void
TDELauncher::destruct(int exit_code)
{
- if (kapp) ((TDELauncher*)kapp)->close();
- // We don't delete kapp here, that's intentional.
+ if (tdeApp) ((TDELauncher*)tdeApp)->close();
+ // We don't delete tdeApp here, that's intentional.
::exit(exit_code);
}
@@ -746,8 +746,8 @@ TDELauncher::requestDone(TDELaunchRequest *request)
DCOPresult.error += ":\n" + request->errorMsg;
DCOPresult.pid = 0;
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
if (!request->startup_dpy.isEmpty())
{
Display* dpy = NULL;
@@ -811,7 +811,7 @@ TDELauncher::requestStart(TDELaunchRequest *request)
length += (*it).length() + 1; // Envs...
}
length += sizeof( long ); // avoid_loops
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool startup_notify = !request->startup_id.isNull() && request->startup_id != "0";
if( startup_notify )
length += request->startup_id.length() + 1;
@@ -847,7 +847,7 @@ TDELauncher::requestStart(TDELaunchRequest *request)
l = 0; // avoid_loops, always false here
memcpy(p, &l, sizeof(long));
p += sizeof(long);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if( startup_notify )
{
strcpy(p, request->startup_id.data());
@@ -859,7 +859,7 @@ TDELauncher::requestStart(TDELaunchRequest *request)
strcpy(p, request->cwd.data());
p += strlen( p ) + 1;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
request_header.cmd = startup_notify ? LAUNCHER_EXT_EXEC : LAUNCHER_EXEC_NEW;
#else
request_header.cmd = LAUNCHER_EXEC_NEW;
@@ -1050,8 +1050,8 @@ void
TDELauncher::send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
const TQValueList<TQCString> &envs )
{
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
request->startup_id = "0";
if( startup_id == "0" )
return;
@@ -1105,8 +1105,8 @@ void
TDELauncher::cancel_service_startup_info( TDELaunchRequest* request, const TQCString& startup_id,
const TQValueList<TQCString> &envs )
{
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
if( request != NULL )
request->startup_id = "0";
if( !startup_id.isEmpty() && startup_id != "0" )
@@ -1158,7 +1158,7 @@ TDELauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
request->dcop_service_type = KService::DCOP_None;
request->dcop_name = 0;
request->pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
request->startup_id = startup_id;
#endif
request->envs = envs;
@@ -1184,7 +1184,7 @@ TDELauncher::queueRequest(TDELaunchRequest *request)
if (!bProcessingQueue)
{
bProcessingQueue = true;
- TQTimer::singleShot(0, this, TQT_SLOT( slotDequeue() ));
+ TQTimer::singleShot(0, this, TQ_SLOT( slotDequeue() ));
}
}
@@ -1318,7 +1318,7 @@ TDELauncher::requestSlave(const TQString &protocol,
request->dcop_name = 0;
request->dcop_service_type = KService::DCOP_None;
request->pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
request->startup_id = "0";
#endif
request->status = TDELaunchRequest::Launching;
@@ -1358,9 +1358,9 @@ TDELauncher::acceptSlave(TDESocket *slaveSocket)
IdleSlave *slave = new IdleSlave(slaveSocket);
// Send it a SLAVE_STATUS command.
mSlaveList.append(slave);
- connect(slave, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSlaveGone()));
- connect(slave, TQT_SIGNAL(statusUpdate(IdleSlave *)),
- this, TQT_SLOT(slotSlaveStatus(IdleSlave *)));
+ connect(slave, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSlaveGone()));
+ connect(slave, TQ_SIGNAL(statusUpdate(IdleSlave *)),
+ this, TQ_SLOT(slotSlaveStatus(IdleSlave *)));
if (!mTimer.isActive())
{
mTimer.start(1000*10);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 14:00:07 +0000