Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
bbcacaf5
Commit
bbcacaf5
authored
Mar 18, 2010
by
Friedemann Kleint
Browse files
Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4.
parent
718dd06e
Changes
125
Hide whitespace changes
Inline
Side-by-side
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>
...
...
Prev
1
2
3
4
5
…
7
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment