Debugger: Avoid some Gdb* in common type names

They had been created for use with GDB, but are more general
nowadays.

s/GdbResponse/DebuggerResponse/,
s/GdbResultClass/ResultClass, etc

Change-Id: Idfa3e280cdda882a8b3f02dff7e7d993e7e82d03
Reviewed-by: hjk <hjk@theqtcompany.com>

src/plugins/debugger/debuggerprotocol.cpp

@@ -395,19 +395,19 @@ qulonglong GdbMi::toAddress() const
 //
 //////////////////////////////////////////////////////////////////////////////////
 
-QByteArray GdbResponse::stringFromResultClass(GdbResultClass resultClass)
+QByteArray DebuggerResponse::stringFromResultClass(ResultClass resultClass)
 {
     switch (resultClass) {
-        case GdbResultDone: return "done";
-        case GdbResultRunning: return "running";
-        case GdbResultConnected: return "connected";
-        case GdbResultError: return "error";
-        case GdbResultExit: return "exit";
+        case ResultDone: return "done";
+        case ResultRunning: return "running";
+        case ResultConnected: return "connected";
+        case ResultError: return "error";
+        case ResultExit: return "exit";
         default: return "unknown";
     }
 }
 
-QByteArray GdbResponse::toString() const
+QByteArray DebuggerResponse::toString() const
 {
     QByteArray result;
     if (token != -1)

src/plugins/debugger/debuggerprotocol.h

@@ -170,26 +170,26 @@ public:
     void dumpChildren(QByteArray *str, bool multiline, int indent) const;
 };
 
-enum GdbResultClass
+enum ResultClass
 {
     // "done" | "running" | "connected" | "error" | "exit"
-    GdbResultUnknown,
-    GdbResultDone,
-    GdbResultRunning,
-    GdbResultConnected,
-    GdbResultError,
-    GdbResultExit
+    ResultUnknown,
+    ResultDone,
+    ResultRunning,
+    ResultConnected,
+    ResultError,
+    ResultExit
 };
 
