From 9417bea9acd7184b33adc176c1c5b507126b0c69 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 17 Jan 2013 21:51:27 +0200
Subject: [PATCH] VCS: Remove superfluous virtual
Change-Id: I105057202091f4b90f7f50eefb3506ee56d4bc1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/bazaar/annotationhighlighter.h | 2 +-
src/plugins/bazaar/bazaarcommitwidget.cpp | 2 +-
src/plugins/bazaar/bazaarcontrol.h | 2 +-
src/plugins/bazaar/bazaareditor.h | 10 +++++-----
src/plugins/bazaar/bazaarplugin.h | 2 +-
src/plugins/clearcase/annotationhighlighter.h | 2 +-
src/plugins/clearcase/clearcasesubmiteditor.h | 2 +-
src/plugins/cvs/cvsplugin.h | 6 +++---
src/plugins/git/annotationhighlighter.h | 2 +-
src/plugins/git/clonewizard.h | 12 ++++++------
src/plugins/git/clonewizardpage.h | 6 +++---
src/plugins/git/gitorious/gitoriousclonewizard.cpp | 2 +-
src/plugins/git/gitorious/gitoriousclonewizard.h | 12 ++++++------
.../git/gitorious/gitorioushostwizardpage.h | 4 ++--
src/plugins/git/gitorious/gitoriousprojectwidget.h | 2 +-
.../git/gitorious/gitoriousprojectwizardpage.h | 4 ++--
.../git/gitorious/gitoriousrepositorywizardpage.h | 4 ++--
src/plugins/git/gitplugin.h | 6 +++---
src/plugins/git/gitsubmiteditor.cpp | 2 +-
src/plugins/git/gitsubmiteditorwidget.cpp | 2 +-
src/plugins/git/mergetool.cpp | 2 +-
src/plugins/git/remotedialog.h | 2 +-
src/plugins/mercurial/annotationhighlighter.h | 2 +-
src/plugins/mercurial/mercurialclient.h | 8 ++++----
src/plugins/mercurial/mercurialcommitwidget.cpp | 2 +-
src/plugins/mercurial/mercurialcontrol.h | 2 +-
src/plugins/mercurial/mercurialeditor.h | 14 +++++++-------
src/plugins/mercurial/mercurialplugin.h | 6 +++---
src/plugins/perforce/annotationhighlighter.h | 2 +-
src/plugins/perforce/perforcechecker.h | 2 +-
src/plugins/perforce/perforceeditor.h | 12 ++++++------
src/plugins/perforce/perforceplugin.h | 4 ++--
src/plugins/subversion/annotationhighlighter.h | 2 +-
src/plugins/subversion/checkoutwizard.h | 12 ++++++------
src/plugins/subversion/checkoutwizardpage.h | 2 +-
src/plugins/subversion/subversioneditor.h | 12 ++++++------
src/plugins/subversion/subversionplugin.h | 8 ++++----
37 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h
index f60c5ba4d30..07ca1b7301f 100644
--- a/src/plugins/bazaar/annotationhighlighter.h
+++ b/src/plugins/bazaar/annotationhighlighter.h
@@ -42,7 +42,7 @@ public:
QTextDocument *document = 0);
private:
- virtual QString changeNumber(const QString &block) const;
+ QString changeNumber(const QString &block) const;
mutable QRegExp m_changeset;
};
diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp
index d55ece70e92..74988b85c69 100644
--- a/src/plugins/bazaar/bazaarcommitwidget.cpp
+++ b/src/plugins/bazaar/bazaarcommitwidget.cpp
@@ -61,7 +61,7 @@ class BazaarSubmitHighlighter : QSyntaxHighlighter
{
public:
explicit BazaarSubmitHighlighter(QTextEdit *parent);
- virtual void highlightBlock(const QString &text);
+ void highlightBlock(const QString &text);
private:
enum State { Header, Comment, Other };
diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h
index 361868ba0e6..632db28bf35 100644
--- a/src/plugins/bazaar/bazaarcontrol.h
+++ b/src/plugins/bazaar/bazaarcontrol.h
@@ -66,7 +66,7 @@ public:
QStringList vcsSnapshots(const QString &topLevel);
bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
- virtual bool vcsAnnotate(const QString &file, int line);
+ bool vcsAnnotate(const QString &file, int line);
public slots:
// To be connected to the VCSTask's success signal to emit the repository/
diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h
index 772ae1b7f91..b82208aeb5c 100644
--- a/src/plugins/bazaar/bazaareditor.h
+++ b/src/plugins/bazaar/bazaareditor.h
@@ -44,11 +44,11 @@ public:
explicit BazaarEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent);
private:
- virtual QSet<QString> annotationChanges() const;
- virtual QString changeUnderCursor(const QTextCursor &cursor) const;
- virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
- virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
- virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
+ QSet<QString> annotationChanges() const;
+ QString changeUnderCursor(const QTextCursor &cursor) const;
+ VcsBase::DiffHighlighter *createDiffHighlighter() const;
+ VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
+ QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
mutable QRegExp m_changesetId;
mutable QRegExp m_exactChangesetId;
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index 1b97763bbbf..ff6b6fbbd76 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -80,7 +80,7 @@ class BazaarPlugin : public VcsBase::VcsBasePlugin
public:
BazaarPlugin();
- virtual ~BazaarPlugin();
+ ~BazaarPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
static BazaarPlugin *instance();
diff --git a/src/plugins/clearcase/annotationhighlighter.h b/src/plugins/clearcase/annotationhighlighter.h
index 22c624b93d5..66f9d593105 100644
--- a/src/plugins/clearcase/annotationhighlighter.h
+++ b/src/plugins/clearcase/annotationhighlighter.h
@@ -45,7 +45,7 @@ public:
QTextDocument *document = 0);
private:
- virtual QString changeNumber(const QString &block) const;
+ QString changeNumber(const QString &block) const;
const QChar m_separator;
};
diff --git a/src/plugins/clearcase/clearcasesubmiteditor.h b/src/plugins/clearcase/clearcasesubmiteditor.h
index c49b63fda37..f980964ec7d 100644
--- a/src/plugins/clearcase/clearcasesubmiteditor.h
+++ b/src/plugins/clearcase/clearcasesubmiteditor.h
@@ -55,7 +55,7 @@ public:
void setIsUcm(bool isUcm);
protected:
- virtual QByteArray fileContents() const;
+ QByteArray fileContents() const;
};
diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h
index 4a29ef0902b..ed326f3bc96 100644
--- a/src/plugins/cvs/cvsplugin.h
+++ b/src/plugins/cvs/cvsplugin.h
@@ -77,7 +77,7 @@ public:
CvsPlugin();
~CvsPlugin();
- virtual bool initialize(const QStringList &arguments, QString *errorMessage);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void cvsDiff(const QString &workingDir, const QStringList &files);
@@ -125,8 +125,8 @@ private slots:
void cvsDiff(const Cvs::Internal::CvsDiffParameters &p);
protected:
- virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
- virtual bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
+ void updateActions(VcsBase::VcsBasePlugin::ActionState);
+ bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private:
bool isCommitEditorOpen() const;
diff --git a/src/plugins/git/annotationhighlighter.h b/src/plugins/git/annotationhighlighter.h
index 1047263c24a..fbaf4c3082f 100644
--- a/src/plugins/git/annotationhighlighter.h
+++ b/src/plugins/git/annotationhighlighter.h
@@ -44,7 +44,7 @@ public:
QTextDocument *document = 0);
private:
- virtual QString changeNumber(const QString &block) const;
+ QString changeNumber(const QString &block) const;
const QChar m_blank;
};
diff --git a/src/plugins/git/clonewizard.h b/src/plugins/git/clonewizard.h
index 11c8954ccfa..b89d432f8f5 100644
--- a/src/plugins/git/clonewizard.h
+++ b/src/plugins/git/clonewizard.h
@@ -42,15 +42,15 @@ public:
explicit CloneWizard(QObject *parent = 0);
// IWizard
- virtual QIcon icon() const;
- virtual QString description() const;
- virtual QString displayName() const;
+ QIcon icon() const;
+ QString description() const;
+ QString displayName() const;
protected:
// BaseCheckoutWizard
- virtual QList<QWizardPage*> createParameterPages(const QString &path);
- virtual QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> ¶meterPages,
- QString *checkoutPath);
+ QList<QWizardPage*> createParameterPages(const QString &path);
+ QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> ¶meterPages,
+ QString *checkoutPath);
};
} // namespace Internal
diff --git a/src/plugins/git/clonewizardpage.h b/src/plugins/git/clonewizardpage.h
index 2b991cb006f..62214c7a319 100644
--- a/src/plugins/git/clonewizardpage.h
+++ b/src/plugins/git/clonewizardpage.h
@@ -49,13 +49,13 @@ class CloneWizardPage : public VcsBase::BaseCheckoutWizardPage
Q_PROPERTY(bool deleteMasterBranch READ deleteMasterBranch WRITE setDeleteMasterBranch)
public:
explicit CloneWizardPage(QWidget *parent = 0);
- virtual ~CloneWizardPage();
+ ~CloneWizardPage();
QSharedPointer<VcsBase::AbstractCheckoutJob> createCheckoutJob(QString *checkoutPath) const;
protected:
- virtual QString directoryFromRepository(const QString &r) const;
- virtual QStringList branches(const QString &repository, int *current);
+ QString directoryFromRepository(const QString &r) const;
+ QStringList branches(const QString &repository, int *current);
bool deleteMasterBranch() const;
void setDeleteMasterBranch(bool v);
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
index eeefb55ce2f..91440da17ab 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
@@ -53,7 +53,7 @@ namespace Internal {
class GitoriousCloneWizardPage : public Git::CloneWizardPage {
public:
explicit GitoriousCloneWizardPage(const GitoriousRepositoryWizardPage *rp, QWidget *parent = 0);
- virtual void initializePage();
+ void initializePage();
private:
const GitoriousRepositoryWizardPage *m_repositoryPage;
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.h b/src/plugins/git/gitorious/gitoriousclonewizard.h
index 0b05e1fa6ff..84d11b4c7bb 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.h
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.h
@@ -44,15 +44,15 @@ public:
explicit GitoriousCloneWizard(QObject *parent = 0);
// IWizard
- virtual QIcon icon() const;
- virtual QString description() const;
- virtual QString displayName() const;
+ QIcon icon() const;
+ QString description() const;
+ QString displayName() const;
protected:
// BaseCheckoutWizard
- virtual QList<QWizardPage*> createParameterPages(const QString &path);
- virtual QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> ¶meterPages,
- QString *checkoutPath);
+ QList<QWizardPage*> createParameterPages(const QString &path);
+ QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> ¶meterPages,
+ QString *checkoutPath);
};
} // namespace Internal
diff --git a/src/plugins/git/gitorious/gitorioushostwizardpage.h b/src/plugins/git/gitorious/gitorioushostwizardpage.h
index 51cd2a847b6..5bf5b01f2e2 100644
--- a/src/plugins/git/gitorious/gitorioushostwizardpage.h
+++ b/src/plugins/git/gitorious/gitorioushostwizardpage.h
@@ -43,9 +43,9 @@ class GitoriousHostWizardPage : public QWizardPage {
Q_OBJECT
public:
GitoriousHostWizardPage(QWidget *parent = 0);
- virtual ~GitoriousHostWizardPage();
+ ~GitoriousHostWizardPage();
- virtual bool isComplete() const;
+ bool isComplete() const;
int selectedHostIndex() const;
diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.h b/src/plugins/git/gitorious/gitoriousprojectwidget.h
index eea472c878f..4199d601193 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.h
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.h
@@ -63,7 +63,7 @@ public:
QWidget *parent = 0);
~GitoriousProjectWidget();
- virtual bool isValid() const;
+ bool isValid() const;
QSharedPointer<GitoriousProject> project() const;
diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h
index 2296ee47905..d4611b357bb 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h
+++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h
@@ -61,8 +61,8 @@ public:
explicit GitoriousProjectWizardPage(const GitoriousHostWizardPage *hostPage,
QWidget *parent = 0);
- virtual void initializePage();
- virtual bool isComplete() const;
+ void initializePage();
+ bool isComplete() const;
QSharedPointer<GitoriousProject> project() const;
int selectedHostIndex() const;
diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
index 75c31a746b1..11f2aa6f680 100644
--- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
+++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
@@ -58,8 +58,8 @@ public:
QWidget *parent = 0);
~GitoriousRepositoryWizardPage();
- virtual void initializePage();
- virtual bool isComplete() const;
+ void initializePage();
+ bool isComplete() const;
QString repositoryName() const;
QUrl repositoryURL() const;
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index dc9ca7f20e0..1d8d1f72416 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -91,7 +91,7 @@ public:
static GitPlugin *instance();
- virtual bool initialize(const QStringList &arguments, QString *errorMessage);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
GitVersionControl *gitVersionControl() const;
@@ -141,8 +141,8 @@ private slots:
void testStatusParsing();
#endif
protected:
- virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
- virtual bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
+ void updateActions(VcsBase::VcsBasePlugin::ActionState);
+ bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private:
inline ParameterActionCommandPair
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 0c2acf67580..34863efcdec 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -51,7 +51,7 @@ public:
GitSubmitFileModel(QObject *parent = 0) : VcsBase::SubmitFileModel(parent)
{ }
- virtual void updateSelections(SubmitFileModel *source)
+ void updateSelections(SubmitFileModel *source)
{
int j = 0;
for (int i = 0; i < rowCount() && j < source->rowCount(); ++i) {
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index f34062c7ec8..f35b9b98aee 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -61,7 +61,7 @@ static QTextCharFormat commentFormat()
class GitSubmitHighlighter : QSyntaxHighlighter {
public:
explicit GitSubmitHighlighter(QTextEdit *parent);
- virtual void highlightBlock(const QString &text);
+ void highlightBlock(const QString &text);
private:
enum State { Header, Comment, Other };
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 6b3e76ae0fb..86713de89cb 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -59,7 +59,7 @@ protected:
return res;
}
- virtual qint64 writeData(const char *data, qint64 len)
+ qint64 writeData(const char *data, qint64 len)
{
if (len > 0)
m_window->append(QString::fromLocal8Bit(data, len));
diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h
index 0af701a0763..91f60a281d0 100644
--- a/src/plugins/git/remotedialog.h
+++ b/src/plugins/git/remotedialog.h
@@ -89,7 +89,7 @@ public slots:
private slots:
protected:
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e);
private:
Ui::RemoteDialog *m_ui;
diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h
index aca9c4a97bd..a38e10c6d13 100644
--- a/src/plugins/mercurial/annotationhighlighter.h
+++ b/src/plugins/mercurial/annotationhighlighter.h
@@ -43,7 +43,7 @@ public:
QTextDocument *document = 0);
private:
- virtual QString changeNumber(const QString &block) const;
+ QString changeNumber(const QString &block) const;
mutable QRegExp changeset;
};
diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h
index 8ab6a274b3a..8b051d4545a 100644
--- a/src/plugins/mercurial/mercurialclient.h
+++ b/src/plugins/mercurial/mercurialclient.h
@@ -45,10 +45,10 @@ public:
MercurialSettings *settings() const;
- virtual bool synchronousClone(const QString &workingDir,
- const QString &srcLocation,
- const QString &dstLocation,
- const QStringList &extraOptions = QStringList());
+ bool synchronousClone(const QString &workingDir,
+ const QString &srcLocation,
+ const QString &dstLocation,
+ const QStringList &extraOptions = QStringList());
bool manifestSync(const QString &repository, const QString &filename);
QString branchQuerySync(const QString &repositoryRoot);
QStringList parentRevisionsSync(const QString &workingDirectory,
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index bb14eb68060..eaea3a399ad 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -61,7 +61,7 @@ class MercurialSubmitHighlighter : QSyntaxHighlighter
{
public:
explicit MercurialSubmitHighlighter(QTextEdit *parent);
- virtual void highlightBlock(const QString &text);
+ void highlightBlock(const QString &text);
private:
enum State { Header, Comment, Other };
diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h
index 39202c48dd4..86449103093 100644
--- a/src/plugins/mercurial/mercurialcontrol.h
+++ b/src/plugins/mercurial/mercurialcontrol.h
@@ -67,7 +67,7 @@ public:
bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
bool sccManaged(const QString &filename);
- virtual bool vcsAnnotate(const QString &file, int line);
+ bool vcsAnnotate(const QString &file, int line);
public slots:
// To be connected to the HgTask's success signal to emit the repository/
diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h
index 57c38a9eacc..cde52c086cc 100644
--- a/src/plugins/mercurial/mercurialeditor.h
+++ b/src/plugins/mercurial/mercurialeditor.h
@@ -44,13 +44,13 @@ public:
explicit MercurialEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent);
private:
- virtual QSet<QString> annotationChanges() const;
- virtual QString changeUnderCursor(const QTextCursor &cursor) const;
- virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
- virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
- virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
- virtual QString decorateVersion(const QString &revision) const;
- virtual QStringList annotationPreviousVersions(const QString &revision) const;
+ QSet<QString> annotationChanges() const;
+ QString changeUnderCursor(const QTextCursor &cursor) const;
+ VcsBase::DiffHighlighter *createDiffHighlighter() const;
+ VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
+ QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
+ QString decorateVersion(const QString &revision) const;
+ QStringList annotationPreviousVersions(const QString &revision) const;
mutable QRegExp exactIdentifier12;
mutable QRegExp exactIdentifier40;
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index 78868fcf85e..f23295986de 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -68,7 +68,7 @@ class MercurialPlugin : public VcsBase::VcsBasePlugin
public:
MercurialPlugin();
- virtual ~MercurialPlugin();
+ ~MercurialPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
static MercurialPlugin *instance() { return m_instance; }
@@ -119,8 +119,8 @@ private slots:
void serve();*/
protected:
- virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
- virtual bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
+ void updateActions(VcsBase::VcsBasePlugin::ActionState);
+ bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private:
void createMenu();
diff --git a/src/plugins/perforce/annotationhighlighter.h b/src/plugins/perforce/annotationhighlighter.h
index 11400d71952..46d2d9023be 100644
--- a/src/plugins/perforce/annotationhighlighter.h
+++ b/src/plugins/perforce/annotationhighlighter.h
@@ -45,7 +45,7 @@ public:
QTextDocument *document = 0);
private:
- virtual QString changeNumber(const QString &block) const;
+ QString changeNumber(const QString &block) const;
const QChar m_colon;
};
diff --git a/src/plugins/perforce/perforcechecker.h b/src/plugins/perforce/perforcechecker.h
index 1c8ee83e769..b10cbb80f52 100644
--- a/src/plugins/perforce/perforcechecker.h
+++ b/src/plugins/perforce/perforcechecker.h
@@ -45,7 +45,7 @@ class PerforceChecker : public QObject
Q_OBJECT
public:
explicit PerforceChecker(QObject *parent = 0);
- virtual ~PerforceChecker();
+ ~PerforceChecker();
public slots:
void start(const QString &binary,
diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h
index 4f3cba966d0..a9435eb6295 100644
--- a/src/plugins/perforce/perforceeditor.h
+++ b/src/plugins/perforce/perforceeditor.h
@@ -48,12 +48,12 @@ public:
QWidget *parent);
private:
- virtual QSet<QString> annotationChanges() const;
- virtual QString changeUnderCursor(const QTextCursor &) const;
- virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
- virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
- virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
- virtual QStringList annotationPreviousVersions(const QString &v) const;
+ QSet<QString> annotationChanges() const;
+ QString changeUnderCursor(const QTextCursor &) const;
+ VcsBase::DiffHighlighter *createDiffHighlighter() const;
+ VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
+ QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
+ QStringList annotationPreviousVersions(const QString &v) const;
mutable QRegExp m_changeNumberPattern;
PerforcePlugin *m_plugin;
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 8ef2f700825..d8f50f1a9fd 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -138,8 +138,8 @@ private slots:
void slotTopLevelFailed(const QString &);
protected:
- virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
- virtual bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
+ void updateActions(VcsBase::VcsBasePlugin::ActionState);
+ bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private:
diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h
index 8f14722f852..a19993962d3 100644
--- a/src/plugins/subversion/annotationhighlighter.h
+++ b/src/plugins/subversion/annotationhighlighter.h
@@ -44,7 +44,7 @@ public:
QTextDocument *document = 0);
private:
- virtual QString changeNumber(const QString &block) const;
+ QString changeNumber(const QString &block) const;
const QChar m_blank;
};
diff --git a/src/plugins/subversion/checkoutwizard.h b/src/plugins/subversion/checkoutwizard.h
index 6d750ba54df..7230c87e0b5 100644
--- a/src/plugins/subversion/checkoutwizard.h
+++ b/src/plugins/subversion/checkoutwizard.h
@@ -42,15 +42,15 @@ public:
explicit CheckoutWizard(QObject *parent = 0);
// IWizard
- virtual QIcon icon() const;
- virtual QString description() const;
- virtual QString displayName() const;
+ QIcon icon() const;
+ QString description() const;
+ QString displayName() const;
protected:
// BaseCheckoutWizard
- virtual QList<QWizardPage*> createParameterPages(const QString &path);
- virtual QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> ¶meterPage,
- QString *checkoutPath);
+ QList<QWizardPage*> createParameterPages(const QString &path);
+ QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> ¶meterPage,
+ QString *checkoutPath);
};
} // namespace Internal
diff --git a/src/plugins/subversion/checkoutwizardpage.h b/src/plugins/subversion/checkoutwizardpage.h
index f2be38cbef2..55620acc053 100644
--- a/src/plugins/subversion/checkoutwizardpage.h
+++ b/src/plugins/subversion/checkoutwizardpage.h
@@ -41,7 +41,7 @@ public:
CheckoutWizardPage(QWidget *parent = 0);
protected:
- virtual QString directoryFromRepository(const QString &r) const;
+ QString directoryFromRepository(const QString &r) const;
};
} // namespace Internal
diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h
index db91720a807..96c139685de 100644
--- a/src/plugins/subversion/subversioneditor.h
+++ b/src/plugins/subversion/subversioneditor.h
@@ -46,12 +46,12 @@ public:
QWidget *parent);
private:
- virtual QSet<QString> annotationChanges() const;
- virtual QString changeUnderCursor(const QTextCursor &) const;
- virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
- virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
- virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
- virtual QStringList annotationPreviousVersions(const QString &) const;
+ QSet<QString> annotationChanges() const;
+ QString changeUnderCursor(const QTextCursor &) const;
+ VcsBase::DiffHighlighter *createDiffHighlighter() const;
+ VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
+ QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
+ QStringList annotationPreviousVersions(const QString &) const;
mutable QRegExp m_changeNumberPattern;
mutable QRegExp m_revisionNumberPattern;
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 405234c2d87..b3760d1e4c8 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -98,8 +98,8 @@ public:
bool vcsDelete(const QString &workingDir, const QString &fileName);
bool vcsMove(const QString &workingDir, const QString &from, const QString &to);
bool managesDirectory(const QString &directory, QString *topLevel = 0) const;
- virtual bool vcsCheckout(const QString &directory, const QByteArray &url);
- virtual QString vcsGetRepositoryURL(const QString &directory);
+ bool vcsCheckout(const QString &directory, const QByteArray &url);
+ QString vcsGetRepositoryURL(const QString &directory);
static SubversionPlugin *instance();
@@ -138,8 +138,8 @@ private slots:
void updateRepository();
protected:
- virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
- virtual bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
+ void updateActions(VcsBase::VcsBasePlugin::ActionState);
+ bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private:
inline bool isCommitEditorOpen() const;
--
GitLab