diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-06-17 23:50:30 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2020-06-18 05:17:59 +0000 |
commit | 5ebe34a33205199bd755283ed0a8c30870dadab8 (patch) | |
tree | 2a3c4429728f4cc6fe66e5bc1997dc6761164c5a /src/plugins/perforce | |
parent | e9df7825fa8a8714c3623154f1fc3cf13066a9a4 (diff) |
VCS: Add vcsDescribe
Already exists in all implementations, but there was no common declaration.
Change-Id: Ieb3d10d1936c207722b5001712bce41e8114dcdc
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r-- | src/plugins/perforce/perforceplugin.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index ee31ca5cec..a04394e90d 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -224,6 +224,7 @@ public: bool vcsMove(const QString &from, const QString &to) final; bool vcsCreateRepository(const QString &directory) final; void vcsAnnotate(const QString &file, int line) final; + void vcsDescribe(const QString &source, const QString &n) final; QString vcsOpenText() const final; QString vcsMakeWritableText() const final; @@ -237,7 +238,6 @@ public: IEditor *openPerforceSubmitEditor(const QString &fileName, const QStringList &depotFileNames); - void describe(const QString &source, const QString &n); void getTopLevel(const QString &workingDirectory = QString(), bool isSync = false); void updateActions(ActionState) override; @@ -371,19 +371,19 @@ public: VcsEditorFactory logEditorFactory { &logEditorParameters, [] { return new PerforceEditorWidget; }, - std::bind(&PerforcePluginPrivate::describe, this, _1, _2) + std::bind(&PerforcePluginPrivate::vcsDescribe, this, _1, _2) }; VcsEditorFactory annotateEditorFactory { &annotateEditorParameters, [] { return new PerforceEditorWidget; }, - std::bind(&PerforcePluginPrivate::describe, this, _1, _2) + std::bind(&PerforcePluginPrivate::vcsDescribe, this, _1, _2) }; VcsEditorFactory diffEditorFactory { &diffEditorParameters, [] { return new PerforceEditorWidget; }, - std::bind(&PerforcePluginPrivate::describe, this, _1, _2) + std::bind(&PerforcePluginPrivate::vcsDescribe, this, _1, _2) }; }; @@ -824,7 +824,7 @@ void PerforcePluginPrivate::describeChange() { ChangeNumberDialog dia; if (dia.exec() == QDialog::Accepted && dia.number() > 0) - describe(QString(), QString::number(dia.number())); + vcsDescribe(QString(), QString::number(dia.number())); } void PerforcePluginPrivate::annotateCurrentFile() @@ -1539,7 +1539,7 @@ void PerforcePluginPrivate::p4Diff(const PerforceDiffParameters &p) diffEditorWidget->setEditorConfig(pw); } -void PerforcePluginPrivate::describe(const QString & source, const QString &n) +void PerforcePluginPrivate::vcsDescribe(const QString & source, const QString &n) { QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(nullptr) : VcsBaseEditor::getCodec(source); |