feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt to upstream change

Browse Source 
Change-Id: I78dc0a6a300857cadeb770ad43dc06beca32351b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2022-11-11 08:15:45 +01:00
parent 267bfdb0f9
commit 06191a5883
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/fossil/commiteditor.cpp
View File

@@ -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)
{

2
plugins/fossil/commiteditor.h
View File

@@ -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);

5
plugins/fossil/fossilcommitwidget.cpp
View File

@@ -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);

5
plugins/fossil/fossilcommitwidget.h
View File

@@ -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;

2
plugins/fossil/fossilplugin.cpp
View File

@@ -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);