Utils: Inline rootinjectfsengine.h into its only user

Change-Id: Iac02bdf550ed313fec3a1c113583cd6ef1581d3e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

4 files changed, 29 insertions, 44 deletions

diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 3dff6c4f6f..c1cf3f86a8 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -270,7 +270,6 @@ extend_qtc_library(Utils
           fsengine/fsengine_impl.h
           fsengine/diriterator.h
           fsengine/fileiteratordevicesappender.h
-          fsengine/rootinjectfsengine.h
           fsengine/fixedlistfsengine.h
           fsengine/fsenginehandler.cpp
           fsengine/fsenginehandler.h
diff --git a/src/libs/utils/fsengine/fsenginehandler.cpp b/src/libs/utils/fsengine/fsenginehandler.cpp
index 29fe759a86..d6751d8b6a 100644
--- a/src/libs/utils/fsengine/fsenginehandler.cpp
+++ b/src/libs/utils/fsengine/fsenginehandler.cpp
@@ -3,17 +3,42 @@
 
 #include "fsenginehandler.h"
 
+#include "fileiteratordevicesappender.h"
 #include "fixedlistfsengine.h"
-#include "fsengine_impl.h"
-#include "rootinjectfsengine.h"
-
 #include "fsengine.h"
+#include "fsengine_impl.h"
 
 #include "../algorithm.h"
 #include "../hostosinfo.h"
 
+#include <QtCore/private/qfsfileengine_p.h>
+
 namespace Utils::Internal {
 
+class RootInjectFSEngine final : public QFSFileEngine
+{
+public:
+    using QFSFileEngine::QFSFileEngine;
+
+public:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    IteratorUniquePtr beginEntryList(const QString &path,
+                                     QDir::Filters filters,
+                                     const QStringList &filterNames) override
+    {
+        return std::make_unique<FileIteratorWrapper>(
+            QFSFileEngine::beginEntryList(path, filters, filterNames));
+    }
+#else
+    Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
+    {
+        std::unique_ptr<QAbstractFileEngineIterator> baseIterator(
+            QFSFileEngine::beginEntryList(filters, filterNames));
+        return new FileIteratorWrapper(std::move(baseIterator));
+    }
+#endif
+};
+
 static FilePath removeDoubleSlash(const QString &fileName)
 {
     // Reduce every two or more slashes to a single slash.
diff --git a/src/libs/utils/fsengine/rootinjectfsengine.h b/src/libs/utils/fsengine/rootinjectfsengine.h
deleted file mode 100644
index 9eb6a8a832..0000000000
--- a/src/libs/utils/fsengine/rootinjectfsengine.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "fileiteratordevicesappender.h"
-
-#include <QtCore/private/qfsfileengine_p.h>
-
-namespace Utils {
-namespace Internal {
-
-class RootInjectFSEngine : public QFSFileEngine
-{
-public:
-    using QFSFileEngine::QFSFileEngine;
-
-public:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    IteratorUniquePtr beginEntryList(const QString &path,
-                                     QDir::Filters filters,
-                                     const QStringList &filterNames) override
-    {
-        return std::make_unique<FileIteratorWrapper>(
-            QFSFileEngine::beginEntryList(path, filters, filterNames));
-    }
-#else
-    Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
-    {
-        std::unique_ptr<QAbstractFileEngineIterator> baseIterator(
-            QFSFileEngine::beginEntryList(filters, filterNames));
-        return new FileIteratorWrapper(std::move(baseIterator));
-    }
-#endif
-};
-
-} // namespace Internal
-} // namespace Utils
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 211d184f73..9ef9108a2f 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -374,8 +374,7 @@ QtcLibrary {
             "fsenginehandler.cpp",
             "fsenginehandler.h",
             "fsengine_impl.cpp",
-            "fsengine_impl.h",
-            "rootinjectfsengine.h",
+            "fsengine_impl.h"
         ]
     }