Commit 54da18ea authored by Friedemann Kleint's avatar Friedemann Kleint

Clean exported headers of the Core plugin.

Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 93f57a99
......@@ -44,6 +44,7 @@
#include <coreplugin/rightpane.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/projectexplorer.h>
......@@ -65,6 +66,7 @@
#include <QVBoxLayout>
#include <QDockWidget>
#include <QAction>
#include <QMenu>
#include <QToolButton>
#include <QComboBox>
#include <QStackedWidget>
......
......@@ -35,10 +35,12 @@
#include <utils/qtcassert.h>
#include <QAction>
#include <QApplication>
#include <QClipboard>
#include <QContextMenuEvent>
#include <QFontMetrics>
#include <QMenu>
#include <QPainter>
#include <QScrollBar>
......
......@@ -33,6 +33,9 @@
#include "androidconstants.h"
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h>
#include <utils/fileutils.h>
#include <QFileInfo>
......
......@@ -37,6 +37,8 @@
#include <coreplugin/editormanager/ieditor.h>
#include <texteditor/texteditor.h>
#include <QActionGroup>
QT_BEGIN_NAMESPACE
class QToolBar;
class QActionGroup;
......
......@@ -34,15 +34,16 @@
#include "androidconstants.h"
#include "javacompletionassistprovider.h"
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
#include <utils/uncommentselection.h>
#include <coreplugin/editormanager/ieditorfactory.h>
#include <texteditor/normalindenter.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/normalindenter.h>
#include <texteditor/texteditor.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/fileutils.h>
#include <utils/uncommentselection.h>
#include <QFileInfo>
......
......@@ -48,6 +48,7 @@
#include <coreplugin/id.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/locator/commandlocator.h>
......
......@@ -57,6 +57,7 @@
#include <QDir>
#include <QFileInfo>
#include <QFutureWatcher>
#include <QMenu>
#include <QPlainTextEdit>
#include <QProcess>
#include <QScrollBar>
......
......@@ -36,6 +36,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <projectexplorer/projectexplorer.h>
......
......@@ -42,6 +42,7 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h>
#include <texteditor/texteditor.h>
#include <QThread>
......
......@@ -34,15 +34,17 @@
#include "cmakeproject.h"
#include "cmakesettingspage.h"
#include <utils/synchronousprocess.h>
#include <coreplugin/icore.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <projectexplorer/projecttree.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projecttree.h>
#include <utils/synchronousprocess.h>
#include <QAction>
#include <QDateTime>
using namespace CMakeProjectManager::Internal;
......
......@@ -32,6 +32,7 @@
#include "actionmanager.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icontext.h>
#include <coreplugin/id.h>
#include <utils/hostosinfo.h>
......
......@@ -48,6 +48,8 @@ QT_END_NAMESPACE
namespace Core {
class ActionContainer;
class Command;
class Context;
namespace Internal {
class CorePlugin;
......
......@@ -29,8 +29,10 @@
****************************************************************************/
#include "commandbutton.h"
#include "actionmanager.h"
#include "command.h"
#include "../id.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <utils/proxyaction.h>
using namespace Core;
......
......@@ -33,8 +33,6 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QObject>
QT_BEGIN_NAMESPACE
class QLineEdit;
class QTreeWidget;
......
......@@ -33,14 +33,11 @@
#include "core_global.h"
#include "generatedfile.h"
#include "featureprovider.h"
#include <coreplugin/iwizardfactory.h>
#include <extensionsystem/iplugin.h>
#include <QSharedDataPointer>
#include <QList>
#include <QVariantMap>
QT_BEGIN_NAMESPACE
class QIcon;
......
......@@ -31,6 +31,7 @@
#include "coreplugin.h"
#include "designmode.h"
#include "editmode.h"
#include "idocument.h"
#include "helpmanager.h"
#include "mainwindow.h"
#include "modemanager.h"
......
......@@ -31,6 +31,7 @@
#include "designmode.h"
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/coreconstants.h>
......
......@@ -35,6 +35,7 @@
#include <QCheckBox>
#include <QGroupBox>
#include <QIcon>
#include <QLabel>
#include <QPushButton>
......@@ -80,6 +81,11 @@
side of the \gui Options dialog.
*/
QIcon Core::IOptionsPage::categoryIcon() const
{
return QIcon(m_categoryIcon);
}
/*!
\fn QWidget *IOptionsPage::widget()
......@@ -183,3 +189,8 @@ bool Core::IOptionsPage::matches(const QString &searchKeyWord) const
return true;
return false;
}
QIcon Core::IOptionsPageProvider::categoryIcon() const
{
return QIcon(m_categoryIcon);
}
......@@ -33,10 +33,14 @@
#include <coreplugin/id.h>
#include <QIcon>
#include <QObject>
#include <QStringList>
QT_BEGIN_NAMESPACE
class QIcon;
class QWidget;
QT_END_NAMESPACE
namespace Core {
class CORE_EXPORT IOptionsPage : public QObject
......@@ -51,7 +55,7 @@ public:
QString displayName() const { return m_displayName; }
Id category() const { return m_category; }
QString displayCategory() const { return m_displayCategory; }
QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
QIcon categoryIcon() const;
virtual bool matches(const QString &searchKeyWord) const;
virtual QWidget *widget() = 0;
......@@ -92,7 +96,7 @@ public:
Id category() const { return m_category; }
QString displayCategory() const { return m_displayCategory; }
QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
QIcon categoryIcon() const;
virtual QList<IOptionsPage *> pages() const = 0;
virtual bool matches(const QString & /* searchKeyWord*/) const = 0;
......
......@@ -36,6 +36,7 @@
#include <QDialog>
#include <QIcon>
#include <QList>
#include <QVariantMap>
QT_BEGIN_NAMESPACE
class QAbstractProxyModel;
......
......@@ -32,6 +32,8 @@
#include <coreplugin/fileiconprovider.h>
#include <coreplugin/idocument.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <QDir>
......
......@@ -37,6 +37,7 @@
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <QAbstractItemModel>
#include <QDir>
#include <QIcon>
#include <QMimeData>
......
......@@ -36,9 +36,10 @@
#include <utils/fileutils.h>
#include <QAbstractItemModel>
QT_FORWARD_DECLARE_CLASS(QIcon)
QT_BEGIN_NAMESPACE
class QAbstractItemModel;
class QIcon;
QT_END_NAMESPACE
namespace Core {
......
......@@ -35,6 +35,7 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/icontext.h>
#include <coreplugin/idocument.h>
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
......
......@@ -40,6 +40,7 @@
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/dialogs/openwithdialog.h>
#include <coreplugin/dialogs/readonlyfilesdialog.h>
......@@ -68,6 +69,7 @@
#include <utils/hostosinfo.h>
#include <utils/macroexpander.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/mimetypes/mimetype.h>
#include <utils/qtcassert.h>
#include <QClipboard>
......
......@@ -35,18 +35,14 @@
#include "documentmodel.h"
#include <coreplugin/id.h>
#include <coreplugin/idocument.h> // enumerations
#include <utils/mimetypes/mimetype.h>
#include <QList>
#include <QWidget>
#include <QMenu>
#include <functional>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
QT_FORWARD_DECLARE_CLASS(QMenu)
namespace Utils { class MimeType; }
namespace Core {
......
......@@ -50,6 +50,7 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QMenu>
#include <QMouseEvent>
#include <QPainter>
#include <QStackedWidget>
......
......@@ -31,7 +31,11 @@
#ifndef IEDITORFACTORY_H
#define IEDITORFACTORY_H
#include <coreplugin/idocumentfactory.h>
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <QObject>
#include <QStringList>
namespace Core {
......
......@@ -35,6 +35,7 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <QApplication>
#include <QMenu>
......
......@@ -31,6 +31,7 @@
#include "editortoolbar.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/documentmodel.h>
#include <coreplugin/editormanager/editormanager.h>
......
......@@ -35,8 +35,6 @@
#include <utils/styledbar.h>
#include <QIcon>
#include <functional>
QT_BEGIN_NAMESPACE
......
......@@ -31,6 +31,7 @@
#include "externaltool.h"
#include "externaltoolmanager.h"
#include "idocument.h"
#include "messagemanager.h"
#include "documentmanager.h"
#include "editormanager/editormanager.h"
......
......@@ -31,10 +31,12 @@
#include "externaltoolmanager.h"
#include "externaltool.h"
#include "coreconstants.h"
#include "icontext.h"
#include "icore.h"
#include "messagemanager.h"
#include "actionmanager/actionmanager.h"
#include "actionmanager/actioncontainer.h"
#include "actionmanager/command.h"
#include <utils/qtcassert.h>
......
......@@ -35,7 +35,6 @@
#include <coreplugin/id.h>
#include <QObject>
#include <QSet>
#include <QStringList>
......
......@@ -34,10 +34,13 @@
#include "findtoolbar.h"
#include "findtoolwindow.h"
#include "searchresultwindow.h"
#include "icontext.h"
#include "ifindfilter.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
......
......@@ -29,6 +29,7 @@
****************************************************************************/
#include "findtoolbar.h"
#include "icontext.h"
#include "ifindfilter.h"
#include "findplugin.h"
......@@ -37,6 +38,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/findplaceholder.h>
#include <extensionsystem/pluginmanager.h>
......
......@@ -34,6 +34,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icontext.h>
#include <utils/qtcassert.h>
......
......@@ -32,14 +32,13 @@
#define IDOCUMENT_H
#include "core_global.h"
#include "id.h"
#include <utils/fileutils.h>
#include <QObject>
namespace Core {
namespace Utils { class FileName; }
namespace Core {
class Id;
class InfoBar;
namespace Internal {
......
......@@ -32,13 +32,11 @@
#define IWIZARDFACTORY_H
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <coreplugin/featureprovider.h>
#include <QIcon>
#include <QObject>
#include <QString>
#include <QVariantMap>
namespace Core {
......
......@@ -33,10 +33,10 @@
#include "core_global.h"
#include <functional>
#include <QFileInfo>
#include <QString>
QT_BEGIN_NAMESPACE
class QObject;
class QString;
QT_END_NAMESPACE
namespace Core {
......
......@@ -32,6 +32,7 @@
#include "locatorwidget.h"
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/idocument.h>
#include <utils/fileutils.h>
#include <QDir>
......
......@@ -34,6 +34,7 @@
#include <coreplugin/editormanager/ieditor.h>
#include <utils/fileutils.h>
#include <QAbstractItemModel>
#include <QFileInfo>
#include <QMutexLocker>
......
......@@ -36,6 +36,7 @@
#include "mainwindow.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/imode.h>
......
......@@ -32,7 +32,6 @@
#define MODEMANAGER_H
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <QObject>
QT_BEGIN_NAMESPACE
......@@ -41,6 +40,7 @@ QT_END_NAMESPACE
namespace Core {
class Id;
class IMode;
namespace Internal {
......
......@@ -39,6 +39,7 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
......
......@@ -29,6 +29,7 @@
****************************************************************************/
#include "futureprogress.h"
#include "id.h"
#include "progressbar.h"
#include <utils/stylehelper.h>
......
......@@ -32,13 +32,13 @@
#define FUTUREPROGRESS_H
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <QString>
#include <QFuture>
#include <QWidget>
namespace Core {
class Id;
class FutureProgressPrivate;
class CORE_EXPORT FutureProgress : public QWidget
......
......@@ -33,6 +33,7 @@
#include "progressbar.h"
#include "progressview.h"
#include "../actionmanager/actionmanager.h"
#include "../actionmanager/command.h"
#include "../icontext.h"
#include "../coreconstants.h"
#include "../icore.h"
......
......@@ -38,8 +38,6 @@
#include <utils/macroexpander.h>
#include <functional>
namespace Utils { class MacroExpander; }
namespace Core {
namespace Internal { class VariableChooserPrivate; }
......
......@@ -32,13 +32,13 @@
#define VCSMANAGER_H
#include "core_global.h"
#include "id.h"
#include <QString>
#include <QObject>
namespace Core {
class Id;
class IVersionControl;
namespace Internal { class MainWindow; }
......
......@@ -32,6 +32,7 @@
#include "actionmanager/actioncontainer.h"
#include "actionmanager/actionmanager.h"
#include "actionmanager/command.h"
#include "coreconstants.h"
#include "icore.h"
......
......@@ -61,6 +61,7 @@
#include <QApplication>
#include <QClipboard>
#include <QInputDialog>
#include <QMenu>
#include <QUrl>
using namespace Core;
......
......@@ -52,6 +52,7 @@
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/fileiconprovider.h>
#include <coreplugin/icore.h>
......