diff options
Diffstat (limited to 'languages/cpp/debugger/gdbcontroller.cpp')
| -rw-r--r-- | languages/cpp/debugger/gdbcontroller.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index bca8b98d..da53c0ec 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -30,7 +30,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <twin.h> #include <tqdatetime.h> @@ -798,17 +798,17 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); application_ = application; @@ -984,7 +984,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000) break; @@ -1002,7 +1002,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000) break; @@ -1018,7 +1018,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -1098,11 +1098,11 @@ void GDBController::slotRun() if (stateIsOn(s_appNotStarted)) { delete tty_; - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -1459,9 +1459,9 @@ void GDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) FileSymbol file; file.contents = reply; - std::auto_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); + std::unique_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); - if (r.get() == 0) + if (!r) { // FIXME: Issue an error! kdDebug(9012) << "Invalid MI message: " << reply << "\n"; @@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const void GDBController::demandAttention() const { - if ( TQWidget * w = kapp->mainWidget() ) + if ( TQWidget * w = tdeApp->mainWidget() ) { KWin::demandAttention( w->winId(), true ); } |