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

ProjectNodes: Sprinkle override over the Node classes

Browse Source 
Change-Id: I87db3a1b212aa0a3f140b8d299679f6c1f691004
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-29 16:59:27 +01:00
parent 66982fc12d
commit e60f62c131
9 changed files with 82 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
View File

@@ -56,8 +56,8 @@ class AutotoolsProjectNode : public ProjectExplorer::ProjectNode
public: public:
AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile); AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile);
bool showInSimpleTree() const; bool showInSimpleTree() const override;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
private: private:
AutotoolsProject *m_project; AutotoolsProject *m_project;

4
src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
View File

@@ -43,8 +43,8 @@ class CMakeProjectNode : public ProjectExplorer::ProjectNode
friend class CMakeProject; friend class CMakeProject;
public: public:
CMakeProjectNode(const Utils::FileName &fileName); CMakeProjectNode(const Utils::FileName &fileName);
virtual bool showInSimpleTree() const; bool showInSimpleTree() const override;
virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
}; };
} // namespace Internal } // namespace Internal

10
src/plugins/genericprojectmanager/genericprojectnodes.h
View File

@@ -52,13 +52,13 @@ public:
Core::IDocument *projectFile() const; Core::IDocument *projectFile() const;
QString projectFilePath() const; QString projectFilePath() const;
bool showInSimpleTree() const; bool showInSimpleTree() const override;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0); bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0) override;
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0) override;
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath) override;
void refresh(QSet<QString> oldFileList = QSet<QString>()); void refresh(QSet<QString> oldFileList = QSet<QString>());

20
src/plugins/projectexplorer/projectnodes.h
View File

@@ -155,7 +155,7 @@ public:
FileType fileType() const; FileType fileType() const;
bool isGenerated() const; bool isGenerated() const;
FileNode *asFileNode(); FileNode *asFileNode() override;
private: private:
// managed by ProjectNode // managed by ProjectNode
@@ -172,9 +172,9 @@ class PROJECTEXPLORER_EXPORT FolderNode : public Node
public: public:
explicit FolderNode(const Utils::FileName &folderPath, NodeType nodeType = FolderNodeType, explicit FolderNode(const Utils::FileName &folderPath, NodeType nodeType = FolderNodeType,
const QString &displayName = QString()); const QString &displayName = QString());
virtual ~FolderNode(); ~FolderNode() override;
QString displayName() const; QString displayName() const override;
QIcon icon() const; QIcon icon() const;
QList<FileNode*> fileNodes() const; QList<FileNode*> fileNodes() const;
@@ -213,7 +213,7 @@ public:
void addFolderNodes(const QList<FolderNode*> &subFolders); void addFolderNodes(const QList<FolderNode*> &subFolders);
void removeFolderNodes(const QList<FolderNode*> &subFolders); void removeFolderNodes(const QList<FolderNode*> &subFolders);
FolderNode *asFolderNode(); FolderNode *asFolderNode() override;
protected: protected:
QList<FolderNode*> m_subFolderNodes; QList<FolderNode*> m_subFolderNodes;
@@ -230,7 +230,7 @@ class PROJECTEXPLORER_EXPORT VirtualFolderNode : public FolderNode
{ {
public: public:
explicit VirtualFolderNode(const Utils::FileName &folderPath, int priority); explicit VirtualFolderNode(const Utils::FileName &folderPath, int priority);
virtual ~VirtualFolderNode(); ~VirtualFolderNode() override;
int priority() const; int priority() const;
private: private:
@@ -291,18 +291,18 @@ class PROJECTEXPLORER_EXPORT SessionNode : public FolderNode
public: public:
SessionNode(); SessionNode();
QList<ProjectAction> supportedActions(Node *node) const; QList<ProjectAction> supportedActions(Node *node) const override;
QList<ProjectNode*> projectNodes() const; QList<ProjectNode*> projectNodes() const;
void accept(NodesVisitor *visitor); void accept(NodesVisitor *visitor) override;
bool isEnabled() const { return true; } bool isEnabled() const override { return true; }
bool showInSimpleTree() const; bool showInSimpleTree() const override;
void projectDisplayNameChanged(Node *node); void projectDisplayNameChanged(Node *node);
SessionNode *asSessionNode(); SessionNode *asSessionNode() override;
protected: protected:
void addProjectNodes(const QList<ProjectNode*> &projectNodes); void addProjectNodes(const QList<ProjectNode*> &projectNodes);
void removeProjectNodes(const QList<ProjectNode*> &projectNodes); void removeProjectNodes(const QList<ProjectNode*> &projectNodes);

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

@@ -778,7 +778,7 @@ public:
, m_displayName(nodeDisplayName) , m_displayName(nodeDisplayName)
{} {}
QString displayName() const { return m_displayName; } QString displayName() const override { return m_displayName; }
private: private:
QString m_displayName; QString m_displayName;
}; };

