From 5ebe34a33205199bd755283ed0a8c30870dadab8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 17 Jun 2020 23:50:30 +0300 Subject: VCS: Add vcsDescribe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Already exists in all implementations, but there was no common declaration. Change-Id: Ieb3d10d1936c207722b5001712bce41e8114dcdc Reviewed-by: André Hartmann --- src/plugins/clearcase/clearcaseplugin.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/clearcase') diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 12f6ea4de08..7c0c95c6323 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -200,6 +200,7 @@ public: bool vcsCreateRepository(const QString &directory) final; void vcsAnnotate(const QString &file, int line) final; + void vcsDescribe(const QString &source, const QString &changeNr) final; QString vcsOpenText() const final; QString vcsMakeWritableText() const final; @@ -250,7 +251,6 @@ public: const QString &revision = QString(), int lineNumber = -1) const; bool newActivity(); void updateStreamAndView(); - void describe(const QString &source, const QString &changeNr); protected: void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override; @@ -363,19 +363,19 @@ private: VcsEditorFactory logEditorFactory { &logEditorParameters, [] { return new ClearCaseEditorWidget; }, - std::bind(&ClearCasePluginPrivate::describe, this, _1, _2) + std::bind(&ClearCasePluginPrivate::vcsDescribe, this, _1, _2) }; VcsEditorFactory annotateEditorFactory { &annotateEditorParameters, [] { return new ClearCaseEditorWidget; }, - std::bind(&ClearCasePluginPrivate::describe, this, _1, _2) + std::bind(&ClearCasePluginPrivate::vcsDescribe, this, _1, _2) }; VcsEditorFactory diffEditorFactory { &diffEditorParameters, [] { return new ClearCaseEditorWidget; }, - std::bind(&ClearCasePluginPrivate::describe, this, _1, _2) + std::bind(&ClearCasePluginPrivate::vcsDescribe, this, _1, _2) }; friend class ClearCasePlugin; @@ -1605,7 +1605,7 @@ void ClearCasePluginPrivate::vcsAnnotateHelper(const QString &workingDir, const } } -void ClearCasePluginPrivate::describe(const QString &source, const QString &changeNr) +void ClearCasePluginPrivate::vcsDescribe(const QString &source, const QString &changeNr) { const QFileInfo fi(source); QString topLevel; -- cgit v1.2.3