diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2014-02-03 14:45:28 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-02-19 14:51:47 +0100 |
| commit | c17bce14cffbb230a98f0ae724b13da5d9d0e1df (patch) | |
| tree | ad8d4d84a9bb949491fb903c9c43d6bc7eb56289 /src/plugins/projectexplorer/projectfilewizardextension.cpp | |
| parent | a89b89d750506d13fd45cbbe11bf77f34fb695c1 (diff) | |
| download | qt-creator-c17bce14cffbb230a98f0ae724b13da5d9d0e1df.tar.gz | |
ProjectNodes: Move supportedActions to Node
By default this simply calls the parent's supportedActions.
Most changes are due to the enum moving.
Change-Id: I25bf21b712cca48450014dbb0f748ac0c461e029
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/projectfilewizardextension.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectfilewizardextension.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index a67a87fe47..1e843ae728 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -94,20 +94,20 @@ namespace Internal { class AllProjectNodesVisitor : public NodesVisitor { public: - AllProjectNodesVisitor(ProjectNode::ProjectAction action) + AllProjectNodesVisitor(ProjectExplorer::ProjectAction action) : m_action(action) {} - static ProjectNodeList allProjects(ProjectNode::ProjectAction action); + static ProjectNodeList allProjects(ProjectExplorer::ProjectAction action); virtual void visitProjectNode(ProjectNode *node); private: ProjectNodeList m_projectNodes; - ProjectNode::ProjectAction m_action; + ProjectExplorer::ProjectAction m_action; }; -ProjectNodeList AllProjectNodesVisitor::allProjects(ProjectNode::ProjectAction action) +ProjectNodeList AllProjectNodesVisitor::allProjects(ProjectExplorer::ProjectAction action) { AllProjectNodesVisitor visitor(action); SessionManager::sessionNode()->accept(&visitor); @@ -397,7 +397,7 @@ QList<QWizardPage *> ProjectFileWizardExtension::extensionPages(const IWizard *w static inline void getProjectChoicesAndToolTips(QStringList *projectChoicesParam, QStringList *projectToolTipsParam, - ProjectNode::ProjectAction *projectActionParam, + ProjectExplorer::ProjectAction *projectActionParam, const QString &generatedProjectFilePath, ProjectWizardContext *context) { @@ -413,12 +413,12 @@ static inline void getProjectChoicesAndToolTips(QStringList *projectChoicesParam // via Map. ProjectEntryMap entryMap; - ProjectNode::ProjectAction projectAction = + ProjectExplorer::ProjectAction projectAction = context->wizard->kind() == IWizard::ProjectWizard - ? ProjectNode::AddSubProject : ProjectNode::AddNewFile; + ? ProjectExplorer::AddSubProject : ProjectExplorer::AddNewFile; foreach (ProjectNode *n, AllProjectNodesVisitor::allProjects(projectAction)) { - if (projectAction == ProjectNode::AddNewFile - || (projectAction == ProjectNode::AddSubProject + if (projectAction == ProjectExplorer::AddNewFile + || (projectAction == ProjectExplorer::AddSubProject && (generatedProjectFilePath.isEmpty() ? true : n->canAddSubProject(generatedProjectFilePath)))) entryMap.insert(ProjectEntry(n), true); } @@ -441,14 +441,14 @@ void ProjectFileWizardExtension::initProjectChoices(const QString &generatedProj { QStringList projectChoices; QStringList projectToolTips; - ProjectNode::ProjectAction projectAction; + ProjectExplorer::ProjectAction projectAction; getProjectChoicesAndToolTips(&projectChoices, &projectToolTips, &projectAction, generatedProjectFilePath, m_context); m_context->page->setProjects(projectChoices); m_context->page->setProjectToolTips(projectToolTips); - m_context->page->setAddingSubProject(projectAction == ProjectNode::AddSubProject); + m_context->page->setAddingSubProject(projectAction == ProjectExplorer::AddSubProject); } bool ProjectFileWizardExtension::processFiles( |