From 3d8b6845a39ab5ceb709c9e98241362c78a6ac3e Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@nokia.com> Date: Tue, 2 Feb 2010 11:32:39 +0100 Subject: [PATCH] Devirtualise cmakeproject Reviewed-by: dt --- .../cmakeprojectmanager/cmakeproject.h | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index 30be081c611..ec94ed313c3 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -74,22 +74,22 @@ public: CMakeBuildConfiguration *activeCMakeBuildConfiguration() const; - virtual QString displayName() const; - virtual QString id() const; - virtual Core::IFile *file() const; - virtual ProjectExplorer::IBuildConfigurationFactory *buildConfigurationFactory() const; - virtual CMakeManager *projectManager() const; + QString displayName() const; + QString id() const; + Core::IFile *file() const; + ProjectExplorer::IBuildConfigurationFactory *buildConfigurationFactory() const; + CMakeManager *projectManager() const; - virtual QList<ProjectExplorer::Project *> dependsOn(); //NBS TODO implement dependsOn + QList<ProjectExplorer::Project *> dependsOn(); //NBS TODO implement dependsOn - virtual bool isApplication() const; + bool isApplication() const; - virtual ProjectExplorer::BuildConfigWidget *createConfigWidget(); - virtual QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets(); + ProjectExplorer::BuildConfigWidget *createConfigWidget(); + QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets(); - virtual ProjectExplorer::ProjectNode *rootProjectNode() const; + ProjectExplorer::ProjectNode *rootProjectNode() const; - virtual QStringList files(FilesMode fileMode) const; + QStringList files(FilesMode fileMode) const; QStringList targets() const; bool hasTarget(const QString &title) const; @@ -105,7 +105,7 @@ signals: void targetsChanged(); protected: - virtual bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map); // called by CMakeBuildSettingsWidget void changeBuildDirectory(CMakeBuildConfiguration *bc, const QString &newBuildDirectory); @@ -206,8 +206,8 @@ class CMakeBuildSettingsWidget : public ProjectExplorer::BuildConfigWidget { Q_OBJECT public: - CMakeBuildSettingsWidget(CMakeProject *project); - virtual QString displayName() const; + explicit CMakeBuildSettingsWidget(CMakeProject *project); + QString displayName() const; // This is called to set up the config widget before showing it // buildConfiguration is QString::null for the non buildConfiguration specific page -- GitLab