diff options
Diffstat (limited to 'tdeinit/tdelauncher.cpp')
| -rw-r--r-- | tdeinit/tdelauncher.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp index 8325f3acb..c254ebaa4 100644 --- a/tdeinit/tdelauncher.cpp +++ b/tdeinit/tdelauncher.cpp @@ -40,7 +40,7 @@ #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 @@ -169,7 +169,7 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup) tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ), dontBlockReading(false), newStartup( new_startup ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 mCached_dpy = NULL; #endif connect(&mAutoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoStart())); @@ -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 @@ -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; @@ -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; |