Commit 959a75d6 authored by Friedemann Kleint's avatar Friedemann Kleint

Clean headers in vcsbase-plugin.

Change-Id: Ibbfd5e0b07b2a06d17f4e3360511d7ad13b49f55
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent ec10e0d7
...@@ -29,11 +29,9 @@ ...@@ -29,11 +29,9 @@
#include "baseannotationhighlighter.h" #include "baseannotationhighlighter.h"
#include <QSet>
#include <QDebug> #include <QDebug>
#include <QColor> #include <QColor>
#include <QTextDocument> #include <QTextDocument>
#include <QTextEdit>
#include <QTextCharFormat> #include <QTextCharFormat>
typedef QMap<QString, QTextCharFormat> ChangeNumberFormatMap; typedef QMap<QString, QTextCharFormat> ChangeNumberFormatMap;
......
...@@ -28,15 +28,12 @@ ...@@ -28,15 +28,12 @@
****************************************************************************/ ****************************************************************************/
#include "basecheckoutwizard.h" #include "basecheckoutwizard.h"
#include "vcsbaseconstants.h"
#include "checkoutwizarddialog.h" #include "checkoutwizarddialog.h"
#include "checkoutjobs.h" #include "checkoutjobs.h"
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFileInfo>
#include <QDir> #include <QDir>
#include <QMessageBox> #include <QMessageBox>
......
...@@ -30,12 +30,11 @@ ...@@ -30,12 +30,11 @@
#include "basevcseditorfactory.h" #include "basevcseditorfactory.h"
#include "vcsbaseeditor.h" #include "vcsbaseeditor.h"
#include <coreplugin/editormanager/editormanager.h>
#include <texteditor/fontsettings.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QStringList>
/*! /*!
\class VcsBase::BaseVCSEditorFactory \class VcsBase::BaseVCSEditorFactory
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/editormanager/ieditorfactory.h>
#include <QStringList> QT_FORWARD_DECLARE_CLASS(QStringList)
namespace VcsBase { namespace VcsBase {
namespace Internal { namespace Internal {
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include "basevcssubmiteditorfactory.h" #include "basevcssubmiteditorfactory.h"
#include "vcsbasesubmiteditor.h" #include "vcsbasesubmiteditor.h"
#include <coreplugin/editormanager/editormanager.h>
namespace VcsBase { namespace VcsBase {
namespace Internal { namespace Internal {
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <QDebug> #include <QDebug>
#include <QQueue> #include <QQueue>
#include <QDir> #include <QDir>
#include <QStringList>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
......
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
#include "vcsbase_global.h" #include "vcsbase_global.h"
#include <QObject> #include <QObject>
#include <QStringList>
#include <QProcess> #include <QProcess>
#include <QProcessEnvironment> #include <QProcessEnvironment>
QT_FORWARD_DECLARE_CLASS(QStringList)
namespace VcsBase { namespace VcsBase {
namespace Internal { class ProcessCheckoutJobPrivate; } namespace Internal { class ProcessCheckoutJobPrivate; }
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QApplication> #include <QApplication>
#include <QCursor>
/*! /*!
\class VcsBase::CheckoutProgressWizardPage \class VcsBase::CheckoutProgressWizardPage
......
...@@ -28,19 +28,20 @@ ...@@ -28,19 +28,20 @@
****************************************************************************/ ****************************************************************************/
#include "command.h" #include "command.h"
#include "vcsbaseconstants.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <QDebug> #include <QDebug>
#include <QProcess> #include <QProcess>
#include <QProcessEnvironment>
#include <QFuture> #include <QFuture>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include <QFileInfo> #include <QFileInfo>
#include <QCoreApplication> #include <QCoreApplication>
#include <QVariant>
#include <QStringList>
Q_DECLARE_METATYPE(QVariant) Q_DECLARE_METATYPE(QVariant)
......
...@@ -33,9 +33,10 @@ ...@@ -33,9 +33,10 @@
#include "vcsbase_global.h" #include "vcsbase_global.h"
#include <QObject> #include <QObject>
#include <QStringList>
#include <QVariant> QT_FORWARD_DECLARE_CLASS(QStringList)
#include <QProcessEnvironment> QT_FORWARD_DECLARE_CLASS(QVariant)
QT_FORWARD_DECLARE_CLASS(QProcessEnvironment)
namespace VcsBase { namespace VcsBase {
......
...@@ -29,16 +29,13 @@ ...@@ -29,16 +29,13 @@
#include "commonsettingspage.h" #include "commonsettingspage.h"
#include "vcsbaseconstants.h" #include "vcsbaseconstants.h"
#include "nicknamedialog.h"
#include "ui_commonsettingspage.h" #include "ui_commonsettingspage.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
#include <QDebug> #include <QDebug>
#include <QCoreApplication> #include <QCoreApplication>
#include <QMessageBox>
namespace VcsBase { namespace VcsBase {
namespace Internal { namespace Internal {
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include "vcsbaseoptionspage.h" #include "vcsbaseoptionspage.h"
#include <QPointer>
#include <QWidget> #include <QWidget>
namespace VcsBase { namespace VcsBase {
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <QDebug> #include <QDebug>
#include <QtAlgorithms> #include <QtAlgorithms>
#include <QRegExp> #include <QRegExp>
#include <QBrush>
/*! /*!
\class VcsBase::DiffHighlighter \class VcsBase::DiffHighlighter
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QDebug> #include <QDebug>
#include <QFile>
#include <QDir> #include <QDir>
#include <QPushButton> #include <QPushButton>
#include <QStandardItemModel> #include <QStandardItemModel>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "submitfilemodel.h" #include "submitfilemodel.h"
#include "vcsbaseconstants.h"
#include <coreplugin/fileiconprovider.h> #include <coreplugin/fileiconprovider.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
......
...@@ -29,12 +29,10 @@ ...@@ -29,12 +29,10 @@
#include "vcsbaseclient.h" #include "vcsbaseclient.h"
#include "command.h" #include "command.h"
#include "vcsbaseconstants.h"
#include "vcsbaseclientsettings.h" #include "vcsbaseclientsettings.h"
#include "vcsbaseeditorparameterwidget.h" #include "vcsbaseeditorparameterwidget.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -44,7 +42,6 @@ ...@@ -44,7 +42,6 @@
#include <vcsbase/vcsbaseplugin.h> #include <vcsbase/vcsbaseplugin.h>
#include <QStringList> #include <QStringList>
#include <QSharedPointer>
#include <QDir> #include <QDir>
#include <QProcess> #include <QProcess>
#include <QSignalMapper> #include <QSignalMapper>
...@@ -52,7 +49,8 @@ ...@@ -52,7 +49,8 @@
#include <QDebug> #include <QDebug>
#include <QFileInfo> #include <QFileInfo>
#include <QByteArray> #include <QByteArray>
#include <QMetaType> #include <QVariant>
#include <QProcessEnvironment>
/*! /*!
\class VcsBase::VcsBaseClient \class VcsBase::VcsBaseClient
......
...@@ -35,12 +35,11 @@ ...@@ -35,12 +35,11 @@
#include <QObject> #include <QObject>
#include <QStringList> #include <QStringList>
#include <QSharedPointer>
#include <QVariant>
#include <QProcessEnvironment>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QFileInfo; class QFileInfo;
class QVariant;
class QProcessEnvironment;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Utils { namespace Utils {
......
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/synchronousprocess.h>
#include <QSettings> #include <QSettings>
#include <QVariant>
namespace { namespace {
......
...@@ -30,16 +30,9 @@ ...@@ -30,16 +30,9 @@
#include "vcsbaseeditor.h" #include "vcsbaseeditor.h"
#include "diffhighlighter.h" #include "diffhighlighter.h"
#include "baseannotationhighlighter.h" #include "baseannotationhighlighter.h"
#include "vcsbaseconstants.h"
#include "vcsbaseoutputwindow.h"
#include "vcsbaseplugin.h" #include "vcsbaseplugin.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/editorconfiguration.h> #include <projectexplorer/editorconfiguration.h>
...@@ -49,30 +42,24 @@ ...@@ -49,30 +42,24 @@
#include <texteditor/basetextdocument.h> #include <texteditor/basetextdocument.h>
#include <texteditor/basetextdocumentlayout.h> #include <texteditor/basetextdocumentlayout.h>
#include <texteditor/fontsettings.h> #include <texteditor/fontsettings.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <extensionsystem/invoker.h>
#include <QDebug> #include <QDebug>
#include <QFileInfo> #include <QFileInfo>
#include <QFile> #include <QFile>
#include <QProcess>
#include <QRegExp> #include <QRegExp>
#include <QSet> #include <QSet>
#include <QTextCodec> #include <QTextCodec>
#include <QTextStream>
#include <QUrl> #include <QUrl>
#include <QTextBlock> #include <QTextBlock>
#include <QDesktopServices> #include <QDesktopServices>
#include <QAction> #include <QAction>
#include <QKeyEvent> #include <QKeyEvent>
#include <QLayout>
#include <QMenu> #include <QMenu>
#include <QTextCursor> #include <QTextCursor>
#include <QTextEdit> #include <QTextEdit>
#include <QComboBox> #include <QComboBox>
#include <QToolBar>
#include <QClipboard> #include <QClipboard>
#include <QApplication> #include <QApplication>
#include <QMessageBox> #include <QMessageBox>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <QToolButton> #include <QToolButton>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QStringList>
#include <QDebug> #include <QDebug>
namespace VcsBase { namespace VcsBase {
......
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
#include "vcsbase_global.h" #include "vcsbase_global.h"
#include <QStringList>
#include <QVariant> #include <QVariant>
#include <QWidget> #include <QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QComboBox; class QComboBox;
class QToolButton; class QToolButton;
class QStringList;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace VcsBase { namespace VcsBase {
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "vcsbaseoutputwindow.h" #include "vcsbaseoutputwindow.h"
#include <utils/qtcassert.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <QPlainTextEdit> #include <QPlainTextEdit>
...@@ -38,7 +37,6 @@ ...@@ -38,7 +37,6 @@
#include <QTextBlock> #include <QTextBlock>
#include <QMenu> #include <QMenu>
#include <QAction> #include <QAction>
#include <QTextDocument>
#include <QTextBlockUserData> #include <QTextBlockUserData>
#include <QPointer> #include <QPointer>
......
...@@ -35,17 +35,14 @@ ...@@ -35,17 +35,14 @@
#include "corelistener.h" #include "corelistener.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/idocument.h> #include <coreplugin/id.h>
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/environment.h>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
...@@ -53,7 +50,6 @@ ...@@ -53,7 +50,6 @@
#include <QScopedPointer> #include <QScopedPointer>
#include <QSharedPointer> #include <QSharedPointer>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QTextStream>
#include <QTextCodec> #include <QTextCodec>
#include <QAction> #include <QAction>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "vcsbase_global.h" #include "vcsbase_global.h"
#include <coreplugin/id.h>
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
#include <QSharedDataPointer> #include <QSharedDataPointer>
...@@ -46,7 +45,10 @@ QT_END_NAMESPACE ...@@ -46,7 +45,10 @@ QT_END_NAMESPACE
namespace Utils { struct SynchronousProcessResponse; } namespace Utils { struct SynchronousProcessResponse; }
namespace Core { class IVersionControl; } namespace Core {
class IVersionControl;
class Id;
}
namespace VcsBase { namespace VcsBase {
......
...@@ -39,21 +39,9 @@ ...@@ -39,21 +39,9 @@
#include "vcsplugin.h" #include "vcsplugin.h"
#include <aggregation/aggregate.h> #include <aggregation/aggregate.h>
#include <cplusplus/Control.h>
#include <cplusplus/CoreTypes.h>
#include <cplusplus/FullySpecifiedType.h>
#include <cplusplus/Literals.h>
#include <cpptools/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/Symbol.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <coreplugin/idocument.h>
#include <coreplugin/mainwindow.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <utils/completingtextedit.h>
#include <utils/checkablemessagebox.h> #include <utils/checkablemessagebox.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
...@@ -63,25 +51,21 @@ ...@@ -63,25 +51,21 @@
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>