Debugger: Header cleanup

src/plugins/debugger/breakpointmarker.cpp

@@ -35,12 +35,7 @@
 #include "breakhandler.h"
 #include "debuggercore.h"
 
-#include <texteditor/basetextmark.h>
-#include <utils/qtcassert.h>
-
-#include <QtCore/QByteArray>
-#include <QtCore/QDebug>
-
+#include <QtGui/QIcon>
 
 //////////////////////////////////////////////////////////////////
 //

src/plugins/debugger/breakpointmarker.h

@@ -34,11 +34,8 @@
 #ifndef DEBUGGER_BREAKPOINTMARKER_H
 #define DEBUGGER_BREAKPOINTMARKER_H
 
-#include <QtCore/QString>
-#include <QtGui/QIcon>
-
 #include "breakpoint.h"
-#include "breakhandler.h"
+
 #include <texteditor/basetextmark.h>
 
 namespace Debugger {

src/plugins/debugger/breakwindow.cpp

@@ -46,15 +46,9 @@
 #include <QtCore/QDebug>
 
 #include <QtGui/QAction>
-#include <QtGui/QHeaderView>
 #include <QtGui/QIntValidator>
-#include <QtGui/QItemSelectionModel>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMenu>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QToolButton>
-#include <QtGui/QTreeView>
-
 
 namespace Debugger {
 namespace Internal {

src/plugins/debugger/breakwindow.h

@@ -34,7 +34,7 @@
 #ifndef DEBUGGER_BREAKWINDOW_H
 #define DEBUGGER_BREAKWINDOW_H
 
-#include "breakhandler.h"
+#include "breakpoint.h"
 
 #include <QtGui/QTreeView>
 

src/plugins/debugger/cdb2/cdbengine2.cpp

@@ -32,6 +32,8 @@
 **************************************************************************/
 
 #include "cdbengine2.h"
+#include "debuggerstartparameters.h"
+#include "disassemblerlines.h"
 #include "cdboptions2.h"
 #include "cdboptionspage2.h"
 #include "bytearrayinputstream.h"
@@ -41,6 +43,7 @@
 #include "stackhandler.h"
 #include "watchhandler.h"
 #include "threadshandler.h"
+#include "moduleshandler.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "registerhandler.h"

src/plugins/debugger/debuggeractions.cpp

@@ -36,8 +36,6 @@
 #include "registerpostmortemaction.h"
 #endif
 
-#include <projectexplorer/toolchain.h>
-
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
@@ -45,13 +43,6 @@
 #include <QtCore/QDebug>
 #include <QtCore/QVariant>
 #include <QtCore/QSettings>
-#include <QtCore/QFileInfo>
-
-#include <QtGui/QAction>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QCheckBox>
-#include <QtGui/QLineEdit>
 
 using namespace Utils;
 

src/plugins/debugger/debuggeractions.h

@@ -35,7 +35,6 @@
 #define DEBUGGER_ACTIONS_H
 
 #include <QtCore/QHash>
-#include <QtCore/QMap>
 
 QT_BEGIN_NAMESPACE
 class QSettings;

src/plugins/debugger/debuggercore.h

@@ -34,12 +34,9 @@
 #ifndef DEBUGGERCORE_H
 #define DEBUGGERCORE_H
 
-#include "debugger_global.h"
 #include "debuggerconstants.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QMultiMap>
-#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 class QIcon;
@@ -58,7 +55,6 @@ class SavedAction;
 namespace Debugger {
 
 class DebuggerEngine;
-class DebuggerStartParameters;
 
 namespace Internal {
 

src/plugins/debugger/debuggerengine.cpp

@@ -39,6 +39,7 @@
 #include "debuggerrunner.h"
 #include "debuggerstringutils.h"
 #include "debuggertooltip.h"
+#include "debuggerstartparameters.h"
 
 #include "memoryagent.h"
 #include "disassembleragent.h"
@@ -63,7 +64,6 @@
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetextmark.h>
 
-#include <utils/environment.h>
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
 
@@ -95,6 +95,17 @@ using namespace TextEditor;
 
 namespace Debugger {
 
+Internal::Location::Location(const StackFrame &frame, bool marker)
+{
+    init();
+    m_fileName = frame.file;
+    m_lineNumber = frame.line;
+    m_needsMarker = marker;
+    m_functionName = frame.function;
+    m_hasDebugInfo = frame.isUsable();
+    m_address = frame.address;
+}
+
 QDebug operator<<(QDebug d, DebuggerState state)
 {
     //return d << DebuggerEngine::stateName(state) << '(' << int(state) << ')';

src/plugins/debugger/debuggerengine.h

@@ -36,13 +36,7 @@
 
 #include "debugger_global.h"
 #include "debuggerconstants.h"
-#include "debuggerstartparameters.h"
-#include "moduleshandler.h" // For 'Symbols'
 #include "breakpoint.h" // For 'BreakpointId'
-#include "stackframe.h"
-
-#include <coreplugin/ssh/sshconnection.h>
-#include <utils/environment.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
@@ -51,6 +45,7 @@ QT_BEGIN_NAMESPACE
 class QDebug;
 class QPoint;
 class QMessageBox;
+class QAbstractItemModel;
 QT_END_NAMESPACE
 
 namespace TextEditor {
@@ -65,7 +60,7 @@ namespace Debugger {
 
 class DebuggerEnginePrivate;
 class DebuggerRunControl;
-
+class DebuggerStartParameters;
 
 DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
 DEBUGGER_EXPORT QDebug operator<<(QDebug str, DebuggerState state);
@@ -101,10 +96,7 @@ public:
     Location(const QString &file) { init(); m_fileName = file; }
     Location(const QString &file, int line, bool marker = true)
         { init(); m_lineNumber = line; m_fileName = file; m_needsMarker = marker; }
-    Location(const StackFrame &frame, bool marker = true) //: m_frame(frame)
-        { init(); m_fileName = frame.file; m_lineNumber = frame.line;
-          m_needsMarker = marker; m_functionName = frame.function;
-          m_hasDebugInfo = frame.isUsable(); m_address = frame.address; }
+    Location(const StackFrame &frame, bool marker = true);
     QString fileName() const { return m_fileName; }
     QString functionName() const { return m_functionName; }
     int lineNumber() const { return m_lineNumber; }

src/plugins/debugger/debuggerplugin.cpp

@@ -33,6 +33,7 @@
 
 #include "debuggerplugin.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggerconstants.h"
 #include "debuggercore.h"
@@ -50,6 +51,7 @@
 #include "disassembleragent.h"
 #include "logwindow.h"
 #include "moduleswindow.h"
+#include "moduleshandler.h"
 #include "registerwindow.h"
 #include "snapshotwindow.h"
 #include "stackhandler.h"

src/plugins/debugger/debuggerplugin.h

@@ -38,8 +38,6 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <QtCore/QObject>
-
 namespace ProjectExplorer {
 class RunConfiguration;
 class RunControl;

src/plugins/debugger/debuggerrunner.cpp

@@ -39,6 +39,7 @@
 #include "debuggermainwindow.h"
 #include "debuggerplugin.h"
 #include "debuggerstringutils.h"
+#include "debuggerstartparameters.h"
 #include "gdb/gdboptionspage.h"
 #include "lldb/lldbenginehost.h"
 

src/plugins/debugger/debuggerrunner.h

@@ -35,7 +35,6 @@
 #define DEBUGGERRUNNER_H
 
 #include "debugger_global.h"
-#include "debuggerconstants.h"
 
 #include <projectexplorer/runconfiguration.h>
 

src/plugins/debugger/debuggerstartparameters.h

@@ -35,6 +35,7 @@
 #define DEBUGGER_DEBUGGERSTARTPARAMETERS_H
 
 #include "debugger_global.h"
+#include "debuggerconstants.h"
 
 #include <coreplugin/ssh/sshconnection.h>
 #include <utils/environment.h>

src/plugins/debugger/debuggerstreamops.cpp

@@ -33,6 +33,12 @@
 
 #include "debuggerstreamops.h"
 
+#include "breakpoint.h"
+#include "watchdata.h"
+#include "disassemblerlines.h"
+
+#include <QtCore/QDataStream>
+
 namespace Debugger {
 namespace Internal {
 

src/plugins/debugger/debuggerstreamops.h

@@ -34,18 +34,20 @@
 #ifndef DEBUGGERPLUGIN_STREAMOPS_H
 #define DEBUGGERPLUGIN_STREAMOPS_H
 
-#include "breakpoint.h"
-#include "stackframe.h"
 #include "threaddata.h"
-#include "watchdata.h"
-#include "disassemblerlines.h"
+#include "stackframe.h"
 
-#include <QtCore/QDataStream>
-#include <QtCore/QVector>
+QT_FORWARD_DECLARE_CLASS(QDataStream)
 
 namespace Debugger {
 namespace Internal {
 
+class BreakpointParameters;
+class BreakpointResponse;
+class WatchData;
+class DisassemblerLine;
+class DisassemblerLines;
+
 QDataStream &operator<<(QDataStream& stream, const ThreadData &thread);
 QDataStream &operator>>(QDataStream& stream, ThreadData &threads);
 QDataStream &operator<<(QDataStream& stream, const Threads &threads);

src/plugins/debugger/disassembleragent.cpp

@@ -33,6 +33,7 @@
 
 #include "disassembleragent.h"
 
+#include "disassemblerlines.h"
 #include "breakhandler.h"
 #include "debuggerengine.h"
 #include "debuggercore.h"
@@ -54,7 +55,7 @@
 
 #include <QtGui/QTextBlock>
 #include <QtGui/QIcon>
-
+#include <QtCore/QPointer>
 
 using namespace Core;
 

src/plugins/debugger/disassembleragent.h

@@ -34,21 +34,14 @@
 #ifndef DEBUGGER_DISASSEMBLERAGENT_H
 #define DEBUGGER_DISASSEMBLERAGENT_H
 
-#include "disassemblerlines.h"
-
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
-
-namespace Core {
-class IEditor;
-}
 
 namespace Debugger {
 
 class DebuggerEngine;
 
 namespace Internal {
-
+class DisassemblerLines;
 class Location;
 class DisassemblerAgentPrivate;
 
@@ -85,7 +78,6 @@ private:
     DisassemblerAgentPrivate *d;
 };
 
-
 } // namespace Internal
 } // namespace Debugger
 

src/plugins/debugger/gdb/abstractgdbadapter.cpp

@@ -33,6 +33,7 @@
 
 #include "abstractgdbadapter.h"
 #include "gdbengine.h"
+#include "debuggerstartparameters.h"
 #include "abstractgdbprocess.h"
 
 #include <utils/qtcassert.h>

src/plugins/debugger/gdb/abstractplaingdbadapter.cpp

@@ -34,6 +34,7 @@
 #include "abstractplaingdbadapter.h"
 #include "gdbmi.h"
 #include "gdbengine.h"
+#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerstringutils.h"

src/plugins/debugger/gdb/attachgdbadapter.cpp

@@ -33,6 +33,7 @@
 
 #include "attachgdbadapter.h"
 #include "gdbmi.h"
+#include "debuggerstartparameters.h"
 
 #include "gdbengine.h"
 #include "procinterrupt.h"

src/plugins/debugger/gdb/classicgdbengine.cpp

@@ -34,6 +34,7 @@
 #include "gdbengine.h"
 #include "gdbmi.h"
 
+#include "debuggerstartparameters.h"
 #include "abstractgdbadapter.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
@@ -179,8 +180,7 @@ void GdbEngine::runDebuggingHelperClassic(const WatchData &data0, bool dumpChild
     QByteArray params;
     QList<QByteArray> extraArgs;
     const QtDumperHelper::TypeData td = m_dumperHelper.typeData(data0.type);
-    m_dumperHelper.evaluationParameters(data, td, QtDumperHelper::GdbDebugger,
-        &params, &extraArgs);
+    m_dumperHelper.evaluationParameters(data, td, &params, &extraArgs);
 
     //int protocol = (data.iname.startsWith("watch") && data.type == "QImage") ? 3 : 2;
     //int protocol = data.iname.startsWith("watch") ? 3 : 2;

src/plugins/debugger/gdb/coregdbadapter.cpp

@@ -33,6 +33,7 @@
 
 #include "coregdbadapter.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggercore.h"
 #include "debuggeractions.h"
 #include "debuggerstringutils.h"

src/plugins/debugger/gdb/gdbengine.cpp

@@ -35,6 +35,8 @@
 
 #include "gdbengine.h"
 
+#include "debuggerstartparameters.h"
+#include "disassemblerlines.h"
 #include "attachgdbadapter.h"
 #include "coregdbadapter.h"
 #include "localplaingdbadapter.h"

src/plugins/debugger/gdb/localplaingdbadapter.cpp

@@ -34,6 +34,7 @@
 #include "localplaingdbadapter.h"
 
 #include "gdbengine.h"
+#include "debuggerstartparameters.h"
 #include "procinterrupt.h"
 #include "debuggercore.h"
 #include "debuggerstringutils.h"

src/plugins/debugger/gdb/remotegdbserveradapter.cpp

@@ -33,6 +33,7 @@
 
 #include "remotegdbserveradapter.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggercore.h"
 #include "debuggerstringutils.h"
 #include "gdbengine.h"

src/plugins/debugger/gdb/remoteplaingdbadapter.cpp

@@ -33,6 +33,7 @@
 
 #include "remoteplaingdbadapter.h"
 #include "gdbengine.h"
+#include "debuggerstartparameters.h"
 
 #include <debugger/debuggeractions.h>
 #include <debugger/debuggerstringutils.h>

src/plugins/debugger/gdb/tcftrkgdbadapter.cpp

@@ -32,6 +32,8 @@
 **************************************************************************/
 
 #include "tcftrkgdbadapter.h"
+
+#include "debuggerstartparameters.h"
 #include "tcftrkdevice.h"
 #include "trkutils.h"
 #include "gdbmi.h"

src/plugins/debugger/gdb/termgdbadapter.cpp

@@ -32,6 +32,8 @@
 **************************************************************************/
 
 #include "termgdbadapter.h"
+
+#include "debuggerstartparameters.h"
 #include "gdbmi.h"
 #include "gdbengine.h"
 #include "procinterrupt.h"

src/plugins/debugger/gdb/trkgdbadapter.cpp

@@ -33,6 +33,7 @@
 
 #include "trkgdbadapter.h"
 
+#include "debuggerstartparameters.h"
 #include "gdbmi.h"
 #include "launcher.h"
 #include "symbiandevicemanager.h"

src/plugins/debugger/lldb/ipcenginehost.cpp

@@ -34,6 +34,7 @@
 #include "ipcenginehost.h"
 
 #include "ipcengineguest.h"
+#include "debuggerstartparameters.h"
 #include "breakhandler.h"
 #include "breakpoint.h"
 #include "disassemblerlines.h"

src/plugins/debugger/lldb/lldbenginehost.cpp

@@ -35,6 +35,7 @@
 
 #include "lldbenginehost.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggerconstants.h"
 #include "debuggerdialogs.h"

src/plugins/debugger/moduleshandler.h

@@ -36,8 +36,9 @@
 
 #include <QtCore/QVector>
 #include <QtCore/QObject>
-#include <QtGui/QSortFilterProxyModel>
+#include <QtCore/QAbstractItemModel>
 
+QT_FORWARD_DECLARE_CLASS(QSortFilterProxyModel)
 
 namespace Debugger {
 namespace Internal {

src/plugins/debugger/pdb/pdbengine.cpp

@@ -35,6 +35,7 @@
 
 #include "pdbengine.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerdialogs.h"

src/plugins/debugger/qml/qmladapter.cpp

@@ -32,6 +32,8 @@
 **************************************************************************/
 
 #include "qmladapter.h"
+
+#include "debuggerstartparameters.h"
 #include "qmldebuggerclient.h"
 #include "qmljsprivateapi.h"
 

src/plugins/debugger/qml/qmlcppengine.cpp

 #include "qmlcppengine.h"
+#include "debuggerstartparameters.h"
 #include "qmlengine.h"
 #include "debuggermainwindow.h"
 #include "debuggercore.h"

src/plugins/debugger/qml/qmlengine.cpp

@@ -34,6 +34,7 @@
 #include "qmlengine.h"
 #include "qmladapter.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggeractions.h"
 #include "debuggerconstants.h"
 #include "debuggercore.h"

src/plugins/debugger/script/scriptengine.cpp

@@ -35,6 +35,7 @@
 
 #include "scriptengine.h"
 
+#include "debuggerstartparameters.h"
 #include "breakhandler.h"
 #include "debuggerconstants.h"
 #include "debuggercore.h"

src/plugins/debugger/snapshothandler.cpp

@@ -37,6 +37,7 @@
 #include "debuggercore.h"
 #include "debuggerengine.h"
 #include "debuggerrunner.h"
+#include "debuggerstartparameters.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/debugger/sourceagent.cpp

@@ -43,7 +43,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/icore.h>
 
 #include <texteditor/basetextdocument.h>
@@ -59,6 +58,8 @@
 #include <QtCore/QDebug>
 #include <QtCore/QMetaObject>
 #include <QtCore/QTimer>
+#include <QtCore/QPointer>
+#include <QtCore/QFileInfo>
 
 #include <QtGui/QMessageBox>
 #include <QtGui/QPlainTextEdit>

src/plugins/debugger/sourceagent.h

@@ -35,9 +35,6 @@
 #define DEBUGGER_SOURCE_AGENT_H
 
 #include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QPointer>
-#include <QtCore/QVector>
 
 namespace Debugger {
 
@@ -59,7 +56,6 @@ private:
     SourceAgentPrivate *d;
 };
 
-
 } // namespace Internal
 } // namespace Debugger
 

src/plugins/debugger/tcf/tcfengine.cpp

@@ -33,6 +33,7 @@
 
 #include "tcfengine.h"
 
+#include "debuggerstartparameters.h"
 #include "debuggerconstants.h"
 #include "debuggerdialogs.h"
 #include "debuggerstringutils.h"

src/plugins/debugger/threaddata.h

@@ -34,10 +34,10 @@
 #ifndef THREADDATA_H
 #define THREADDATA_H
 
-#include <QtCore/QList>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 
 namespace Debugger {
-
 namespace Internal {
 
 ////////////////////////////////////////////////////////////////////////

src/plugins/debugger/threadshandler.h

@@ -35,8 +35,6 @@
 #define THREADSHANDLER_H
 
 #include <QtCore/QAbstractTableModel>
-#include <QtCore/QList>
-
 #include <QtGui/QIcon>
 
 #include "threaddata.h"

src/plugins/debugger/watchutils.cpp

@@ -541,11 +541,11 @@ bool isSymbianIntType(const QByteArray &type)
     return type == "TInt" || type == "TBool";
 }
 
-QByteArray sizeofTypeExpression(const QByteArray &type, QtDumperHelper::Debugger debugger)
+QByteArray sizeofTypeExpression(const QByteArray &type)
 {
     if (type.endsWith('*'))
         return "sizeof(void*)";
-    if (debugger != QtDumperHelper::GdbDebugger || type.endsWith('>'))
+    if (type.endsWith('>'))
         return "sizeof(" + type + ')';
     return "sizeof(" + gdbQuoteTypes(type) + ')';
 }
@@ -1009,16 +1009,6 @@ bool QtDumperHelper::parseQuery(const GdbMi &contents)
     return true;
 }
 
-// parse a query
-bool QtDumperHelper::parseQuery(const char *data)
-{
-    GdbMi root;
-    root.fromStringMultiple(QByteArray(data));
-    if (!root.isValid())
-        return false;
-    return parseQuery(root);
-}
-
 void QtDumperHelper::addSize(const QByteArray &name, int size)
 {
     // Special interest cases
@@ -1074,8 +1064,7 @@ QtDumperHelper::TypeData QtDumperHelper::typeData(const QByteArray &typeName) co
 
 // Format an expression to have the debugger query the
 // size. Use size cache if possible
-QByteArray QtDumperHelper::evaluationSizeofTypeExpression(const QByteArray &typeName,
-                                                       Debugger debugger) const
+QByteArray QtDumperHelper::evaluationSizeofTypeExpression(const QByteArray &typeName) const
 {
     // Look up special size types
     const SpecialSizeType st = specialSizeType(typeName);
@@ -1088,7 +1077,7 @@ QByteArray QtDumperHelper::evaluationSizeofTypeExpression(const QByteArray &type