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
Q
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
Tobias Hunger
qt-creator
Commits
bbcacaf5
Commit
bbcacaf5
authored
Mar 18, 2010
by
Friedemann Kleint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4.
parent
718dd06e
Changes
125
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
125 changed files
with
556 additions
and
414 deletions
+556
-414
src/plugins/bookmarks/bookmarksplugin.cpp
src/plugins/bookmarks/bookmarksplugin.cpp
+2
-0
src/plugins/coreplugin/actionmanager/actioncontainer.h
src/plugins/coreplugin/actionmanager/actioncontainer.h
+6
-3
src/plugins/coreplugin/actionmanager/actionmanager.h
src/plugins/coreplugin/actionmanager/actionmanager.h
+3
-3
src/plugins/coreplugin/actionmanager/commandmappings.cpp
src/plugins/coreplugin/actionmanager/commandmappings.cpp
+2
-1
src/plugins/coreplugin/actionmanager/commandmappings.h
src/plugins/coreplugin/actionmanager/commandmappings.h
+1
-1
src/plugins/coreplugin/actionmanager/commandsfile.h
src/plugins/coreplugin/actionmanager/commandsfile.h
+0
-1
src/plugins/coreplugin/basefilewizard.cpp
src/plugins/coreplugin/basefilewizard.cpp
+1
-0
src/plugins/coreplugin/basefilewizard.h
src/plugins/coreplugin/basefilewizard.h
+1
-2
src/plugins/coreplugin/basemode.cpp
src/plugins/coreplugin/basemode.cpp
+1
-0
src/plugins/coreplugin/basemode.h
src/plugins/coreplugin/basemode.h
+5
-1
src/plugins/coreplugin/coreimpl.cpp
src/plugins/coreplugin/coreimpl.cpp
+1
-0
src/plugins/coreplugin/coreimpl.h
src/plugins/coreplugin/coreimpl.h
+1
-1
src/plugins/coreplugin/dialogs/saveitemsdialog.h
src/plugins/coreplugin/dialogs/saveitemsdialog.h
+1
-1
src/plugins/coreplugin/dialogs/settingsdialog.h
src/plugins/coreplugin/dialogs/settingsdialog.h
+2
-2
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+3
-0
src/plugins/coreplugin/dialogs/shortcutsettings.h
src/plugins/coreplugin/dialogs/shortcutsettings.h
+4
-3
src/plugins/coreplugin/editmode.h
src/plugins/coreplugin/editmode.h
+0
-2
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/coreplugin/editormanager/editormanager.cpp
+43
-20
src/plugins/coreplugin/editormanager/editormanager.h
src/plugins/coreplugin/editormanager/editormanager.h
+1
-27
src/plugins/coreplugin/editormanager/editorview.cpp
src/plugins/coreplugin/editormanager/editorview.cpp
+3
-0
src/plugins/coreplugin/editormanager/editorview.h
src/plugins/coreplugin/editormanager/editorview.h
+10
-14
src/plugins/coreplugin/editormanager/openeditorsview.h
src/plugins/coreplugin/editormanager/openeditorsview.h
+3
-8
src/plugins/coreplugin/editormanager/openeditorswindow.cpp
src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+1
-0
src/plugins/coreplugin/fancyactionbar.h
src/plugins/coreplugin/fancyactionbar.h
+0
-1
src/plugins/coreplugin/fancytabwidget.h
src/plugins/coreplugin/fancytabwidget.h
+4
-4
src/plugins/coreplugin/flowlayout.cpp
src/plugins/coreplugin/flowlayout.cpp
+3
-0
src/plugins/coreplugin/flowlayout.h
src/plugins/coreplugin/flowlayout.h
+1
-3
src/plugins/coreplugin/generalsettings.cpp
src/plugins/coreplugin/generalsettings.cpp
+1
-0
src/plugins/coreplugin/generalsettings.h
src/plugins/coreplugin/generalsettings.h
+4
-1
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/mainwindow.cpp
+3
-0
src/plugins/coreplugin/modemanager.cpp
src/plugins/coreplugin/modemanager.cpp
+94
-58
src/plugins/coreplugin/modemanager.h
src/plugins/coreplugin/modemanager.h
+9
-24
src/plugins/coreplugin/navigationwidget.cpp
src/plugins/coreplugin/navigationwidget.cpp
+1
-0
src/plugins/coreplugin/outputpane.cpp
src/plugins/coreplugin/outputpane.cpp
+2
-0
src/plugins/coreplugin/progressmanager/futureprogress.cpp
src/plugins/coreplugin/progressmanager/futureprogress.cpp
+1
-1
src/plugins/coreplugin/progressmanager/progressbar.cpp
src/plugins/coreplugin/progressmanager/progressbar.cpp
+1
-0
src/plugins/coreplugin/progressmanager/progressbar.h
src/plugins/coreplugin/progressmanager/progressbar.h
+1
-3
src/plugins/coreplugin/progressmanager/progressmanager.h
src/plugins/coreplugin/progressmanager/progressmanager.h
+1
-1
src/plugins/coreplugin/progressmanager/progressview.cpp
src/plugins/coreplugin/progressmanager/progressview.cpp
+1
-0
src/plugins/coreplugin/progressmanager/progressview.h
src/plugins/coreplugin/progressmanager/progressview.h
+4
-2
src/plugins/coreplugin/sidebar.cpp
src/plugins/coreplugin/sidebar.cpp
+1
-0
src/plugins/cpaster/cpasterplugin.cpp
src/plugins/cpaster/cpasterplugin.cpp
+2
-0
src/plugins/cppeditor/cppeditor.cpp
src/plugins/cppeditor/cppeditor.cpp
+1
-0
src/plugins/cppeditor/cppplugin.cpp
src/plugins/cppeditor/cppplugin.cpp
+1
-0
src/plugins/cpptools/cppfindreferences.cpp
src/plugins/cpptools/cppfindreferences.cpp
+1
-0
src/plugins/cpptools/cpptoolsplugin.cpp
src/plugins/cpptools/cpptoolsplugin.cpp
+2
-0
src/plugins/cvs/cvsplugin.cpp
src/plugins/cvs/cvsplugin.cpp
+2
-0
src/plugins/debugger/breakwindow.cpp
src/plugins/debugger/breakwindow.cpp
+1
-0
src/plugins/debugger/cdb/cdbdebugengine.cpp
src/plugins/debugger/cdb/cdbdebugengine.cpp
+1
-0
src/plugins/debugger/debuggeractions.cpp
src/plugins/debugger/debuggeractions.cpp
+1
-0
src/plugins/debugger/debuggeractions.h
src/plugins/debugger/debuggeractions.h
+6
-2
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeragents.cpp
+2
-0
src/plugins/debugger/debuggeragents.h
src/plugins/debugger/debuggeragents.h
+6
-10
src/plugins/debugger/debuggerconstants.h
src/plugins/debugger/debuggerconstants.h
+1
-1
src/plugins/debugger/debuggermainwindow.cpp
src/plugins/debugger/debuggermainwindow.cpp
+7
-9
src/plugins/debugger/debuggermainwindow.h
src/plugins/debugger/debuggermainwindow.h
+17
-5
src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/debuggermanager.cpp
+3
-1
src/plugins/debugger/debuggermanager.h
src/plugins/debugger/debuggermanager.h
+0
-1
src/plugins/debugger/debuggeroutputwindow.cpp
src/plugins/debugger/debuggeroutputwindow.cpp
+3
-0
src/plugins/debugger/debuggeroutputwindow.h
src/plugins/debugger/debuggeroutputwindow.h
+5
-3
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/debuggerplugin.cpp
+5
-0
src/plugins/debugger/debuggerplugin.h
src/plugins/debugger/debuggerplugin.h
+0
-2
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.cpp
+0
-2
src/plugins/debugger/debuggerrunner.h
src/plugins/debugger/debuggerrunner.h
+0
-3
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
+137
-85
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/debugger/debuggeruiswitcher.h
+20
-50
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
+1
-0
src/plugins/debugger/gdb/trkgdbadapter.cpp
src/plugins/debugger/gdb/trkgdbadapter.cpp
+1
-0
src/plugins/debugger/moduleswindow.cpp
src/plugins/debugger/moduleswindow.cpp
+2
-0
src/plugins/debugger/outputcollector.h
src/plugins/debugger/outputcollector.h
+0
-1
src/plugins/debugger/procinterrupt.h
src/plugins/debugger/procinterrupt.h
+0
-2
src/plugins/debugger/registerwindow.cpp
src/plugins/debugger/registerwindow.cpp
+2
-1
src/plugins/debugger/snapshothandler.cpp
src/plugins/debugger/snapshothandler.cpp
+1
-0
src/plugins/debugger/snapshothandler.h
src/plugins/debugger/snapshothandler.h
+0
-4
src/plugins/debugger/snapshotwindow.cpp
src/plugins/debugger/snapshotwindow.cpp
+2
-1
src/plugins/debugger/snapshotwindow.h
src/plugins/debugger/snapshotwindow.h
+0
-1
src/plugins/debugger/sourcefileswindow.cpp
src/plugins/debugger/sourcefileswindow.cpp
+2
-0
src/plugins/debugger/sourcefileswindow.h
src/plugins/debugger/sourcefileswindow.h
+1
-8
src/plugins/debugger/stackhandler.cpp
src/plugins/debugger/stackhandler.cpp
+1
-0
src/plugins/debugger/stackhandler.h
src/plugins/debugger/stackhandler.h
+0
-1
src/plugins/debugger/stackwindow.cpp
src/plugins/debugger/stackwindow.cpp
+2
-0
src/plugins/debugger/stackwindow.h
src/plugins/debugger/stackwindow.h
+0
-6
src/plugins/debugger/threadswindow.cpp
src/plugins/debugger/threadswindow.cpp
+2
-0
src/plugins/debugger/watchhandler.cpp
src/plugins/debugger/watchhandler.cpp
+1
-0
src/plugins/debugger/watchwindow.cpp
src/plugins/debugger/watchwindow.cpp
+1
-0
src/plugins/designer/formeditorw.cpp
src/plugins/designer/formeditorw.cpp
+2
-0
src/plugins/fakevim/fakevimplugin.cpp
src/plugins/fakevim/fakevimplugin.cpp
+4
-2
src/plugins/find/findplugin.cpp
src/plugins/find/findplugin.cpp
+2
-0
src/plugins/genericprojectmanager/genericprojectwizard.cpp
src/plugins/genericprojectmanager/genericprojectwizard.cpp
+2
-0
src/plugins/git/gitplugin.cpp
src/plugins/git/gitplugin.cpp
+2
-0
src/plugins/help/helpplugin.cpp
src/plugins/help/helpplugin.cpp
+2
-0
src/plugins/locator/locatorplugin.cpp
src/plugins/locator/locatorplugin.cpp
+3
-0
src/plugins/mercurial/mercurialplugin.cpp
src/plugins/mercurial/mercurialplugin.cpp
+2
-0
src/plugins/perforce/perforceplugin.cpp
src/plugins/perforce/perforceplugin.cpp
+2
-0
src/plugins/projectexplorer/customwizard/customwizard.h
src/plugins/projectexplorer/customwizard/customwizard.h
+1
-0
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/projectexplorer/outputwindow.cpp
+2
-0
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.cpp
+2
-0
src/plugins/projectexplorer/taskwindow.cpp
src/plugins/projectexplorer/taskwindow.cpp
+1
-0
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
+1
-0
src/plugins/qmlinspector/qmlinspector.cpp
src/plugins/qmlinspector/qmlinspector.cpp
+1
-1
src/plugins/qmlinspector/qmlinspectorplugin.cpp
src/plugins/qmlinspector/qmlinspectorplugin.cpp
+1
-0
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
+2
-0
src/plugins/qmljseditor/qmljseditorplugin.cpp
src/plugins/qmljseditor/qmljseditorplugin.cpp
+2
-0
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
...plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+2
-0
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+2
-1
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
...4projectmanager/customwidgetwizard/customwidgetwizard.cpp
+2
-0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
...ns/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
+0
-1
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
+3
-0
src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
+4
-5
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
...gins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+4
-0
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
...lugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
+0
-1
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+5
-1
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
+6
-6
src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
...ins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
+1
-0
src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
...ugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
+2
-3
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+4
-0
src/plugins/qt4projectmanager/qt-s60/s60manager.h
src/plugins/qt4projectmanager/qt-s60/s60manager.h
+4
-5
src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h
src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h
+0
-1
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+2
-0
src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+2
-0
src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
+2
-0
src/plugins/subversion/subversionplugin.cpp
src/plugins/subversion/subversionplugin.cpp
+2
-0
src/plugins/texteditor/basefilefind.cpp
src/plugins/texteditor/basefilefind.cpp
+1
-0
src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor.cpp
+2
-0
src/plugins/texteditor/texteditoractionhandler.cpp
src/plugins/texteditor/texteditoractionhandler.cpp
+2
-0
No files found.
src/plugins/bookmarks/bookmarksplugin.cpp
View file @
bbcacaf5
...
...
@@ -37,6 +37,8 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h>
#include <texteditor/texteditorconstants.h>
...
...
src/plugins/coreplugin/actionmanager/actioncontainer.h
View file @
bbcacaf5
...
...
@@ -31,9 +31,12 @@
#define ACTIONCONTAINER_H
#include <QtCore/QObject>
#include <QtGui/QMenu>
#include <QtGui/QMenuBar>
#include <QtGui/QAction>
QT_BEGIN_NAMESPACE
class
QMenu
;
class
QMenuBar
;
class
QAction
;
QT_END_NAMESPACE
namespace
Core
{
...
...
src/plugins/coreplugin/actionmanager/actionmanager.h
View file @
bbcacaf5
...
...
@@ -32,9 +32,6 @@
#include "coreplugin/core_global.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <QtCore/QObject>
#include <QtCore/QList>
...
...
@@ -46,6 +43,9 @@ QT_END_NAMESPACE
namespace
Core
{
class
ActionContainer
;
class
Command
;
class
CORE_EXPORT
ActionManager
:
public
QObject
{
Q_OBJECT
...
...
src/plugins/coreplugin/actionmanager/commandmappings.cpp
View file @
bbcacaf5
...
...
@@ -37,12 +37,13 @@
#include "filemanager.h"
#include "icore.h"
#include "uniqueidmanager.h"
#include <utils/treewidgetcolumnstretcher.h>
#include <utils/treewidgetcolumnstretcher.h>
#include <QtGui/QKeyEvent>
#include <QtGui/QShortcut>
#include <QtGui/QHeaderView>
#include <QtGui/QTreeWidgetItem>
#include <QtGui/QFileDialog>
#include <QtCore/QCoreApplication>
#include <QtDebug>
...
...
src/plugins/coreplugin/actionmanager/commandmappings.h
View file @
bbcacaf5
...
...
@@ -33,11 +33,11 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QObject>
#include <QtGui/QTreeWidgetItem>
QT_BEGIN_NAMESPACE
class
QLineEdit
;
class
QTreeWidget
;
class
QTreeWidgetItem
;
class
Ui_CommandMappings
;
QT_END_NAMESPACE
...
...
src/plugins/coreplugin/actionmanager/commandsfile.h
View file @
bbcacaf5
...
...
@@ -33,7 +33,6 @@
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QtGui/QKeySequence>
namespace
Core
{
...
...
src/plugins/coreplugin/basefilewizard.cpp
View file @
bbcacaf5
...
...
@@ -51,6 +51,7 @@
#include <QtGui/QMessageBox>
#include <QtGui/QWizard>
#include <QtGui/QMainWindow>
#include <QtGui/QIcon>
enum
{
debugWizard
=
0
};
...
...
src/plugins/coreplugin/basefilewizard.h
View file @
bbcacaf5
...
...
@@ -34,12 +34,11 @@
#include <coreplugin/dialogs/iwizard.h>
#include <QtGui/QIcon>
#include <QtCore/QSharedDataPointer>
#include <QtCore/QMap>
#include <QtCore/QList>
QT_BEGIN_NAMESPACE
class
QIcon
;
class
QWizard
;
class
QWizardPage
;
class
QDebug
;
...
...
src/plugins/coreplugin/basemode.cpp
View file @
bbcacaf5
...
...
@@ -32,6 +32,7 @@
#include <extensionsystem/pluginmanager.h>
#include <QtGui/QWidget>
#include <QtGui/QIcon>
using
namespace
Core
;
...
...
src/plugins/coreplugin/basemode.h
View file @
bbcacaf5
...
...
@@ -34,9 +34,13 @@
#include "imode.h"
#include <QtCore/QObject>
#include <QtGui/QWidget>
#include <QtGui/QIcon>
QT_BEGIN_NAMESPACE
class
QWidget
;
QT_END_NAMESPACE
namespace
Core
{
class
CORE_EXPORT
BaseMode
...
...
src/plugins/coreplugin/coreimpl.cpp
View file @
bbcacaf5
...
...
@@ -28,6 +28,7 @@
**************************************************************************/
#include "coreimpl.h"
#include "mainwindow.h"
#include <QtCore/QDir>
#include <QtCore/QCoreApplication>
...
...
src/plugins/coreplugin/coreimpl.h
View file @
bbcacaf5
...
...
@@ -31,10 +31,10 @@
#define COREIMPL_H
#include "icore.h"
#include "mainwindow.h"
namespace
Core
{
namespace
Internal
{
class
MainWindow
;
class
CoreImpl
:
public
ICore
{
...
...
src/plugins/coreplugin/dialogs/saveitemsdialog.h
View file @
bbcacaf5
...
...
@@ -30,7 +30,7 @@
#ifndef SAVEITEMSDIALOG_H
#define SAVEITEMSDIALOG_H
#include <QtCore/Q
Map
>
#include <QtCore/Q
List
>
#include <QtGui/QDialog>
#include "ui_saveitemsdialog.h"
...
...
src/plugins/coreplugin/dialogs/settingsdialog.h
View file @
bbcacaf5
...
...
@@ -30,12 +30,12 @@
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
#include "coreplugin/dialogs/ioptionspage.h"
#include <QtCore/QList>
#include <QtCore/QSet>
#include <QtGui/QDialog>
#include "coreplugin/dialogs/ioptionspage.h"
QT_BEGIN_NAMESPACE
class
QModelIndex
;
class
QStandardItemModel
;
...
...
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View file @
bbcacaf5
...
...
@@ -44,6 +44,9 @@
#include <QtGui/QHeaderView>
#include <QtGui/QFileDialog>
#include <QtGui/QLineEdit>
#include <QtGui/QAction>
#include <QtGui/QKeyEvent>
#include <QtGui/QTreeWidgetItem>
#include <QtCore/QCoreApplication>
#include <QtDebug>
...
...
src/plugins/coreplugin/dialogs/shortcutsettings.h
View file @
bbcacaf5
...
...
@@ -32,10 +32,11 @@
#include <coreplugin/actionmanager/commandmappings.h>
#include <QtCore/QObject>
#include <QtGui/QKeySequence>
#include <QtGui/QTreeWidgetItem>
#include <QtGui/QKeyEvent>
QT_BEGIN_NAMESPACE
class
QKeyEvent
;
QT_END_NAMESPACE
namespace
Core
{
...
...
src/plugins/coreplugin/editmode.h
View file @
bbcacaf5
...
...
@@ -32,8 +32,6 @@
#include <coreplugin/imode.h>
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
class
QSplitter
;
class
QWidget
;
...
...
src/plugins/coreplugin/editormanager/editormanager.cpp
View file @
bbcacaf5
...
...
@@ -45,8 +45,11 @@
#include <coreplugin/modemanager.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/editormanager/ieditorfactory.h>
#include <coreplugin/editormanager/iexternaleditor.h>
#include <coreplugin/icorelistener.h>
#include <coreplugin/imode.h>
#include <coreplugin/settingsdatabase.h>
#include <coreplugin/variablemanager.h>
...
...
@@ -76,10 +79,6 @@
Q_DECLARE_METATYPE
(
Core
::
IEditor
*
)
using
namespace
Core
;
using
namespace
Core
::
Internal
;
using
namespace
Utils
;
enum
{
debugEditorManager
=
0
};
static
inline
ExtensionSystem
::
PluginManager
*
pluginManager
()
...
...
@@ -87,6 +86,46 @@ static inline ExtensionSystem::PluginManager *pluginManager()
return
ExtensionSystem
::
PluginManager
::
instance
();
}
//===================EditorClosingCoreListener======================
namespace
Core
{
namespace
Internal
{
class
EditorClosingCoreListener
:
public
ICoreListener
{
public:
EditorClosingCoreListener
(
EditorManager
*
em
);
bool
editorAboutToClose
(
IEditor
*
editor
);
bool
coreAboutToClose
();
private:
EditorManager
*
m_em
;
};
EditorClosingCoreListener
::
EditorClosingCoreListener
(
EditorManager
*
em
)
:
m_em
(
em
)
{
}
bool
EditorClosingCoreListener
::
editorAboutToClose
(
IEditor
*
)
{
return
true
;
}
bool
EditorClosingCoreListener
::
coreAboutToClose
()
{
// Do not ask for files to save.
// MainWindow::closeEvent has already done that.
return
m_em
->
closeAllEditors
(
false
);
}
}
// namespace Internal
}
// namespace Core
using
namespace
Core
;
using
namespace
Core
::
Internal
;
using
namespace
Utils
;
//===================EditorManager=====================
EditorManagerPlaceHolder
*
EditorManagerPlaceHolder
::
m_current
=
0
;
...
...
@@ -1953,19 +1992,3 @@ void EditorManager::gotoOtherSplit()
}
//===================EditorClosingCoreListener======================
EditorClosingCoreListener
::
EditorClosingCoreListener
(
EditorManager
*
em
)
:
m_em
(
em
)
{
}
bool
EditorClosingCoreListener
::
editorAboutToClose
(
IEditor
*
)
{
return
true
;
}
bool
EditorClosingCoreListener
::
coreAboutToClose
()
{
// Do not ask for files to save.
// MainWindow::closeEvent has already done that.
return
m_em
->
closeAllEditors
(
false
);
}
src/plugins/coreplugin/editormanager/editormanager.h
View file @
bbcacaf5
...
...
@@ -32,15 +32,12 @@
#include "../core_global.h"
#include <coreplugin/icorelistener.h>
#include <coreplugin/ifile.h>
#include <coreplugin/ifile.h> // enumerations
#include <QtGui/QWidget>
#include <QtCore/QList>
#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
class
QSettings
;
class
QModelIndex
;
QT_END_NAMESPACE
...
...
@@ -273,27 +270,4 @@ private:
}
// namespace Core
Q_DECLARE_OPERATORS_FOR_FLAGS
(
Core
::
EditorManager
::
OpenEditorFlags
);
//===================EditorClosingCoreListener======================
namespace
Core
{
namespace
Internal
{
class
EditorClosingCoreListener
:
public
ICoreListener
{
Q_OBJECT
public:
EditorClosingCoreListener
(
EditorManager
*
em
);
bool
editorAboutToClose
(
IEditor
*
editor
);
bool
coreAboutToClose
();
private:
EditorManager
*
m_em
;
};
}
// namespace Internal
}
// namespace Core
#endif // EDITORMANAGER_H
src/plugins/coreplugin/editormanager/editorview.cpp
View file @
bbcacaf5
...
...
@@ -58,6 +58,9 @@
#include <QtGui/QToolButton>
#include <QtGui/QMenu>
#include <QtGui/QClipboard>
#include <QtGui/QAction>
#include <QtGui/QSplitter>
#include <QtGui/QStackedLayout>
#ifdef Q_WS_MAC
#include <qmacstyle_mac.h>
...
...
src/plugins/coreplugin/editormanager/editorview.h
View file @
bbcacaf5
...
...
@@ -33,27 +33,24 @@
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QSettings>
#include <QtGui/QWidget>
#include <QtGui/QAction>
#include <QtGui/QSplitter>
#include <QtGui/QStackedLayout>
#include <QtCore/QPointer>
#include <coreplugin/icontext.h>
#include <coreplugin/ifile.h>
#include <QtGui/QSortFilterProxyModel>
#include <QtCore/QVariant>
QT_BEGIN_NAMESPACE
class
QComboBox
;
class
QToolButton
;
class
QLabel
;
class
QStackedWidget
;
class
QSplitter
;
class
QStackedLayout
;
class
QAction
;
class
QFrame
;
QT_END_NAMESPACE
namespace
Core
{
class
IContext
;
class
IFile
;
class
IEditor
;
class
OpenEditorsModel
;
class
EditorToolBar
;
...
...
@@ -72,7 +69,7 @@ class EditorView : public QWidget
Q_OBJECT
public:
EditorView
(
QWidget
*
parent
=
0
);
explicit
EditorView
(
QWidget
*
parent
=
0
);
virtual
~
EditorView
();
int
editorCount
()
const
;
...
...
@@ -146,8 +143,8 @@ class SplitterOrView : public QWidget
{
Q_OBJECT
public:
SplitterOrView
(
OpenEditorsModel
*
model
);
// creates a root splitter
SplitterOrView
(
Core
::
IEditor
*
editor
=
0
);
explicit
SplitterOrView
(
OpenEditorsModel
*
model
);
// creates a root splitter
explicit
SplitterOrView
(
Core
::
IEditor
*
editor
=
0
);
~
SplitterOrView
();
void
split
(
Qt
::
Orientation
orientation
);
...
...
@@ -187,7 +184,6 @@ protected:
void
paintEvent
(
QPaintEvent
*
);
void
mousePressEvent
(
QMouseEvent
*
e
);
private:
void
unsplitAll_helper
();
SplitterOrView
*
findNextView_helper
(
SplitterOrView
*
view
,
bool
*
found
);
...
...
src/plugins/coreplugin/editormanager/openeditorsview.h
View file @
bbcacaf5
...
...
@@ -32,17 +32,13 @@
#include "ui_openeditorsview.h"
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/inavigationwidgetfactory.h>
#include <QtCore/QList>
#include <QtGui/QWidget>
#include <QtGui/QKeySequence>
#include <QtGui/QAbstractButton>
#include <QtGui/QTreeWidgetItem>
#include <QtGui/QStyledItemDelegate>
namespace
Core
{
class
IEditor
;
namespace
Internal
{
class
OpenEditorsDelegate
:
public
QStyledItemDelegate
...
...
@@ -50,7 +46,7 @@ class OpenEditorsDelegate : public QStyledItemDelegate
Q_OBJECT
public:
OpenEditorsDelegate
(
QObject
*
parent
=
0
);
explicit
OpenEditorsDelegate
(
QObject
*
parent
=
0
);
void
paint
(
QPainter
*
painter
,
const
QStyleOptionViewItem
&
option
,
const
QModelIndex
&
index
)
const
;
...
...
@@ -58,7 +54,6 @@ public:
mutable
QModelIndex
pressedIndex
;
};
class
OpenEditorsWidget
:
public
QWidget
{
Q_OBJECT
...
...
src/plugins/coreplugin/editormanager/openeditorswindow.cpp
View file @
bbcacaf5
...
...
@@ -31,6 +31,7 @@
#include "openeditorsmodel.h"
#include "editormanager.h"
#include "editorview.h"
#include "ifile.h"
#include <utils/qtcassert.h>
...
...
src/plugins/coreplugin/fancyactionbar.h
View file @
bbcacaf5
...
...
@@ -30,7 +30,6 @@
#ifndef FANCYACTIONBAR_H
#define FANCYACTIONBAR_H
#include <QtCore/QMap>
#include <QtGui/QToolButton>
QT_BEGIN_NAMESPACE
...
...
src/plugins/coreplugin/fancytabwidget.h
View file @
bbcacaf5
...
...
@@ -30,12 +30,12 @@
#ifndef FANCYTABWIDGET_H
#define FANCYTABWIDGET_H
#include <QtGui/QPushButton>
#include <QtGui/QTabBar>
#include <QtGui/QStyleOptionTabV2>
#include <QtCore/QTimeLine>
#include <QtGui/QIcon>
#include <QtGui/QWidget>
#include <QtCore/QTimer>
#include <QtCore/QPropertyAnimation>
QT_BEGIN_NAMESPACE
class
QPainter
;
class
QStackedLayout
;
...
...
src/plugins/coreplugin/flowlayout.cpp
View file @
bbcacaf5
...
...
@@ -29,6 +29,9 @@
#include "flowlayout.h"
#include <QRect>
#include <QWidgetItem>
using
namespace
Core
::
Internal
;
FlowLayout
::
FlowLayout
(
QWidget
*
parent
,
int
margin
,
int
spacing
)
...
...
src/plugins/coreplugin/flowlayout.h
View file @
bbcacaf5
...
...
@@ -30,9 +30,7 @@
#ifndef FLOWLAYOUT_H
#define FLOWLAYOUT_H
#include <QLayout>
#include <QRect>
#include <QWidgetItem>
#include <QtGui/QLayout>
namespace
Core
{
namespace
Internal
{
...
...
src/plugins/coreplugin/generalsettings.cpp
View file @
bbcacaf5
...
...
@@ -38,6 +38,7 @@
#include <coreplugin/icore.h>
#include <QtGui/QMainWindow>
#include <QtGui/QMessageBox>
#include <QtCore/QCoreApplication>
#include <QtCore/QTextStream>
...
...
src/plugins/coreplugin/generalsettings.h
View file @
bbcacaf5
...
...
@@ -32,7 +32,10 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QPointer>
#include <QtGui/QMessageBox>
QT_BEGIN_NAMESPACE
class
QMessageBox
;
QT_END_NAMESPACE
namespace
Core
{
namespace
Internal
{
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
bbcacaf5
...
...
@@ -29,6 +29,7 @@
#include "mainwindow.h"
#include "actioncontainer.h"
#include "command.h"
#include "actionmanager_p.h"
#include "coreimpl.h"
#include "coreconstants.h"
...
...
@@ -64,6 +65,7 @@
#include "editormanager/systemeditor.h"
#include <coreplugin/findplaceholder.h>
#include <coreplugin/icorelistener.h>
#include <coreplugin/settingsdatabase.h>
#include <utils/pathchooser.h>
#include <utils/stylehelper.h>
...
...
@@ -86,6 +88,7 @@
#include <QtGui/QWizard>
#include <QtGui/QToolButton>
#include <QtGui/QMessageBox>
#include <QtGui/QMenuBar>
/*
#ifdef Q_OS_UNIX
...
...
src/plugins/coreplugin/modemanager.cpp
View file @
bbcacaf5
This diff is collapsed.
Click to expand it.
src/plugins/coreplugin/modemanager.h
View file @
bbcacaf5
...
...
@@ -31,39 +31,33 @@
#define MODEMANAGER_H
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QVector>
#include <coreplugin/core_global.h>
QT_BEGIN_NAMESPACE
class
QAction
;
class
QSignalMapper
;
class
QMenu
;
QT_END_NAMESPACE
namespace
Core
{
class
Command
;
class
IMode
;
namespace
Internal
{
class
FancyTabWidget
;
class
FancyActionBar
;
class
FancyConfigButton
;
class
MainWindow
;
}
// namespace Internal
class
MainWindow
;
class
FancyTabWidget
;
}
struct
ModeManagerPrivate
;
class
CORE_EXPORT
ModeManager
:
public
QObject
{
Q_OBJECT
public:
ModeManager
(
Internal
::
MainWindow
*
mainWindow
,
Internal
::
FancyTabWidget
*
modeStack
);
explicit
ModeManager
(
Internal
::
MainWindow
*
mainWindow
,
Internal
::
FancyTabWidget
*
modeStack
);
virtual
~
ModeManager
();
void
init
();