Debugger: rename gdb/gdbmi.{h,cpp} into debuggerprotocol.{h,cpp}

The scope is a bit broader nowadays.

Change-Id: I9578da94f06df199be5668c1751fd7bfb37f1c5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

src/plugins/debugger/cdb/cdbengine.cpp

@@ -38,6 +38,7 @@
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerinternalconstants.h"
+#include "debuggerprotocol.h"
 #include "debuggerrunner.h"
 #include "debuggerstartparameters.h"
 #include "debuggertooltipmanager.h"
@@ -51,7 +52,6 @@
 #include "threadshandler.h"
 #include "watchhandler.h"
 #include "watchutils.h"
-#include "gdb/gdbmi.h"
 #include "shared/cdbsymbolpathlisteditor.h"
 #include "shared/hostutils.h"
 #include "procinterrupt.h"

src/plugins/debugger/cdb/cdbparsehelpers.cpp

@@ -28,13 +28,14 @@
 ****************************************************************************/
 
 #include "cdbparsehelpers.h"
+
 #include "breakpoint.h"
-#include "threadshandler.h"
-#include "registerhandler.h"
 #include "bytearrayinputstream.h"
-#include "gdb/gdbmi.h"
+#include "debuggerprotocol.h"
 #include "disassemblerlines.h"
+#include "registerhandler.h"
 #include "shared/hostutils.h"
+#include "threadshandler.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/debugger/debugger.pro

@@ -34,6 +34,7 @@ HEADERS += \
     debuggerengine.h \
     debuggermainwindow.h \
     debuggerplugin.h \
+    debuggerprotocol.h \
     debuggerrunner.h \
     debuggerstartparameters.h \
     debuggerstreamops.h \
@@ -85,6 +86,7 @@ SOURCES += \
     debuggerengine.cpp \
     debuggermainwindow.cpp \
     debuggerplugin.cpp \
+    debuggerprotocol.cpp \
     debuggerrunner.cpp \
     debuggerstreamops.cpp \
     debuggerkitconfigwidget.cpp \

src/plugins/debugger/debugger.qbs

