Adapt to upstream change

Change-Id: I78dc0a6a300857cadeb770ad43dc06beca32351b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

5 files changed, 9 insertions, 7 deletions

diff --git a/plugins/fossil/commiteditor.cpp b/plugins/fossil/commiteditor.cpp
index 4ed3370..9b02ab7 100644
--- a/plugins/fossil/commiteditor.cpp
+++ b/plugins/fossil/commiteditor.cpp
@@ -47,7 +47,7 @@ FossilCommitWidget *CommitEditor::commitWidget()
     return static_cast<FossilCommitWidget *>(widget());
 }
 
-void CommitEditor::setFields(const QString &repositoryRoot, const BranchInfo &branch,
+void CommitEditor::setFields(const Utils::FilePath &repositoryRoot, const BranchInfo &branch,
                              const QStringList &tags, const QString &userName,
                              const QList<VcsBase::VcsBaseClient::StatusItem> &repoStatus)
 {
diff --git a/plugins/fossil/commiteditor.h b/plugins/fossil/commiteditor.h
index cb8bbfa..531628f 100644
--- a/plugins/fossil/commiteditor.h
+++ b/plugins/fossil/commiteditor.h
@@ -43,7 +43,7 @@ class CommitEditor : public VcsBase::VcsBaseSubmitEditor
 public:
     CommitEditor();
 
-    void setFields(const QString &repositoryRoot, const BranchInfo &branch,
+    void setFields(const Utils::FilePath &repositoryRoot, const BranchInfo &branch,
                    const QStringList &tags, const QString &userName,
                    const QList<VcsBase::VcsBaseClient::StatusItem> &repoStatus);
 
diff --git a/plugins/fossil/fossilcommitwidget.cpp b/plugins/fossil/fossilcommitwidget.cpp
index beef90f..f45fcac 100644
--- a/plugins/fossil/fossilcommitwidget.cpp
+++ b/plugins/fossil/fossilcommitwidget.cpp
@@ -31,6 +31,7 @@
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/completingtextedit.h>
+#include <utils/filepath.h>
 #include <utils/qtcassert.h>
 
 #include <QDir>
@@ -95,10 +96,10 @@ FossilCommitWidget::FossilCommitWidget() : m_commitPanel(new QWidget)
             this, &FossilCommitWidget::branchChanged);
 }
 
-void FossilCommitWidget::setFields(const QString &repoPath, const BranchInfo &branch,
+void FossilCommitWidget::setFields(const Utils::FilePath &repoPath, const BranchInfo &branch,
                                    const QStringList &tags, const QString &userName)
 {
-    m_commitPanelUi.localRootLineEdit->setText(QDir::toNativeSeparators(repoPath));
+    m_commitPanelUi.localRootLineEdit->setText(repoPath.toUserOutput());
     m_commitPanelUi.currentBranchLineEdit->setText(branch.name);
     const QString tagsText = tags.join(", ");
     m_commitPanelUi.currentTagsLineEdit->setText(tagsText);
diff --git a/plugins/fossil/fossilcommitwidget.h b/plugins/fossil/fossilcommitwidget.h
index aa84e4e..21180d2 100644
--- a/plugins/fossil/fossilcommitwidget.h
+++ b/plugins/fossil/fossilcommitwidget.h
@@ -33,6 +33,7 @@ QT_BEGIN_NAMESPACE
 class QValidator;
 QT_END_NAMESPACE
 
+namespace Utils { class FilePath; }
 
 namespace Fossil {
 namespace Internal {
@@ -50,8 +51,8 @@ class FossilCommitWidget : public VcsBase::SubmitEditorWidget
 public:
     FossilCommitWidget();
 
-    void setFields(const QString &repoPath, const BranchInfo &newBranch, const QStringList &tags,
-                   const QString &userName);
+    void setFields(const Utils::FilePath &repoPath, const BranchInfo &newBranch,
+                   const QStringList &tags, const QString &userName);
 
     QString newBranch() const;
     QStringList tags() const;
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 471912b..3d13f2d 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -728,7 +728,7 @@ void FossilPluginPrivate::showCommitWidget(const QList<VcsBase::VcsBaseClient::S
     QStringList tags = m_client.synchronousTagQuery(m_submitRepository, currentRevision.id);
     // Fossil includes branch name in tag list -- remove.
     tags.removeAll(currentBranch.name);
-    commitEditor->setFields(m_submitRepository.toString(), currentBranch, tags, currentUser, status);
+    commitEditor->setFields(m_submitRepository, currentBranch, tags, currentUser, status);
 
     connect(commitEditor, &VcsBase::VcsBaseSubmitEditor::diffSelectedFiles,
             this, &FossilPluginPrivate::diffFromEditorSelected);