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/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>