Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
22f03cbd
Commit
22f03cbd
authored
Nov 02, 2010
by
Friedemann Kleint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ProjectExplor/Debugger: Header cleanup
parent
220a3d1a
Changes
84
Hide whitespace changes
Inline
Side-by-side
Showing
84 changed files
with
115 additions
and
286 deletions
+115
-286
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
+4
-1
src/plugins/debugger/breakhandler.cpp
src/plugins/debugger/breakhandler.cpp
+0
-5
src/plugins/debugger/breakwindow.h
src/plugins/debugger/breakwindow.h
+1
-2
src/plugins/debugger/cdb/cdbmodules.cpp
src/plugins/debugger/cdb/cdbmodules.cpp
+1
-0
src/plugins/debugger/consolewindow.cpp
src/plugins/debugger/consolewindow.cpp
+2
-28
src/plugins/debugger/debuggeractions.cpp
src/plugins/debugger/debuggeractions.cpp
+1
-1
src/plugins/debugger/debuggeractions.h
src/plugins/debugger/debuggeractions.h
+1
-1
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeragents.cpp
+0
-1
src/plugins/debugger/debuggerengine.cpp
src/plugins/debugger/debuggerengine.cpp
+1
-4
src/plugins/debugger/debuggerengine.h
src/plugins/debugger/debuggerengine.h
+0
-1
src/plugins/debugger/debuggermainwindow.h
src/plugins/debugger/debuggermainwindow.h
+0
-1
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/debuggerplugin.cpp
+0
-46
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.cpp
+0
-11
src/plugins/debugger/debuggerrunner.h
src/plugins/debugger/debuggerrunner.h
+0
-2
src/plugins/debugger/debuggertooltip.cpp
src/plugins/debugger/debuggertooltip.cpp
+1
-4
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
+0
-7
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/debugger/debuggeruiswitcher.h
+1
-3
src/plugins/debugger/gdb/abstractgdbadapter.cpp
src/plugins/debugger/gdb/abstractgdbadapter.cpp
+21
-1
src/plugins/debugger/gdb/abstractgdbadapter.h
src/plugins/debugger/gdb/abstractgdbadapter.h
+10
-10
src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
+2
-1
src/plugins/debugger/gdb/attachgdbadapter.cpp
src/plugins/debugger/gdb/attachgdbadapter.cpp
+1
-0
src/plugins/debugger/gdb/attachgdbadapter.h
src/plugins/debugger/gdb/attachgdbadapter.h
+1
-2
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
+1
-0
src/plugins/debugger/gdb/coregdbadapter.cpp
src/plugins/debugger/gdb/coregdbadapter.cpp
+1
-1
src/plugins/debugger/gdb/coregdbadapter.h
src/plugins/debugger/gdb/coregdbadapter.h
+1
-3
src/plugins/debugger/gdb/gdbengine.h
src/plugins/debugger/gdb/gdbengine.h
+1
-4
src/plugins/debugger/gdb/gdboptionspage.h
src/plugins/debugger/gdb/gdboptionspage.h
+0
-1
src/plugins/debugger/gdb/localplaingdbadapter.h
src/plugins/debugger/gdb/localplaingdbadapter.h
+1
-3
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
+1
-1
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+1
-1
src/plugins/debugger/gdb/remotegdbserveradapter.h
src/plugins/debugger/gdb/remotegdbserveradapter.h
+1
-2
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
+1
-1
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
+1
-1
src/plugins/debugger/gdb/tcftrkgdbadapter.h
src/plugins/debugger/gdb/tcftrkgdbadapter.h
+1
-1
src/plugins/debugger/gdb/termgdbadapter.cpp
src/plugins/debugger/gdb/termgdbadapter.cpp
+1
-1
src/plugins/debugger/gdb/termgdbadapter.h
src/plugins/debugger/gdb/termgdbadapter.h
+2
-3
src/plugins/debugger/gdb/trkgdbadapter.cpp
src/plugins/debugger/gdb/trkgdbadapter.cpp
+1
-0
src/plugins/debugger/gdb/trkgdbadapter.h
src/plugins/debugger/gdb/trkgdbadapter.h
+1
-1
src/plugins/debugger/logwindow.cpp
src/plugins/debugger/logwindow.cpp
+22
-21
src/plugins/debugger/logwindow.h
src/plugins/debugger/logwindow.h
+2
-0
src/plugins/debugger/moduleshandler.cpp
src/plugins/debugger/moduleshandler.cpp
+0
-6
src/plugins/debugger/moduleswindow.cpp
src/plugins/debugger/moduleswindow.cpp
+0
-1
src/plugins/debugger/registerwindow.cpp
src/plugins/debugger/registerwindow.cpp
+0
-6
src/plugins/debugger/sessionengine.cpp
src/plugins/debugger/sessionengine.cpp
+0
-1
src/plugins/debugger/snapshothandler.cpp
src/plugins/debugger/snapshothandler.cpp
+2
-5
src/plugins/debugger/snapshothandler.h
src/plugins/debugger/snapshothandler.h
+1
-1
src/plugins/debugger/snapshotwindow.cpp
src/plugins/debugger/snapshotwindow.cpp
+1
-3
src/plugins/debugger/snapshotwindow.h
src/plugins/debugger/snapshotwindow.h
+0
-1
src/plugins/debugger/sourcefileshandler.h
src/plugins/debugger/sourcefileshandler.h
+0
-2
src/plugins/debugger/sourcefileswindow.cpp
src/plugins/debugger/sourcefileswindow.cpp
+0
-3
src/plugins/debugger/sourcefileswindow.h
src/plugins/debugger/sourcefileswindow.h
+1
-2
src/plugins/debugger/stackhandler.cpp
src/plugins/debugger/stackhandler.cpp
+0
-2
src/plugins/debugger/stackhandler.h
src/plugins/debugger/stackhandler.h
+0
-3
src/plugins/debugger/stackwindow.cpp
src/plugins/debugger/stackwindow.cpp
+0
-5
src/plugins/debugger/threadswindow.cpp
src/plugins/debugger/threadswindow.cpp
+0
-2
src/plugins/debugger/watchdata.cpp
src/plugins/debugger/watchdata.cpp
+0
-2
src/plugins/debugger/watchdata.h
src/plugins/debugger/watchdata.h
+0
-1
src/plugins/debugger/watchhandler.cpp
src/plugins/debugger/watchhandler.cpp
+0
-4
src/plugins/debugger/watchhandler.h
src/plugins/debugger/watchhandler.h
+0
-1
src/plugins/debugger/watchwindow.h
src/plugins/debugger/watchwindow.h
+0
-1
src/plugins/genericprojectmanager/genericprojectmanager.h
src/plugins/genericprojectmanager/genericprojectmanager.h
+1
-0
src/plugins/projectexplorer/abstractprocessstep.cpp
src/plugins/projectexplorer/abstractprocessstep.cpp
+1
-2
src/plugins/projectexplorer/allprojectsfilter.h
src/plugins/projectexplorer/allprojectsfilter.h
+0
-1
src/plugins/projectexplorer/allprojectsfind.cpp
src/plugins/projectexplorer/allprojectsfind.cpp
+1
-2
src/plugins/projectexplorer/allprojectsfind.h
src/plugins/projectexplorer/allprojectsfind.h
+0
-3
src/plugins/projectexplorer/buildstepspage.cpp
src/plugins/projectexplorer/buildstepspage.cpp
+1
-0
src/plugins/projectexplorer/buildstepspage.h
src/plugins/projectexplorer/buildstepspage.h
+4
-2
src/plugins/projectexplorer/currentprojectfilter.cpp
src/plugins/projectexplorer/currentprojectfilter.cpp
+0
-4
src/plugins/projectexplorer/currentprojectfilter.h
src/plugins/projectexplorer/currentprojectfilter.h
+0
-2
src/plugins/projectexplorer/currentprojectfind.cpp
src/plugins/projectexplorer/currentprojectfind.cpp
+0
-5
src/plugins/projectexplorer/currentprojectfind.h
src/plugins/projectexplorer/currentprojectfind.h
+0
-5
src/plugins/projectexplorer/editorconfiguration.cpp
src/plugins/projectexplorer/editorconfiguration.cpp
+1
-1
src/plugins/projectexplorer/iprojectmanager.h
src/plugins/projectexplorer/iprojectmanager.h
+3
-1
src/plugins/projectexplorer/pluginfilefactory.h
src/plugins/projectexplorer/pluginfilefactory.h
+0
-1
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.cpp
+1
-0
src/plugins/projectexplorer/projectmodels.cpp
src/plugins/projectexplorer/projectmodels.cpp
+1
-3
src/plugins/projectexplorer/projecttreewidget.cpp
src/plugins/projectexplorer/projecttreewidget.cpp
+1
-0
src/plugins/projectexplorer/projecttreewidget.h
src/plugins/projectexplorer/projecttreewidget.h
+3
-1
src/plugins/projectexplorer/projectwelcomepagewidget.cpp
src/plugins/projectexplorer/projectwelcomepagewidget.cpp
+0
-1
src/plugins/projectexplorer/projectwindow.cpp
src/plugins/projectexplorer/projectwindow.cpp
+2
-14
src/plugins/projectexplorer/showineditortaskhandler.cpp
src/plugins/projectexplorer/showineditortaskhandler.cpp
+0
-1
src/plugins/qmlprojectmanager/qmlprojectmanager.h
src/plugins/qmlprojectmanager/qmlprojectmanager.h
+1
-0
src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
+0
-4
src/plugins/qt4projectmanager/qtuicodemodelsupport.h
src/plugins/qt4projectmanager/qtuicodemodelsupport.h
+1
-4
No files found.
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View file @
22f03cbd
...
...
@@ -30,10 +30,13 @@
#ifndef CMAKEPROJECTMANAGER_H
#define CMAKEPROJECTMANAGER_H
#include <coreplugin/dialogs/ioptionspage.h>
#include <projectexplorer/iprojectmanager.h>
#include <coreplugin/dialogs/ioptionspage.h>
#include <coreplugin/icontext.h>
#include <utils/environment.h>
#include <utils/pathchooser.h>
#include <QtCore/QFuture>
#include <QtCore/QStringList>
#include <QtCore/QDir>
...
...
src/plugins/debugger/breakhandler.cpp
View file @
22f03cbd
...
...
@@ -35,17 +35,12 @@
#include "debuggerplugin.h"
#include "debuggerstringutils.h"
#include "threadshandler.h"
#include "stackhandler.h"
#include "stackframe.h"
#include <texteditor/basetextmark.h>
#include <utils/qtcassert.h>
#include <QtCore/QDir>
#include <QtCore/QByteArray>
#include <QtCore/QFileInfo>
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/breakwindow.h
View file @
22f03cbd
...
...
@@ -30,13 +30,12 @@
#ifndef DEBUGGER_BREAKWINDOW_H
#define DEBUGGER_BREAKWINDOW_H
#include "breakpoint.h"
#include <QtGui/QTreeView>
namespace
Debugger
{
namespace
Internal
{
class
BreakpointData
;
class
BreakWindow
:
public
QTreeView
{
Q_OBJECT
...
...
src/plugins/debugger/cdb/cdbmodules.cpp
View file @
22f03cbd
...
...
@@ -34,6 +34,7 @@
#include <QtCore/QFileInfo>
#include <QtCore/QRegExp>
#include <QtCore/QVector>
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/consolewindow.cpp
View file @
22f03cbd
...
...
@@ -28,32 +28,22 @@
**************************************************************************/
#include "consolewindow.h"
#include "logwindow.h"
#include "debuggeractions.h"
#include "debuggerconstants.h"
#include <QtCore/QDebug>
#include <QtCore/QFile>
#include <QtCore/QTime>
#include <QtGui/QAction>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include <QtGui/QKeyEvent>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QMenu>
#include <QtGui/QSpacerItem>
#include <QtGui/QSplitter>
#include <QtGui/QSyntaxHighlighter>
#include <QtGui/QTextBlock>
#include <QtGui/QPlainTextEdit>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <aggregation/aggregate.h>
#include <coreplugin/findplaceholder.h>
#include <coreplugin/minisplitter.h>
#include <find/basetextfind.h>
#include <utils/savedaction.h>
...
...
@@ -268,25 +258,9 @@ private:
void
Console
::
saveContents
()
{
while
(
true
)
{
const
QString
fileName
=
QFileDialog
::
getSaveFileName
(
this
,
tr
(
"Log File"
));
if
(
fileName
.
isEmpty
())
break
;
QFile
file
(
fileName
);
if
(
file
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Text
|
QIODevice
::
Truncate
))
{
file
.
write
(
toPlainText
().
toUtf8
());
file
.
close
();
break
;
}
else
{
QMessageBox
::
warning
(
this
,
tr
(
"Write Failure"
),
tr
(
"Unable to write log contents to '%1': %2"
).
arg
(
fileName
,
file
.
errorString
()));
}
}
LogWindow
::
writeLogContents
(
this
,
this
);
}
/////////////////////////////////////////////////////////////////////
//
// ConsoleWindow
...
...
src/plugins/debugger/debuggeractions.cpp
View file @
22f03cbd
...
...
@@ -81,7 +81,7 @@ void DebuggerSettings::insertItem(int code, SavedAction *item)
m_items
[
code
]
=
item
;
}
void
DebuggerSettings
::
readSettings
(
QSettings
*
settings
)
void
DebuggerSettings
::
readSettings
(
const
QSettings
*
settings
)
{
foreach
(
SavedAction
*
item
,
m_items
)
item
->
readSettings
(
settings
);
...
...
src/plugins/debugger/debuggeractions.h
View file @
22f03cbd
...
...
@@ -68,7 +68,7 @@ public:
static
DebuggerSettings
*
instance
();
public
slots
:
void
readSettings
(
QSettings
*
settings
);
void
readSettings
(
const
QSettings
*
settings
);
void
writeSettings
(
QSettings
*
settings
)
const
;
private:
...
...
src/plugins/debugger/debuggeragents.cpp
View file @
22f03cbd
...
...
@@ -44,7 +44,6 @@
#include <texteditor/basetexteditor.h>
#include <texteditor/plaintexteditor.h>
#include <texteditor/basetextmark.h>
#include <texteditor/itexteditor.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/basetextdocument.h>
...
...
src/plugins/debugger/debuggerengine.cpp
View file @
22f03cbd
...
...
@@ -49,11 +49,11 @@
#include "breakwindow.h"
#include <coreplugin/icore.h>
#include <coreplugin/ifile.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/futureprogress.h>
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/toolchaintype.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
...
...
@@ -65,8 +65,6 @@
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QTimer>
#include <QtCore/QFutureInterface>
...
...
@@ -79,7 +77,6 @@
#include <QtGui/QPushButton>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
#include <QtGui/QTextDocument>
#include <QtGui/QTreeWidget>
#include <QtGui/QMainWindow>
...
...
src/plugins/debugger/debuggerengine.h
View file @
22f03cbd
...
...
@@ -37,7 +37,6 @@
#include <coreplugin/ssh/sshconnection.h>
#include <QtCore/QObject>
#include <QtCore/QSharedPointer>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
...
...
src/plugins/debugger/debuggermainwindow.h
View file @
22f03cbd
...
...
@@ -31,7 +31,6 @@
#define DEBUGGERMAINWINDOW_H
#include <utils/fancymainwindow.h>
#include "debuggerconstants.h"
QT_FORWARD_DECLARE_CLASS
(
QMenu
);
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
22f03cbd
...
...
@@ -35,7 +35,6 @@
#include "debuggerdialogs.h"
#include "debuggerengine.h"
#include "debuggermainwindow.h"
#include "debuggerplugin.h"
#include "debuggerrunner.h"
#include "debuggerstringutils.h"
#include "debuggertooltip.h"
...
...
@@ -52,16 +51,9 @@
#include "threadswindow.h"
#include "watchwindow.h"
#include "breakhandler.h"
#include "sessionengine.h"
#include "snapshothandler.h"
#include "threadshandler.h"
#include "watchutils.h"
#ifdef Q_OS_WIN
# include "shared/peutils.h"
#endif
#include "ui_commonoptionspage.h"
#include "ui_dumperoptionpage.h"
...
...
@@ -79,15 +71,8 @@
#include <coreplugin/imode.h>
#include <coreplugin/icorelistener.h>
#include <coreplugin/manhattanstyle.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/minisplitter.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/navigationwidget.h>
#include <coreplugin/outputpane.h>
#include <coreplugin/rightpane.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/CppDocument.h>
#include <cppeditor/cppeditorconstants.h>
#include <cpptools/cppmodelmanagerinterface.h>
...
...
@@ -104,52 +89,21 @@
#include <texteditor/basetexteditor.h>
#include <texteditor/basetextmark.h>
#include <texteditor/fontsettings.h>
#include <texteditor/itexteditor.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/texteditorsettings.h>
//#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <utils/qtcassert.h>
#include <utils/savedaction.h>
#include <utils/styledbar.h>
#include <qml/scriptconsole.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QObject>
#include <QtCore/QPoint>
#include <QtCore/QSettings>
#include <QtCore/QTextStream>
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtCore/QVariant>
#include <QtCore/QtPlugin>
#include <QtCore/QScopedPointer>
#include <QtGui/QAbstractItemView>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QComboBox>
#include <QtGui/QDockWidget>
#include <QtGui/QErrorMessage>
#include <QtGui/QFileDialog>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
#include <QtGui/QPlainTextEdit>
#include <QtGui/QPushButton>
#include <QtGui/QStatusBar>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
#include <QtGui/QToolButton>
#include <QtGui/QToolTip>
#include <QtGui/QTreeWidget>
#include <climits>
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
22f03cbd
...
...
@@ -30,7 +30,6 @@
#include "debuggerrunner.h"
#include "debuggeractions.h"
#include "debuggerconstants.h"
#include "debuggerengine.h"
#include "debuggerplugin.h"
#include "debuggerstringutils.h"
...
...
@@ -48,27 +47,17 @@
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/project.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/applicationrunconfiguration.h> // For LocalApplication*
#include <utils/environment.h>
#include <utils/synchronousprocess.h>
#include <utils/qtcassert.h>
#include <utils/fancymainwindow.h>
#include <coreplugin/icore.h>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QTimer>
#include <QtCore/QStringList>
#include <QtGui/QAbstractItemView>
#include <QtGui/QTextDocument>
#include <QtGui/QTreeWidget>
#include <QtGui/QMessageBox>
using
namespace
ProjectExplorer
;
...
...
src/plugins/debugger/debuggerrunner.h
View file @
22f03cbd
...
...
@@ -53,8 +53,6 @@ class GdbEngine;
class
AbstractGdbAdapter
;
}
//DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
class
DEBUGGER_EXPORT
DebuggerRunControlFactory
:
public
ProjectExplorer
::
IRunControlFactory
{
...
...
src/plugins/debugger/debuggertooltip.cpp
View file @
22f03cbd
...
...
@@ -29,20 +29,17 @@
#include "debuggertooltip.h"
#include <QtCore/QPointer>
#include <QtCore/QtDebug>
#include <QtCore/QPointer>
#include <QtGui/QApplication>
#include <QtGui/QDesktopWidget>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QKeyEvent>
#include <QtGui/QLabel>
#include <QtGui/QScrollBar>
#include <QtGui/QTreeView>
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/debuggeruiswitcher.cpp
View file @
22f03cbd
...
...
@@ -29,13 +29,8 @@
#include "debuggeruiswitcher.h"
#include "debuggermainwindow.h"
#include "debuggeractions.h"
#include "debuggerconstants.h"
#include "debuggerrunner.h"
#include "debuggerplugin.h"
#include "savedaction.h"
#include <utils/savedaction.h>
#include <utils/styledbar.h>
#include <utils/qtcassert.h>
...
...
@@ -48,7 +43,6 @@
#include <coreplugin/findplaceholder.h>
#include <coreplugin/icore.h>
#include <coreplugin/minisplitter.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/navigationwidget.h>
#include <coreplugin/outputpane.h>
#include <coreplugin/rightpane.h>
...
...
@@ -60,7 +54,6 @@
#include <projectexplorer/target.h>
#include <projectexplorer/runconfiguration.h>
#include <QtGui/QActionGroup>
#include <QtGui/QStackedWidget>
#include <QtGui/QVBoxLayout>
#include <QtGui/QMenu>
...
...
src/plugins/debugger/debuggeruiswitcher.h
View file @
22f03cbd
...
...
@@ -40,16 +40,14 @@ class QDockWidget;
QT_END_NAMESPACE
namespace
Core
{
class
ActionContainer
;
class
Command
;
class
Context
;
class
BaseMode
;
class
IMode
;
class
BaseMode
;
}
namespace
Utils
{
class
FancyMainWindow
;
class
SavedAction
;
}
namespace
ProjectExplorer
{
...
...
src/plugins/debugger/gdb/abstractgdbadapter.cpp
View file @
22f03cbd
...
...
@@ -28,7 +28,7 @@
**************************************************************************/
#include "abstractgdbadapter.h"
#include "gdbengine.h"
#include "abstractgdbprocess.h"
#include <utils/qtcassert.h>
...
...
@@ -104,5 +104,25 @@ QString AbstractGdbAdapter::msgConnectRemoteServerFailed(const QString &why)
return
tr
(
"Connecting to remote server failed:
\n
%1"
).
arg
(
why
);
}
DebuggerState
AbstractGdbAdapter
::
state
()
const
{
return
m_engine
->
state
();
}
const
DebuggerStartParameters
&
AbstractGdbAdapter
::
startParameters
()
const
{
return
m_engine
->
startParameters
();
}
DebuggerStartParameters
&
AbstractGdbAdapter
::
startParameters
()
{
return
m_engine
->
startParameters
();
}
void
AbstractGdbAdapter
::
showMessage
(
const
QString
&
msg
,
int
channel
,
int
timeout
)
{
m_engine
->
showMessage
(
msg
,
channel
,
timeout
);
}
}
// namespace Internal
}
// namespace Debugger
src/plugins/debugger/gdb/abstractgdbadapter.h
View file @
22f03cbd
...
...
@@ -30,14 +30,18 @@
#ifndef DEBUGGER_ABSTRACT_GDB_ADAPTER
#define DEBUGGER_ABSTRACT_GDB_ADAPTER
#include
<QtCore/QObject>
#include
"debuggerconstants.h"
#include
"gdbengine.h"
#include
<QtCore/QObject>
namespace
Debugger
{
class
DebuggerStartParameters
;
namespace
Internal
{
class
AbstractGdbProcess
;
class
GdbEngine
;
class
GdbResponse
;
// AbstractGdbAdapter is inherited by PlainGdbAdapter used for local
// debugging and TrkGdbAdapter used for on-device debugging.
...
...
@@ -85,14 +89,10 @@ public:
virtual
void
trkReloadThreads
()
{}
protected:
DebuggerState
state
()
const
{
return
m_engine
->
state
();
}
const
DebuggerStartParameters
&
startParameters
()
const
{
return
m_engine
->
startParameters
();
}
DebuggerStartParameters
&
startParameters
()
{
return
m_engine
->
startParameters
();
}
void
showMessage
(
const
QString
&
msg
,
int
channel
=
LogDebug
,
int
timeout
=
1
)
{
m_engine
->
showMessage
(
msg
,
channel
,
timeout
);
}
DebuggerState
state
()
const
;
const
DebuggerStartParameters
&
startParameters
()
const
;
DebuggerStartParameters
&
startParameters
();
void
showMessage
(
const
QString
&
msg
,
int
channel
=
LogDebug
,
int
timeout
=
1
);
GdbEngine
*
const
m_engine
;
};
...
...
src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
View file @
22f03cbd
...
...
@@ -28,7 +28,8 @@
**************************************************************************/
#include "abstractplaingdbadapter.h"
#include "gdbmi.h"
#include "gdbengine.h"
#include "debuggeractions.h"
#include "debuggerstringutils.h"
...
...
src/plugins/debugger/gdb/attachgdbadapter.cpp
View file @
22f03cbd
...
...
@@ -28,6 +28,7 @@
**************************************************************************/
#include "attachgdbadapter.h"
#include "gdbmi.h"
#include "gdbengine.h"
#include "procinterrupt.h"
...
...
src/plugins/debugger/gdb/attachgdbadapter.h
View file @
22f03cbd
...
...
@@ -31,8 +31,7 @@
#define DEBUGGER_ATTACHGDBADAPTER_H
#include "abstractgdbadapter.h"
#include "abstractgdbprocess.h"
#include "localgdbprocess.h"
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/gdb/classicgdbengine.cpp
View file @
22f03cbd
...
...
@@ -28,6 +28,7 @@
**************************************************************************/
#include "gdbengine.h"
#include "gdbmi.h"
#include "abstractgdbadapter.h"
#include "debuggeractions.h"
...
...
src/plugins/debugger/gdb/coregdbadapter.cpp
View file @
22f03cbd
...
...
@@ -28,7 +28,7 @@
**************************************************************************/
#include "coregdbadapter.h"
#include "gdbmi.h"
#include "debuggeractions.h"
#include "gdbengine.h"
#include "debuggerstringutils.h"
...
...
src/plugins/debugger/gdb/coregdbadapter.h
View file @
22f03cbd
...
...
@@ -31,9 +31,7 @@
#define DEBUGGER_COREGDBADAPTER_H
#include "abstractgdbadapter.h"
#include "abstractgdbprocess.h"
#include "localgdbprocess.h"
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/gdb/gdbengine.h
View file @
22f03cbd
...
...
@@ -32,12 +32,11 @@
#include "debuggerengine.h"
#include "gdbmi.h"
#include "localgdbprocess.h"
#include "stackframe.h"
#include "watchutils.h"
#include <QtCore/QByteArray>
#include <QtCore/QProcess>
#include <QtCore/QHash>
#include <QtCore/QMap>
#include <QtCore/QMultiMap>
...
...
@@ -47,11 +46,9 @@
#include <QtCore/QTextCodec>
#include <QtCore/QTime>
#include <QtCore/QVariant>
#include <QtCore/QSharedPointer>
QT_BEGIN_NAMESPACE
class
QMainWindow
;
class
QMessageBox
;
class
QTimer
;
QT_END_NAMESPACE
...
...
src/plugins/debugger/gdb/gdboptionspage.h
View file @
22f03cbd
...
...
@@ -35,7 +35,6 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <utils/savedaction.h>
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/gdb/localplaingdbadapter.h
View file @
22f03cbd
...
...
@@ -31,9 +31,7 @@
#define DEBUGGER_PLAINGDBADAPTER_H
#include "abstractplaingdbadapter.h"
#include "abstractgdbprocess.h"
#include "localgdbprocess.h"
#include <outputcollector.h>
namespace
Debugger
{
...
...
src/plugins/debugger/gdb/pythongdbengine.cpp
View file @
22f03cbd
...
...
@@ -28,7 +28,7 @@
**************************************************************************/
#include "gdbengine.h"
#include "gdbmi.h"
#include "abstractgdbadapter.h"
#include "debuggeractions.h"
#include "debuggerstringutils.h"
...
...
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View file @
22f03cbd
...
...
@@ -28,7 +28,7 @@
**************************************************************************/
#include "remotegdbserveradapter.h"
#include "gdbmi.h"
#include "debuggerstringutils.h"
#include "gdbengine.h"
...
...
src/plugins/debugger/gdb/remotegdbserveradapter.h
View file @
22f03cbd
...
...
@@ -31,8 +31,7 @@
#define DEBUGGER_REMOTEGDBADAPTER_H
#include "abstractgdbadapter.h"
#include "abstractgdbprocess.h"
#include "localgdbprocess.h"
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
View file @
22f03cbd
...
...
@@ -28,12 +28,12 @@
**************************************************************************/
#include "remoteplaingdbadapter.h"
#include "gdbengine.h"
#include <debugger/debuggeractions.h>
#include <debugger/debuggerstringutils.h>
#include <utils/qtcassert.h>
namespace
Debugger
{
namespace
Internal
{