diff options
Diffstat (limited to 'src')
22 files changed, 28 insertions, 32 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index edfbfa2704..3791acd8c8 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -39,7 +39,6 @@ #include <QVector> #include <QHash> #include <QMap> -#include <QFutureInterface> #include <QVersionNumber> #include <utils/fileutils.h> diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index e745305d32..b8b8d3468e 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -31,7 +31,6 @@ #include <qmldebug/qmldebugcommandlinearguments.h> #include <qmldebug/qmloutputparser.h> -#include <QFutureInterface> #include <QObject> #include <QTimer> #include <QTcpSocket> diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 58e934098e..f1f15da32c 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -60,7 +60,6 @@ #include <QDir> #include <QFileInfo> -#include <QFutureWatcher> #include <QMenu> #include <QPlainTextEdit> #include <QProcess> diff --git a/src/plugins/clangrefactoring/clangsymbolsfindfilter.h b/src/plugins/clangrefactoring/clangsymbolsfindfilter.h index 1693a19602..ea8872f403 100644 --- a/src/plugins/clangrefactoring/clangsymbolsfindfilter.h +++ b/src/plugins/clangrefactoring/clangsymbolsfindfilter.h @@ -27,11 +27,10 @@ #include <coreplugin/find/ifindfilter.h> -#include <QFutureWatcher> -#include <QPointer> -#include <QWidget> #include <QCheckBox> +#include <QPointer> #include <QRadioButton> +#include <QWidget> namespace Core { class SearchResult; } diff --git a/src/plugins/cppcheck/cppchecktool.h b/src/plugins/cppcheck/cppchecktool.h index cc5f77d218..c10c2516e2 100644 --- a/src/plugins/cppcheck/cppchecktool.h +++ b/src/plugins/cppcheck/cppchecktool.h @@ -27,7 +27,7 @@ #include <cppcheck/cppcheckoptions.h> -#include <QFuture> +#include <QFutureInterface> #include <QPointer> #include <QRegularExpression> diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index ad5a4b988f..aa58f2b896 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -91,7 +91,6 @@ #include <QAction> #include <QApplication> #include <QElapsedTimer> -#include <QFutureWatcher> #include <QMenu> #include <QPointer> #include <QTextEdit> diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 18438934d0..52bf900dac 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -48,6 +48,7 @@ #include <QtConcurrentMap> #include <QCheckBox> #include <QDir> +#include <QFutureWatcher> #include <functional> diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h index ce83173444..a2e21438ac 100644 --- a/src/plugins/cpptools/cppfindreferences.h +++ b/src/plugins/cpptools/cppfindreferences.h @@ -31,7 +31,6 @@ #include <QObject> #include <QPointer> #include <QFuture> -#include <QFutureWatcher> QT_FORWARD_DECLARE_CLASS(QTimer) diff --git a/src/plugins/cpptools/cppprojectupdater.cpp b/src/plugins/cpptools/cppprojectupdater.cpp index c56b2666f0..f0b0bda090 100644 --- a/src/plugins/cpptools/cppprojectupdater.cpp +++ b/src/plugins/cpptools/cppprojectupdater.cpp @@ -33,6 +33,8 @@ #include <utils/qtcassert.h> #include <utils/runextensions.h> +#include <QFutureInterface> + namespace CppTools { CppProjectUpdater::CppProjectUpdater() diff --git a/src/plugins/cpptools/cppprojectupdater.h b/src/plugins/cpptools/cppprojectupdater.h index 62e64a1dae..f3f85a8a14 100644 --- a/src/plugins/cpptools/cppprojectupdater.h +++ b/src/plugins/cpptools/cppprojectupdater.h @@ -29,7 +29,6 @@ #include "cpptools_global.h" #include "projectinfo.h" -#include <QFutureInterface> #include <QFutureWatcher> namespace CppTools { diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index 2d588e502b..dff38b9af2 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -36,7 +36,6 @@ #include <QDebug> #include <QDir> #include <QFileInfo> -#include <QFutureWatcher> #include <QStringList> #include <QUrl> diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h index 3eeb0ba910..a75f303e39 100644 --- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h +++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h @@ -35,7 +35,6 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <QFuture> -#include <QFutureWatcher> #include <QObject> #include <QQueue> diff --git a/src/plugins/nim/project/nimproject.h b/src/plugins/nim/project/nimproject.h index 540d2129bb..62497770ed 100644 --- a/src/plugins/nim/project/nimproject.h +++ b/src/plugins/nim/project/nimproject.h @@ -29,7 +29,6 @@ #include <projectexplorer/projectnodes.h> #include <QElapsedTimer> -#include <QFutureWatcher> #include <QTimer> namespace Nim { diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index 1a764712ca..a0c5ab4ec3 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -42,6 +42,7 @@ #include <utils/runextensions.h> #include <QDateTime> +#include <QFutureInterface> #include <QFutureWatcher> #include <QProcess> #include <QThreadPool> diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h index 1ad6d80692..884c1bf683 100644 --- a/src/plugins/projectexplorer/extracompiler.h +++ b/src/plugins/projectexplorer/extracompiler.h @@ -34,7 +34,6 @@ #include <utils/environment.h> #include <QByteArray> -#include <QFuture> #include <QHash> #include <QList> @@ -43,6 +42,13 @@ QT_FORWARD_DECLARE_CLASS(QProcess); QT_FORWARD_DECLARE_CLASS(QThreadPool); +QT_BEGIN_NAMESPACE +template <typename T> +class QFutureInterface; +template <typename T> +class QFutureWatcher; +QT_END_NAMESPACE + namespace ProjectExplorer { diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index da6dcd0eb6..6d0cb2e6da 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -72,6 +72,7 @@ #include <QDebug> #include <QDir> #include <QFileSystemWatcher> +#include <QFuture> #include <QLoggingCategory> #include <QTimer> diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 93044db96b..af10652c35 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -36,7 +36,6 @@ #include <QStringList> #include <QFutureInterface> -#include <QFuture> QT_BEGIN_NAMESPACE class QMakeGlobals; diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index e5152be4f5..000e191587 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -25,14 +25,15 @@ #include "qmljsfindreferences.h" -#include <texteditor/basefilefind.h> +#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/find/searchresultwindow.h> -#include <extensionsystem/pluginmanager.h> -#include <utils/filesearch.h> +#include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/futureprogress.h> -#include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/icore.h> +#include <extensionsystem/pluginmanager.h> +#include <texteditor/basefilefind.h> +#include <utils/filesearch.h> +#include <utils/runextensions.h> #include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsbind.h> @@ -47,15 +48,14 @@ #include "qmljseditorconstants.h" -#include <QTime> -#include <QTimer> -#include <QtConcurrentRun> -#include <QtConcurrentMap> +#include <QApplication> #include <QDebug> #include <QDir> -#include <QApplication> +#include <QFuture> #include <QLabel> -#include <utils/runextensions.h> +#include <QTime> +#include <QTimer> +#include <QtConcurrentMap> #include <functional> diff --git a/src/plugins/qmljseditor/qmljsfindreferences.h b/src/plugins/qmljseditor/qmljsfindreferences.h index 41c8fc07d2..aec4cb6c6d 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.h +++ b/src/plugins/qmljseditor/qmljsfindreferences.h @@ -29,7 +29,6 @@ #include <QMutex> #include <QObject> -#include <QFuture> #include <QFutureWatcher> #include <QPointer> diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.h b/src/plugins/qmlprofiler/qmlprofilertracefile.h index 60198ee3d4..b92198be91 100644 --- a/src/plugins/qmlprofiler/qmlprofilertracefile.h +++ b/src/plugins/qmlprofiler/qmlprofilertracefile.h @@ -34,7 +34,6 @@ #include <tracing/timelinetracefile.h> -#include <QFutureInterface> #include <QObject> #include <QVector> #include <QString> diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 5efec8e297..894f79d40a 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -60,13 +60,12 @@ #include <resourceeditor/resourcenode.h> +#include <QCoreApplication> #include <QDir> -#include <QUrl> #include <QFileInfo> -#include <QFuture> -#include <QCoreApplication> #include <QProcess> #include <QRegularExpression> +#include <QUrl> #include <algorithm> diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index 30ffbdb22f..4eb3a119a4 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -33,7 +33,6 @@ #include <valgrind/valgrindrunner.h> #include <QFutureInterface> -#include <QFutureWatcher> namespace Valgrind { namespace Internal { |