40
src/plugins/qbsprojectmanager/qbsnodes.h
View File

@@ -54,7 +54,7 @@ public:
QbsFileNode(const Utils::FileName &filePath, const ProjectExplorer::FileType fileType, bool generated, QbsFileNode(const Utils::FileName &filePath, const ProjectExplorer::FileType fileType, bool generated,
int line); int line);
QString displayName() const; QString displayName() const override;
}; };
class QbsFolderNode : public ProjectExplorer::FolderNode class QbsFolderNode : public ProjectExplorer::FolderNode
@@ -64,7 +64,7 @@ public:
const QString &displayName); const QString &displayName);
private: private:
QList<ProjectExplorer::ProjectAction> supportedActions(ProjectExplorer::Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(ProjectExplorer::Node *node) const override;
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -78,9 +78,9 @@ class QbsBaseProjectNode : public ProjectExplorer::ProjectNode
public: public:
explicit QbsBaseProjectNode(const Utils::FileName &path); explicit QbsBaseProjectNode(const Utils::FileName &path);
bool showInSimpleTree() const; bool showInSimpleTree() const override;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
private: private:
friend class QbsGroupNode; friend class QbsGroupNode;
}; };
@@ -94,11 +94,11 @@ class QbsGroupNode : public QbsBaseProjectNode
public: public:
QbsGroupNode(const qbs::GroupData &grp, const QString &productPath); QbsGroupNode(const qbs::GroupData &grp, const QString &productPath);
bool isEnabled() const; bool isEnabled() const override;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0); bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0) override;
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0) override;
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath) override;
void updateQbsGroupData(const qbs::GroupData &grp, const QString &productPath, void updateQbsGroupData(const qbs::GroupData &grp, const QString &productPath,
bool productWasEnabled, bool productIsEnabled); bool productWasEnabled, bool productIsEnabled);
@@ -130,17 +130,17 @@ class QbsProductNode : public QbsBaseProjectNode
public: public:
explicit QbsProductNode(const qbs::Project &project, const qbs::ProductData &prd); explicit QbsProductNode(const qbs::Project &project, const qbs::ProductData &prd);
bool isEnabled() const; bool isEnabled() const override;
bool showInSimpleTree() const; bool showInSimpleTree() const override;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0); bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0) override;
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0) override;
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath) override;
void setQbsProductData(const qbs::Project &project, const qbs::ProductData prd); void setQbsProductData(const qbs::Project &project, const qbs::ProductData prd);
const qbs::ProductData qbsProductData() const { return m_qbsProductData; } const qbs::ProductData qbsProductData() const { return m_qbsProductData; }
QList<ProjectExplorer::RunConfiguration *> runConfigurations() const; QList<ProjectExplorer::RunConfiguration *> runConfigurations() const override;
private: private:
QbsGroupNode *findGroupNode(const QString &name); QbsGroupNode *findGroupNode(const QString &name);
@@ -157,13 +157,13 @@ class QbsProjectNode : public QbsBaseProjectNode
{ {
public: public:
explicit QbsProjectNode(const Utils::FileName &path); explicit QbsProjectNode(const Utils::FileName &path);
~QbsProjectNode(); ~QbsProjectNode() override;
virtual QbsProject *project() const; virtual QbsProject *project() const;
const qbs::Project qbsProject() const; const qbs::Project qbsProject() const;
const qbs::ProjectData qbsProjectData() const { return m_projectData; } const qbs::ProjectData qbsProjectData() const { return m_projectData; }
bool showInSimpleTree() const; bool showInSimpleTree() const override;
protected: protected:
void update(const qbs::Project &qbsProject, const qbs::ProjectData &prjData); void update(const qbs::Project &qbsProject, const qbs::ProjectData &prjData);
@@ -190,12 +190,12 @@ public:
using QbsProjectNode::update; using QbsProjectNode::update;
void update(); void update();
QbsProject *project() const { return m_project; } QbsProject *project() const override { return m_project; }
private: private:
QStringList unreferencedBuildSystemFiles(const qbs::Project &p) const; QStringList unreferencedBuildSystemFiles(const qbs::Project &p) const;
QbsProject * const m_project; QbsProject *const m_project;
ProjectExplorer::FolderNode *m_buildSystemFiles; ProjectExplorer::FolderNode *m_buildSystemFiles;
}; };

