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>

23 files changed, 47 insertions, 50 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 983e832a91..550d0360a7 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/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"
diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
index 4e53737094..f2d879ed1f 100644
--- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp
+++ b/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>
 
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index e24bb8116e..eb9e101e71 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/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 \
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index aca3f4b358..df334e33c1 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/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",
diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/debuggerprotocol.cpp
index b3d777f3cc..a194ff90df 100644
--- a/src/plugins/debugger/gdb/gdbmi.cpp
+++ b/src/plugins/debugger/debuggerprotocol.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "gdbmi.h"
+#include "debuggerprotocol.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/debuggerprotocol.h
index 6de4f9416d..539ac1129a 100644
--- a/src/plugins/debugger/gdb/gdbmi.h
+++ b/src/plugins/debugger/debuggerprotocol.h
@@ -27,8 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_GDBMI_H
-#define DEBUGGER_GDBMI_H
+#ifndef DEBUGGER_PROTOCOL_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
diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
index 54a689f6c7..c2e28e5fe1 100644
--- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
+++ b/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>
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 8198de832a..486f198469 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -28,12 +28,11 @@
 ****************************************************************************/
 
 #include "attachgdbadapter.h"
-#include "gdbmi.h"
-#include "debuggerstartparameters.h"
 
-#include "gdbengine.h"
-#include "procinterrupt.h"
+#include "debuggerprotocol.h"
 #include "debuggerstringutils.h"
+#include "debuggerstartparameters.h"
+#include "procinterrupt.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 7a8214fa26..a6634d8226 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/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"
 
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index 1586a65f96..88c203dc66 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/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>
diff --git a/src/plugins/debugger/gdb/gdb.pri b/src/plugins/debugger/gdb/gdb.pri
index b371e63e73..7a100e6851 100644
--- a/src/plugins/debugger/gdb/gdb.pri
+++ b/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 \
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 7a04053868..2d97fbcda2 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/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"
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 3cb423e56b..cffe79e9f9 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/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"
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 5042a847cd..6e0386be60 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/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>
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 6711575e9d..34256cf718 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -29,12 +29,11 @@
 
 #include "termgdbadapter.h"
 
+#include "debuggercore.h"
+#include "debuggerprotocol.h"
 #include "debuggerstartparameters.h"
-#include "gdbmi.h"
-#include "gdbengine.h"
-#include "procinterrupt.h"
 #include "debuggerstringutils.h"
-#include "debuggercore.h"
+#include "procinterrupt.h"
 #include "shared/hostutils.h"
 
 #include <utils/hostosinfo.h>
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 8539d99048..ca78dcff62 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/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>
diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp
index de41be2ba9..7669393ceb 100644
--- a/src/plugins/debugger/threadshandler.cpp
+++ b/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>
 
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 41aa9aa20f..a54e244145 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/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>
 
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 3f7e295972..ae523d34fa 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/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 \
-    $$MACROSDIR/dumper.cpp \
+    #$$DUMPERDIR/dumper.cpp \
+    $$DEBUGGERDIR/debuggerprotocol.cpp \
     tst_dumpers.cpp
 
 exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += USE_PRIVATE
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index 164bb5b75e..7fc000fbc9 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -9,4 +9,4 @@ INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
 
 SOURCES += \
     tst_gdb.cpp \
-    $$DEBUGGERDIR/gdb/gdbmi.cpp \
+    $$DEBUGGERDIR/debuggerprotocol.cpp \
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index eb2227292f..ed88a870e6 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/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>
diff --git a/tests/auto/debugger/tst_version.cpp b/tests/auto/debugger/tst_version.cpp
index 10f9b1f1e1..5ec6f7d9c8 100644
--- a/tests/auto/debugger/tst_version.cpp
+++ b/tests/auto/debugger/tst_version.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "gdb/gdbmi.h"
+#include "debuggerprotocol.h"
 
 #include <QtTest>
 
diff --git a/tests/auto/debugger/version.pro b/tests/auto/debugger/version.pro
index aeb0b4e542..bc158b8c98 100644
--- a/tests/auto/debugger/version.pro
+++ b/tests/auto/debugger/version.pro
@@ -8,5 +8,5 @@ INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
 
 SOURCES += \
     tst_version.cpp \
-    $$DEBUGGERDIR/gdb/gdbmi.cpp \
+    $$DEBUGGERDIR/debuggerprotocol.cpp \