From 277248724f291a9a82d3cfa4ac6225320b0af93a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 15 Apr 2025 15:30:42 +0200
Subject: [PATCH] VcsBase: Use FilePath::fileContents() instead of FileReader
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FileReader is going to be removed.

Change-Id: I52661420b90d019ec019a9f5dc8daadfa49208ac
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 6954b4cdf20..9fdf755cb04 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -38,6 +38,7 @@
 #include <utils/icon.h>
 #include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/temporarydirectory.h>
 #include <utils/theme/theme.h>
 
@@ -239,14 +240,14 @@ static inline QStringList fieldTexts(const QString &fileContents)
 
 void VcsBaseSubmitEditor::createUserFields(const FilePath &fieldConfigFile)
 {
-    FileReader reader;
-    if (!reader.fetch(fieldConfigFile)) {
-        QMessageBox::critical(ICore::dialogParent(), Tr::tr("File Error"), reader.errorString());
+    const Result<QByteArray> config = fieldConfigFile.fileContents();
+    if (!config) {
+        QMessageBox::critical(ICore::dialogParent(), Tr::tr("File Error"), config.error());
         return;
     }
 
     // Parse into fields
-    const QStringList fields = fieldTexts(QString::fromUtf8(reader.text()));
+    const QStringList fields = fieldTexts(QString::fromUtf8(normalizeNewlines(config.value())));
     if (fields.empty())
         return;
     // Create a completer on user names