From b5af4501df0d72b9bb6d977a4abe9e87355b6468 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 21 Mar 2023 19:20:55 +0100 Subject: [PATCH] Fix include style Change-Id: I64cb77f8d39dac35821fe96d735bc5dda35738e7 Reviewed-by: Christian Stenger --- src/libs/utils/qrcparser.h | 3 ++- src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp | 2 +- src/plugins/clangformat/clangformatfile.h | 3 ++- src/plugins/cmakeprojectmanager/cmakeprojectimporter.h | 3 ++- src/plugins/coreplugin/editormanager/editormanager.h | 4 ++-- src/plugins/coreplugin/locator/ilocatorfilter.h | 2 +- src/plugins/cppeditor/cppquickfixsettingspage.h | 4 +++- src/plugins/debugger/debuggerengine.cpp | 6 +++--- src/plugins/debugger/debuggerengine.h | 4 +++- src/plugins/docker/dockersettings.cpp | 2 +- src/plugins/imageviewer/imageview.cpp | 2 +- .../mesonprojectmanager/mesonbuildconfiguration.h | 4 ++-- src/plugins/qmakeprojectmanager/makefileparse.cpp | 7 ++++--- src/plugins/qmakeprojectmanager/qmakeparser.cpp | 7 ++++--- src/plugins/qnx/qnxconfiguration.cpp | 10 ++++------ src/plugins/studiowelcome/stylemodel.cpp | 4 ++-- src/plugins/studiowelcome/wizardhandler.cpp | 2 +- tests/auto/utils/asynctask/tst_asynctask.cpp | 5 ++--- tests/auto/utils/mathutils/tst_mathutils.cpp | 2 +- 19 files changed, 41 insertions(+), 35 deletions(-) diff --git a/src/libs/utils/qrcparser.h b/src/libs/utils/qrcparser.h index 42cd9b6666f..14352e26b8d 100644 --- a/src/libs/utils/qrcparser.h +++ b/src/libs/utils/qrcparser.h @@ -4,7 +4,8 @@ #pragma once #include "utils_global.h" -#include "utils/filepath.h" + +#include "filepath.h" #include #include diff --git a/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp b/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp index f1156857948..3abb700df1d 100644 --- a/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp +++ b/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp @@ -7,7 +7,7 @@ #include "qdbtr.h" #include -#include "projectexplorer/devicesupport/idevice.h" +#include #include #include #include diff --git a/src/plugins/clangformat/clangformatfile.h b/src/plugins/clangformat/clangformatfile.h index 6e2267befc9..dcd0e0d6c10 100644 --- a/src/plugins/clangformat/clangformatfile.h +++ b/src/plugins/clangformat/clangformatfile.h @@ -3,7 +3,8 @@ #pragma once -#include "utils/filepath.h" +#include + #include namespace CppEditor { class CppCodeStyleSettings; } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h index 7c7716dc8b2..229ccfa36d5 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h @@ -4,10 +4,11 @@ #pragma once #include "presetsparser.h" -#include "utils/temporarydirectory.h" #include +#include + namespace CMakeProjectManager { class CMakeTool; diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index f73142a933e..6118d15c3dd 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -9,8 +9,8 @@ #include "documentmodel.h" #include "ieditor.h" -#include "utils/link.h" -#include "utils/textfileformat.h" +#include +#include #include #include diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index e7042387602..a8e30029d6f 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -3,12 +3,12 @@ #pragma once -#include "utils/tasktree.h" #include #include #include #include +#include #include #include diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.h b/src/plugins/cppeditor/cppquickfixsettingspage.h index 3e14fde864a..0fea07f91a1 100644 --- a/src/plugins/cppeditor/cppquickfixsettingspage.h +++ b/src/plugins/cppeditor/cppquickfixsettingspage.h @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once -#include "coreplugin/dialogs/ioptionspage.h" + +#include + #include namespace CppEditor { diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 5a465e2798b..eeba3bfe9ed 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -13,15 +13,16 @@ #include "debuggertr.h" #include "breakhandler.h" +#include "debuggermainwindow.h" #include "disassembleragent.h" +#include "enginemanager.h" #include "localsandexpressionswindow.h" #include "logwindow.h" -#include "debuggermainwindow.h" -#include "enginemanager.h" #include "memoryagent.h" #include "moduleshandler.h" #include "registerhandler.h" #include "peripheralregisterhandler.h" +#include "shared/peutils.h" #include "sourcefileshandler.h" #include "sourceutils.h" #include "stackhandler.h" @@ -31,7 +32,6 @@ #include "watchhandler.h" #include "watchutils.h" #include "watchwindow.h" -#include "debugger/shared/peutils.h" #include #include diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index c07ce656da8..215cb3081dd 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -7,12 +7,14 @@ #include "debuggerconstants.h" #include "debuggerprotocol.h" #include "breakhandler.h" -#include "projectexplorer/abi.h" #include "threadshandler.h" #include + +#include #include #include + #include #include diff --git a/src/plugins/docker/dockersettings.cpp b/src/plugins/docker/dockersettings.cpp index bfec44f2433..60e9ec4ff2a 100644 --- a/src/plugins/docker/dockersettings.cpp +++ b/src/plugins/docker/dockersettings.cpp @@ -5,13 +5,13 @@ #include "dockerconstants.h" #include "dockertr.h" -#include "utils/hostosinfo.h" #include #include #include +#include #include using namespace Utils; diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp index 34b74d49086..9a2af284f49 100644 --- a/src/plugins/imageviewer/imageview.cpp +++ b/src/plugins/imageviewer/imageview.cpp @@ -8,11 +8,11 @@ #include "imageviewerfile.h" #include "imageviewertr.h" #include "multiexportdialog.h" -#include "utils/mimeutils.h" #include #include +#include #include #include diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h index 6bc4a96afe8..a4059091892 100644 --- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h +++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once -#include "projectexplorer/buildconfiguration.h" -#include "projectexplorer/target.h" +#include +#include namespace MesonProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index 32193a4dbdc..5fbab2084dd 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -359,11 +359,12 @@ void MakeFileParse::parseCommandLine(const QString &command, const QString &proj // Unit tests: #ifdef WITH_TESTS -# include -# include "qmakeprojectmanagerplugin.h" +#include "qmakeprojectmanagerplugin.h" -# include "projectexplorer/outputparser_test.h" +#include + +#include using namespace QmakeProjectManager::Internal; using namespace ProjectExplorer; diff --git a/src/plugins/qmakeprojectmanager/qmakeparser.cpp b/src/plugins/qmakeprojectmanager/qmakeparser.cpp index e95b403bff4..2cb9d941c14 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparser.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparser.cpp @@ -71,11 +71,12 @@ OutputLineParser::Result QMakeParser::handleLine(const QString &line, OutputForm // Unit tests: #ifdef WITH_TESTS -# include -# include "qmakeprojectmanagerplugin.h" +#include "qmakeprojectmanagerplugin.h" -# include "projectexplorer/outputparser_test.h" +#include + +#include using namespace QmakeProjectManager::Internal; diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index c1b0e498f0c..0ca024248a8 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -8,10 +8,12 @@ #include "qnxtoolchain.h" #include "qnxtr.h" -#include "debugger/debuggeritem.h" - #include +#include +#include +#include + #include #include #include @@ -23,10 +25,6 @@ #include -#include -#include -#include - #include #include diff --git a/src/plugins/studiowelcome/stylemodel.cpp b/src/plugins/studiowelcome/stylemodel.cpp index d93fc5fded2..1198052994e 100644 --- a/src/plugins/studiowelcome/stylemodel.cpp +++ b/src/plugins/studiowelcome/stylemodel.cpp @@ -3,8 +3,8 @@ #include "stylemodel.h" -#include "utils/algorithm.h" -#include "utils/qtcassert.h" +#include +#include #include diff --git a/src/plugins/studiowelcome/wizardhandler.cpp b/src/plugins/studiowelcome/wizardhandler.cpp index ee20518e604..d6d750d39eb 100644 --- a/src/plugins/studiowelcome/wizardhandler.cpp +++ b/src/plugins/studiowelcome/wizardhandler.cpp @@ -11,8 +11,8 @@ #include -#include "utils/wizard.h" #include +#include using namespace StudioWelcome; diff --git a/tests/auto/utils/asynctask/tst_asynctask.cpp b/tests/auto/utils/asynctask/tst_asynctask.cpp index 12dc849591b..67a291172a1 100644 --- a/tests/auto/utils/asynctask/tst_asynctask.cpp +++ b/tests/auto/utils/asynctask/tst_asynctask.cpp @@ -1,9 +1,8 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "utils/asynctask.h" - -#include "utils/algorithm.h" +#include +#include #include diff --git a/tests/auto/utils/mathutils/tst_mathutils.cpp b/tests/auto/utils/mathutils/tst_mathutils.cpp index b817f157436..a29f908748d 100644 --- a/tests/auto/utils/mathutils/tst_mathutils.cpp +++ b/tests/auto/utils/mathutils/tst_mathutils.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "utils/mathutils.h" +#include #include