feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Remove superfluous virtual

Browse Source 
Change-Id: I105057202091f4b90f7f50eefb3506ee56d4bc1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-17 21:51:27 +02:00
committed by Tobias Hunger
parent df5cd3d6f5
commit 9417bea9ac
37 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/bazaar/annotationhighlighter.h
View File

@@ -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;
};

2
src/plugins/bazaar/bazaarcommitwidget.cpp
View File

@@ -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 };

2
src/plugins/bazaar/bazaarcontrol.h
View File

@@ -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/

10
src/plugins/bazaar/bazaareditor.h
View File

@@ -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;

2
src/plugins/bazaar/bazaarplugin.h
View File

@@ -80,7 +80,7 @@ class BazaarPlugin : public VcsBase::VcsBasePlugin
public:
BazaarPlugin();
virtual ~BazaarPlugin();
~BazaarPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
static BazaarPlugin *instance();

2
src/plugins/clearcase/annotationhighlighter.h
View File

@@ -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;
};

2
src/plugins/clearcase/clearcasesubmiteditor.h
View File

@@ -55,7 +55,7 @@ public:
void setIsUcm(bool isUcm);
protected:
virtual QByteArray fileContents() const;
QByteArray fileContents() const;
};

6
src/plugins/cvs/cvsplugin.h
View File

@@ -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;

2
src/plugins/git/annotationhighlighter.h
View File

@@ -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;
};

12
src/plugins/git/clonewizard.h
View File

@@ -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*> &parameterPages,
QString *checkoutPath);
QList<QWizardPage*> createParameterPages(const QString &path);
QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPages,
QString *checkoutPath);
};
} // namespace Internal

6
src/plugins/git/clonewizardpage.h
View File

@@ -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);

2
src/plugins/git/gitorious/gitoriousclonewizard.cpp
View File

@@ -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;

12
src/plugins/git/gitorious/gitoriousclonewizard.h
View File

@@ -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*> &parameterPages,
QString *checkoutPath);
QList<QWizardPage*> createParameterPages(const QString &path);
QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPages,
QString *checkoutPath);
};
} // namespace Internal

4
src/plugins/git/gitorious/gitorioushostwizardpage.h
View File

@@ -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;

2
src/plugins/git/gitorious/gitoriousprojectwidget.h
View File

@@ -63,7 +63,7 @@ public:
QWidget *parent = 0);
~GitoriousProjectWidget();
virtual bool isValid() const;
bool isValid() const;
QSharedPointer<GitoriousProject> project() const;

4
src/plugins/git/gitorious/gitoriousprojectwizardpage.h
View File

@@ -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;

4
src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
View File

@@ -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;

6
src/plugins/git/gitplugin.h
View File

@@ -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

2
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -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) {

2
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -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 };

2
src/plugins/git/mergetool.cpp
View File

@@ -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));

2
src/plugins/git/remotedialog.h
View File

@@ -89,7 +89,7 @@ public slots:
private slots:
protected:
virtual void changeEvent(QEvent *e);
void changeEvent(QEvent *e);
private:
Ui::RemoteDialog *m_ui;

2
src/plugins/mercurial/annotationhighlighter.h
View File

@@ -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;
};

8
src/plugins/mercurial/mercurialclient.h
View File

@@ -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,

2
src/plugins/mercurial/mercurialcommitwidget.cpp
View File

@@ -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 };

2
src/plugins/mercurial/mercurialcontrol.h
View File

@@ -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/

14
src/plugins/mercurial/mercurialeditor.h
View File

@@ -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;

6
src/plugins/mercurial/mercurialplugin.h
View File

@@ -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();

2
src/plugins/perforce/annotationhighlighter.h
View File

@@ -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;
};

2
src/plugins/perforce/perforcechecker.h
View File

@@ -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,

12
src/plugins/perforce/perforceeditor.h
View File

@@ -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;

4
src/plugins/perforce/perforceplugin.h
View File

@@ -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:

2
src/plugins/subversion/annotationhighlighter.h
View File

@@ -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;
};

12
src/plugins/subversion/checkoutwizard.h
View File

@@ -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*> &parameterPage,
QString *checkoutPath);
QList<QWizardPage*> createParameterPages(const QString &path);
QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPage,
QString *checkoutPath);
};
} // namespace Internal

2
src/plugins/subversion/checkoutwizardpage.h
View File

@@ -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

12
src/plugins/subversion/subversioneditor.h
View File

@@ -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;

8
src/plugins/subversion/subversionplugin.h
View File

@@ -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;