From 772d3d7c795dda0cc3b8c9c2ab8db89a37780cec Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 4 Oct 2022 17:44:50 +0200
Subject: [PATCH] NickNameDialog: Use more FilePath

Change-Id: Id7677a636977343ab6cef72ad0267f27981c640a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/vcsbase/nicknamedialog.cpp | 7 +++----
 src/plugins/vcsbase/nicknamedialog.h   | 7 +++++--
 src/plugins/vcsbase/vcsplugin.cpp      | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp
index 1a5a529950c..c0caec23042 100644
--- a/src/plugins/vcsbase/nicknamedialog.cpp
+++ b/src/plugins/vcsbase/nicknamedialog.cpp
@@ -10,7 +10,6 @@
 
 #include <QDebug>
 #include <QDialogButtonBox>
-#include <QDir>
 #include <QPushButton>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
@@ -227,7 +226,7 @@ QStandardItemModel *NickNameDialog::createModel(QObject *parent)
     return model;
 }
 
-bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
+bool NickNameDialog::populateModelFromMailCapFile(const FilePath &fileName,
                                                   QStandardItemModel *model,
                                                   QString *errorMessage)
 {
@@ -236,7 +235,7 @@ bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
     if (fileName.isEmpty())
         return true;
     FileReader reader;
-    if (!reader.fetch(FilePath::fromString(fileName), QIODevice::Text, errorMessage))
+    if (!reader.fetch(fileName, QIODevice::Text, errorMessage))
          return false;
     // Split into lines and read
     NickNameEntry entry;
@@ -247,7 +246,7 @@ bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
             model->appendRow(entry.toModelRow());
         } else {
             qWarning("%s: Invalid mail cap entry at line %d: '%s'\n",
-                     qPrintable(QDir::toNativeSeparators(fileName)),
+                     qPrintable(fileName.toUserOutput()),
                      i + 1, qPrintable(lines.at(i)));
         }
     }
diff --git a/src/plugins/vcsbase/nicknamedialog.h b/src/plugins/vcsbase/nicknamedialog.h
index 6ca5e0e704e..29c4a85d430 100644
--- a/src/plugins/vcsbase/nicknamedialog.h
+++ b/src/plugins/vcsbase/nicknamedialog.h
@@ -13,7 +13,10 @@ class QSortFilterProxyModel;
 class QStandardItemModel;
 QT_END_NAMESPACE
 
-namespace Utils { class TreeView; }
+namespace Utils {
+class FilePath;
+class TreeView;
+}
 
 namespace VcsBase::Internal {
 
@@ -29,7 +32,7 @@ public:
 
     // Utilities to initialize/populate the model
     static QStandardItemModel *createModel(QObject *parent);
-    static bool populateModelFromMailCapFile(const QString &file,
+    static bool populateModelFromMailCapFile(const Utils::FilePath &file,
                                              QStandardItemModel *model,
                                              QString *errorMessage);
 
diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp
index 60343d27a8e..29f84088c03 100644
--- a/src/plugins/vcsbase/vcsplugin.cpp
+++ b/src/plugins/vcsbase/vcsplugin.cpp
@@ -138,7 +138,7 @@ QStandardItemModel *VcsPlugin::nickNameModel()
 void VcsPlugin::populateNickNameModel()
 {
     QString errorMessage;
-    if (!NickNameDialog::populateModelFromMailCapFile(settings().nickNameMailMap.value(),
+    if (!NickNameDialog::populateModelFromMailCapFile(settings().nickNameMailMap.filePath(),
                                                       d->m_nickNameModel,
                                                       &errorMessage)) {
         qWarning("%s", qPrintable(errorMessage));