Remove #include <utils/fileutils.h> from most header files

It has some platform specific warts, filepath.h is somewhat
cheaper and less ugly overall.

Partially clean up surroundings

Change-Id: Ida1fd470ec020f69c446109427f92a08e879789f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/libs/advanceddockingsystem/ads_globals.cpp

@@ -10,6 +10,7 @@
 #include <utils/hostosinfo.h>
 
 #include <QAbstractButton>
+#include <QEvent>
 #include <QPainter>
 #include <QStyle>
 #include <QVariant>

src/libs/advanceddockingsystem/workspace.h

@@ -5,7 +5,7 @@
 
 #include "ads_globals.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace ADS {
 

src/libs/cplusplus/DependencyTable.h

@@ -5,7 +5,7 @@
 
 #include <cplusplus/CPlusPlusForwardDeclarations.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QBitArray>
 #include <QHash>

src/libs/cplusplus/FindUsages.h

@@ -8,7 +8,8 @@
 #include "TypeOfExpression.h"
 
 #include <cplusplus/ASTVisitor.h>
-#include <utils/fileutils.h>
+
+#include <utils/filepath.h>
 
 #include <QSet>
 

src/libs/utils/commandline.h

@@ -114,6 +114,13 @@ private:
     bool m_isWindows;
 };
 
