diff options
28 files changed, 25 insertions, 78 deletions
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp index 093a38db56..613c2a7b90 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.cpp +++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp @@ -29,11 +29,9 @@ #include "baseannotationhighlighter.h" -#include <QSet> #include <QDebug> #include <QColor> #include <QTextDocument> -#include <QTextEdit> #include <QTextCharFormat> typedef QMap<QString, QTextCharFormat> ChangeNumberFormatMap; diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp index 91d9db1b06..880b1affb9 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.cpp +++ b/src/plugins/vcsbase/basecheckoutwizard.cpp @@ -28,15 +28,12 @@ ****************************************************************************/ #include "basecheckoutwizard.h" -#include "vcsbaseconstants.h" #include "checkoutwizarddialog.h" #include "checkoutjobs.h" #include <projectexplorer/projectexplorer.h> -#include <projectexplorer/projectexplorerconstants.h> #include <QCoreApplication> -#include <QFileInfo> #include <QDir> #include <QMessageBox> diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index b46c321b48..03488abe7a 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -30,12 +30,11 @@ #include "basevcseditorfactory.h" #include "vcsbaseeditor.h" -#include <coreplugin/editormanager/editormanager.h> -#include <texteditor/fontsettings.h> #include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditorsettings.h> #include <QCoreApplication> +#include <QStringList> /*! \class VcsBase::BaseVCSEditorFactory diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index 722bcb6c26..1f0d440200 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QStringList> +QT_FORWARD_DECLARE_CLASS(QStringList) namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp index 146fe25c53..b17ea6b57e 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp @@ -30,8 +30,6 @@ #include "basevcssubmiteditorfactory.h" #include "vcsbasesubmiteditor.h" -#include <coreplugin/editormanager/editormanager.h> - namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp index d2509da6ed..7b618ec625 100644 --- a/src/plugins/vcsbase/checkoutjobs.cpp +++ b/src/plugins/vcsbase/checkoutjobs.cpp @@ -35,6 +35,7 @@ #include <QDebug> #include <QQueue> #include <QDir> +#include <QStringList> #include <utils/synchronousprocess.h> #include <utils/qtcassert.h> diff --git a/src/plugins/vcsbase/checkoutjobs.h b/src/plugins/vcsbase/checkoutjobs.h index 053837244e..ce4c9a0112 100644 --- a/src/plugins/vcsbase/checkoutjobs.h +++ b/src/plugins/vcsbase/checkoutjobs.h @@ -33,10 +33,11 @@ #include "vcsbase_global.h" #include <QObject> -#include <QStringList> #include <QProcess> #include <QProcessEnvironment> +QT_FORWARD_DECLARE_CLASS(QStringList) + namespace VcsBase { namespace Internal { class ProcessCheckoutJobPrivate; } diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp index a914c8b92d..4b44a905da 100644 --- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp +++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp @@ -34,7 +34,6 @@ #include <utils/qtcassert.h> #include <QApplication> -#include <QCursor> /*! \class VcsBase::CheckoutProgressWizardPage diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp index 70856bf9b1..556f86515f 100644 --- a/src/plugins/vcsbase/command.cpp +++ b/src/plugins/vcsbase/command.cpp @@ -28,19 +28,20 @@ ****************************************************************************/ #include "command.h" -#include "vcsbaseconstants.h" #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <extensionsystem/pluginmanager.h> #include <utils/synchronousprocess.h> #include <QDebug> #include <QProcess> +#include <QProcessEnvironment> #include <QFuture> #include <QtConcurrentRun> #include <QFileInfo> #include <QCoreApplication> +#include <QVariant> +#include <QStringList> Q_DECLARE_METATYPE(QVariant) diff --git a/src/plugins/vcsbase/command.h b/src/plugins/vcsbase/command.h index 8a7a0cee71..5619d702c4 100644 --- a/src/plugins/vcsbase/command.h +++ b/src/plugins/vcsbase/command.h @@ -33,9 +33,10 @@ #include "vcsbase_global.h" #include <QObject> -#include <QStringList> -#include <QVariant> -#include <QProcessEnvironment> + +QT_FORWARD_DECLARE_CLASS(QStringList) +QT_FORWARD_DECLARE_CLASS(QVariant) +QT_FORWARD_DECLARE_CLASS(QProcessEnvironment) namespace VcsBase { diff --git a/src/plugins/vcsbase/commonsettingspage.cpp b/src/plugins/vcsbase/commonsettingspage.cpp index 7bcc354d4e..16ac3600cd 100644 --- a/src/plugins/vcsbase/commonsettingspage.cpp +++ b/src/plugins/vcsbase/commonsettingspage.cpp @@ -29,16 +29,13 @@ #include "commonsettingspage.h" #include "vcsbaseconstants.h" -#include "nicknamedialog.h" #include "ui_commonsettingspage.h" #include <coreplugin/icore.h> -#include <extensionsystem/pluginmanager.h> #include <QDebug> #include <QCoreApplication> -#include <QMessageBox> namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/commonsettingspage.h b/src/plugins/vcsbase/commonsettingspage.h index cbbe05a670..e0d0b1e45b 100644 --- a/src/plugins/vcsbase/commonsettingspage.h +++ b/src/plugins/vcsbase/commonsettingspage.h @@ -34,7 +34,6 @@ #include "vcsbaseoptionspage.h" -#include <QPointer> #include <QWidget> namespace VcsBase { diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp index 85052ddcbc..464f399c39 100644 --- a/src/plugins/vcsbase/diffhighlighter.cpp +++ b/src/plugins/vcsbase/diffhighlighter.cpp @@ -36,7 +36,6 @@ #include <QDebug> #include <QtAlgorithms> #include <QRegExp> -#include <QBrush> /*! \class VcsBase::DiffHighlighter diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp index 9d64526291..6630da5621 100644 --- a/src/plugins/vcsbase/nicknamedialog.cpp +++ b/src/plugins/vcsbase/nicknamedialog.cpp @@ -33,7 +33,6 @@ #include <utils/fileutils.h> #include <QDebug> -#include <QFile> #include <QDir> #include <QPushButton> #include <QStandardItemModel> diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp index f5d4a4212a..89555876ac 100644 --- a/src/plugins/vcsbase/submitfilemodel.cpp +++ b/src/plugins/vcsbase/submitfilemodel.cpp @@ -28,7 +28,6 @@ ****************************************************************************/ #include "submitfilemodel.h" -#include "vcsbaseconstants.h" #include <coreplugin/fileiconprovider.h> #include <utils/qtcassert.h> diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index b778149ae3..059dff26c0 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -29,12 +29,10 @@ #include "vcsbaseclient.h" #include "command.h" -#include "vcsbaseconstants.h" #include "vcsbaseclientsettings.h" #include "vcsbaseeditorparameterwidget.h" #include <coreplugin/icore.h> -#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/vcsmanager.h> #include <utils/qtcassert.h> @@ -44,7 +42,6 @@ #include <vcsbase/vcsbaseplugin.h> #include <QStringList> -#include <QSharedPointer> #include <QDir> #include <QProcess> #include <QSignalMapper> @@ -52,7 +49,8 @@ #include <QDebug> #include <QFileInfo> #include <QByteArray> -#include <QMetaType> +#include <QVariant> +#include <QProcessEnvironment> /*! \class VcsBase::VcsBaseClient diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index 08659977ab..114fcd8e05 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -35,12 +35,11 @@ #include <QObject> #include <QStringList> -#include <QSharedPointer> -#include <QVariant> -#include <QProcessEnvironment> QT_BEGIN_NAMESPACE class QFileInfo; +class QVariant; +class QProcessEnvironment; QT_END_NAMESPACE namespace Utils { diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index 683312696b..5e56da91f5 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -31,9 +31,9 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> -#include <utils/synchronousprocess.h> #include <QSettings> +#include <QVariant> namespace { diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 05d1e56e87..59541e6b9a 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -30,16 +30,9 @@ #include "vcsbaseeditor.h" #include "diffhighlighter.h" #include "baseannotationhighlighter.h" -#include "vcsbaseconstants.h" -#include "vcsbaseoutputwindow.h" #include "vcsbaseplugin.h" -#include <coreplugin/editormanager/editormanager.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 <extensionsystem/pluginmanager.h> #include <projectexplorer/editorconfiguration.h> @@ -49,30 +42,24 @@ #include <texteditor/basetextdocument.h> #include <texteditor/basetextdocumentlayout.h> #include <texteditor/fontsettings.h> -#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> #include <utils/qtcassert.h> -#include <extensionsystem/invoker.h> #include <QDebug> #include <QFileInfo> #include <QFile> -#include <QProcess> #include <QRegExp> #include <QSet> #include <QTextCodec> -#include <QTextStream> #include <QUrl> #include <QTextBlock> #include <QDesktopServices> #include <QAction> #include <QKeyEvent> -#include <QLayout> #include <QMenu> #include <QTextCursor> #include <QTextEdit> #include <QComboBox> -#include <QToolBar> #include <QClipboard> #include <QApplication> #include <QMessageBox> diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp index 2bb2c57deb..8eec2807a1 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp @@ -33,6 +33,7 @@ #include <QToolButton> #include <QHBoxLayout> +#include <QStringList> #include <QDebug> namespace VcsBase { diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h index 9d781d458e..79f2f862e1 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h @@ -32,13 +32,13 @@ #include "vcsbase_global.h" -#include <QStringList> #include <QVariant> #include <QWidget> QT_BEGIN_NAMESPACE class QComboBox; class QToolButton; +class QStringList; QT_END_NAMESPACE namespace VcsBase { diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp index d81b7e386e..3728253f55 100644 --- a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp @@ -29,7 +29,6 @@ #include "vcsbaseoutputwindow.h" -#include <utils/qtcassert.h> #include <coreplugin/editormanager/editormanager.h> #include <QPlainTextEdit> @@ -38,7 +37,6 @@ #include <QTextBlock> #include <QMenu> #include <QAction> -#include <QTextDocument> #include <QTextBlockUserData> #include <QPointer> diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 4af135df64..11991ac575 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -35,17 +35,14 @@ #include "corelistener.h" #include <coreplugin/icore.h> -#include <coreplugin/idocument.h> +#include <coreplugin/id.h> #include <coreplugin/iversioncontrol.h> -#include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/vcsmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/project.h> #include <utils/qtcassert.h> #include <utils/synchronousprocess.h> -#include <utils/environment.h> #include <QDebug> #include <QDir> @@ -53,7 +50,6 @@ #include <QScopedPointer> #include <QSharedPointer> #include <QProcessEnvironment> -#include <QTextStream> #include <QTextCodec> #include <QAction> diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index c27b68a5b6..ae018d9933 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -32,7 +32,6 @@ #include "vcsbase_global.h" -#include <coreplugin/id.h> #include <extensionsystem/iplugin.h> #include <QSharedDataPointer> @@ -46,7 +45,10 @@ QT_END_NAMESPACE namespace Utils { struct SynchronousProcessResponse; } -namespace Core { class IVersionControl; } +namespace Core { +class IVersionControl; +class Id; +} namespace VcsBase { diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 3bb4c8ed18..8c708ac670 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -39,21 +39,9 @@ #include "vcsplugin.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 <cplusplus/Symbol.h> -#include <cplusplus/Symbols.h> -#include <cplusplus/TranslationUnit.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 <utils/completingtextedit.h> #include <utils/checkablemessagebox.h> #include <utils/synchronousprocess.h> #include <utils/fileutils.h> @@ -63,25 +51,21 @@ #include <texteditor/texteditorsettings.h> #include <projectexplorer/projectexplorer.h> -#include <projectexplorer/session.h> #include <projectexplorer/project.h> #include <QDebug> #include <QDir> #include <QProcess> -#include <QFile> #include <QFileInfo> #include <QPointer> #include <QStringListModel> -#include <QTextStream> #include <QStyle> #include <QToolBar> #include <QAction> #include <QApplication> #include <QMessageBox> #include <QCompleter> -#include <QLineEdit> -#include <QTextEdit> + #include <cstring> enum { debug = 0 }; diff --git a/src/plugins/vcsbase/vcsconfigurationpage.cpp b/src/plugins/vcsbase/vcsconfigurationpage.cpp index a9f1552b4f..eff1dee121 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.cpp +++ b/src/plugins/vcsbase/vcsconfigurationpage.cpp @@ -31,7 +31,6 @@ #include "vcsbaseconstants.h" -#include <coreplugin/dialogs/iwizard.h> #include <coreplugin/icore.h> #include <coreplugin/iversioncontrol.h> diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index ee080fcd64..23d87fad90 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -28,15 +28,12 @@ ****************************************************************************/ #include "vcsplugin.h" -#include "diffhighlighter.h" #include "commonsettingspage.h" #include "nicknamedialog.h" #include "vcsbaseoutputwindow.h" #include "corelistener.h" #include <coreplugin/icore.h> -#include <coreplugin/coreconstants.h> -#include <coreplugin/id.h> #include <coreplugin/mimedatabase.h> #include <QtPlugin> diff --git a/src/plugins/vcsbase/vcsplugin.h b/src/plugins/vcsbase/vcsplugin.h index 8eb0d7c0c2..a111f27b1c 100644 --- a/src/plugins/vcsbase/vcsplugin.h +++ b/src/plugins/vcsbase/vcsplugin.h @@ -32,8 +32,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> - QT_BEGIN_NAMESPACE class QStandardItemModel; QT_END_NAMESPACE |