44
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -138,27 +138,27 @@ class QMAKEPROJECTMANAGER_EXPORT QmakePriFileNode : public ProjectExplorer::Proj
{ {
public: public:
QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmakeProFileNode, const Utils::FileName &filePath); QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmakeProFileNode, const Utils::FileName &filePath);
~QmakePriFileNode(); ~QmakePriFileNode() override;
void update(const Internal::PriFileEvalResult &result); void update(const Internal::PriFileEvalResult &result);
// ProjectNode interface // ProjectNode interface
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
bool showInSimpleTree() const { return false; } bool showInSimpleTree() const override { return false; }
bool canAddSubProject(const QString &proFilePath) const; bool canAddSubProject(const QString &proFilePath) const override;
bool addSubProjects(const QStringList &proFilePaths); bool addSubProjects(const QStringList &proFilePaths) override;
bool removeSubProjects(const QStringList &proFilePaths); bool removeSubProjects(const QStringList &proFilePaths) override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0); bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0) override;
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0) override;
bool deleteFiles(const QStringList &filePaths); bool deleteFiles(const QStringList &filePaths) override;
bool canRenameFile(const QString &filePath, const QString &newFilePath); bool canRenameFile(const QString &filePath, const QString &newFilePath) override;
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath) override;
AddNewInformation addNewInformation(const QStringList &files, Node *context) const; AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
bool setProVariable(const QString &var, const QStringList &values, bool setProVariable(const QString &var, const QStringList &values,
const QString &scope = QString(), const QString &scope = QString(),
@@ -166,8 +166,8 @@ public:
bool folderChanged(const QString &changedFolder, const QSet<Utils::FileName> &newFiles); bool folderChanged(const QString &changedFolder, const QSet<Utils::FileName> &newFiles);
bool deploysFolder(const QString &folder) const; bool deploysFolder(const QString &folder) const override;
QList<ProjectExplorer::RunConfiguration *> runConfigurations() const; QList<ProjectExplorer::RunConfiguration *> runConfigurations() const override;
QmakeProFileNode *proFileNode() const; QmakeProFileNode *proFileNode() const;
QList<QmakePriFileNode*> subProjectNodesExact() const; QList<QmakePriFileNode*> subProjectNodesExact() const;
@@ -265,16 +265,14 @@ class ProVirtualFolderNode : public ProjectExplorer::VirtualFolderNode
public: public:
explicit ProVirtualFolderNode(const Utils::FileName &folderPath, int priority, const QString &typeName) explicit ProVirtualFolderNode(const Utils::FileName &folderPath, int priority, const QString &typeName)
: VirtualFolderNode(folderPath, priority), m_typeName(typeName) : VirtualFolderNode(folderPath, priority), m_typeName(typeName)
{ { }
} QString displayName() const override
QString displayName() const
{ {
return m_typeName; return m_typeName;
} }
QString tooltip() const QString tooltip() const override
{ {
return QString(); return QString();
} }
@@ -328,13 +326,13 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeProFileNode : public QmakePriFileNode
{ {
public: public:
QmakeProFileNode(QmakeProject *project, const Utils::FileName &filePath); QmakeProFileNode(QmakeProject *project, const Utils::FileName &filePath);
~QmakeProFileNode(); ~QmakeProFileNode() override;
bool isParent(QmakeProFileNode *node); bool isParent(QmakeProFileNode *node);
bool showInSimpleTree() const; bool showInSimpleTree() const override;
AddNewInformation addNewInformation(const QStringList &files, Node *context) const; AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
QmakeProjectType projectType() const; QmakeProjectType projectType() const;

12
src/plugins/qmlprojectmanager/qmlprojectnodes.h
View File

@@ -48,18 +48,18 @@ class QmlProjectNode : public ProjectExplorer::ProjectNode
{ {
public: public:
QmlProjectNode(QmlProject *project, Core::IDocument *projectFile); QmlProjectNode(QmlProject *project, Core::IDocument *projectFile);
virtual ~QmlProjectNode(); ~QmlProjectNode() override;
Core::IDocument *projectFile() const; Core::IDocument *projectFile() const;
QString projectFilePath() const; QString projectFilePath() const;
virtual bool showInSimpleTree() const; virtual bool showInSimpleTree() const override;
virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
virtual bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0); virtual bool addFiles(const QStringList &filePaths, QStringList *notAdded = 0) override;
virtual bool deleteFiles(const QStringList &filePaths); virtual bool deleteFiles(const QStringList &filePaths) override;
virtual bool renameFile(const QString &filePath, const QString &newFilePath); virtual bool renameFile(const QString &filePath, const QString &newFilePath) override;
void refresh(); void refresh();

30
src/plugins/resourceeditor/resourcenode.h
View File

@@ -46,18 +46,18 @@ class RESOURCE_EXPORT ResourceTopLevelNode : public ProjectExplorer::FolderNode
{ {
public: public:
ResourceTopLevelNode(const Utils::FileName &filePath, FolderNode *parent); ResourceTopLevelNode(const Utils::FileName &filePath, FolderNode *parent);
~ResourceTopLevelNode(); ~ResourceTopLevelNode() override;
void update(); void update();
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded); bool addFiles(const QStringList &filePaths, QStringList *notAdded) override;
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved) override;
bool addPrefix(const QString &prefix, const QString &lang); bool addPrefix(const QString &prefix, const QString &lang);
bool removePrefix(const QString &prefix, const QString &lang); bool removePrefix(const QString &prefix, const QString &lang);
AddNewInformation addNewInformation(const QStringList &files, Node *context) const; AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
bool showInSimpleTree() const; bool showInSimpleTree() const override;
bool removeNonExistingFiles(); bool removeNonExistingFiles();
private: private:
@@ -70,19 +70,19 @@ class ResourceFolderNode : public ProjectExplorer::FolderNode
friend class ResourceEditor::ResourceTopLevelNode; // for updateFiles friend class ResourceEditor::ResourceTopLevelNode; // for updateFiles
public: public:
ResourceFolderNode(const QString &prefix, const QString &lang, ResourceTopLevelNode *parent); ResourceFolderNode(const QString &prefix, const QString &lang, ResourceTopLevelNode *parent);
~ResourceFolderNode(); ~ResourceFolderNode() override;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
QString displayName() const; QString displayName() const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded); bool addFiles(const QStringList &filePaths, QStringList *notAdded) override;
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved) override;
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath) override;
bool renamePrefix(const QString &prefix, const QString &lang); bool renamePrefix(const QString &prefix, const QString &lang);
AddNewInformation addNewInformation(const QStringList &files, Node *context) const; AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
QString prefix() const; QString prefix() const;
QString lang() const; QString lang() const;
@@ -99,9 +99,9 @@ class ResourceFileNode : public ProjectExplorer::FileNode
public: public:
ResourceFileNode(const Utils::FileName &filePath, const QString &qrcPath, ResourceTopLevelNode *topLevel); ResourceFileNode(const Utils::FileName &filePath, const QString &qrcPath, ResourceTopLevelNode *topLevel);
QString displayName() const; QString displayName() const override;
QString qrcPath() const; QString qrcPath() const;
QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
private: private:
QString m_displayName; QString m_displayName;