+struct QTCREATOR_UTILS_EXPORT RunResult
+{
+    int exitCode = -1;
+    QByteArray stdOut;
+    QByteArray stdErr;
+};
+
 class QTCREATOR_UTILS_EXPORT CommandLine
 {
 public:

src/libs/utils/devicefileaccess.cpp

@@ -7,6 +7,7 @@
 #include "commandline.h"
 #include "environment.h"
 #include "expected.h"
+#include "fileutils.h"
 #include "hostosinfo.h"
 #include "osspecificaspects.h"
 #include "qtcassert.h"
@@ -16,7 +17,6 @@
 #include "qtcprocess.h"
 #endif
 
-#include <QCoreApplication>
 #include <QFileSystemWatcher>
 #include <QOperatingSystemVersion>
 #include <QRandomGenerator>

src/libs/utils/devicefileaccess.h

@@ -6,12 +6,15 @@
 #include "hostosinfo.h"
 #include "utils_global.h"
 
-#include "fileutils.h"
+#include "filepath.h"
 
 class tst_unixdevicefileaccess; // For testing.
 
 namespace Utils {
 
+class CommandLine;
+class RunResult;
+
 // Base class including dummy implementation usable as fallback.
 class QTCREATOR_UTILS_EXPORT DeviceFileAccess
 {

src/libs/utils/deviceshell.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "commandline.h"
 #include "expected.h"
-#include "fileutils.h"
 #include "utils_global.h"
 
 #include <QHash>
@@ -17,7 +17,6 @@
 
 namespace Utils {
 
-class CommandLine;
 class ProcessResultData;
 class Process;
 

src/libs/utils/fileutils.h

@@ -34,13 +34,6 @@ namespace Utils {
 
 class CommandLine;
 
-struct QTCREATOR_UTILS_EXPORT RunResult
-{
-    int exitCode = -1;
-    QByteArray stdOut;
-    QByteArray stdErr;
-};
-
 class QTCREATOR_UTILS_EXPORT FileUtils
 {
 public:

src/plugins/android/androidbuildapkstep.cpp

@@ -33,6 +33,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/fancylineedit.h>
+#include <utils/fileutils.h>
 #include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
@@ -52,12 +53,9 @@
 #include <QListView>
 #include <QLoggingCategory>
 #include <QMessageBox>
-#include <QProcess>
 #include <QPushButton>
 #include <QTimer>
-#include <QToolButton>
 
-#include <algorithm>
 #include <memory>
 
 using namespace ProjectExplorer;

src/plugins/android/androidconfigurations.cpp

@@ -31,6 +31,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcprocess.h>

src/plugins/android/androidcreatekeystorecertificate.cpp

@@ -5,6 +5,7 @@
 #include "androidcreatekeystorecertificate.h"
 #include "androidtr.h"
 
+#include <utils/fileutils.h>
 #include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcprocess.h>

src/plugins/android/androiddeployqtstep.cpp

@@ -38,6 +38,7 @@
 #include <utils/async.h>
 #include <utils/commandline.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>

src/plugins/android/androiddevice.cpp

@@ -24,9 +24,10 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
+#include <utils/fileutils.h>
 #include <utils/guard.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/url.h>
 
 #include <QFileSystemWatcher>

src/plugins/android/androidmanifesteditoriconwidget.cpp

@@ -6,10 +6,10 @@
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
+
+#include <utils/fileutils.h>
 #include <utils/utilsicons.h>
 
-#include <QFileDialog>
-#include <QFileInfo>
 #include <QGridLayout>
 #include <QLabel>
 #include <QLoggingCategory>

src/plugins/android/androidsdkpackage.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-#include <utils/fileutils.h>
+
+#include <utils/filepath.h>
 
 #include <QList>
 #include <QObject>

src/plugins/android/createandroidmanifestwizard.cpp

@@ -18,6 +18,7 @@
 
 #include <qtsupport/qtkitaspect.h>
 
+#include <utils/fileutils.h>
 #include <utils/infolabel.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
@@ -25,7 +26,6 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDir>
-#include <QFileInfo>
 #include <QFormLayout>
 #include <QLabel>
 #include <QMessageBox>

src/plugins/android/createandroidmanifestwizard.h

@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/wizard.h>
 
 namespace ProjectExplorer { class BuildSystem; }
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
 
 class CreateAndroidManifestWizard : public Utils::Wizard
 {
@@ -36,5 +35,4 @@ private:
     bool m_copyGradle;
 };
 
-} // namespace Internal
-} // namespace Android
+} // Android::Internal

src/plugins/android/splashscreencontainerwidget.cpp

@@ -8,7 +8,7 @@
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 
-#include <utils/filepath.h>
+#include <utils/fileutils.h>
 #include <utils/utilsicons.h>
 
 #include <QCheckBox>

src/plugins/android/splashscreenwidget.cpp

@@ -6,6 +6,8 @@
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
+
+#include <utils/fileutils.h>
 #include <utils/utilsicons.h>
 
 #include <QGridLayout>

src/plugins/autotest/qtest/qttest_utils.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QHash>
 

src/plugins/autotest/quick/quicktest_utils.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QHash>
 

src/plugins/autotest/testresultspane.cpp

@@ -30,6 +30,7 @@
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <utils/fileutils.h>
 #include <utils/proxyaction.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>

src/plugins/autotest/testtreeitem.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/treemodel.h>
 
 #include <QList>

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

@@ -6,7 +6,7 @@
 #include "xmlproject.h"
 #include "xmlpropertygroup.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Debugger { class DebuggerRunTool; }
 

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

@@ -7,7 +7,7 @@
 
 #include <utils/detailsbutton.h>
 #include <utils/detailswidget.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDialog>
 

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

@@ -6,7 +6,7 @@
 #include "uvtargetdriverselection.h"
 
 #include <utils/basetreeview.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/treemodel.h>
 
 namespace BareMetal::Internal::Uv {

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

@@ -7,7 +7,7 @@
 
 #include <utils/detailsbutton.h>
 #include <utils/detailswidget.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDialog>
 

src/plugins/bazaar/bazaarplugin.cpp

@@ -25,6 +25,7 @@
 #include <utils/action.h>
 #include <utils/commandline.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>

src/plugins/beautifier/uncrustify/uncrustify.cpp

@@ -27,6 +27,7 @@
 #include <texteditor/texteditor.h>
 
 #include <utils/aspects.h>
+#include <utils/fileutils.h>
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcprocess.h>

src/plugins/clangformat/clangformatfile.cpp

@@ -14,6 +14,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <fstream>
+
 using namespace ClangFormat;
 
 ClangFormatFile::ClangFormatFile(

src/plugins/clangformat/clangformatglobalconfigwidget.cpp

@@ -24,6 +24,7 @@
 #include <texteditor/texteditorsettings.h>
 
 #include <utils/guard.h>
+#include <utils/fileutils.h>
 #include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 

src/plugins/clangformat/clangformatutils.cpp

@@ -20,6 +20,7 @@
 
 #include <utils/qtcassert.h>
 #include <utils/expected.h>
+#include <utils/fileutils.h>
 
 #include <QCryptographicHash>
 #include <QLoggingCategory>

src/plugins/clangformat/clangformatutils.h

@@ -5,21 +5,20 @@
 
 #include "clangformatsettings.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <clang/Format/Format.h>
 
 #include <QFile>
 
-#include <fstream>
-
 namespace TextEditor {
 class ICodeStylePreferences;
 class TabSettings;
 }
 namespace ProjectExplorer { class Project; }
 namespace CppEditor { class CppCodeStyleSettings; }
+
 namespace ClangFormat {
 
 QString projectUniqueId(ProjectExplorer::Project *project);

src/plugins/clangtools/clangfileinfo.h

@@ -7,7 +7,7 @@
 #include <cppeditor/cppprojectfile.h>
 #include <cppeditor/projectpart.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QSet>
 

src/plugins/clangtools/clangtool.cpp

@@ -44,6 +44,7 @@
 #include <utils/checkablemessagebox.h>
 #include <utils/fancylineedit.h>
 #include <utils/fancymainwindow.h>
+#include <utils/fileutils.h>
 #include <utils/infolabel.h>
 #include <utils/progressindicator.h>
 #include <utils/proxyaction.h>

src/plugins/clangtools/clangtoolsdiagnosticmodel.h

@@ -10,10 +10,8 @@
 
 #include <debugger/analyzer/detailederrorview.h>
 #include <utils/filesystemwatcher.h>
-#include <utils/fileutils.h>
 #include <utils/treemodel.h>
 
-#include <QFileSystemWatcher>
 #include <QPointer>
 #include <QSortFilterProxyModel>
 #include <QVector>

src/plugins/clangtools/clangtoolsprojectsettings.h

@@ -7,10 +7,8 @@
 
 #include <projectexplorer/project.h>
 
-#include <utils/fileutils.h>
+namespace ClangTools::Internal {
 
-namespace ClangTools {
-namespace Internal {
 class Diagnostic;
 
 class SuppressedDiagnostic
@@ -88,7 +86,6 @@ private:
     SuppressedDiagnosticsList m_suppressedDiagnostics;
 };
 
-} // namespace Internal
-} // namespace ClangTools
+} // ClangTools::Internal
 
 Q_DECLARE_METATYPE(std::shared_ptr<ClangTools::Internal::ClangToolsProjectSettings>)

src/plugins/clangtools/virtualfilesystemoverlay.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/temporarydirectory.h>
 
 #include <QHash>
@@ -11,8 +11,7 @@
 
 namespace Core { class IDocument; }
 
-namespace ClangTools {
-namespace Internal {
+namespace ClangTools::Internal {
 
 class VirtualFileSystemOverlay
 {
@@ -38,5 +37,4 @@ private:
     QMap<Utils::FilePath, Utils::FilePath> m_mapping;
 };
 
-} // namespace Internal
-} // namespace ClangTools
+} // ClangTools::Internal

src/plugins/clearcase/clearcaseplugin.cpp

@@ -32,6 +32,7 @@
 #include <utils/action.h>
 #include <utils/algorithm.h>
 #include <utils/async.h>
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/infobar.h>
 #include <utils/layoutbuilder.h>

src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

@@ -45,6 +45,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
+#include <utils/fileutils.h>
 #include <utils/macroexpander.h>
 #include <utils/mimeconstants.h>
 #include <utils/qtcprocess.h>

src/plugins/cmakeprojectmanager/cmakebuildtarget.h

@@ -9,10 +9,6 @@
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/runconfigurationaspects.h>
 
-#include <utils/fileutils.h>
-
-#include <QStringList>
-
 namespace CMakeProjectManager {
 
 enum TargetType {

src/plugins/cmakeprojectmanager/fileapidataextractor.cpp

@@ -16,6 +16,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/icon.h>
+#include <utils/fileutils.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>

src/plugins/cmakeprojectmanager/fileapiparser.h

@@ -10,10 +10,6 @@
 #include <projectexplorer/headerpath.h>
 #include <projectexplorer/projectmacro.h>
 
-#include <utils/filesystemwatcher.h>
-#include <utils/fileutils.h>
-
-#include <QString>
 #include <QVector>
 #include <QVersionNumber>
 

src/plugins/cmakeprojectmanager/fileapireader.cpp

@@ -16,6 +16,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/async.h>
+#include <utils/fileutils.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 #include <utils/temporarydirectory.h>

src/plugins/coco/cocoplugin.cpp

@@ -13,9 +13,10 @@
 #include <extensionsystem/iplugin.h>
 
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/pathchooser.h>
 
-#include <QAction>
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 

src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h

@@ -7,8 +7,6 @@
 
 #include <projectexplorer/buildsystem.h>
 
-#include <utils/fileutils.h>
-
 #include <QFutureWatcher>
 #include <QObject>
 #include <QStringList>

src/plugins/coreplugin/fileutils.h

@@ -5,7 +5,7 @@
 
 #include "core_global.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 QT_BEGIN_NAMESPACE
 class QWidget;

src/plugins/cppeditor/cppcodemodelinspectordumper.cpp

@@ -9,9 +9,12 @@
 #include "cppworkingcopy.h"
 
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/projectmacro.h>
 #include <projectexplorer/project.h>
+
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/temporarydirectory.h>
 
 #include <cplusplus/CppDocument.h>

src/plugins/cppeditor/cppmodelmanager_test.cpp

@@ -22,6 +22,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projectnodes.h>
 
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 

src/plugins/cppeditor/cppoutlinemodel.h

@@ -11,6 +11,7 @@
 #include <cplusplus/Overview.h>
 
 #include <QSharedPointer>
+#include <QTimer>
 
 #include <utility>
 

src/plugins/cppeditor/cppuseselectionsupdater.cpp

@@ -11,6 +11,7 @@
 #include <utils/qtcassert.h>
 #include <utils/textutils.h>
 
+#include <QCoreApplication>
 #include <QTextBlock>
 #include <QTextCursor>
 

src/plugins/cppeditor/cursorineditor.h

@@ -4,7 +4,8 @@
 #pragma once
 
 #include <cplusplus/CppDocument.h>
-#include <utils/fileutils.h>
+
+#include <utils/filepath.h>
 #include <utils/link.h>
 
 #include <QTextCursor>

src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.h

@@ -4,11 +4,10 @@
 #pragma once
 
 #include "cppquickfixsettings.h"
-#include <projectexplorer/project.h>
-#include <utils/fileutils.h>
 
-namespace CppEditor {
-namespace Internal {
+#include <projectexplorer/project.h>
+
+namespace CppEditor::Internal {
 
 class CppQuickFixProjectsSettings : public QObject
 {
@@ -39,7 +38,6 @@ private:
     bool m_useGlobalSettings;
 };
 
-} // namespace Internal
-} // namespace CppEditor
+} // CppEditor::Internal
 
 Q_DECLARE_METATYPE(QSharedPointer<CppEditor::Internal::CppQuickFixProjectsSettings>)

src/plugins/cppeditor/quickfixes/extractfunction.cpp

@@ -15,6 +15,7 @@
 #include <cplusplus/declarationcomments.h>
 #include <cplusplus/Overview.h>
 
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QPushButton>

src/plugins/debugger/debuggerengine.cpp

@@ -53,11 +53,12 @@
 #include <utils/algorithm.h>
 #include <utils/basetreeview.h>
 #include <utils/checkablemessagebox.h>
+#include <utils/fileutils.h>
 #include <utils/macroexpander.h>
-#include <utils/qtcprocess.h>
 #include <utils/processhandle.h>
 #include <utils/processinterface.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/styledbar.h>
 #include <utils/utilsicons.h>
 
@@ -66,7 +67,6 @@
 #include <QDebug>
 #include <QDir>
 #include <QDockWidget>
-#include <QFileInfo>
 #include <QHeaderView>
 #include <QTextBlock>
 #include <QTimer>

src/plugins/debugger/debuggerplugin.cpp

@@ -83,6 +83,7 @@
 #include <utils/basetreeview.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/fancymainwindow.h>
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/processinfo.h>
 #include <utils/proxyaction.h>

src/plugins/debugger/debuggersourcepathmappingwidget.cpp

@@ -9,6 +9,7 @@
 
 #include <utils/buildablehelperlibrary.h>
 #include <utils/fancylineedit.h>
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>

src/plugins/debugger/stackframe.cpp

@@ -12,6 +12,7 @@
 #include <QDir>
 #include <QFileInfo>
 
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 
 using namespace Utils;

src/plugins/debugger/unstartedappwatcherdialog.cpp

@@ -7,8 +7,6 @@
 #include "debuggerkitaspect.h"
 #include "debuggertr.h"
 
-#include <utils/pathchooser.h>
-
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitchooser.h>
@@ -20,11 +18,12 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
+#include <utils/fileutils.h>
+#include <utils/pathchooser.h>
 #include <utils/processinterface.h>
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
-#include <QFileDialog>
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QKeyEvent>

src/plugins/designer/qtcreatorintegration.cpp

@@ -38,6 +38,7 @@
 #include <texteditor/textdocument.h>
 
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/mimeutils.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>

src/plugins/designer/resourcehandler.cpp

@@ -13,6 +13,7 @@
 #include <resourceeditor/resourcenode.h>
 
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <QDesignerFormWindowInterface>

src/plugins/effectcomposer/effectcomposerwidget.cpp

@@ -10,7 +10,6 @@
 #include "effectutils.h"
 #include "propertyhandler.h"
 
-
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -26,6 +25,7 @@
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <QHBoxLayout>

src/plugins/fossil/fossilplugin.cpp

@@ -30,6 +30,7 @@
 
 #include <utils/action.h>
 #include <utils/commandline.h>
+#include <utils/fileutils.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 

src/plugins/genericprojectmanager/genericprojectwizard.cpp

@@ -6,6 +6,7 @@
 #include "genericprojectconstants.h"
 #include "genericprojectmanagertr.h"
 
+#include <coreplugin/basefilewizard.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iwizardfactory.h>
 

src/plugins/genericprojectmanager/genericprojectwizard.h

@@ -3,19 +3,8 @@
 
 #pragma once
 
-#include <coreplugin/basefilewizard.h>
-#include <coreplugin/basefilewizardfactory.h>
-#include <utils/fileutils.h>
-#include <utils/wizard.h>
-
-namespace Utils { class FileWizardPage; }
-
-namespace GenericProjectManager {
-namespace Internal {
-
-class FilesSelectionWizardPage;
+namespace GenericProjectManager::Internal {
 
 void setupGenericProjectWizard();
 
-} // namespace Internal
-} // namespace GenericProjectManager
+} // GenericProjectManager::Internal

src/plugins/git/gerrit/gerritplugin.cpp

@@ -22,6 +22,7 @@
 #include <coreplugin/vcsmanager.h>
 
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
 #include <utils/processinterface.h>
 

src/plugins/git/gitclient.h

@@ -10,11 +10,8 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/iversioncontrol.h>
 
-#include <utils/fileutils.h>
-
 #include <vcsbase/vcsbaseclient.h>
 
-#include <QObject>
 #include <QStringList>
 #include <QVersionNumber>
 #include <QWidget>
@@ -23,19 +20,9 @@ QT_BEGIN_NAMESPACE
 class QMenu;
 QT_END_NAMESPACE
 
-namespace Core { class ICore; }
 namespace Tasking { class GroupItem; }
 
-namespace DiffEditor {
-class ChunkSelection;
-class DiffEditorController;
-}
-
-namespace VcsBase {
-class SubmitFileModel;
-class VcsBaseEditorWidget;
-class VcsCommand;
-}
+namespace VcsBase { class SubmitFileModel; }
 
 namespace Git::Internal {
 

src/plugins/git/gitplugin.cpp

@@ -46,6 +46,7 @@
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/commandline.h>
+#include <utils/fileutils.h>
 #include <utils/infobar.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>

src/plugins/ios/iosrunconfiguration.h

@@ -8,8 +8,6 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/runconfigurationaspects.h>
 
-#include <utils/fileutils.h>
-
 #include <QStandardItemModel>
 
 QT_BEGIN_NAMESPACE

src/plugins/languageclient/lspinspector.cpp

@@ -16,6 +16,7 @@
 
 #include <texteditor/texteditor.h>
 
+#include <utils/fileutils.h>
 #include <utils/jsontreeitem.h>
 #include <utils/layoutbuilder.h>
 #include <utils/listmodel.h>

src/plugins/mcusupport/mcusupportsdk.cpp

@@ -17,16 +17,19 @@
 #include "mcutargetfactorylegacy.h"
 
 #include <baremetal/baremetalconstants.h>
+
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
+
 #include <utils/algorithm.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 
 #include <QDir>
-#include <QDirIterator>
 #include <QHash>
 #include <QJsonArray>
 #include <QJsonDocument>

src/plugins/mcusupport/mcusupportsdk.h

@@ -5,7 +5,8 @@
 
 #include "mcusupport_global.h"
 #include "settingshandler.h"
-#include <utils/fileutils.h>
+
+#include <utils/filepath.h>
 
 namespace McuSupport::Internal {
 

src/plugins/mercurial/mercurialplugin.cpp

@@ -26,6 +26,7 @@
 #include <utils/action.h>
 #include <utils/commandline.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <vcsbase/vcsbaseconstants.h>

src/plugins/mesonprojectmanager/buildoptions.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QCheckBox>
 #include <QComboBox>

src/plugins/mesonprojectmanager/buildsystemfilesparser.h

@@ -0,0 +1,19 @@
+// Copyright (C) 2020 Alexis Jeandet.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "common.h"
+#include "mesonpluginconstants.h"
+
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+
+namespace MesonProjectManager {
+namespace Internal {
+
+} // namespace Internal
+} // namespace MesonProjectManager

src/plugins/mesonprojectmanager/projecttree.h

@@ -0,0 +1,22 @@
+// Copyright (C) 2020 Alexis Jeandet.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "mesoninfoparser.h"
+#include "mesonprojectnodes.h"
+
+#include <utils/filepath.h>
+
+namespace MesonProjectManager::Internal {
+
+class ProjectTree
+{
+public:
+    ProjectTree();
+    static std::unique_ptr<MesonProjectNode> buildTree(const Utils::FilePath &srcDir,
+                                                       const TargetsList &targets,
+                                                       const Utils::FilePaths &bsFiles);
+};
+
+} // MesonProjectManager::Internal

src/plugins/mesonprojectmanager/target.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDir>
 #include <QVariant>

src/plugins/perfprofiler/perfdatareader.h

@@ -11,6 +11,8 @@
 #include <QProcess>
 #include <QQueue>
 
+namespace Utils { class CommandLine; }
+
 namespace ProjectExplorer {
 class Kit;
 class RunControl;

src/plugins/perfprofiler/perfloaddialog.cpp

@@ -12,6 +12,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
+#include <utils/fileutils.h>
 #include <utils/layoutbuilder.h>
 
 #include <QDialogButtonBox>
@@ -21,8 +22,7 @@
 
 using namespace Utils;
 
-namespace PerfProfiler {
-namespace Internal {
+namespace PerfProfiler::Internal {
 
 PerfLoadDialog::PerfLoadDialog(QWidget *parent)
     : QDialog(parent)
@@ -119,5 +119,4 @@ void PerfLoadDialog::chooseDefaults()
         m_executableDirLineEdit->setText(bc->buildDirectory().toString());
 }
 
-} // namespace Internal
-} // namespace PerfProfiler
+} // PerfProfiler::Internal

src/plugins/perfprofiler/perfprofilertool.cpp

@@ -32,10 +32,10 @@
 
 #include <utils/algorithm.h>
 #include <utils/fancymainwindow.h>
+#include <utils/fileutils.h>
 #include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
-#include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>
 

src/plugins/perfprofiler/perfprofilertool.h

@@ -13,6 +13,7 @@
 #include <tracing/timelinezoomcontrol.h>
 #include <utils/fileinprojectfinder.h>
 
+#include <QCoreApplication>
 #include <QLabel>
 #include <QToolButton>
 

src/plugins/projectexplorer/buildinfo.h

@@ -7,7 +7,6 @@
 
 #include "buildconfiguration.h"
 
-#include <utils/fileutils.h>
 #include <utils/id.h>
 
 namespace ProjectExplorer {

src/plugins/projectexplorer/environmentwidget.cpp

@@ -13,6 +13,7 @@
 #include <utils/environment.h>
 #include <utils/environmentdialog.h>
 #include <utils/environmentmodel.h>
+#include <utils/fileutils.h>
 #include <utils/headerviewstretcher.h>
 #include <utils/hostosinfo.h>
 #include <utils/itemviews.h>

src/plugins/projectexplorer/fileinsessionfinder.h

@@ -5,7 +5,7 @@
 
 #include "projectexplorer_export.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/headerpath.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDir>
 #include <QString>

src/plugins/projectexplorer/kit.cpp

@@ -14,7 +14,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/displayname.h>
-#include <utils/filepath.h>
+#include <utils/fileutils.h>
 #include <utils/icon.h>
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>

src/plugins/projectexplorer/kitmanager.h

@@ -11,8 +11,8 @@
 
 #include <utils/aspects.h>
 
-#include <QObject>
 #include <QPair>
+#include <QPushButton>
 #include <QSet>
 
 #include <functional>

src/plugins/projectexplorer/kitmanagerconfigwidget.cpp

@@ -12,6 +12,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/detailswidget.h>
+#include <utils/fileutils.h>
 #include <utils/layoutbuilder.h>
 #include <utils/macroexpander.h>
 #include <utils/pathchooser.h>

src/plugins/projectexplorer/makestep.h

@@ -7,7 +7,7 @@
 #include "runconfigurationaspects.h"
 
 #include <utils/aspects.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Utils { class Environment; }
 

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -19,6 +19,7 @@
 #include <utils/async.h>
 #include <utils/datafromprocess.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcprocess.h>

src/plugins/projectexplorer/parseissuesdialog.cpp

@@ -3,7 +3,6 @@
 
 #include "parseissuesdialog.h"
 
-#include "ioutputparser.h"
 #include "kitaspects.h"
 #include "kitchooser.h"
 #include "kitmanager.h"
@@ -11,6 +10,9 @@
 #include "projectexplorertr.h"
 #include "taskhub.h"
 
+#include <utils/fileutils.h>
+#include <utils/outputformatter.h>
+
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -23,12 +25,9 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include <memory>
-
 using namespace Utils;
 
-namespace ProjectExplorer {
-namespace Internal {
+namespace ProjectExplorer::Internal {
 
 class ParseIssuesDialog::Private
 {
@@ -135,5 +134,4 @@ void ParseIssuesDialog::accept()
     QDialog::accept();
 }
 
-} // namespace Internal
-} // namespace ProjectExplorer
+} // ProjectExplorer::Internal

src/plugins/projectexplorer/projectimporter.h

@@ -7,8 +7,6 @@
 
 #include "toolchain.h"
 
-#include <utils/fileutils.h>
-
 namespace ProjectExplorer {
 
 class BuildInfo;

src/plugins/projectexplorer/projectmanager.cpp

@@ -26,6 +26,7 @@
 #include <texteditor/texteditor.h>
 
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>

src/plugins/projectexplorer/projectmodels.h

@@ -6,13 +6,10 @@
 #include "expanddata.h"
 #include "projectnodes.h"
 
-#include <utils/fileutils.h>
 #include <utils/treemodel.h>
 
-#include <QPointer>
 #include <QSet>
 #include <QTimer>
-#include <QTreeView>
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/projectnodes.h

@@ -8,7 +8,7 @@
 #include <QIcon>
 #include <QStringList>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <functional>

src/plugins/projectexplorer/projectwindow.cpp

@@ -35,6 +35,7 @@
 #include <utils/algorithm.h>
 #include <utils/basetreeview.h>
 #include <utils/hostosinfo.h>
+#include <utils/fileutils.h>
 #include <utils/navigationtreeview.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcsettings.h>

src/plugins/projectexplorer/rawprojectpart.h

@@ -13,11 +13,8 @@
 
 #include <utils/cpplanguage_details.h>
 #include <utils/environment.h>
-#include <utils/fileutils.h>
 #include <utils/store.h>
 
-#include <QPointer>
-
 #include <functional>
 
 namespace ProjectExplorer {

src/plugins/projectexplorer/task.h

@@ -6,16 +6,14 @@
 #include "projectexplorer_export.h"
 
 #include <utils/id.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QIcon>
 #include <QMetaType>
 #include <QStringList>
 #include <QTextLayout>
 
-namespace TextEditor {
-class TextMark;
-}
+namespace TextEditor { class TextMark; }
 
 namespace ProjectExplorer {
 
@@ -122,6 +120,6 @@ using Tasks = QList<Task>;
 PROJECTEXPLORER_EXPORT QString toHtml(const Tasks &issues);
 PROJECTEXPLORER_EXPORT bool containsType(const Tasks &issues, Task::TaskType);
 
-} //namespace ProjectExplorer
+} // ProjectExplorer
 
 Q_DECLARE_METATYPE(ProjectExplorer::Task)

src/plugins/projectexplorer/workspaceproject.cpp

@@ -20,6 +20,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/stringutils.h>
 
 #include <QJsonArray>