diff options
Diffstat (limited to 'klinkstatus/src/global.cpp')
| -rw-r--r-- | klinkstatus/src/global.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 4fa6d88f..f214a85b 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -20,7 +20,7 @@ #include <tdeapplication.h> #include <kstaticdeleter.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <sys/types.h> #include <unistd.h> @@ -44,7 +44,7 @@ Global::Global(TQObject *parent, const char *name) : TQObject(parent, name), loop_started_(false) { m_self_ = this; - dcop_client_ = kapp->dcopClient(); + dcop_client_ = tdeApp->dcopClient(); } Global::~Global() @@ -89,7 +89,7 @@ bool Global::isQuantaAvailableViaDCOP() TQCString Global::quantaDCOPAppId() { - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); TQCString app_id; if(client->isApplicationRegistered("quanta")) // quanta is unnique application @@ -111,7 +111,7 @@ TQCString Global::quantaDCOPAppId() { ps_list[i] = ps_list[i].stripWhiteSpace (); if(self()->dcop_client_->isApplicationRegistered("quanta-" + ps_list[i].local8Bit())) - app_id = "quanta-" + ps_list[i]; + app_id = "quanta-" + ps_list[i].utf8(); } } @@ -149,12 +149,12 @@ void Global::execCommand(TQString const& command) self()->process_PS_ = new TDEProcess(); *(self()->process_PS_) << TQStringList::split(" ",command); - connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(processExited(TDEProcess*)), - self(), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(processExited(TDEProcess*)), + self(), TQ_SLOT(slotProcessExited(TDEProcess*))); //if TDEProcess fails I think a message box is needed... I will fix it if (!self()->process_PS_->start(TDEProcess::NotifyOnExit,TDEProcess::All)) @@ -164,11 +164,11 @@ void Global::execCommand(TQString const& command) { //To avoid lock-ups, start a timer. TQTimer* timer = new TQTimer(self()); - connect(timer, TQT_SIGNAL(timeout()), - self(), TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + self(), TQ_SLOT(slotProcessTimeout())); timer->start(120*1000, true); self()->loop_started_ = true; - kapp->enter_loop(); + tdeApp->enter_loop(); delete timer; } } @@ -196,7 +196,7 @@ void Global::slotProcessTimeout() { if (loop_started_) { - kapp->exit_loop(); + tdeApp->exit_loop(); loop_started_ = false; } } |