From 2853660a59972ef7186ecd23a98ffd6163349c19 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 24 May 2022 00:40:44 +0200 Subject: [PATCH] Utils: More forward declarations / drop unused headers [D-G] Round 1 - focus on headers. For classes with initial in range [D-G]. Try to keep the same separators between different kind of headers. Change-Id: Id42cd7b3743a816f75cecb6b576c0e37cb057473 Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: hjk --- .../advanceddockingsystem/ads_globals.cpp | 2 ++ .../floatingdockcontainer.cpp | 3 +++ .../floatingdragpreview.cpp | 2 ++ src/libs/utils/delegates.h | 1 + src/libs/utils/differ.h | 1 + src/libs/utils/dropsupport.cpp | 6 ++--- src/libs/utils/dropsupport.h | 2 +- src/libs/utils/elidinglabel.h | 1 + src/libs/utils/environment.cpp | 13 ++++++----- src/libs/utils/environment.h | 23 +++++++++---------- src/libs/utils/environmentdialog.h | 4 +++- src/libs/utils/environmentmodel.h | 2 ++ src/libs/utils/fadingindicator.h | 6 +++-- src/libs/utils/fancylineedit.h | 3 ++- src/libs/utils/fancymainwindow.cpp | 4 ++-- src/libs/utils/filecrumblabel.cpp | 3 ++- src/libs/utils/filecrumblabel.h | 3 ++- src/libs/utils/fileinprojectfinder.h | 5 ++-- src/libs/utils/filepath.cpp | 12 +++++----- src/libs/utils/filepath.h | 4 ++-- src/libs/utils/filesearch.h | 8 +++++-- src/libs/utils/filesystemmodel.h | 1 - src/libs/utils/fileutils.cpp | 2 ++ src/libs/utils/fileutils.h | 6 +---- src/libs/utils/filewizardpage.h | 3 ++- src/libs/utils/fixedsizeclicklabel.h | 1 + src/libs/utils/futuresynchronizer.h | 2 +- src/libs/utils/guard.h | 1 + src/libs/utils/namevaluedictionary.cpp | 1 + src/libs/utils/namevaluedictionary.h | 1 - src/libs/utils/namevaluemodel.cpp | 10 ++++---- .../android/androidmanifesteditorwidget.cpp | 2 ++ src/plugins/android/javalanguageserver.cpp | 1 + .../android/splashscreencontainerwidget.cpp | 2 ++ src/plugins/autotest/qtest/qttestsettings.cpp | 1 + src/plugins/clangcodemodel/clangdast.cpp | 1 + src/plugins/coreplugin/mimetypesettings.cpp | 2 ++ .../cppeditor/resourcepreviewhoverhandler.cpp | 1 + src/plugins/cvs/cvssettings.cpp | 1 + src/plugins/debugger/debuggeractions.cpp | 1 + .../debugger/peripheralregisterhandler.cpp | 1 + src/plugins/fakevim/fakevimactions.cpp | 1 + .../jsonwizard/jsonwizardfactory.cpp | 1 + .../qmakeprojectmanager/qmakeparsernodes.cpp | 2 +- .../qmakeprojectmanager/qmakesettings.cpp | 3 +++ .../propertyeditor/propertyeditorview.cpp | 1 + .../remotelinuxenvironmentreader.h | 1 + .../texteditor/highlightersettingspage.cpp | 1 + .../tst_languageserverprotocol.cpp | 2 ++ tests/auto/utils/fileutils/tst_fileutils.cpp | 1 + .../processtestapp/processtestapp.cpp | 1 + 51 files changed, 107 insertions(+), 56 deletions(-) diff --git a/src/libs/advanceddockingsystem/ads_globals.cpp b/src/libs/advanceddockingsystem/ads_globals.cpp index a93139bd7c9..df8979a1214 100644 --- a/src/libs/advanceddockingsystem/ads_globals.cpp +++ b/src/libs/advanceddockingsystem/ads_globals.cpp @@ -39,6 +39,8 @@ #include "docksplitter.h" #include "iconprovider.h" +#include + #include #include #include diff --git a/src/libs/advanceddockingsystem/floatingdockcontainer.cpp b/src/libs/advanceddockingsystem/floatingdockcontainer.cpp index 3865f287da9..73e2485db09 100644 --- a/src/libs/advanceddockingsystem/floatingdockcontainer.cpp +++ b/src/libs/advanceddockingsystem/floatingdockcontainer.cpp @@ -41,6 +41,9 @@ #include "dockoverlay.h" #include "dockwidget.h" #include "linux/floatingwidgettitlebar.h" + +#include + #ifdef Q_OS_WIN #include #ifdef _MSC_VER diff --git a/src/libs/advanceddockingsystem/floatingdragpreview.cpp b/src/libs/advanceddockingsystem/floatingdragpreview.cpp index ece71843417..d56d879decf 100644 --- a/src/libs/advanceddockingsystem/floatingdragpreview.cpp +++ b/src/libs/advanceddockingsystem/floatingdragpreview.cpp @@ -41,6 +41,8 @@ #include "dockoverlay.h" #include "dockwidget.h" +#include + #include #include #include diff --git a/src/libs/utils/delegates.h b/src/libs/utils/delegates.h index eb9819fc7ab..17ab30ea6db 100644 --- a/src/libs/utils/delegates.h +++ b/src/libs/utils/delegates.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include "pathchooser.h" #include diff --git a/src/libs/utils/differ.h b/src/libs/utils/differ.h index 58e56d683f2..a9667c25bf0 100644 --- a/src/libs/utils/differ.h +++ b/src/libs/utils/differ.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include QT_BEGIN_NAMESPACE diff --git a/src/libs/utils/dropsupport.cpp b/src/libs/utils/dropsupport.cpp index 7a0a2b4b4e1..a4beda8f4a0 100644 --- a/src/libs/utils/dropsupport.cpp +++ b/src/libs/utils/dropsupport.cpp @@ -39,7 +39,7 @@ namespace Utils { -static bool isFileDrop(const QMimeData *d, QList *files = nullptr) +static bool isFileDropMime(const QMimeData *d, QList *files = nullptr) { // internal drop if (const auto internalData = qobject_cast(d)) { @@ -94,7 +94,7 @@ QStringList DropSupport::mimeTypesForFilePaths() bool DropSupport::isFileDrop(QDropEvent *event) { - return Utils::isFileDrop(event->mimeData()); + return isFileDropMime(event->mimeData()); } bool DropSupport::isValueDrop(QDropEvent *event) @@ -125,7 +125,7 @@ bool DropSupport::eventFilter(QObject *obj, QEvent *event) if (!m_filterFunction || m_filterFunction(de, this)) { const auto fileDropMimeData = qobject_cast(de->mimeData()); QList tempFiles; - if (Utils::isFileDrop(de->mimeData(), &tempFiles)) { + if (isFileDropMime(de->mimeData(), &tempFiles)) { event->accept(); accepted = true; if (fileDropMimeData && fileDropMimeData->isOverridingFileDropAction()) diff --git a/src/libs/utils/dropsupport.h b/src/libs/utils/dropsupport.h index c545045a450..29e5a2cef10 100644 --- a/src/libs/utils/dropsupport.h +++ b/src/libs/utils/dropsupport.h @@ -60,7 +60,7 @@ public: static QStringList mimeTypesForFilePaths(); signals: - void filesDropped(const QList &files, const QPoint &dropPos); + void filesDropped(const QList &files, const QPoint &dropPos); void valuesDropped(const QList &values, const QPoint &dropPos); public: diff --git a/src/libs/utils/elidinglabel.h b/src/libs/utils/elidinglabel.h index 936727be703..d84487187db 100644 --- a/src/libs/utils/elidinglabel.h +++ b/src/libs/utils/elidinglabel.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include namespace Utils { diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index a90cf6c289a..635b562fa26 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -26,6 +26,7 @@ #include "environment.h" #include "algorithm.h" +#include "fileutils.h" #include "qtcassert.h" #include @@ -34,12 +35,12 @@ #include #include -Q_GLOBAL_STATIC_WITH_ARGS(Utils::Environment, staticSystemEnvironment, +namespace Utils { + +Q_GLOBAL_STATIC_WITH_ARGS(Environment, staticSystemEnvironment, (QProcessEnvironment::systemEnvironment().toStringList())) -Q_GLOBAL_STATIC(QVector, environmentProviders) - -namespace Utils { +Q_GLOBAL_STATIC(QVector, environmentProviders) QProcessEnvironment Environment::toProcessEnvironment() const { @@ -126,7 +127,7 @@ void Environment::prependOrSetLibrarySearchPath(const FilePath &value) void Environment::prependOrSetLibrarySearchPaths(const FilePaths &values) { - Utils::reverseForeach(values, [this](const FilePath &value) { + reverseForeach(values, [this](const FilePath &value) { prependOrSetLibrarySearchPath(value); }); } @@ -406,7 +407,7 @@ FilePath Environment::expandVariables(const FilePath &variables) const QStringList Environment::expandVariables(const QStringList &variables) const { - return Utils::transform(variables, [this](const QString &i) { return expandVariables(i); }); + return transform(variables, [this](const QString &i) { return expandVariables(i); }); } void EnvironmentProvider::addProvider(EnvironmentProvider &&provider) diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index 4f2e6dd087c..ca152647321 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -25,13 +25,12 @@ #pragma once -#include "fileutils.h" -#include "hostosinfo.h" -#include "namevaluedictionary.h" -#include "namevalueitem.h" -#include "optional.h" +#include "utils_global.h" -#include +#include "environmentfwd.h" +#include "filepath.h" +#include "namevaluedictionary.h" +#include "optional.h" #include @@ -51,11 +50,11 @@ public: void appendOrSet(const QString &key, const QString &value, const QString &sep = QString()); void prependOrSet(const QString &key, const QString &value, const QString &sep = QString()); - void appendOrSetPath(const Utils::FilePath &value); - void prependOrSetPath(const Utils::FilePath &value); + void appendOrSetPath(const FilePath &value); + void prependOrSetPath(const FilePath &value); - void prependOrSetLibrarySearchPath(const Utils::FilePath &value); - void prependOrSetLibrarySearchPaths(const Utils::FilePaths &values); + void prependOrSetLibrarySearchPath(const FilePath &value); + void prependOrSetLibrarySearchPaths(const FilePaths &values); void setupEnglishOutput(); @@ -97,8 +96,8 @@ public: void addSetValue(const QString &key, const QString &value); void addUnsetValue(const QString &key); - void addPrependToPath(const Utils::FilePaths &values); - void addAppendToPath(const Utils::FilePaths &values); + void addPrependToPath(const FilePaths &values); + void addAppendToPath(const FilePaths &values); void addModify(const NameValueItems &items); void addChange(const Item &item) { m_changeItems.append(item); } diff --git a/src/libs/utils/environmentdialog.h b/src/libs/utils/environmentdialog.h index 6dbb38e1917..c6cdc5241aa 100644 --- a/src/libs/utils/environmentdialog.h +++ b/src/libs/utils/environmentdialog.h @@ -25,7 +25,9 @@ #pragma once -#include "environment.h" +#include "utils_global.h" + +#include "environmentfwd.h" #include "namevaluesdialog.h" #include diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h index ac5f017448c..5457bdb0497 100644 --- a/src/libs/utils/environmentmodel.h +++ b/src/libs/utils/environmentmodel.h @@ -25,6 +25,8 @@ #pragma once +#include "utils_global.h" + #include "namevaluemodel.h" namespace Utils { diff --git a/src/libs/utils/fadingindicator.h b/src/libs/utils/fadingindicator.h index 5f4e96436c4..eed2efdfc55 100644 --- a/src/libs/utils/fadingindicator.h +++ b/src/libs/utils/fadingindicator.h @@ -27,8 +27,10 @@ #include "utils_global.h" -#include -#include +QT_BEGIN_NAMESPACE +class QString; +class QWidget; +QT_END_NAMESPACE namespace Utils { namespace FadingIndicator { diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index 13127f08823..1a90a7ce24a 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include "completinglineedit.h" #include @@ -140,7 +141,7 @@ protected: void keyPressEvent(QKeyEvent *event) override; signals: - void buttonClicked(Utils::FancyLineEdit::Side side); + void buttonClicked(FancyLineEdit::Side side); void leftButtonClicked(); void rightButtonClicked(); diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index cdaa1d0a7bc..f975212d868 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -254,7 +254,7 @@ DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable) QString title = inner->windowTitle(); toggleViewAction()->setProperty("original_title", title); - title = Utils::stripAccelerator(title); + title = stripAccelerator(title); setWindowTitle(title); QStyleOptionDockWidget opt; @@ -547,7 +547,7 @@ void FancyMainWindow::addDockActionsToMenu(QMenu *menu) actions.append(action); } } - Utils::sort(actions, [](const QAction *action1, const QAction *action2) { + sort(actions, [](const QAction *action1, const QAction *action2) { QTC_ASSERT(action1, return true); QTC_ASSERT(action2, return false); return stripAccelerator(action1->text()).toLower() < stripAccelerator(action2->text()).toLower(); diff --git a/src/libs/utils/filecrumblabel.cpp b/src/libs/utils/filecrumblabel.cpp index cf03af553c4..db273bb26db 100644 --- a/src/libs/utils/filecrumblabel.cpp +++ b/src/libs/utils/filecrumblabel.cpp @@ -25,7 +25,8 @@ #include "filecrumblabel.h" -#include +#include "filepath.h" +#include "hostosinfo.h" #include #include diff --git a/src/libs/utils/filecrumblabel.h b/src/libs/utils/filecrumblabel.h index 05dd050812c..fe3cafe996c 100644 --- a/src/libs/utils/filecrumblabel.h +++ b/src/libs/utils/filecrumblabel.h @@ -26,12 +26,13 @@ #pragma once #include "utils_global.h" -#include "fileutils.h" #include namespace Utils { +class FilePath; + class QTCREATOR_UTILS_EXPORT FileCrumbLabel : public QLabel { Q_OBJECT diff --git a/src/libs/utils/fileinprojectfinder.h b/src/libs/utils/fileinprojectfinder.h index dd4771580fc..1629341c0ba 100644 --- a/src/libs/utils/fileinprojectfinder.h +++ b/src/libs/utils/fileinprojectfinder.h @@ -25,8 +25,9 @@ #pragma once -#include -#include +#include "utils_global.h" + +#include "filepath.h" #include #include diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 237113a14da..07c76f7f753 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -1277,24 +1277,24 @@ Environment FilePath::deviceEnvironment() const QString FilePath::formatFilePaths(const QList &files, const QString &separator) { - const QStringList nativeFiles = Utils::transform(files, &FilePath::toUserOutput); + const QStringList nativeFiles = transform(files, &FilePath::toUserOutput); return nativeFiles.join(separator); } void FilePath::removeDuplicates(QList &files) { // FIXME: Improve. - QStringList list = Utils::transform(files, &FilePath::toString); + QStringList list = transform(files, &FilePath::toString); list.removeDuplicates(); - files = Utils::transform(list, &FilePath::fromString); + files = transform(list, &FilePath::fromString); } void FilePath::sort(QList &files) { // FIXME: Improve. - QStringList list = Utils::transform(files, &FilePath::toString); + QStringList list = transform(files, &FilePath::toString); list.sort(); - files = Utils::transform(list, &FilePath::fromString); + files = transform(list, &FilePath::fromString); } FilePath FilePath::pathAppended(const QString &path) const @@ -1332,7 +1332,7 @@ FilePath FilePath::stringAppended(const QString &str) const QHashValueType FilePath::hash(uint seed) const { - if (Utils::HostOsInfo::fileNameCaseSensitivity() == Qt::CaseInsensitive) + if (HostOsInfo::fileNameCaseSensitivity() == Qt::CaseInsensitive) return qHash(m_data.toUpper(), seed); return qHash(m_data, seed); } diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index b3c035ea870..ecd61beec1f 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -26,9 +26,9 @@ #pragma once #include "utils_global.h" -#include "porting.h" -#include "hostosinfo.h" +#include "osspecificaspects.h" +#include "porting.h" #include #include diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index c5f1544c609..1161ff5e3da 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -28,14 +28,18 @@ #include "utils_global.h" #include -#include #include +#include #include #include #include -QT_FORWARD_DECLARE_CLASS(QTextCodec) +QT_BEGIN_NAMESPACE +template +class QFuture; +class QTextCodec; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/filesystemmodel.h b/src/libs/utils/filesystemmodel.h index 2278238bf18..1a458817d91 100644 --- a/src/libs/utils/filesystemmodel.h +++ b/src/libs/utils/filesystemmodel.h @@ -42,7 +42,6 @@ #include "utils_global.h" #include -#include #include QT_BEGIN_NAMESPACE diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 3b6145807ca..3f1752e63e9 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -33,6 +33,8 @@ #include #include #include +#include + #include #ifdef QT_GUI_LIB diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index b202fd490a9..dbcc10019ac 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -31,11 +31,6 @@ #include #include -#include -#include -#include -#include -#include // Mac. #ifdef QT_WIDGETS_LIB #include @@ -48,6 +43,7 @@ QT_BEGIN_NAMESPACE class QDataStream; class QTextStream; class QWidget; +class QXmlStreamWriter; // for withNtfsPermissions #ifdef Q_OS_WIN diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index b763afa2f85..546009ce451 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -27,11 +27,12 @@ #include "utils_global.h" -#include "filepath.h" #include "wizardpage.h" namespace Utils { +class FilePath; + class FileWizardPagePrivate; class QTCREATOR_UTILS_EXPORT FileWizardPage : public WizardPage diff --git a/src/libs/utils/fixedsizeclicklabel.h b/src/libs/utils/fixedsizeclicklabel.h index 93cf27cc9fb..ac41e6cdd1e 100644 --- a/src/libs/utils/fixedsizeclicklabel.h +++ b/src/libs/utils/fixedsizeclicklabel.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include namespace Utils { diff --git a/src/libs/utils/futuresynchronizer.h b/src/libs/utils/futuresynchronizer.h index 00f49043a71..80bb0e31e78 100644 --- a/src/libs/utils/futuresynchronizer.h +++ b/src/libs/utils/futuresynchronizer.h @@ -26,10 +26,10 @@ #pragma once #include "utils_global.h" -#include #include #include +#include namespace Utils { diff --git a/src/libs/utils/guard.h b/src/libs/utils/guard.h index 063825650dc..2f986d82b06 100644 --- a/src/libs/utils/guard.h +++ b/src/libs/utils/guard.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include namespace Utils { diff --git a/src/libs/utils/namevaluedictionary.cpp b/src/libs/utils/namevaluedictionary.cpp index 65ee7974ac0..364b6dc4003 100644 --- a/src/libs/utils/namevaluedictionary.cpp +++ b/src/libs/utils/namevaluedictionary.cpp @@ -25,6 +25,7 @@ #include "algorithm.h" #include "namevaluedictionary.h" +#include "namevalueitem.h" #include "qtcassert.h" namespace Utils { diff --git a/src/libs/utils/namevaluedictionary.h b/src/libs/utils/namevaluedictionary.h index 8023c97dfd1..3d371ede86d 100644 --- a/src/libs/utils/namevaluedictionary.h +++ b/src/libs/utils/namevaluedictionary.h @@ -25,7 +25,6 @@ #pragma once -#include "fileutils.h" #include "hostosinfo.h" #include "namevalueitem.h" diff --git a/src/libs/utils/namevaluemodel.cpp b/src/libs/utils/namevaluemodel.cpp index 697a6b58117..d05f2f5b4af 100644 --- a/src/libs/utils/namevaluemodel.cpp +++ b/src/libs/utils/namevaluemodel.cpp @@ -25,11 +25,13 @@ #include "namevaluemodel.h" -#include -#include -#include -#include +#include "algorithm.h" +#include "hostosinfo.h" +#include "namevaluedictionary.h" +#include "namevalueitem.h" +#include "qtcassert.h" +#include #include #include #include diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 4b397c19420..b04ce6de5e5 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -76,6 +76,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp index 4c06b296ebd..6ed0c983622 100644 --- a/src/plugins/android/javalanguageserver.cpp +++ b/src/plugins/android/javalanguageserver.cpp @@ -44,6 +44,7 @@ #include #include +#include using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp index a738b0ed127..261c0d56746 100644 --- a/src/plugins/android/splashscreencontainerwidget.cpp +++ b/src/plugins/android/splashscreencontainerwidget.cpp @@ -43,6 +43,8 @@ #include #include #include +#include +#include using namespace Utils; diff --git a/src/plugins/autotest/qtest/qttestsettings.cpp b/src/plugins/autotest/qtest/qttestsettings.cpp index a8d5626aa1a..486b831766d 100644 --- a/src/plugins/autotest/qtest/qttestsettings.cpp +++ b/src/plugins/autotest/qtest/qttestsettings.cpp @@ -28,6 +28,7 @@ #include "../autotestconstants.h" #include "qttestconstants.h" +#include #include using namespace Utils; diff --git a/src/plugins/clangcodemodel/clangdast.cpp b/src/plugins/clangcodemodel/clangdast.cpp index 88a9416c72c..b424a9a6c05 100644 --- a/src/plugins/clangcodemodel/clangdast.cpp +++ b/src/plugins/clangcodemodel/clangdast.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index de486aa2402..05da64dbca0 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -52,6 +52,8 @@ #include #include #include +#include +#include static const char kModifiedMimeTypesFile[] = "mimetypes/modifiedmimetypes.xml"; diff --git a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp index 238464619a9..85e1b6e0157 100644 --- a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp +++ b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp @@ -38,6 +38,7 @@ #include #include +#include using namespace Core; using namespace TextEditor; diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index 7ec116d79bf..a84764ee49a 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -27,6 +27,7 @@ #include +#include #include #include diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index 736869cc591..31b325c2bce 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -38,6 +38,7 @@ #include #include +#include #include #include diff --git a/src/plugins/debugger/peripheralregisterhandler.cpp b/src/plugins/debugger/peripheralregisterhandler.cpp index 2cdf51c9773..5c63c156cae 100644 --- a/src/plugins/debugger/peripheralregisterhandler.cpp +++ b/src/plugins/debugger/peripheralregisterhandler.cpp @@ -37,6 +37,7 @@ #include #include #include +#include using namespace Utils; diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp index 0d2f1e2f18f..60b2c6467f2 100644 --- a/src/plugins/fakevim/fakevimactions.cpp +++ b/src/plugins/fakevim/fakevimactions.cpp @@ -31,6 +31,7 @@ // Qt Creator. The idea is to keep this file here in a "clean" state that // allows easy reuse with any QTextEdit or QPlainTextEdit derived class. +#include #include #include diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index a56c5ded8ee..8a87218b7b7 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -40,6 +40,7 @@ #include #include +#include #include #include #include diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index de37451d5d3..d5dc6a91e79 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -27,7 +27,6 @@ #include "qmakeproject.h" #include "qmakeprojectmanagerconstants.h" -#include "qmakebuildconfiguration.h" #include #include @@ -57,6 +56,7 @@ #include #include #include +#include using namespace Core; using namespace ProjectExplorer; diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.cpp b/src/plugins/qmakeprojectmanager/qmakesettings.cpp index 12886c1486d..8102ce10818 100644 --- a/src/plugins/qmakeprojectmanager/qmakesettings.cpp +++ b/src/plugins/qmakeprojectmanager/qmakesettings.cpp @@ -29,8 +29,11 @@ #include +#include #include +#include + using namespace Utils; namespace QmakeProjectManager { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 126dd67c2e7..4f3859d00d7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #include diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h index da6b858e291..6c313d0d926 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h @@ -29,6 +29,7 @@ #include #include +#include namespace Utils { class QtcProcess; } diff --git a/src/plugins/texteditor/highlightersettingspage.cpp b/src/plugins/texteditor/highlightersettingspage.cpp index d169d498475..c571308c83f 100644 --- a/src/plugins/texteditor/highlightersettingspage.cpp +++ b/src/plugins/texteditor/highlightersettingspage.cpp @@ -29,6 +29,7 @@ #include "ui_highlightersettingspage.h" #include +#include #include #include diff --git a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp index 073e9ac05c2..86d817c5f0c 100644 --- a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp +++ b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp @@ -27,6 +27,8 @@ #include #include +#include + #include #include diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp index 3678da4193d..45e1c7df850 100644 --- a/tests/auto/utils/fileutils/tst_fileutils.cpp +++ b/tests/auto/utils/fileutils/tst_fileutils.cpp @@ -28,6 +28,7 @@ #include #include +#include #include //TESTED_COMPONENT=src/libs/utils diff --git a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp index 16953222186..c72f742d438 100644 --- a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp +++ b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp @@ -27,6 +27,7 @@ #include +#include #include #include #include