From b1f5b18ac5e545fd8ebbea5b24693e0c7f362573 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 31 Jan 2020 17:21:51 +0100 Subject: [PATCH] Vcs: Provide default implementations for some pure methods Saves empty re-implementations in some cases. Change-Id: I4ffa039d70257f2256942e09fcabe790943e1578 Reviewed-by: Orgad Shaneh --- src/plugins/cvs/cvsplugin.cpp | 4 ---- src/plugins/subversion/subversionclient.cpp | 18 ------------------ src/plugins/subversion/subversionclient.h | 3 --- src/plugins/vcsbase/vcsbaseclient.h | 6 +++--- 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 99a6498e6e3..e6b922409f4 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -196,10 +196,6 @@ public: }); } - QString findTopLevelForFile(const QFileInfo &) const override { return {}; } - QStringList revisionSpec(const QString &) const override { return {}; } - StatusItem parseStatusLine(const QString &) const override { return {}; } - ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override { if (cmd == DiffCommand) { diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 48dd15e7aee..8159bfa5964 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -325,24 +325,6 @@ void SubversionClient::describe(const QString &workingDirectory, int changeNumbe controller->requestReload(); } -QString SubversionClient::findTopLevelForFile(const QFileInfo &file) const -{ - Q_UNUSED(file) - return QString(); -} - -QStringList SubversionClient::revisionSpec(const QString &revision) const -{ - Q_UNUSED(revision) - return QStringList(); -} - -VcsBaseClient::StatusItem SubversionClient::parseStatusLine(const QString &line) const -{ - Q_UNUSED(line) - return VcsBaseClient::StatusItem(); -} - } // namespace Internal } // namespace Subversion diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h index c93445d76aa..5af77fcd1d5 100644 --- a/src/plugins/subversion/subversionclient.h +++ b/src/plugins/subversion/subversionclient.h @@ -62,9 +62,6 @@ public: bool enableAnnotationContextMenu = false) override; void describe(const QString &workingDirectory, int changeNumber, const QString &title); - QString findTopLevelForFile(const QFileInfo &file) const override; - QStringList revisionSpec(const QString &revision) const override; - StatusItem parseStatusLine(const QString &line) const override; // Add authorization options to the command line arguments. static QStringList addAuthenticationOptions(const VcsBase::VcsBaseClientSettings &settings); diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index f538dfc16e8..164838fb9f2 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -192,7 +192,7 @@ public: const QString &commitMessageFile, const QStringList &extraOptions = QStringList()); - virtual QString findTopLevelForFile(const QFileInfo &file) const = 0; + virtual QString findTopLevelForFile(const QFileInfo &/*file*/) const { return {}; } virtual void view(const QString &source, const QString &id, const QStringList &extraOptions = QStringList()); @@ -226,13 +226,13 @@ protected: virtual Core::Id vcsEditorKind(VcsCommandTag cmd) const = 0; virtual Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const; - virtual QStringList revisionSpec(const QString &revision) const = 0; + virtual QStringList revisionSpec(const QString &/*revision*/) const { return {}; } typedef std::function ConfigCreator; void setDiffConfigCreator(ConfigCreator creator); void setLogConfigCreator(ConfigCreator creator); - virtual StatusItem parseStatusLine(const QString &line) const = 0; + virtual StatusItem parseStatusLine(const QString &/*line*/) const { return {}; } QString vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const;