From 991cf8499106e1e6a35efd35bcd62cfb2387552c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Thu, 26 Feb 2015 15:29:28 +0100
Subject: [PATCH] Clean exported headers of the Debugger plugin.

Change-Id: I70ca6773e0f6aa6d80a441f8920d7f5d2418e1bf
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/android/androidconfigurations.cpp       | 1 +
 src/plugins/debugger/breakhandler.cpp               | 1 +
 src/plugins/debugger/breakhandler.h                 | 1 +
 src/plugins/debugger/debuggerdialogs.cpp            | 1 +
 src/plugins/debugger/debuggerengine.h               | 5 ++---
 src/plugins/debugger/debuggeritem.cpp               | 1 +
 src/plugins/debugger/debuggeritem.h                 | 1 -
 src/plugins/debugger/debuggeritemmanager.cpp        | 1 +
 src/plugins/debugger/debuggeritemmanager.h          | 5 ++++-
 src/plugins/debugger/debuggerkitconfigwidget.cpp    | 1 +
 src/plugins/debugger/debuggerkitinformation.cpp     | 1 +
 src/plugins/debugger/debuggerkitinformation.h       | 5 +----
 src/plugins/debugger/debuggeroptionspage.cpp        | 1 +
 src/plugins/debugger/debuggerstartparameters.h      | 3 +--
 src/plugins/debugger/debuggertooltipmanager.cpp     | 1 +
 src/plugins/debugger/disassembleragent.cpp          | 1 +
 src/plugins/debugger/lldb/lldbengine.h              | 1 +
 src/plugins/debugger/pdb/pdbengine.cpp              | 1 +
 src/plugins/debugger/pdb/pdbengine.h                | 2 ++
 src/plugins/debugger/qml/qmlcppengine.cpp           | 1 +
 src/plugins/debugger/qml/qmlengine.cpp              | 1 +
 src/plugins/debugger/qml/qmlengine.h                | 4 +++-
 src/plugins/debugger/snapshothandler.cpp            | 2 ++
 src/plugins/debugger/threadswindow.cpp              | 1 +
 src/plugins/debugger/unstartedappwatcherdialog.cpp  | 1 +
 src/plugins/ios/iosconfigurations.cpp               | 1 +
 src/plugins/qnx/blackberryapilevelconfiguration.cpp | 1 +
 src/plugins/qnx/qnxbaseconfiguration.cpp            | 1 +
 28 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 9e74f386246..557425ade65 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -47,6 +47,7 @@
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/session.h>
 #include <debugger/debuggeritemmanager.h>
+#include <debugger/debuggeritem.h>
 #include <debugger/debuggerkitinformation.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index a13f54326c0..ee60ba1062f 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -40,6 +40,7 @@
 #include <texteditor/textmark.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/fileutils.h>
 
 #if USE_BREAK_MODEL_TEST
 #include <modeltest.h>
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 430f93c698a..25263610fc4 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -32,6 +32,7 @@
 #define DEBUGGER_BREAKHANDLER_H
 
 #include "breakpoint.h"
+#include "debuggerprotocol.h"
 
 #include <utils/treemodel.h>
 
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index b23253c9ef8..7b724bad3d0 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -31,6 +31,7 @@
 #include "debuggerdialogs.h"
 
 #include "debuggerkitinformation.h"
+#include "debuggerstartparameters.h"
 #include "debuggerruncontrol.h"
 #include "debuggerstringutils.h"
 #include "cdb/cdbengine.h"
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index a7313a9c7c4..5a1444caaca 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -33,9 +33,6 @@
 
 #include "debugger_global.h"
 #include "debuggerconstants.h"
-#include "debuggerprotocol.h"
-#include "debuggerstartparameters.h"
-#include "threaddata.h" // For ThreadId.
 
 #include <QObject>
 
