From 9b121e3df0ebb148c2b34bcc66f262bf1a726d9c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 8 Apr 2011 13:42:49 +0200
Subject: [PATCH] Bazaar: Remove unnecessary virtuals
Remove unnecessary virtuals and whitespaces
---
src/plugins/bazaar/bazaarclient.h | 54 +++++++++++++++----------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 79ad273241b..2b2ab9328d2 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -75,40 +75,40 @@ public:
bool synchronousSetUserId();
BranchInfo synchronousBranchQuery(const QString &repositoryRoot) const;
- virtual QString findTopLevelForFile(const QFileInfo &file) const;
+ QString findTopLevelForFile(const QFileInfo &file) const;
private slots:
void bazaarDiff(const Bazaar::Internal::BazaarDiffParameters &p);
protected:
- virtual QString vcsEditorKind(VCSCommand cmd) const;
+ QString vcsEditorKind(VCSCommand cmd) const;
- virtual QStringList cloneArguments(const QString &srcLocation,
- const QString &dstLocation,
- const ExtraCommandOptions &extraOptions) const;
- virtual QStringList pullArguments(const QString &srcLocation,
- const ExtraCommandOptions &extraOptions) const;
- virtual QStringList pushArguments(const QString &dstLocation,
- const ExtraCommandOptions &extraOptions) const;
- virtual QStringList commitArguments(const QStringList &files,
- const QString &commitMessageFile,
- const ExtraCommandOptions &extraOptions) const;
- virtual QStringList importArguments(const QStringList &files) const;
- virtual QStringList updateArguments(const QString &revision) const;
- virtual QStringList revertArguments(const QString &file, const QString &revision) const;
- virtual QStringList revertAllArguments(const QString &revision) const;
- virtual QStringList annotateArguments(const QString &file,
- const QString &revision, int lineNumber) const;
- virtual QStringList diffArguments(const QStringList &files,
- const ExtraCommandOptions &extraOptions) const;
- virtual void initializeDiffEditor(const QString &workingDir, const QStringList &files,
- const VCSBase::VCSBaseClient::ExtraCommandOptions &extra,
- VCSBase::VCSBaseEditorWidget *diffEditorWidget);
- virtual QStringList logArguments(const QStringList &files) const;
- virtual QStringList statusArguments(const QString &file) const;
- virtual QStringList viewArguments(const QString &revision) const;
+ QStringList cloneArguments(const QString &srcLocation,
+ const QString &dstLocation,
+ const ExtraCommandOptions &extraOptions) const;
+ QStringList pullArguments(const QString &srcLocation,
+ const ExtraCommandOptions &extraOptions) const;
+ QStringList pushArguments(const QString &dstLocation,
+ const ExtraCommandOptions &extraOptions) const;
+ QStringList commitArguments(const QStringList &files,
+ const QString &commitMessageFile,
+ const ExtraCommandOptions &extraOptions) const;
+ QStringList importArguments(const QStringList &files) const;
+ QStringList updateArguments(const QString &revision) const;
+ QStringList revertArguments(const QString &file, const QString &revision) const;
+ QStringList revertAllArguments(const QString &revision) const;
+ QStringList annotateArguments(const QString &file,
+ const QString &revision, int lineNumber) const;
+ QStringList diffArguments(const QStringList &files,
+ const ExtraCommandOptions &extraOptions) const;
+ void initializeDiffEditor(const QString &workingDir, const QStringList &files,
+ const VCSBase::VCSBaseClient::ExtraCommandOptions &extra,
+ VCSBase::VCSBaseEditorWidget *diffEditorWidget);
+ QStringList logArguments(const QStringList &files) const;
+ QStringList statusArguments(const QString &file) const;
+ QStringList viewArguments(const QString &revision) const;
- virtual QPair<QString, QString> parseStatusLine(const QString &line) const;
+ QPair<QString, QString> parseStatusLine(const QString &line) const;
private:
QStringList commonPullOrPushArguments(const ExtraCommandOptions &extraOptions) const;
friend class CloneWizard;
--
GitLab