diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index 4ec357e5fe3..26d7bad76ed 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -71,18 +71,18 @@ class AutotoolsProject : public ProjectExplorer::Project public: AutotoolsProject(AutotoolsManager *manager, const QString &fileName); - ~AutotoolsProject(); + ~AutotoolsProject() override; - QString displayName() const; - Core::IDocument *document() const; - ProjectExplorer::IProjectManager *projectManager() const; - ProjectExplorer::ProjectNode *rootProjectNode() const; + QString displayName() const override; + Core::IDocument *document() const override; + ProjectExplorer::IProjectManager *projectManager() const override; + ProjectExplorer::ProjectNode *rootProjectNode() const override; QStringList files(FilesMode fileMode) const; static QString defaultBuildDirectory(const QString &projectPath); QStringList buildTargets() const; protected: - RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); + RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override; private slots: /** diff --git a/src/plugins/cpptools/modelmanagertesthelper.h b/src/plugins/cpptools/modelmanagertesthelper.h index d914cd75bc5..255447b51aa 100644 --- a/src/plugins/cpptools/modelmanagertesthelper.h +++ b/src/plugins/cpptools/modelmanagertesthelper.h @@ -47,22 +47,14 @@ class CPPTOOLS_EXPORT TestProject: public ProjectExplorer::Project public: TestProject(const QString &name, QObject *parent); - virtual ~TestProject(); + ~TestProject() override; - virtual QString displayName() const - { return m_name; } + QString displayName() const override { return m_name; } + Core::IDocument *document() const override { return 0; } + ProjectExplorer::IProjectManager *projectManager() const override { return 0; } + ProjectExplorer::ProjectNode *rootProjectNode() const override { return 0; } - virtual Core::IDocument *document() const - { return 0; } - - virtual ProjectExplorer::IProjectManager *projectManager() const - { return 0; } - - virtual ProjectExplorer::ProjectNode *rootProjectNode() const - { return 0; } - - virtual QStringList files(FilesMode fileMode) const - { Q_UNUSED(fileMode); return QStringList(); } + QStringList files(FilesMode fileMode) const override { Q_UNUSED(fileMode); return QStringList(); } private: QString m_name; @@ -77,7 +69,7 @@ public: explicit ModelManagerTestHelper(QObject *parent = 0, bool testOnlyForCleanedProjects = true); - ~ModelManagerTestHelper(); + ~ModelManagerTestHelper() override; void cleanup(); diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index 37883ea9d4a..0d2f1827d0a 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -54,18 +54,18 @@ class GenericProject : public ProjectExplorer::Project public: GenericProject(Manager *manager, const QString &filename); - ~GenericProject(); + ~GenericProject() override; QString filesFileName() const; QString includesFileName() const; QString configFileName() const; - QString displayName() const; - Core::IDocument *document() const; - ProjectExplorer::IProjectManager *projectManager() const; + QString displayName() const override; + Core::IDocument *document() const override; + ProjectExplorer::IProjectManager *projectManager() const override; - GenericProjectNode *rootProjectNode() const; - QStringList files(FilesMode fileMode) const; + GenericProjectNode *rootProjectNode() const override; + QStringList files(FilesMode fileMode) const override; QStringList buildTargets() const; @@ -86,7 +86,7 @@ public: QStringList files() const; protected: - RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); + RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override; private: bool saveRawFileList(const QStringList &rawFileList); diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 08e494c07da..b907a034433 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -76,7 +76,7 @@ public: }; Project(); - virtual ~Project(); + ~Project() override; virtual QString displayName() const = 0; Core::Id id() const; diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index bff1edbcbd6..ce9dfe0193a 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -246,7 +246,7 @@ class PythonProject : public Project { public: PythonProject(PythonProjectManager *manager, const QString &filename); - ~PythonProject(); + ~PythonProject() override; QString displayName() const override { return m_projectName; } IDocument *document() const override; diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index f46d7b8e2e8..3558c2e81e5 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -63,15 +63,15 @@ class QbsProject : public ProjectExplorer::Project public: QbsProject(QbsManager *manager, const QString &filename); - ~QbsProject(); + ~QbsProject() override; - QString displayName() const; - Core::IDocument *document() const; - QbsManager *projectManager() const; + QString displayName() const override; + Core::IDocument *document() const override; + QbsManager *projectManager() const override; - ProjectExplorer::ProjectNode *rootProjectNode() const; + ProjectExplorer::ProjectNode *rootProjectNode() const override; - QStringList files(FilesMode fileMode) const; + QStringList files(FilesMode fileMode) const override; bool isProjectEditable() const; bool addFilesToProduct(QbsBaseProjectNode *node, const QStringList &filePaths, @@ -104,7 +104,7 @@ public: qbs::Project qbsProject() const; qbs::ProjectData qbsProjectData() const; - bool needsSpecialDeployment() const; + bool needsSpecialDeployment() const override; void generateErrors(const qbs::ErrorInfo &e); static QString productDisplayName(const qbs::Project &project, @@ -128,7 +128,7 @@ private slots: void startParsing(); private: - RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); + RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override; void parse(const QVariantMap &config, const Utils::Environment &env, const QString &dir); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index a363d6766e7..80ffc0f6f15 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -69,22 +69,22 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeProject : public ProjectExplorer::Project public: QmakeProject(QmakeManager *manager, const QString &proFile); - virtual ~QmakeProject(); + ~QmakeProject() override; - QString displayName() const; - Core::IDocument *document() const; - ProjectExplorer::IProjectManager *projectManager() const; + QString displayName() const override; + Core::IDocument *document() const override; + ProjectExplorer::IProjectManager *projectManager() const override; QmakeManager *qmakeProjectManager() const; - bool supportsKit(ProjectExplorer::Kit *k, QString *errorMesage) const; + bool supportsKit(ProjectExplorer::Kit *k, QString *errorMesage) const override; - ProjectExplorer::ProjectNode *rootProjectNode() const; + ProjectExplorer::ProjectNode *rootProjectNode() const override; QmakeProFileNode *rootQmakeProjectNode() const; bool validParse(const Utils::FileName &proFilePath) const; bool parseInProgress(const Utils::FileName &proFilePath) const; - virtual QStringList files(FilesMode fileMode) const; - virtual QString generatedUiHeader(const Utils::FileName &formFile) const; + virtual QStringList files(FilesMode fileMode) const override; + virtual QString generatedUiHeader(const Utils::FileName &formFile) const override; enum Parsing {ExactParse, ExactAndCumulativeParse }; QList allProFiles(const QList &projectTypes = QList(), @@ -123,11 +123,11 @@ public: void watchFolders(const QStringList &l, QmakePriFileNode *node); void unwatchFolders(const QStringList &l, QmakePriFileNode *node); - bool needsConfiguration() const; + bool needsConfiguration() const override; - void configureAsExampleProject(const QSet &platforms); + void configureAsExampleProject(const QSet &platforms) override; - bool requiresTargetPanel() const; + bool requiresTargetPanel() const override; /// \internal QString disabledReasonForRunConfiguration(const Utils::FileName &proFilePath); @@ -138,7 +138,7 @@ public: void emitBuildDirectoryInitialized(); static void proFileParseError(const QString &errorMessage); - ProjectExplorer::ProjectImporter *createProjectImporter() const; + ProjectExplorer::ProjectImporter *createProjectImporter() const override; enum AsyncUpdateState { Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown }; AsyncUpdateState asyncUpdateState() const; @@ -153,7 +153,7 @@ public slots: void scheduleAsyncUpdateLater() { scheduleAsyncUpdate(); } protected: - RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); + RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override; private: void asyncUpdate(); diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index bb529a5defc..9d3c48ca317 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -57,18 +57,18 @@ class QMLPROJECTMANAGER_EXPORT QmlProject : public ProjectExplorer::Project public: QmlProject(Internal::Manager *manager, const Utils::FileName &filename); - virtual ~QmlProject(); + ~QmlProject() override; Utils::FileName filesFileName() const; - QString displayName() const; - Core::IDocument *document() const; - ProjectExplorer::IProjectManager *projectManager() const; + QString displayName() const override; + Core::IDocument *document() const override; + ProjectExplorer::IProjectManager *projectManager() const override; - bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) const; + bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) const override; - ProjectExplorer::ProjectNode *rootProjectNode() const; - QStringList files(FilesMode fileMode) const; + ProjectExplorer::ProjectNode *rootProjectNode() const override; + QStringList files(FilesMode fileMode) const override; bool validProjectFile() const; @@ -102,7 +102,7 @@ private slots: void addedRunConfiguration(ProjectExplorer::RunConfiguration *); protected: - RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); + RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override; private: // plain format