From a693bd97efa87c0221d19c2237705628f614306a Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 20 Oct 2016 12:38:50 +0200 Subject: [PATCH] VCS: "final"-ize IVersionControl implementations Change-Id: I123a8da9b08b2fe5de679d5caac7fa20bfb0ef4a Reviewed-by: Orgad Shaneh --- src/plugins/bazaar/bazaarcontrol.h | 26 +++++++------- src/plugins/clearcase/clearcasecontrol.h | 34 +++++++++---------- src/plugins/cvs/cvscontrol.h | 30 ++++++++-------- src/plugins/git/gitversioncontrol.h | 30 ++++++++-------- src/plugins/mercurial/mercurialcontrol.h | 26 +++++++------- src/plugins/perforce/perforceversioncontrol.h | 32 ++++++++--------- src/plugins/subversion/subversioncontrol.h | 26 +++++++------- 7 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h index 3b0be48097d..9ecb827d363 100644 --- a/src/plugins/bazaar/bazaarcontrol.h +++ b/src/plugins/bazaar/bazaarcontrol.h @@ -45,24 +45,24 @@ class BazaarControl: public Core::IVersionControl public: explicit BazaarControl(BazaarClient *bazaarClient); - QString displayName() const override; - Core::Id id() const override; + QString displayName() const final; + Core::Id id() const final; - bool managesDirectory(const QString &filename, QString *topLevel = 0) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; - bool isConfigured() const override; - bool supportsOperation(Operation operation) const override; - bool vcsOpen(const QString &fileName) override; - bool vcsAdd(const QString &filename) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; - bool vcsAnnotate(const QString &file, int line) override; + bool managesDirectory(const QString &filename, QString *topLevel = 0) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; + bool isConfigured() const final; + bool supportsOperation(Operation operation) const final; + bool vcsOpen(const QString &fileName) final; + bool vcsAdd(const QString &filename) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; + bool vcsAnnotate(const QString &file, int line) final; Core::ShellCommand *createInitialCheckoutCommand(const QString &url, const Utils::FileName &baseDirectory, const QString &localName, - const QStringList &extraArgs) override; + const QStringList &extraArgs) final; // To be connected to the VCSTask's success signal to emit the repository/ // files changed signals according to the variant's type: diff --git a/src/plugins/clearcase/clearcasecontrol.h b/src/plugins/clearcase/clearcasecontrol.h index fbcee6b88c3..050a4bd23ea 100644 --- a/src/plugins/clearcase/clearcasecontrol.h +++ b/src/plugins/clearcase/clearcasecontrol.h @@ -39,28 +39,28 @@ class ClearCaseControl : public Core::IVersionControl Q_OBJECT public: explicit ClearCaseControl(ClearCasePlugin *plugin); - QString displayName() const override; - Core::Id id() const override; + QString displayName() const final; + Core::Id id() const final; - bool managesDirectory(const QString &directory, QString *topLevel = 0) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; + bool managesDirectory(const QString &directory, QString *topLevel = 0) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; - bool isConfigured() const override; + bool isConfigured() const final; - bool supportsOperation(Operation operation) const override; - OpenSupportMode openSupportMode(const QString &fileName) const override; - bool vcsOpen(const QString &fileName) override; - SettingsFlags settingsFlags() const override; - bool vcsAdd(const QString &fileName) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; + bool supportsOperation(Operation operation) const final; + OpenSupportMode openSupportMode(const QString &fileName) const final; + bool vcsOpen(const QString &fileName) final; + SettingsFlags settingsFlags() const final; + bool vcsAdd(const QString &fileName) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; - bool vcsAnnotate(const QString &file, int line) override; + bool vcsAnnotate(const QString &file, int line) final; - QString vcsOpenText() const override; - QString vcsMakeWritableText() const override; - QString vcsTopic(const QString &directory) override; + QString vcsOpenText() const final; + QString vcsMakeWritableText() const final; + QString vcsTopic(const QString &directory) final; void emitRepositoryChanged(const QString &); void emitFilesChanged(const QStringList &); diff --git a/src/plugins/cvs/cvscontrol.h b/src/plugins/cvs/cvscontrol.h index ea9d94ccf7b..5e2c2a6a1b7 100644 --- a/src/plugins/cvs/cvscontrol.h +++ b/src/plugins/cvs/cvscontrol.h @@ -39,28 +39,28 @@ class CvsControl : public Core::IVersionControl public: explicit CvsControl(CvsPlugin *plugin); - QString displayName() const override; - Core::Id id() const override; + QString displayName() const final; + Core::Id id() const final; - bool managesDirectory(const QString &directory, QString *topLevel = 0) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; + bool managesDirectory(const QString &directory, QString *topLevel = 0) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; - bool isConfigured() const override; - bool supportsOperation(Operation operation) const override; - OpenSupportMode openSupportMode(const QString &fileName) const override; - bool vcsOpen(const QString &fileName) override; - bool vcsAdd(const QString &fileName) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; - bool vcsAnnotate(const QString &file, int line) override; + bool isConfigured() const final; + bool supportsOperation(Operation operation) const final; + OpenSupportMode openSupportMode(const QString &fileName) const final; + bool vcsOpen(const QString &fileName) final; + bool vcsAdd(const QString &fileName) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; + bool vcsAnnotate(const QString &file, int line) final; - QString vcsOpenText() const override; + QString vcsOpenText() const final; Core::ShellCommand *createInitialCheckoutCommand(const QString &url, const Utils::FileName &baseDirectory, const QString &localName, - const QStringList &extraArgs) override; + const QStringList &extraArgs) final; void emitRepositoryChanged(const QString &s); void emitFilesChanged(const QStringList &l); diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h index b46ee90484c..c0f75fa9ca5 100644 --- a/src/plugins/git/gitversioncontrol.h +++ b/src/plugins/git/gitversioncontrol.h @@ -39,29 +39,29 @@ class GitVersionControl : public Core::IVersionControl public: explicit GitVersionControl(GitClient *client); - QString displayName() const override; - Core::Id id() const override; + QString displayName() const final; + Core::Id id() const final; - bool managesDirectory(const QString &directory, QString *topLevel) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; + bool managesDirectory(const QString &directory, QString *topLevel) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; - bool isConfigured() const override; - bool supportsOperation(Operation operation) const override; - bool vcsOpen(const QString &fileName) override; - bool vcsAdd(const QString &fileName) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; + bool isConfigured() const final; + bool supportsOperation(Operation operation) const final; + bool vcsOpen(const QString &fileName) final; + bool vcsAdd(const QString &fileName) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; - bool vcsAnnotate(const QString &file, int line) override; - QString vcsTopic(const QString &directory) override; + bool vcsAnnotate(const QString &file, int line) final; + QString vcsTopic(const QString &directory) final; Core::ShellCommand *createInitialCheckoutCommand(const QString &url, const Utils::FileName &baseDirectory, const QString &localName, - const QStringList &extraArgs) override; + const QStringList &extraArgs) final; - QStringList additionalToolsPath() const override; + QStringList additionalToolsPath() const final; void emitFilesChanged(const QStringList &); void emitRepositoryChanged(const QString &); diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h index f9cf123fe27..b9bc590a4e8 100644 --- a/src/plugins/mercurial/mercurialcontrol.h +++ b/src/plugins/mercurial/mercurialcontrol.h @@ -45,23 +45,23 @@ class MercurialControl : public Core::IVersionControl public: explicit MercurialControl(MercurialClient *mercurialClient); - QString displayName() const override; - Core::Id id() const override; - bool managesDirectory(const QString &filename, QString *topLevel = 0) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; - bool isConfigured() const override; - bool supportsOperation(Operation operation) const override; - bool vcsOpen(const QString &fileName) override; - bool vcsAdd(const QString &filename) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; - bool vcsAnnotate(const QString &file, int line) override; + QString displayName() const final; + Core::Id id() const final; + bool managesDirectory(const QString &filename, QString *topLevel = 0) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; + bool isConfigured() const final; + bool supportsOperation(Operation operation) const final; + bool vcsOpen(const QString &fileName) final; + bool vcsAdd(const QString &filename) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; + bool vcsAnnotate(const QString &file, int line) final; Core::ShellCommand *createInitialCheckoutCommand(const QString &url, const Utils::FileName &baseDirectory, const QString &localName, - const QStringList &extraArgs) override; + const QStringList &extraArgs) final; bool sccManaged(const QString &filename); diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h index 5ca6c7b20e8..52670f637aa 100644 --- a/src/plugins/perforce/perforceversioncontrol.h +++ b/src/plugins/perforce/perforceversioncontrol.h @@ -38,24 +38,24 @@ class PerforceVersionControl : public Core::IVersionControl public: explicit PerforceVersionControl(PerforcePlugin *plugin); - QString displayName() const override; - Core::Id id() const override; + QString displayName() const final; + Core::Id id() const final; - bool managesDirectory(const QString &directory, QString *topLevel = 0) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; + bool managesDirectory(const QString &directory, QString *topLevel = 0) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; - bool isConfigured() const override; - bool supportsOperation(Operation operation) const override; - OpenSupportMode openSupportMode(const QString &fileName) const override; - bool vcsOpen(const QString &fileName) override; - SettingsFlags settingsFlags() const override; - bool vcsAdd(const QString &fileName) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; - bool vcsAnnotate(const QString &file, int line) override; - QString vcsOpenText() const override; - QString vcsMakeWritableText() const override; + bool isConfigured() const final; + bool supportsOperation(Operation operation) const final; + OpenSupportMode openSupportMode(const QString &fileName) const final; + bool vcsOpen(const QString &fileName) final; + SettingsFlags settingsFlags() const final; + bool vcsAdd(const QString &fileName) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; + bool vcsAnnotate(const QString &file, int line) final; + QString vcsOpenText() const final; + QString vcsMakeWritableText() const final; void emitRepositoryChanged(const QString &s); void emitFilesChanged(const QStringList &l); diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h index 9f244fd5298..3fa0c35e1d8 100644 --- a/src/plugins/subversion/subversioncontrol.h +++ b/src/plugins/subversion/subversioncontrol.h @@ -38,26 +38,26 @@ class SubversionControl : public Core::IVersionControl Q_OBJECT public: explicit SubversionControl(SubversionPlugin *plugin); - QString displayName() const override; - Core::Id id() const override; + QString displayName() const final; + Core::Id id() const final; - bool managesDirectory(const QString &directory, QString *topLevel = 0) const override; - bool managesFile(const QString &workingDirectory, const QString &fileName) const override; + bool managesDirectory(const QString &directory, QString *topLevel = 0) const final; + bool managesFile(const QString &workingDirectory, const QString &fileName) const final; - bool isConfigured() const override; - bool supportsOperation(Operation operation) const override; - bool vcsOpen(const QString &fileName) override; - bool vcsAdd(const QString &fileName) override; - bool vcsDelete(const QString &filename) override; - bool vcsMove(const QString &from, const QString &to) override; - bool vcsCreateRepository(const QString &directory) override; + bool isConfigured() const final; + bool supportsOperation(Operation operation) const final; + bool vcsOpen(const QString &fileName) final; + bool vcsAdd(const QString &fileName) final; + bool vcsDelete(const QString &filename) final; + bool vcsMove(const QString &from, const QString &to) final; + bool vcsCreateRepository(const QString &directory) final; - bool vcsAnnotate(const QString &file, int line) override; + bool vcsAnnotate(const QString &file, int line) final; Core::ShellCommand *createInitialCheckoutCommand(const QString &url, const Utils::FileName &baseDirectory, const QString &localName, - const QStringList &extraArgs) override; + const QStringList &extraArgs) final; void emitRepositoryChanged(const QString &); void emitFilesChanged(const QStringList &);