@@ -52,6 +49,7 @@ namespace Debugger {
 
 class DebuggerRunControl;
 class DebuggerStartParameters;
+class RemoteSetupResult;
 
 DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
 DEBUGGER_EXPORT QDebug operator<<(QDebug str, DebuggerState state);
@@ -77,6 +75,7 @@ class QmlCppEngine;
 class DebuggerToolTipContext;
 class MemoryViewSetupData;
 class Terminal;
+class ThreadId;
 
 struct WatchUpdateFlags
 {
diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp
index 334be7a6063..971a48e0d58 100644
--- a/src/plugins/debugger/debuggeritem.cpp
+++ b/src/plugins/debugger/debuggeritem.cpp
@@ -28,6 +28,7 @@
 **
 ****************************************************************************/
 
+#include "debuggeritem.h"
 #include "debuggerkitinformation.h"
 #include "debuggerkitconfigwidget.h"
 #include "debuggeroptionspage.h"
diff --git a/src/plugins/debugger/debuggeritem.h b/src/plugins/debugger/debuggeritem.h
index 6117e6c5f34..fc3f85541be 100644
--- a/src/plugins/debugger/debuggeritem.h
+++ b/src/plugins/debugger/debuggeritem.h
@@ -37,7 +37,6 @@
 #include <projectexplorer/abi.h>
 
 #include <utils/fileutils.h>
-#include <utils/macroexpander.h>
 
 #include <QList>
 #include <QVariant>
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index f7cad5d96c7..924d493b63b 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "debuggeritemmanager.h"
+#include "debuggeritem.h"
 #include "debuggerkitinformation.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/debugger/debuggeritemmanager.h b/src/plugins/debugger/debuggeritemmanager.h
index 25afa1b2df7..237d5363213 100644
--- a/src/plugins/debugger/debuggeritemmanager.h
+++ b/src/plugins/debugger/debuggeritemmanager.h
@@ -32,13 +32,16 @@
 #define DEBUGGER_DEBUGGERITEMMANAGER_H
 
 #include "debugger_global.h"
-#include "debuggeritem.h"
+#include "debuggerconstants.h"
 
 #include <QList>
 #include <QObject>
 #include <QString>
 
+namespace Utils { class FileName; }
+
 namespace Debugger {
+class DebuggerItem;
 
 // -----------------------------------------------------------------------
 // DebuggerItemManager
diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp
index d97fb4f8bab..bf6009867ce 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.cpp
+++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp
@@ -31,6 +31,7 @@
 #include "debuggerkitconfigwidget.h"
 
 #include "debuggeritemmanager.h"
+#include "debuggeritem.h"
 #include "debuggerkitinformation.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index f41f0edea2e..c477a14c742 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -31,6 +31,7 @@
 #include "debuggerkitinformation.h"
 
 #include "debuggeritemmanager.h"
+#include "debuggeritem.h"
 #include "debuggerkitconfigwidget.h"
 
 #include <projectexplorer/toolchain.h>
diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h
index 197c754c122..eaf8fcdbfca 100644
--- a/src/plugins/debugger/debuggerkitinformation.h
+++ b/src/plugins/debugger/debuggerkitinformation.h
@@ -33,14 +33,11 @@
 
 #include "debugger_global.h"
 #include "debuggerconstants.h"
-#include "debuggeritem.h"
 
-#include <projectexplorer/abi.h>
 #include <projectexplorer/kitinformation.h>
 
-#include <utils/persistentsettings.h>
-
 namespace Debugger {
+class DebuggerItem;
 
 class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInformation
 {
diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp
index 0484757ca87..fc343cbfcb7 100644
--- a/src/plugins/debugger/debuggeroptionspage.cpp
+++ b/src/plugins/debugger/debuggeroptionspage.cpp
@@ -30,6 +30,7 @@
 
 #include "debuggeroptionspage.h"
 #include "debuggeritemmanager.h"
+#include "debuggeritem.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
index d89af005cc2..cb083d0173b 100644
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ b/src/plugins/debugger/debuggerstartparameters.h
@@ -34,16 +34,15 @@
 #include "debugger_global.h"
 #include "debuggerconstants.h"
 
-#include <coreplugin/id.h>
 #include <ssh/sshconnection.h>
 #include <utils/environment.h>
 #include <projectexplorer/abi.h>
-#include <projectexplorer/kit.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/devicesupport/idevice.h>
 
 #include <QMetaType>
 #include <QVector>
+#include <QPointer>
 
 namespace Debugger {
 
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 6bfdc72ce67..2a51e29c7a4 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -31,6 +31,7 @@
 #include "debuggertooltipmanager.h"
 #include "debuggerinternalconstants.h"
 #include "debuggerengine.h"
+#include "debuggerprotocol.h"
 #include "debuggeractions.h"
 #include "stackhandler.h"
 #include "debuggercore.h"
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index 7c270a65306..d1041622cb0 100644
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -44,6 +44,7 @@
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/editormanager/editormanager.h>
 
+#include <texteditor/textmark.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 
diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h
index ca9109d5fbe..695c2e417f0 100644
--- a/src/plugins/debugger/lldb/lldbengine.h
+++ b/src/plugins/debugger/lldb/lldbengine.h
@@ -36,6 +36,7 @@
 #include <debugger/memoryagent.h>
 #include <debugger/watchhandler.h>
 #include <debugger/debuggertooltipmanager.h>
+#include <debugger/debuggerprotocol.h>
 
 #include <utils/consoleprocess.h>
 
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 80adbd9e3e9..2e24a0c2950 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "pdbengine.h"
+#include "threaddata.h"
 
 #include <debugger/debuggeractions.h>
 #include <debugger/debuggercore.h>
diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h
index d78ba29343d..a30155627ba 100644
--- a/src/plugins/debugger/pdb/pdbengine.h
+++ b/src/plugins/debugger/pdb/pdbengine.h
@@ -38,6 +38,8 @@
 
 namespace Debugger {
 namespace Internal {
+class DebuggerCommand;
+class GdbMi;
 
 /*
  * A debugger engine for Python using the pdb command line debugger.
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index bf2fc5bb2b0..e30540e710a 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -30,6 +30,7 @@
 
 #include "qmlcppengine.h"
 #include "qmlengine.h"
+#include "threaddata.h"
 
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 4f4db64dfcb..9ebd77d65a6 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -31,6 +31,7 @@
 #include "qmlengine.h"
 #include "baseqmldebuggerclient.h"
 #include "qmlinspectoragent.h"
+#include "threaddata.h"
 
 #include <debugger/debuggeractions.h>
 #include <debugger/debuggercore.h>
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index baddc4ae65a..cec9556618b 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -41,10 +41,12 @@
 #include <qmldebug/qmloutputparser.h>
 #include <qmljs/iscriptevaluator.h>
 
-#include <QTextDocument>
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
 namespace Core { class IDocument; }
 
+namespace TextEditor { class BaseTextEditor; }
+
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp
index 4a00a279781..b69680462f6 100644
--- a/src/plugins/debugger/snapshothandler.cpp
+++ b/src/plugins/debugger/snapshothandler.cpp
@@ -37,7 +37,9 @@
 
 #include <utils/qtcassert.h>
 
+#include <QIcon>
 #include <QDebug>
+#include <QFile>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index b5ce52126be..4baceac700f 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "threadswindow.h"
+#include "threaddata.h"
 
 #include "debuggeractions.h"
 #include "debuggercore.h"
diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp
index 5c683aa40ed..6a6b5cffc53 100644
--- a/src/plugins/debugger/unstartedappwatcherdialog.cpp
+++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp
@@ -30,6 +30,7 @@
 
 #include "unstartedappwatcherdialog.h"
 
+#include "debuggeritem.h"
 #include "debuggerdialogs.h"
 #include "debuggerkitinformation.h"
 
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 0bc72ed83d9..4c7b692587a 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -44,6 +44,7 @@
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <debugger/debuggeritemmanager.h>
+#include <debugger/debuggeritem.h>
 #include <debugger/debuggerkitinformation.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
diff --git a/src/plugins/qnx/blackberryapilevelconfiguration.cpp b/src/plugins/qnx/blackberryapilevelconfiguration.cpp
index ce8dc79f9b1..d96a66dd6a3 100644
--- a/src/plugins/qnx/blackberryapilevelconfiguration.cpp
+++ b/src/plugins/qnx/blackberryapilevelconfiguration.cpp
@@ -52,6 +52,7 @@
 #include <qmakeprojectmanager/qmakekitinformation.h>
 
 #include <debugger/debuggeritemmanager.h>
+#include <debugger/debuggeritem.h>
 #include <debugger/debuggerkitinformation.h>
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/qnx/qnxbaseconfiguration.cpp b/src/plugins/qnx/qnxbaseconfiguration.cpp
index 34055d0683a..b0509b73517 100644
--- a/src/plugins/qnx/qnxbaseconfiguration.cpp
+++ b/src/plugins/qnx/qnxbaseconfiguration.cpp
@@ -37,6 +37,7 @@
 #include <projectexplorer/toolchainmanager.h>
 
 #include <debugger/debuggerkitinformation.h>
+#include <debugger/debuggeritem.h>
 
 #include <coreplugin/icore.h>