From ba2ffd45533c57632a8045cab75953a37f20f878 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 6 Sep 2011 15:12:14 +0000
Subject: [PATCH] Remove unnecessary virtual keywords
Change-Id: I8f75bad07959a8d80ddf1c9245b89c1cc977ce61
Reviewed-on: http://codereview.qt.nokia.com/4280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
.../qt-desktop/desktopqtversion.h | 14 ++++----
.../qt-desktop/simulatorqtversion.h | 14 ++++----
.../qt-s60/symbianqtversion.h | 34 +++++++++----------
.../qt4projectmanager/winceqtversion.h | 6 ++--
src/plugins/remotelinux/maemoqtversion.h | 16 ++++-----
5 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
index ddefba095ca..44b61807d19 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
@@ -47,16 +47,16 @@ public:
~DesktopQtVersion();
DesktopQtVersion *clone() const;
- virtual QString type() const;
+ QString type() const;
- virtual bool isValid() const;
- virtual QString invalidReason() const;
- virtual QString warningReason() const;
+ bool isValid() const;
+ QString invalidReason() const;
+ QString warningReason() const;
- virtual QList<ProjectExplorer::Abi> qtAbis() const;
+ QList<ProjectExplorer::Abi> qtAbis() const;
- virtual bool supportsTargetId(const QString &id) const;
- virtual QSet<QString> supportedTargetIds() const;
+ bool supportsTargetId(const QString &id) const;
+ QSet<QString> supportedTargetIds() const;
QString description() const;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
index 832039309a1..14e1e79bb92 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
@@ -47,16 +47,16 @@ public:
~SimulatorQtVersion();
SimulatorQtVersion *clone() const;
- virtual QString type() const;
+ QString type() const;
- virtual bool isValid() const;
- virtual QString invalidReason() const;
- virtual QString warningReason() const;
+ bool isValid() const;
+ QString invalidReason() const;
+ QString warningReason() const;
- virtual QList<ProjectExplorer::Abi> qtAbis() const;
+ QList<ProjectExplorer::Abi> qtAbis() const;
- virtual bool supportsTargetId(const QString &id) const;
- virtual QSet<QString> supportedTargetIds() const;
+ bool supportsTargetId(const QString &id) const;
+ QSet<QString> supportedTargetIds() const;
QString description() const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.h b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.h
index 6da4ed421a9..cfb26622cc3 100644
--- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.h
+++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.h
@@ -50,30 +50,30 @@ public:
QString type() const;
- virtual bool isValid() const;
- virtual QString invalidReason() const;
+ bool isValid() const;
+ QString invalidReason() const;
- virtual bool toolChainAvailable(const QString &id) const;
+ bool toolChainAvailable(const QString &id) const;
- virtual void restoreLegacySettings(QSettings *s);
- virtual void fromMap(const QVariantMap &map);
- virtual QVariantMap toMap() const;
+ void restoreLegacySettings(QSettings *s);
+ void fromMap(const QVariantMap &map);
+ QVariantMap toMap() const;
- virtual QList<ProjectExplorer::Abi> qtAbis() const;
+ QList<ProjectExplorer::Abi> qtAbis() const;
- virtual bool supportsTargetId(const QString &id) const;
- virtual QSet<QString> supportedTargetIds() const;
+ bool supportsTargetId(const QString &id) const;
+ QSet<QString> supportedTargetIds() const;
- virtual QString description() const;
+ QString description() const;
- virtual bool supportsShadowBuilds() const;
- virtual bool supportsBinaryDebuggingHelper() const;
- virtual void addToEnvironment(Utils::Environment &env) const;
- virtual QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const;
+ bool supportsShadowBuilds() const;
+ bool supportsBinaryDebuggingHelper() const;
+ void addToEnvironment(Utils::Environment &env) const;
+ QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const;
- virtual ProjectExplorer::IOutputParser *createOutputParser() const;
+ ProjectExplorer::IOutputParser *createOutputParser() const;
- virtual QString systemRoot() const;
+ QString systemRoot() const;
void setSystemRoot(const QString &);
bool isBuildWithSymbianSbsV2() const;
@@ -81,7 +81,7 @@ public:
QString sbsV2Directory() const;
void setSbsV2Directory(const QString &directory);
- virtual QtSupport::QtConfigWidget *createConfigurationWidget() const;
+ QtSupport::QtConfigWidget *createConfigurationWidget() const;
protected:
QList<ProjectExplorer::Task> reportIssuesImpl(const QString &proFile, const QString &buildDir);
diff --git a/src/plugins/qt4projectmanager/winceqtversion.h b/src/plugins/qt4projectmanager/winceqtversion.h
index 8c87af0995c..b57e01fd50d 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.h
+++ b/src/plugins/qt4projectmanager/winceqtversion.h
@@ -48,10 +48,10 @@ public:
QString type() const;
- virtual QList<ProjectExplorer::Abi> qtAbis() const;
+ QList<ProjectExplorer::Abi> qtAbis() const;
- virtual bool supportsTargetId(const QString &id) const;
- virtual QSet<QString> supportedTargetIds() const;
+ bool supportsTargetId(const QString &id) const;
+ QSet<QString> supportedTargetIds() const;
QString description() const;
};
diff --git a/src/plugins/remotelinux/maemoqtversion.h b/src/plugins/remotelinux/maemoqtversion.h
index 2711a658db7..7c64453eeb9 100644
--- a/src/plugins/remotelinux/maemoqtversion.h
+++ b/src/plugins/remotelinux/maemoqtversion.h
@@ -47,18 +47,18 @@ public:
void fromMap(const QVariantMap &map);
MaemoQtVersion *clone() const;
- virtual QString type() const;
- virtual bool isValid() const;
- virtual QString systemRoot() const;
- virtual QList<ProjectExplorer::Abi> qtAbis() const;
+ QString type() const;
+ bool isValid() const;
+ QString systemRoot() const;
+ QList<ProjectExplorer::Abi> qtAbis() const;
void addToEnvironment(Utils::Environment &env) const;
- virtual bool supportsTargetId(const QString &id) const;
- virtual QSet<QString> supportedTargetIds() const;
+ bool supportsTargetId(const QString &id) const;
+ QSet<QString> supportedTargetIds() const;
- virtual QString description() const;
+ QString description() const;
- virtual bool supportsShadowBuilds() const;
+ bool supportsShadowBuilds() const;
QString osType() const;
private:
mutable QString m_systemRoot;
--
GitLab