From 30312cc74adc59fb25f3026873b9dbdb6871041e Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 9 Nov 2022 15:19:13 +0100
Subject: Vcs: Proliferate FilePath a bit further

Change-Id: I8490917bf0bde59b1cef2509ec14c3ca985fa43d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/vcsbase/submitfilemodel.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/plugins/vcsbase/submitfilemodel.cpp')

diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp
index 4b4681a85a..210ac1dfbe 100644
--- a/src/plugins/vcsbase/submitfilemodel.cpp
+++ b/src/plugins/vcsbase/submitfilemodel.cpp
@@ -3,15 +3,15 @@
 
 #include "submitfilemodel.h"
 
-#include <utils/fileutils.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
 
 #include <QStandardItem>
-#include <QFileInfo>
 #include <QDebug>
 
+using namespace Utils;
+
 namespace VcsBase {
 
 // --------------------------------------------------------------------------
@@ -22,7 +22,6 @@ enum { StateColumn = 0, FileColumn = 1 };
 
 static QBrush fileStatusTextForeground(SubmitFileModel::FileStatusHint statusHint)
 {
-    using Utils::Theme;
     Theme::Color statusTextColor = Theme::VcsBase_FileStatusUnknown_TextColor;
     switch (statusHint) {
     case SubmitFileModel::FileStatusUnknown:
@@ -47,7 +46,7 @@ static QBrush fileStatusTextForeground(SubmitFileModel::FileStatusHint statusHin
     return QBrush(Utils::creatorTheme()->color(statusTextColor));
 }
 
-static QList<QStandardItem *> createFileRow(const QString &repositoryRoot,
+static QList<QStandardItem *> createFileRow(const FilePath &repositoryRoot,
                                             const QString &fileName,
                                             const QString &status,
                                             SubmitFileModel::FileStatusHint statusHint,
@@ -67,8 +66,7 @@ static QList<QStandardItem *> createFileRow(const QString &repositoryRoot,
     // For some reason, Windows (at least) requires a valid (existing) file path to the icon, so
     // the repository root is needed here.
     // Note: for "overlaid" icons in Utils::FileIconProvider a valid file path is not required
-    fileItem->setIcon(Utils::FileIconProvider::icon(
-        Utils::FilePath::fromString(repositoryRoot).pathAppended(fileName)));
+    fileItem->setIcon(FileIconProvider::icon(repositoryRoot.pathAppended(fileName)));
     const QList<QStandardItem *> row{statusItem, fileItem};
     if (statusHint != SubmitFileModel::FileStatusUnknown) {
         const QBrush textForeground = fileStatusTextForeground(statusHint);
@@ -97,12 +95,12 @@ SubmitFileModel::SubmitFileModel(QObject *parent) :
     setHorizontalHeaderLabels({tr("State"), tr("File")});
 }
 
-const QString &SubmitFileModel::repositoryRoot() const
+const FilePath &SubmitFileModel::repositoryRoot() const
 {
     return m_repositoryRoot;
 }
 
-void SubmitFileModel::setRepositoryRoot(const QString &repoRoot)
+void SubmitFileModel::setRepositoryRoot(const FilePath &repoRoot)
 {
     m_repositoryRoot = repoRoot;
 }
-- 
cgit v1.2.1