From eb0e9a8f89697d22497adc353b8c26ecd6d1f765 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 15 Apr 2025 14:43:09 +0200
Subject: [PATCH] ProjectExplorer: Replace a use of FileReader by
 FilePath::fileContents()

Change-Id: I24914f666fbe84b7870fb24c591e0838d4957a8e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../jsonwizard/jsonwizardfilegenerator.cpp    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
index 783d862d1cd..1ddf51f6ef8 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
@@ -11,14 +11,12 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <utils/fileutils.h>
-#include <utils/qtcassert.h>
-#include <utils/macroexpander.h>
-#include <utils/templateengine.h>
 #include <utils/algorithm.h>
+#include <utils/macroexpander.h>
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
+#include <utils/templateengine.h>
 
-#include <QDir>
-#include <QDirIterator>
 #include <QVariant>
 
 using namespace Utils;
@@ -111,9 +109,9 @@ Result<> JsonWizardFileGenerator::setup(const QVariant &data)
 Result<Core::GeneratedFile> JsonWizardFileGenerator::generateFile(const File &file, MacroExpander *expander)
 {
     // Read contents of source file
-    FileReader reader;
-    if (!reader.fetch(file.source))
-        return ResultError(reader.errorString());
+    const Result<QByteArray> contents = file.source.fileContents();
+    if (!contents)
+        return ResultError(contents.error());
 
     // Generate file information:
     Core::GeneratedFile gf;
@@ -122,7 +120,7 @@ Result<Core::GeneratedFile> JsonWizardFileGenerator::generateFile(const File &fi
     if (!file.keepExisting) {
         if (file.isBinary.toBool()) {
             gf.setBinary(true);
-            gf.setBinaryContents(reader.data());
+            gf.setBinaryContents(contents.value());
         } else {
             // TODO: Document that input files are UTF8 encoded!
             gf.setBinary(false);
@@ -146,7 +144,8 @@ Result<Core::GeneratedFile> JsonWizardFileGenerator::generateFile(const File &fi
             });
 
             QString errorMessage;
-            gf.setContents(TemplateEngine::processText(&nested, QString::fromUtf8(reader.text()),
+            gf.setContents(TemplateEngine::processText(&nested,
+                                                       QString::fromUtf8(normalizeNewlines(contents.value())),
                                                        &errorMessage));
             if (!errorMessage.isEmpty()) {
                 return ResultError(Tr::tr("When processing \"%1\":<br>%2")