@@ -66,6 +66,8 @@ QtcPlugin {
         "debuggermainwindow.h",
         "debuggerplugin.cpp",
         "debuggerplugin.h",
+        "debuggerprotocol.cpp",
+        "debuggerprotocol.h",
         "debuggerruncontrolfactory.h",
         "debuggerrunner.cpp",
         "debuggerrunner.h",
@@ -160,8 +162,6 @@ QtcPlugin {
         "gdb/gdb.qrc",
         "gdb/gdbengine.cpp",
         "gdb/gdbengine.h",
-        "gdb/gdbmi.cpp",
-        "gdb/gdbmi.h",
         "gdb/gdboptionspage.cpp",
         "gdb/gdboptionspage.h",
         "gdb/localgdbprocess.cpp",

src/plugins/debugger/debuggerprotocol.cpp

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "gdbmi.h"
+#include "debuggerprotocol.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/debugger/debuggerprotocol.h

@@ -27,8 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_GDBMI_H
+#ifndef DEBUGGER_PROTOCOL_H
-#define DEBUGGER_GDBMI_H
+#define DEBUGGER_PROTOCOL_H
+
+#include "debugger_global.h"
 
 #include <QByteArray>
 #include <QList>
@@ -175,6 +177,5 @@ void extractGdbVersion(const QString &msg,
 } // namespace Internal
 } // namespace Debugger
 
-//Q_DECLARE_METATYPE(GdbDebugger::Internal::GdbMi)
 
-#endif // DEBUGGER_GDBMI_H
+#endif // DEBUGGER_PROTOCOL_H

src/plugins/debugger/gdb/abstractplaingdbadapter.cpp

@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 #include "abstractplaingdbadapter.h"
-#include "gdbmi.h"
+
-#include "gdbengine.h"
-#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
+#include "debuggerprotocol.h"
+#include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
 
 #include <QDir>

src/plugins/debugger/gdb/attachgdbadapter.cpp

@@ -28,12 +28,11 @@
 ****************************************************************************/
 
 #include "attachgdbadapter.h"
-#include "gdbmi.h"
-#include "debuggerstartparameters.h"
 
-#include "gdbengine.h"
+#include "debuggerprotocol.h"
-#include "procinterrupt.h"
 #include "debuggerstringutils.h"
+#include "debuggerstartparameters.h"
+#include "procinterrupt.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/debugger/gdb/classicgdbengine.cpp

@@ -28,13 +28,12 @@
 ****************************************************************************/
 
 #include "gdbengine.h"
-#include "gdbmi.h"
 
-#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
+#include "debuggerprotocol.h"
+#include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
-
 #include "stackhandler.h"
 #include "watchhandler.h"
 

src/plugins/debugger/gdb/coregdbadapter.cpp

@@ -29,12 +29,11 @@
 
 #include "coregdbadapter.h"
 
-#include "debuggerstartparameters.h"
-#include "debuggercore.h"
 #include "debuggeractions.h"
+#include "debuggercore.h"
+#include "debuggerprotocol.h"
+#include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
-#include "gdbmi.h"
-#include "gdbengine.h"
 
 #include <utils/consoleprocess.h>
 #include <utils/elfreader.h>

src/plugins/debugger/gdb/gdb.pri

@@ -1,5 +1,4 @@
 HEADERS += \
-    $$PWD/gdbmi.h \
     $$PWD/gdbengine.h \
     $$PWD/gdboptionspage.h \
     $$PWD/attachgdbadapter.h \
@@ -15,7 +14,6 @@ HEADERS += \
     $$PWD/startgdbserverdialog.h
 
 SOURCES += \
-    $$PWD/gdbmi.cpp \
     $$PWD/gdbengine.cpp \
     $$PWD/classicgdbengine.cpp \
     $$PWD/pythongdbengine.cpp \

src/plugins/debugger/gdb/gdbengine.cpp

@@ -44,11 +44,11 @@
 #include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerplugin.h"
+#include "debuggerprotocol.h"
 #include "debuggerrunner.h"
 #include "debuggerstringutils.h"
 #include "debuggertooltipmanager.h"
 #include "disassembleragent.h"
-#include "gdbmi.h"
 #include "gdboptionspage.h"
 #include "memoryagent.h"
 #include "watchutils.h"

src/plugins/debugger/gdb/pythongdbengine.cpp

@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "gdbengine.h"
-#include "gdbmi.h"
+
+#include "debuggerprotocol.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerstringutils.h"

src/plugins/debugger/gdb/remotegdbserveradapter.cpp

@@ -30,17 +30,16 @@
 #include "remotegdbserveradapter.h"
 
 #include "debuggeractions.h"
-#include "debuggerstartparameters.h"
 #include "debuggercore.h"
+#include "debuggerprotocol.h"
+#include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
-#include "gdbengine.h"
-#include "gdbmi.h"
 
+#include <projectexplorer/abi.h>
+#include <utils/fancymainwindow.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
-#include <utils/fancymainwindow.h>
 #include <utils/qtcprocess.h>
-#include <projectexplorer/abi.h>
 
 #include <QFileInfo>
 #include <QMessageBox>

src/plugins/debugger/gdb/termgdbadapter.cpp

@@ -29,12 +29,11 @@
 
 #include "termgdbadapter.h"
 
-#include "debuggerstartparameters.h"
-#include "gdbmi.h"
-#include "gdbengine.h"
-#include "procinterrupt.h"
-#include "debuggerstringutils.h"
 #include "debuggercore.h"
+#include "debuggerprotocol.h"
+#include "debuggerstartparameters.h"
+#include "debuggerstringutils.h"
+#include "procinterrupt.h"
 #include "shared/hostutils.h"
 
 #include <utils/hostosinfo.h>

src/plugins/debugger/pdb/pdbengine.cpp

@@ -29,11 +29,12 @@
 
 #include "pdbengine.h"
 
-#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerdialogs.h"
 #include "debuggerplugin.h"
+#include "debuggerprotocol.h"
+#include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
 #include "debuggertooltipmanager.h"
 
@@ -44,8 +45,6 @@
 #include "watchhandler.h"
 #include "watchutils.h"
 
-#include "../gdb/gdbmi.h"
-
 #include <utils/qtcassert.h>
 
 #include <texteditor/itexteditor.h>

src/plugins/debugger/threadshandler.cpp

@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 #include "threadshandler.h"
-#include "gdb/gdbmi.h"
-#include "watchutils.h"
 
 #include "debuggerconstants.h"
 #include "debuggercore.h"
+#include "debuggerprotocol.h"
+#include "watchutils.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/debugger/watchutils.cpp

@@ -29,8 +29,8 @@
 
 #include "watchutils.h"
 #include "watchdata.h"
+#include "debuggerprotocol.h"
 #include "debuggerstringutils.h"
-#include "gdb/gdbmi.h"
 
 #include <utils/qtcassert.h>
 

tests/auto/debugger/dumpers.pro

@@ -7,8 +7,8 @@ UTILSDIR    = $$IDE_SOURCE_TREE/src/libs/utils
 MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/dumper
 
 SOURCES += \
-    $$DEBUGGERDIR/gdb/gdbmi.cpp \
+    #$$DUMPERDIR/dumper.cpp \
-    $$MACROSDIR/dumper.cpp \
+    $$DEBUGGERDIR/debuggerprotocol.cpp \
     tst_dumpers.cpp
 
 exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += USE_PRIVATE

tests/auto/debugger/gdb.pro

@@ -9,4 +9,4 @@ INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
 
 SOURCES += \
     tst_gdb.cpp \
-    $$DEBUGGERDIR/gdb/gdbmi.cpp \
+    $$DEBUGGERDIR/debuggerprotocol.cpp \

tests/auto/debugger/tst_gdb.cpp

@@ -36,7 +36,7 @@ bool checkUninitialized = false;
 #define DO_DEBUG 1
 //TESTED_COMPONENT=src/plugins/debugger/gdb
 
-#include "gdb/gdbmi.h"
+#include "debuggerprotocol.h"
 
 #ifdef QT_GUI_LIB
 #include <QBitmap>

tests/auto/debugger/tst_version.cpp

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "gdb/gdbmi.h"
+#include "debuggerprotocol.h"
 
 #include <QtTest>
 

tests/auto/debugger/version.pro

@@ -8,5 +8,5 @@ INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
 
 SOURCES += \
     tst_version.cpp \
-    $$DEBUGGERDIR/gdb/gdbmi.cpp \
+    $$DEBUGGERDIR/debuggerprotocol.cpp \