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

Project: Sprinkle override over all the projects

Browse Source 
Change-Id: I5e03ef5a9fee03473152f8a7511d75a1818c3e05
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-07 17:58:34 +01:00
committed by hjk
parent 5915b66fc8
commit d134bdfb13
8 changed files with 51 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/autotoolsprojectmanager/autotoolsproject.h
View File

@@ -71,18 +71,18 @@ class AutotoolsProject : public ProjectExplorer::Project
public: public:
AutotoolsProject(AutotoolsManager *manager, const QString &fileName); AutotoolsProject(AutotoolsManager *manager, const QString &fileName);
~AutotoolsProject(); ~AutotoolsProject() override;
QString displayName() const; QString displayName() const override;
Core::IDocument *document() const; Core::IDocument *document() const override;
ProjectExplorer::IProjectManager *projectManager() const; ProjectExplorer::IProjectManager *projectManager() const override;
ProjectExplorer::ProjectNode *rootProjectNode() const; ProjectExplorer::ProjectNode *rootProjectNode() const override;
QStringList files(FilesMode fileMode) const; QStringList files(FilesMode fileMode) const;
static QString defaultBuildDirectory(const QString &projectPath); static QString defaultBuildDirectory(const QString &projectPath);
QStringList buildTargets() const; QStringList buildTargets() const;
protected: protected:
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
private slots: private slots:
/** /**

22
src/plugins/cpptools/modelmanagertesthelper.h
View File

@@ -47,22 +47,14 @@ class CPPTOOLS_EXPORT TestProject: public ProjectExplorer::Project
public: public:
TestProject(const QString &name, QObject *parent); TestProject(const QString &name, QObject *parent);
virtual ~TestProject(); ~TestProject() override;
virtual QString displayName() const QString displayName() const override { return m_name; }
{ 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 QStringList files(FilesMode fileMode) const override { Q_UNUSED(fileMode); return QStringList(); }
{ 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(); }
private: private:
QString m_name; QString m_name;
@@ -77,7 +69,7 @@ public:
explicit ModelManagerTestHelper(QObject *parent = 0, explicit ModelManagerTestHelper(QObject *parent = 0,
bool testOnlyForCleanedProjects = true); bool testOnlyForCleanedProjects = true);
~ModelManagerTestHelper(); ~ModelManagerTestHelper() override;
void cleanup(); void cleanup();

14
src/plugins/genericprojectmanager/genericproject.h
View File

@@ -54,18 +54,18 @@ class GenericProject : public ProjectExplorer::Project
public: public:
GenericProject(Manager *manager, const QString &filename); GenericProject(Manager *manager, const QString &filename);
~GenericProject(); ~GenericProject() override;
QString filesFileName() const; QString filesFileName() const;
QString includesFileName() const; QString includesFileName() const;
QString configFileName() const; QString configFileName() const;
QString displayName() const; QString displayName() const override;
Core::IDocument *document() const; Core::IDocument *document() const override;
ProjectExplorer::IProjectManager *projectManager() const; ProjectExplorer::IProjectManager *projectManager() const override;
GenericProjectNode *rootProjectNode() const; GenericProjectNode *rootProjectNode() const override;
QStringList files(FilesMode fileMode) const; QStringList files(FilesMode fileMode) const override;
QStringList buildTargets() const; QStringList buildTargets() const;
@@ -86,7 +86,7 @@ public:
QStringList files() const; QStringList files() const;
protected: protected:
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
private: private:
bool saveRawFileList(const QStringList &rawFileList); bool saveRawFileList(const QStringList &rawFileList);

2
src/plugins/projectexplorer/project.h
View File

@@ -76,7 +76,7 @@ public:
}; };
Project(); Project();
virtual ~Project(); ~Project() override;
virtual QString displayName() const = 0; virtual QString displayName() const = 0;
Core::Id id() const; Core::Id id() const;

2
src/plugins/pythoneditor/pythoneditorplugin.cpp
View File

@@ -246,7 +246,7 @@ class PythonProject : public Project
{ {
public: public:
PythonProject(PythonProjectManager *manager, const QString &filename); PythonProject(PythonProjectManager *manager, const QString &filename);
~PythonProject(); ~PythonProject() override;
QString displayName() const override { return m_projectName; } QString displayName() const override { return m_projectName; }
IDocument *document() const override; IDocument *document() const override;

16
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -63,15 +63,15 @@ class QbsProject : public ProjectExplorer::Project
public: public:
QbsProject(QbsManager *manager, const QString &filename); QbsProject(QbsManager *manager, const QString &filename);
~QbsProject(); ~QbsProject() override;
QString displayName() const; QString displayName() const override;
Core::IDocument *document() const; Core::IDocument *document() const override;
QbsManager *projectManager() const; 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 isProjectEditable() const;
bool addFilesToProduct(QbsBaseProjectNode *node, const QStringList &filePaths, bool addFilesToProduct(QbsBaseProjectNode *node, const QStringList &filePaths,
@@ -104,7 +104,7 @@ public:
qbs::Project qbsProject() const; qbs::Project qbsProject() const;
qbs::ProjectData qbsProjectData() const; qbs::ProjectData qbsProjectData() const;
bool needsSpecialDeployment() const; bool needsSpecialDeployment() const override;
void generateErrors(const qbs::ErrorInfo &e); void generateErrors(const qbs::ErrorInfo &e);
static QString productDisplayName(const qbs::Project &project, static QString productDisplayName(const qbs::Project &project,
@@ -128,7 +128,7 @@ private slots:
void startParsing(); void startParsing();
private: 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); void parse(const QVariantMap &config, const Utils::Environment &env, const QString &dir);

26
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -69,22 +69,22 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeProject : public ProjectExplorer::Project
public: public:
QmakeProject(QmakeManager *manager, const QString &proFile); QmakeProject(QmakeManager *manager, const QString &proFile);
virtual ~QmakeProject(); ~QmakeProject() override;
QString displayName() const; QString displayName() const override;
Core::IDocument *document() const; Core::IDocument *document() const override;
ProjectExplorer::IProjectManager *projectManager() const; ProjectExplorer::IProjectManager *projectManager() const override;
QmakeManager *qmakeProjectManager() const; 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; QmakeProFileNode *rootQmakeProjectNode() const;
bool validParse(const Utils::FileName &proFilePath) const; bool validParse(const Utils::FileName &proFilePath) const;
bool parseInProgress(const Utils::FileName &proFilePath) const; bool parseInProgress(const Utils::FileName &proFilePath) const;
virtual QStringList files(FilesMode fileMode) const; virtual QStringList files(FilesMode fileMode) const override;
virtual QString generatedUiHeader(const Utils::FileName &formFile) const; virtual QString generatedUiHeader(const Utils::FileName &formFile) const override;
enum Parsing {ExactParse, ExactAndCumulativeParse }; enum Parsing {ExactParse, ExactAndCumulativeParse };
QList<QmakeProFileNode *> allProFiles(const QList<QmakeProjectType> &projectTypes = QList<QmakeProjectType>(), QList<QmakeProFileNode *> allProFiles(const QList<QmakeProjectType> &projectTypes = QList<QmakeProjectType>(),
@@ -123,11 +123,11 @@ public:
void watchFolders(const QStringList &l, QmakePriFileNode *node); void watchFolders(const QStringList &l, QmakePriFileNode *node);
void unwatchFolders(const QStringList &l, QmakePriFileNode *node); void unwatchFolders(const QStringList &l, QmakePriFileNode *node);
bool needsConfiguration() const; bool needsConfiguration() const override;
void configureAsExampleProject(const QSet<Core::Id> &platforms); void configureAsExampleProject(const QSet<Core::Id> &platforms) override;
bool requiresTargetPanel() const; bool requiresTargetPanel() const override;
/// \internal /// \internal
QString disabledReasonForRunConfiguration(const Utils::FileName &proFilePath); QString disabledReasonForRunConfiguration(const Utils::FileName &proFilePath);
@@ -138,7 +138,7 @@ public:
void emitBuildDirectoryInitialized(); void emitBuildDirectoryInitialized();
static void proFileParseError(const QString &errorMessage); static void proFileParseError(const QString &errorMessage);
ProjectExplorer::ProjectImporter *createProjectImporter() const; ProjectExplorer::ProjectImporter *createProjectImporter() const override;
enum AsyncUpdateState { Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown }; enum AsyncUpdateState { Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown };
AsyncUpdateState asyncUpdateState() const; AsyncUpdateState asyncUpdateState() const;
@@ -153,7 +153,7 @@ public slots:
void scheduleAsyncUpdateLater() { scheduleAsyncUpdate(); } void scheduleAsyncUpdateLater() { scheduleAsyncUpdate(); }
protected: protected:
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
private: private:
void asyncUpdate(); void asyncUpdate();

16
src/plugins/qmlprojectmanager/qmlproject.h
View File

@@ -57,18 +57,18 @@ class QMLPROJECTMANAGER_EXPORT QmlProject : public ProjectExplorer::Project
public: public:
QmlProject(Internal::Manager *manager, const Utils::FileName &filename); QmlProject(Internal::Manager *manager, const Utils::FileName &filename);
virtual ~QmlProject(); ~QmlProject() override;
Utils::FileName filesFileName() const; Utils::FileName filesFileName() const;
QString displayName() const; QString displayName() const override;
Core::IDocument *document() const; Core::IDocument *document() const override;
ProjectExplorer::IProjectManager *projectManager() const; 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; ProjectExplorer::ProjectNode *rootProjectNode() const override;
QStringList files(FilesMode fileMode) const; QStringList files(FilesMode fileMode) const override;
bool validProjectFile() const; bool validProjectFile() const;
@@ -102,7 +102,7 @@ private slots:
void addedRunConfiguration(ProjectExplorer::RunConfiguration *); void addedRunConfiguration(ProjectExplorer::RunConfiguration *);
protected: protected:
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage); RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
private: private:
// plain format // plain format