diff --git a/plugins/fossil/commiteditor.cpp b/plugins/fossil/commiteditor.cpp index 4ed3370541a..9b02ab7a30a 100644 --- a/plugins/fossil/commiteditor.cpp +++ b/plugins/fossil/commiteditor.cpp @@ -47,7 +47,7 @@ FossilCommitWidget *CommitEditor::commitWidget() return static_cast(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 &repoStatus) { diff --git a/plugins/fossil/commiteditor.h b/plugins/fossil/commiteditor.h index cb8bbfa289e..531628f8cc1 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 &repoStatus); diff --git a/plugins/fossil/fossilcommitwidget.cpp b/plugins/fossil/fossilcommitwidget.cpp index beef90fb5dd..f45fcacde86 100644 --- a/plugins/fossil/fossilcommitwidget.cpp +++ b/plugins/fossil/fossilcommitwidget.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -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 aa84e4eee8f..21180d28357 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 471912b0b24..3d13f2de94a 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -728,7 +728,7 @@ void FossilPluginPrivate::showCommitWidget(const QListsetFields(m_submitRepository.toString(), currentBranch, tags, currentUser, status); + commitEditor->setFields(m_submitRepository, currentBranch, tags, currentUser, status); connect(commitEditor, &VcsBase::VcsBaseSubmitEditor::diffSelectedFiles, this, &FossilPluginPrivate::diffFromEditorSelected);