diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-17 21:51:27 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-18 11:43:17 +0100 |
commit | 9417bea9acd7184b33adc176c1c5b507126b0c69 (patch) | |
tree | c925edf28bfb8cd0b895bd25878b55529ea292e2 /src | |
parent | df5cd3d6f59a10af887536a50967b490ee00c091 (diff) | |
download | qt-creator-9417bea9acd7184b33adc176c1c5b507126b0c69.tar.gz |
VCS: Remove superfluous virtual
Change-Id: I105057202091f4b90f7f50eefb3506ee56d4bc1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
37 files changed, 90 insertions, 90 deletions
diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h index f60c5ba4d3..07ca1b7301 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 d55ece70e9..74988b85c6 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 361868ba0e..632db28bf3 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 772ae1b7f9..b82208aeb5 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 1b97763bbb..ff6b6fbbd7 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 22c624b93d..66f9d59310 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 c49b63fda3..f980964ec7 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 4a29ef0902..ed326f3bc9 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 1047263c24..fbaf4c3082 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 11c8954ccf..b89d432f8f 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 2b991cb006..62214c7a31 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 eeefb55ce2..91440da17a 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 0b05e1fa6f..84d11b4c7b 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 51cd2a847b..5bf5b01f2e 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 eea472c878..4199d60119 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 2296ee4790..d4611b357b 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 75c31a746b..11f2aa6f68 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 dc9ca7f20e..1d8d1f7241 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 0c2acf6758..34863efcde 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 f34062c7ec..f35b9b98ae 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 6b3e76ae0f..86713de89c 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 0af701a076..91f60a281d 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 aca9c4a97b..a38e10c6d1 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 8ab6a274b3..8b051d4545 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 bb14eb6806..eaea3a399a 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 39202c48dd..8644910309 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 57c38a9eac..cde52c086c 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 78868fcf85..f23295986d 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 11400d7195..46d2d9023b 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 1c8ee83e76..b10cbb80f5 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 4f3cba966d..a9435eb629 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 8ef2f70082..d8f50f1a9f 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 8f14722f85..a19993962d 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 6d750ba54d..7230c87e0b 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 f2be38cbef..55620acc05 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 db91720a80..96c139685d 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 405234c2d8..b3760d1e4c 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; |