From 5173c2dc01391e3a96723c6c1275eac92232a2bc Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@nokia.com> Date: Tue, 2 Feb 2010 11:59:24 +0100 Subject: [PATCH] s/target/buildtarget/ in projectnodes This is in preparation of the addition of "targets" in the sense of "platforms to develop for" into the codebase. Reviewed-by: dt --- src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakeprojectnodes.h | 2 +- src/plugins/genericprojectmanager/genericprojectnodes.cpp | 2 +- src/plugins/genericprojectmanager/genericprojectnodes.h | 2 +- src/plugins/projectexplorer/projectmodels.cpp | 2 +- src/plugins/projectexplorer/projectnodes.h | 2 +- src/plugins/qmlprojectmanager/qmlprojectnodes.cpp | 2 +- src/plugins/qmlprojectmanager/qmlprojectnodes.h | 2 +- src/plugins/qt4projectmanager/qt4nodes.cpp | 2 +- src/plugins/qt4projectmanager/qt4nodes.h | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index ba230a2f954..1689bbe23f8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -37,7 +37,7 @@ CMakeProjectNode::CMakeProjectNode(const QString &fileName) { } -bool CMakeProjectNode::hasTargets() const +bool CMakeProjectNode::hasBuildTargets() const { // TODO return true; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index 215ef6645a3..5d857b95170 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -41,7 +41,7 @@ class CMakeProjectNode : public ProjectExplorer::ProjectNode friend class CMakeProject; public: CMakeProjectNode(const QString &fileName); - virtual bool hasTargets() const; + virtual bool hasBuildTargets() const; virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions() const; virtual bool addSubProjects(const QStringList &proFilePaths); virtual bool removeSubProjects(const QStringList &proFilePaths); diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp index 0bb0184448a..c1c936fec0c 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp +++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp @@ -162,7 +162,7 @@ ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName(const return findOrCreateFolderByName(components, components.length()); } -bool GenericProjectNode::hasTargets() const +bool GenericProjectNode::hasBuildTargets() const { return true; } diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h index 9885592200c..eee5cb82d98 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.h +++ b/src/plugins/genericprojectmanager/genericprojectnodes.h @@ -53,7 +53,7 @@ public: Core::IFile *projectFile() const; QString projectFilePath() const; - virtual bool hasTargets() const; + virtual bool hasBuildTargets() const; virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions() const; diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index de589580fda..9b8fec7b322 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -481,7 +481,7 @@ bool FlatModel::filter(Node *node) const isHidden = false; } else if (ProjectNode *projectNode = qobject_cast<ProjectNode*>(node)) { if (m_filterProjects && projectNode->parentFolderNode() != m_rootNode) - isHidden = !projectNode->hasTargets(); + isHidden = !projectNode->hasBuildTargets(); } else if (node->nodeType() == FolderNodeType) { if (m_filterProjects) isHidden = true; diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 422a113b42f..6d35d0cbb61 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -167,7 +167,7 @@ public: // determines if the project will be shown in the flat view // TODO find a better name - virtual bool hasTargets() const = 0; + virtual bool hasBuildTargets() const = 0; virtual QList<ProjectAction> supportedActions() const = 0; diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp index b48b5b36edb..b1ff8f8c5fb 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp @@ -157,7 +157,7 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr return findOrCreateFolderByName(components, components.length()); } -bool QmlProjectNode::hasTargets() const +bool QmlProjectNode::hasBuildTargets() const { return true; } diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h index 1682e3964ce..04e4be3fbd5 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h @@ -54,7 +54,7 @@ public: Core::IFile *projectFile() const; QString projectFilePath() const; - virtual bool hasTargets() const; + virtual bool hasBuildTargets() const; virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions() const; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index e777e101849..e5e1bc46566 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -783,7 +783,7 @@ void Qt4ProFileNode::buildStateChanged(ProjectExplorer::Project *project) } } -bool Qt4ProFileNode::hasTargets() const +bool Qt4ProFileNode::hasBuildTargets() const { return (projectType() == ApplicationTemplate) || (projectType() == LibraryTemplate); } diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index d26787faedf..0f7cf2fb0b5 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -140,7 +140,7 @@ public: // ProjectNode interface QList<ProjectAction> supportedActions() const; - bool hasTargets() const { return false; } + bool hasBuildTargets() const { return false; } bool addSubProjects(const QStringList &proFilePaths); bool removeSubProjects(const QStringList &proFilePaths); @@ -203,7 +203,7 @@ public: QObject *parent = 0); ~Qt4ProFileNode(); - bool hasTargets() const; + bool hasBuildTargets() const; Qt4ProjectType projectType() const; -- GitLab