Remove or replace a few unnecessary #includes

Change-Id: I0545533baab57a4383fda5fd680603fdc6459a01
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/libs/cplusplus/CppDocument.h

@@ -31,7 +31,7 @@
 #include <cplusplus/PreprocessorClient.h>
 #include <cplusplus/DependencyTable.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QSharedPointer>
 #include <QDateTime>

src/libs/languageserverprotocol/lsptypes.h

@@ -29,7 +29,7 @@
 #include "jsonobject.h"
 #include "lsputils.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/link.h>
 #include <utils/mimeutils.h>
 #include <utils/optional.h>

src/libs/utils/fileutils.h

@@ -28,7 +28,6 @@
 #include "utils_global.h"
 
 #include "filepath.h"
-#include "hostosinfo.h"
 
 #include <QCoreApplication>
 #include <QDir>

src/libs/utils/link.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileutils.h"
+#include "filepath.h"
 #include "porting.h"
 
 #include <QString>

src/plugins/android/androidbuildapkstep.h

@@ -30,8 +30,6 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
-#include <utils/fileutils.h>
-
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE

src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp

@@ -30,7 +30,7 @@
 #include "debugserverproviderchooser.h"
 
 #include <utils/qtcassert.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QFormLayout>
 

src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h

@@ -28,7 +28,7 @@
 #include "uvtargetdeviceselection.h"
 
 #include <utils/basetreeview.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/treemodel.h>
 
 QT_BEGIN_NAMESPACE

src/plugins/cmakeprojectmanager/cmaketoolmanager.h

@@ -29,7 +29,7 @@
 
 #include "cmaketool.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QObject>

src/plugins/coreplugin/documentmanager.h

@@ -27,7 +27,7 @@
 
 #include <coreplugin/core_global.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QObject>

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -67,7 +67,7 @@
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/executeondestruction.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/hostosinfo.h>
 #include <utils/infobar.h>
 #include <utils/link.h>

src/plugins/cpaster/frontend/argumentscollector.cpp

@@ -25,7 +25,7 @@
 
 #include "argumentscollector.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QCoreApplication>
 

src/plugins/cppcheck/cppchecktextmarkmanager.h

@@ -27,7 +27,7 @@
 
 #include <cppcheck/cppcheckdiagnosticmanager.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <unordered_map>
 

src/plugins/debugger/breakpoint.h

@@ -28,7 +28,7 @@
 #include <QMetaType>
 #include <QString>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Debugger {
 namespace Internal {

src/plugins/ios/iosdsymbuildstep.h

@@ -27,8 +27,6 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
-#include <utils/fileutils.h>
-
 namespace Ios {
 namespace Internal {
 

src/plugins/ios/iossimulator.h

@@ -28,7 +28,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/idevicefactory.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDebug>
 

src/plugins/mcusupport/mcusupportversiondetection.cpp

@@ -25,7 +25,7 @@
 
 #include "mcusupportversiondetection.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/qtcprocess.h>
 
 #include <QDir>

src/plugins/mesonprojectmanager/project/mesonproject.h

@@ -25,15 +25,12 @@
 
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
 #include "mesonprojectimporter.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectimporter.h>
 #include <projectexplorer/task.h>
 
-#include <utils/fileutils.h>
-
 namespace MesonProjectManager {
 namespace Internal {
 

src/plugins/projectexplorer/buildconfiguration.h

@@ -30,7 +30,7 @@
 #include "task.h"
 
 #include <utils/environment.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Utils { class MacroExpander; }
 

src/plugins/projectexplorer/buildtargetinfo.h

@@ -28,7 +28,7 @@
 #include "projectexplorer_export.h"
 
 #include <utils/environment.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/porting.h>
 
 #include <QList>

src/plugins/projectexplorer/projectnodeshelper.h

@@ -31,7 +31,7 @@
 #include <coreplugin/vcsmanager.h>
 
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace ProjectExplorer {
 
@@ -40,9 +40,8 @@ QList<FileNode *> scanForFiles(QFutureInterface<Result> &future,
                                const Utils::FilePath &directory,
                                const std::function<FileNode *(const Utils::FilePath &)> factory);
 
-// IMPLEMENTATION:
-
 namespace Internal {
+
 template<typename Result>
 QList<FileNode *> scanForFilesRecursively(
     QFutureInterface<Result> &future,

src/plugins/python/pythonutils.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Python {
 namespace Internal {

src/plugins/qbsprojectmanager/qbsprojectimporter.cpp

@@ -25,7 +25,6 @@
 
 #include "qbsprojectimporter.h"
 
-#include "qbsbuildconfiguration.h"
 #include "qbspmlogging.h"
 #include "qbssession.h"
 
@@ -39,7 +38,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtkitinformation.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/hostosinfo.h>
 
 #include <QFileInfo>

src/plugins/qmldesigner/components/eventlist/eventlist.h

@@ -25,9 +25,9 @@
 #pragma once
 
 #include "modelnode.h"
-#include "utils/fileutils.h"
 
-#include <unordered_set>
+#include <utils/filepath.h>
+
 #include <QDialog>
 
 QT_FORWARD_DECLARE_CLASS(QStandardItemModel)

src/plugins/texteditor/codeassist/assistinterface.h

@@ -33,7 +33,7 @@
 #include <QTextCursor>
 #include <QVector>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace TextEditor {
 

src/plugins/todo/todoitem.h

@@ -29,7 +29,7 @@
 #include "constants.h"
 #include "todoicons.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QMetaType>
 #include <QString>