-class GdbResponse
+class DebuggerResponse
 {
 public:
-    GdbResponse() : token(-1), resultClass(GdbResultUnknown) {}
+    DebuggerResponse() : token(-1), resultClass(ResultUnknown) {}
     QByteArray toString() const;
-    static QByteArray stringFromResultClass(GdbResultClass resultClass);
+    static QByteArray stringFromResultClass(ResultClass resultClass);
 
     int            token;
-    GdbResultClass resultClass;
+    ResultClass    resultClass;
     GdbMi          data;
     QVariant       cookie;
     QByteArray     logStreamOutput;

src/plugins/debugger/gdb/attachgdbadapter.cpp

@@ -36,13 +36,10 @@
 
 #include <utils/qtcassert.h>
 
-
 namespace Debugger {
 namespace Internal {
 
-#define CB(callback) \
-    static_cast<GdbEngine::GdbCommandCallback>(&GdbAttachEngine::callback), \
-    STRINGIFY(callback)
+#define CB(callback) [this](const DebuggerResponse &r) { callback(r); }, STRINGIFY(callback)
 
 ///////////////////////////////////////////////////////////////////////
 //
@@ -85,17 +82,17 @@ void GdbAttachEngine::runEngine()
     handleStop1(GdbMi());
 }
 
-void GdbAttachEngine::handleAttach(const GdbResponse &response)
+void GdbAttachEngine::handleAttach(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
     switch (response.resultClass) {
-    case GdbResultDone:
-    case GdbResultRunning:
+    case ResultDone:
+    case ResultRunning:
         showMessage(_("INFERIOR ATTACHED"));
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
         handleInferiorPrepared();
         break;
-    case GdbResultError:
+    case ResultError:
         if (response.data["msg"].data() == "ptrace: Operation not permitted.") {
             notifyInferiorSetupFailed(msgPtraceError(startParameters().startMode));
             break;

src/plugins/debugger/gdb/attachgdbadapter.h

@@ -57,7 +57,7 @@ private:
     void interruptInferior2();
     void shutdownEngine();
 
-    void handleAttach(const GdbResponse &response);
+    void handleAttach(const DebuggerResponse &response);
 };
 
 } // namespace Internal

src/plugins/debugger/gdb/coregdbadapter.cpp

@@ -48,9 +48,7 @@ using namespace Utils;
 namespace Debugger {
 namespace Internal {
 
-#define CB(callback) \
-    static_cast<GdbEngine::GdbCommandCallback>(&GdbCoreEngine::callback), \
-    STRINGIFY(callback)
+#define CB(callback) [this](const DebuggerResponse &r) { callback(r); }, STRINGIFY(callback)
 
 ///////////////////////////////////////////////////////////////////////
 //
@@ -219,11 +217,11 @@ void GdbCoreEngine::setupInferior()
          CB(handleFileExecAndSymbols));
 }
 
-void GdbCoreEngine::handleFileExecAndSymbols(const GdbResponse &response)
+void GdbCoreEngine::handleFileExecAndSymbols(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
     QString core = coreFileName();
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         showMessage(tr("Symbols found."), StatusBar);
         postCommand("target core " + core.toLocal8Bit(),
             CB(handleTargetCore));
@@ -240,10 +238,10 @@ void GdbCoreEngine::handleFileExecAndSymbols(const GdbResponse &response)
     notifyInferiorSetupFailed(msg);
 }
 
-void GdbCoreEngine::handleTargetCore(const GdbResponse &response)
+void GdbCoreEngine::handleTargetCore(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         showMessage(tr("Attached to core."), StatusBar);
         handleInferiorPrepared();
         // Due to the auto-solib-add off setting, we don't have any
@@ -260,7 +258,7 @@ void GdbCoreEngine::handleTargetCore(const GdbResponse &response)
     notifyInferiorSetupFailed(msg);
 }
 
-void GdbCoreEngine::handleRoundTrip(const GdbResponse &response)
+void GdbCoreEngine::handleRoundTrip(const DebuggerResponse &response)
 {
     Q_UNUSED(response);
     loadSymbolsForStack();

src/plugins/debugger/gdb/coregdbadapter.h

@@ -66,9 +66,9 @@ private:
     void interruptInferior();
     void shutdownEngine();
 
-    void handleFileExecAndSymbols(const GdbResponse &response);
-    void handleTargetCore(const GdbResponse &response);
-    void handleRoundTrip(const GdbResponse &response);
+    void handleFileExecAndSymbols(const DebuggerResponse &response);
+    void handleTargetCore(const DebuggerResponse &response);
+    void handleRoundTrip(const DebuggerResponse &response);
     void unpackCoreIfNeeded();
     QString coreFileName() const;
     QString coreName() const;

src/plugins/debugger/gdb/gdbengine.h

@@ -53,7 +53,7 @@ namespace Internal {
 class GdbProcess;
 class DebugInfoTask;
 class DebugInfoTaskHandler;
-class GdbResponse;
+class DebuggerResponse;
 class GdbMi;
 class MemoryAgentCookie;
 class BreakpointParameters;
@@ -100,8 +100,8 @@ private: ////////// General State //////////
 protected: ////////// Gdb Process Management //////////
 
     void startGdb(const QStringList &args = QStringList());
-    void handleInferiorShutdown(const GdbResponse &response);
-    void handleGdbExit(const GdbResponse &response);
+    void handleInferiorShutdown(const DebuggerResponse &response);
+    void handleGdbExit(const DebuggerResponse &response);
 
     void loadInitScript();
 
@@ -116,7 +116,7 @@ protected: ////////// Gdb Process Management //////////
     // This notifies the base of a successful inferior setup.
     void finishInferiorSetup();
 
-    void handleDebugInfoLocation(const GdbResponse &response);
+    void handleDebugInfoLocation(const DebuggerResponse &response);
 
     // The adapter is still running just fine, but it failed to acquire a debuggee.
     void notifyInferiorSetupFailed(const QString &msg);
@@ -158,9 +158,9 @@ private: ////////// Gdb Command Management //////////
         Discardable = 2,
         // We can live without receiving an answer.
         NonCriticalResponse = 8,
-        // Callback expects GdbResultRunning instead of GdbResultDone.
+        // Callback expects ResultRunning instead of ResultDone.
         RunRequest = 16,
-        // Callback expects GdbResultExit instead of GdbResultDone.
+        // Callback expects ResultExit instead of ResultDone.
         ExitRequest = 32,
         // Auto-set inferior shutdown related states.
         LosesChild = 64,
@@ -174,7 +174,7 @@ private: ////////// Gdb Command Management //////////
     Q_DECLARE_FLAGS(GdbCommandFlags, GdbCommandFlag)
 
     protected:
-    typedef void (GdbEngine::*GdbCommandCallback)(const GdbResponse &response);
+    typedef std::function<void(const DebuggerResponse &)> GdbCommandCallback;
 
     struct GdbCommand
     {
@@ -240,10 +240,10 @@ private: ////////// Gdb Output, State & Capability Handling //////////
 protected:
     Q_SLOT void handleResponse(const QByteArray &buff);
     void handleStopResponse(const GdbMi &data);
-    void handleResultRecord(GdbResponse *response);
-    void handleStop1(const GdbResponse &response);
+    void handleResultRecord(DebuggerResponse *response);
+    void handleStop1(const DebuggerResponse &response);
     void handleStop1(const GdbMi &data);
-    void handleStop2(const GdbResponse &response);
+    void handleStop2(const DebuggerResponse &response);
     void handleStop2(const GdbMi &data);
     Q_SLOT void handleStop2();
     StackFrame parseStackFrame(const GdbMi &mi, int level);
@@ -252,9 +252,9 @@ protected:
     bool isSynchronous() const { return true; }
 
     // Gdb initialization sequence
-    void handleShowVersion(const GdbResponse &response);
-    void handleListFeatures(const GdbResponse &response);
-    void handlePythonSetup(const GdbResponse &response);
+    void handleShowVersion(const DebuggerResponse &response);
+    void handleListFeatures(const DebuggerResponse &response);
+    void handlePythonSetup(const DebuggerResponse &response);
 
     int m_gdbVersion; // 7.6.1 is 70601
     bool m_isQnxGdb;
@@ -287,15 +287,15 @@ private: ////////// Inferior Management //////////
     void executeJumpToLine(const ContextData &data);
     void executeReturn();
 
-    void handleExecuteContinue(const GdbResponse &response);
-    void handleExecuteStep(const GdbResponse &response);
-    void handleExecuteNext(const GdbResponse &response);
-    void handleExecuteReturn(const GdbResponse &response);
-    void handleExecuteJumpToLine(const GdbResponse &response);
-    void handleExecuteRunToLine(const GdbResponse &response);
+    void handleExecuteContinue(const DebuggerResponse &response);
+    void handleExecuteStep(const DebuggerResponse &response);
+    void handleExecuteNext(const DebuggerResponse &response);
+    void handleExecuteReturn(const DebuggerResponse &response);
+    void handleExecuteJumpToLine(const DebuggerResponse &response);
+    void handleExecuteRunToLine(const DebuggerResponse &response);
 
     void maybeHandleInferiorPidChanged(const QString &pid);
-    void handleInfoProc(const GdbResponse &response);
+    void handleInfoProc(const DebuggerResponse &response);
     QString msgPtraceError(DebuggerStartMode sm);
 
 private: ////////// View & Data Stuff //////////
@@ -307,18 +307,18 @@ private: ////////// View & Data Stuff //////////
     // Breakpoint specific stuff
     //
     void handleBreakModifications(const GdbMi &bkpts);
-    void handleBreakIgnore(const GdbResponse &response);
-    void handleBreakDisable(const GdbResponse &response);
-    void handleBreakEnable(const GdbResponse &response);
-    void handleBreakInsert1(const GdbResponse &response);
-    void handleBreakInsert2(const GdbResponse &response);
-    void handleBreakDelete(const GdbResponse &response);
-    void handleTraceInsert2(const GdbResponse &response);
-    void handleBreakCondition(const GdbResponse &response);
-    void handleBreakThreadSpec(const GdbResponse &response);
-    void handleBreakLineNumber(const GdbResponse &response);
-    void handleWatchInsert(const GdbResponse &response);
-    void handleCatchInsert(const GdbResponse &response);
+    void handleBreakIgnore(const DebuggerResponse &response);
+    void handleBreakDisable(const DebuggerResponse &response);
+    void handleBreakEnable(const DebuggerResponse &response);
+    void handleBreakInsert1(const DebuggerResponse &response);
+    void handleBreakInsert2(const DebuggerResponse &response);
+    void handleBreakDelete(const DebuggerResponse &response);
+    void handleTraceInsert2(const DebuggerResponse &response);
+    void handleBreakCondition(const DebuggerResponse &response);
+    void handleBreakThreadSpec(const DebuggerResponse &response);
+    void handleBreakLineNumber(const DebuggerResponse &response);
+    void handleWatchInsert(const DebuggerResponse &response);
+    void handleCatchInsert(const DebuggerResponse &response);
     void handleBkpt(const GdbMi &bkpt, Breakpoint bp);
     void updateResponse(BreakpointResponse &response, const GdbMi &bkpt);
     QByteArray breakpointLocation(const BreakpointParameters &data); // For gdb/MI.
@@ -338,24 +338,24 @@ private: ////////// View & Data Stuff //////////
     void examineModules();
 
     void reloadModulesInternal();
-    void handleModulesList(const GdbResponse &response);
-    void handleShowModuleSymbols(const GdbResponse &response);
-    void handleShowModuleSections(const GdbResponse &response);
+    void handleModulesList(const DebuggerResponse &response);
+    void handleShowModuleSymbols(const DebuggerResponse &response);
+    void handleShowModuleSections(const DebuggerResponse &response);
 
     //
     // Snapshot specific stuff
     //
     virtual void createSnapshot();
-    void handleMakeSnapshot(const GdbResponse &response);
+    void handleMakeSnapshot(const DebuggerResponse &response);
 
     //
     // Register specific stuff
     //
     Q_SLOT void reloadRegisters();
     void setRegisterValue(const QByteArray &name, const QString &value);
-    void handleRegisterListNames(const GdbResponse &response);
-    void handleRegisterListValues(const GdbResponse &response);
-    void handleMaintPrintRegisters(const GdbResponse &response);
+    void handleRegisterListNames(const DebuggerResponse &response);
+    void handleRegisterListValues(const DebuggerResponse &response);
+    void handleMaintPrintRegisters(const DebuggerResponse &response);
     QHash<int, QByteArray> m_registerNames; // Map GDB register numbers to indices
 
     //
@@ -366,19 +366,19 @@ private: ////////// View & Data Stuff //////////
     void fetchDisassemblerByCliPointMixed(const DisassemblerAgentCookie &ac);
     void fetchDisassemblerByCliRangeMixed(const DisassemblerAgentCookie &ac);
     void fetchDisassemblerByCliRangePlain(const DisassemblerAgentCookie &ac);
-    void handleFetchDisassemblerByCliPointMixed(const GdbResponse &response);
-    void handleFetchDisassemblerByCliRangeMixed(const GdbResponse &response);
-    void handleFetchDisassemblerByCliRangePlain(const GdbResponse &response);
+    void handleFetchDisassemblerByCliPointMixed(const DebuggerResponse &response);
+    void handleFetchDisassemblerByCliRangeMixed(const DebuggerResponse &response);
+    void handleFetchDisassemblerByCliRangePlain(const DebuggerResponse &response);
     bool handleCliDisassemblerResult(const QByteArray &response, DisassemblerAgent *agent);
 
-    void handleBreakOnQFatal(const GdbResponse &response);
+    void handleBreakOnQFatal(const DebuggerResponse &response);
 
     //
     // Source file specific stuff
     //
     void reloadSourceFiles();
     void reloadSourceFilesInternal();
-    void handleQuerySources(const GdbResponse &response);
+    void handleQuerySources(const DebuggerResponse &response);
 
     QString fullName(const QString &fileName);
     QString cleanupFullName(const QString &fileName);
@@ -395,17 +395,17 @@ private: ////////// View & Data Stuff //////////
     //
 protected:
     void updateAll();
-    void handleStackListFrames(const GdbResponse &response);
-    void handleStackSelectThread(const GdbResponse &response);
-    void handleThreadListIds(const GdbResponse &response);
-    void handleThreadInfo(const GdbResponse &response);
-    void handleThreadNames(const GdbResponse &response);
+    void handleStackListFrames(const DebuggerResponse &response);
+    void handleStackSelectThread(const DebuggerResponse &response);
+    void handleThreadListIds(const DebuggerResponse &response);
+    void handleThreadInfo(const DebuggerResponse &response);
+    void handleThreadNames(const DebuggerResponse &response);
     QByteArray stackCommand(int depth);
     Q_SLOT void reloadStack(bool forceGotoLocation);
     Q_SLOT virtual void reloadFullStack();
     virtual void loadAdditionalQmlStack();
-    void handleQmlStackFrameArguments(const GdbResponse &response);
-    void handleQmlStackTrace(const GdbResponse &response);
+    void handleQmlStackFrameArguments(const DebuggerResponse &response);
+    void handleQmlStackTrace(const DebuggerResponse &response);
     int currentFrame() const;
 
     QList<GdbMi> m_currentFunctionArgs;
@@ -421,13 +421,13 @@ protected:
     virtual void fetchMemory(MemoryAgent *agent, QObject *token,
         quint64 addr, quint64 length);
     void fetchMemoryHelper(const MemoryAgentCookie &cookie);
-    void handleChangeMemory(const GdbResponse &response);
+    void handleChangeMemory(const DebuggerResponse &response);
     virtual void changeMemory(MemoryAgent *agent, QObject *token,
         quint64 addr, const QByteArray &data);
-    void handleFetchMemory(const GdbResponse &response);
+    void handleFetchMemory(const DebuggerResponse &response);
 
     virtual void watchPoint(const QPoint &);
-    void handleWatchPoint(const GdbResponse &response);
+    void handleWatchPoint(const DebuggerResponse &response);
 
     void updateWatchData(const WatchData &data, const WatchUpdateFlags &flags);
     void rebuildWatchModel();
@@ -435,17 +435,17 @@ protected:
 
     void insertData(const WatchData &data);
 
-    void handleVarAssign(const GdbResponse &response);
-    void handleDetach(const GdbResponse &response);
+    void handleVarAssign(const DebuggerResponse &response);
+    void handleDetach(const DebuggerResponse &response);
     void handleThreadGroupCreated(const GdbMi &result);
     void handleThreadGroupExited(const GdbMi &result);
 
     Q_SLOT void createFullBacktrace();
-    void handleCreateFullBacktrace(const GdbResponse &response);
+    void handleCreateFullBacktrace(const DebuggerResponse &response);
 
     void updateLocals();
         void updateLocalsPython(const UpdateParameters &parameters);
-            void handleStackFramePython(const GdbResponse &response);
+            void handleStackFramePython(const DebuggerResponse &response);
 
     void setLocals(const QList<GdbMi> &locals);
 

src/plugins/debugger/gdb/gdbplainengine.cpp

@@ -45,9 +45,7 @@
 namespace Debugger {
 namespace Internal {
 
-#define CB(callback) \
-    static_cast<GdbEngine::GdbCommandCallback>(&GdbPlainEngine::callback), \
-    STRINGIFY(callback)
+#define CB(callback) [this](const DebuggerResponse &r) { callback(r); }, STRINGIFY(callback)
 
 GdbPlainEngine::GdbPlainEngine(const DebuggerStartParameters &startParameters)
     : GdbEngine(startParameters)
@@ -57,7 +55,6 @@ GdbPlainEngine::GdbPlainEngine(const DebuggerStartParameters &startParameters)
         this, SLOT(readDebugeeOutput(QByteArray)));
 }
 
-
 void GdbPlainEngine::setupInferior()
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
@@ -69,10 +66,10 @@ void GdbPlainEngine::setupInferior()
         CB(handleFileExecAndSymbols));
 }
 
-void GdbPlainEngine::handleFileExecAndSymbols(const GdbResponse &response)
+void GdbPlainEngine::handleFileExecAndSymbols(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         handleInferiorPrepared();
     } else {
         QByteArray ba = response.data["msg"].data();
@@ -92,10 +89,10 @@ void GdbPlainEngine::runEngine()
         postCommand("-exec-run", GdbEngine::RunRequest, CB(handleExecRun));
 }
 
-void GdbPlainEngine::handleExecRun(const GdbResponse &response)
+void GdbPlainEngine::handleExecRun(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
-    if (response.resultClass == GdbResultRunning) {
+    if (response.resultClass == ResultRunning) {
         //notifyEngineRunOkAndInferiorRunRequested();
         notifyEngineRunAndInferiorRunOk(); // For gdb < 7.0
         //showStatusMessage(tr("Running..."));

src/plugins/debugger/gdb/gdbplainengine.h

@@ -46,8 +46,8 @@ public:
     explicit GdbPlainEngine(const DebuggerStartParameters &startParameters);
 
 private:
-    void handleExecRun(const GdbResponse &response);
-    void handleFileExecAndSymbols(const GdbResponse &response);
+    void handleExecRun(const DebuggerResponse &response);
+    void handleFileExecAndSymbols(const DebuggerResponse &response);
 
     void setupInferior();
     void runEngine();

src/plugins/debugger/gdb/remotegdbserveradapter.cpp

@@ -49,9 +49,7 @@
 namespace Debugger {
 namespace Internal {
 
-#define CB(callback) \
-    static_cast<GdbEngine::GdbCommandCallback>(&GdbRemoteServerEngine::callback), \
-    STRINGIFY(callback)
+#define CB(callback) [this](const DebuggerResponse &r) { callback(r); }, STRINGIFY(callback)
 
 ///////////////////////////////////////////////////////////////////////
 //
@@ -220,17 +218,17 @@ void GdbRemoteServerEngine::setupInferior()
     }
 }
 
-void GdbRemoteServerEngine::handleSetTargetAsync(const GdbResponse &response)
+void GdbRemoteServerEngine::handleSetTargetAsync(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultError)
+    if (response.resultClass == ResultError)
         qDebug() << "Adapter too old: does not support asynchronous mode.";
 }
 
-void GdbRemoteServerEngine::handleFileExecAndSymbols(const GdbResponse &response)
+void GdbRemoteServerEngine::handleFileExecAndSymbols(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         callTargetRemote();
     } else {
         QByteArray reason = response.data["msg"].data();
@@ -273,10 +271,10 @@ void GdbRemoteServerEngine::callTargetRemote()
         postCommand("target remote " + channel, CB(handleTargetRemote), 10);
 }
 
-void GdbRemoteServerEngine::handleTargetRemote(const GdbResponse &response)
+void GdbRemoteServerEngine::handleTargetRemote(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         // gdb server will stop the remote application itself.
         showMessage(_("INFERIOR STARTED"));
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
@@ -294,10 +292,10 @@ void GdbRemoteServerEngine::handleTargetRemote(const GdbResponse &response)
     }
 }
 
-void GdbRemoteServerEngine::handleTargetExtendedRemote(const GdbResponse &response)
+void GdbRemoteServerEngine::handleTargetExtendedRemote(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         showMessage(_("ATTACHED TO GDB SERVER STARTED"));
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
         QString postAttachCommands = stringSetting(GdbPostAttachCommands);
@@ -320,10 +318,10 @@ void GdbRemoteServerEngine::handleTargetExtendedRemote(const GdbResponse &respon
     }
 }
 
-void GdbRemoteServerEngine::handleTargetExtendedAttach(const GdbResponse &response)
+void GdbRemoteServerEngine::handleTargetExtendedAttach(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         // gdb server will stop the remote application itself.
         handleInferiorPrepared();
     } else {
@@ -333,11 +331,11 @@ void GdbRemoteServerEngine::handleTargetExtendedAttach(const GdbResponse &respon
     }
 }
 
-void GdbRemoteServerEngine::handleTargetQnx(const GdbResponse &response)
+void GdbRemoteServerEngine::handleTargetQnx(const DebuggerResponse &response)
 {
     QTC_ASSERT(m_isQnxGdb, qDebug() << m_isQnxGdb);
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    if (response.resultClass == GdbResultDone) {
+    if (response.resultClass == ResultDone) {
         // gdb server will stop the remote application itself.
         showMessage(_("INFERIOR STARTED"));
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
@@ -358,18 +356,18 @@ void GdbRemoteServerEngine::handleTargetQnx(const GdbResponse &response)
     }
 }
 
-void GdbRemoteServerEngine::handleAttach(const GdbResponse &response)
+void GdbRemoteServerEngine::handleAttach(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
     switch (response.resultClass) {
-    case GdbResultDone:
-    case GdbResultRunning: {
+    case ResultDone:
+    case ResultRunning: {
         showMessage(_("INFERIOR ATTACHED"));
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
         handleInferiorPrepared();
         break;
     }
-    case GdbResultError:
+    case ResultError:
         if (response.data["msg"].data() == "ptrace: Operation not permitted.") {
             notifyInferiorSetupFailed(msgPtraceError(startParameters().startMode));
             break;
@@ -381,18 +379,18 @@ void GdbRemoteServerEngine::handleAttach(const GdbResponse &response)
     }
 }
 
-void GdbRemoteServerEngine::handleSetNtoExecutable(const GdbResponse &response)
+void GdbRemoteServerEngine::handleSetNtoExecutable(const DebuggerResponse &response)
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
     switch (response.resultClass) {
-    case GdbResultDone:
-    case GdbResultRunning: {
+    case ResultDone: