From 2b696938287e0d8b82778565469f9e12bc6adcaa Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 6 Jan 2016 15:04:26 +0100 Subject: [PATCH] CMake: Store project name in root node Store project name in root node and remove the member variable that was used for this purpose from the CMakeProject. Makes sure the same name is used more consistently. Change-Id: I2b60a15143934bdeffe6c744fd300be7e81c674e Reviewed-by: Niels Weber --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 5 ++--- src/plugins/cmakeprojectmanager/cmakeproject.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index dfd25b09759..7d8a50aa41a 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -97,7 +97,7 @@ CMakeProject::CMakeProject(CMakeManager *manager, const FileName &fileName) setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT)); setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX)); - m_projectName = fileName.parentDir().fileName(); + m_rootNode->setDisplayName(fileName.parentDir().fileName()); m_file = new CMakeFile(this, fileName); @@ -290,7 +290,6 @@ bool CMakeProject::parseCMakeLists() // how can we ensure that it is completely written? m_watcher->addPath(cbpFile); - m_projectName = cbpparser.projectName(); m_rootNode->setDisplayName(cbpparser.projectName()); //qDebug()<<"Building Tree"; @@ -505,7 +504,7 @@ ProjectExplorer::FolderNode *CMakeProject::findOrCreateFolder(CMakeProjectNode * QString CMakeProject::displayName() const { - return m_projectName; + return m_rootNode->displayName(); } Core::IDocument *CMakeProject::document() const diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index d61585ce7e9..290c5845cd3 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -149,7 +149,6 @@ private: ProjectExplorer::Target *m_activeTarget; Utils::FileName m_fileName; Internal::CMakeFile *m_file; - QString m_projectName; // TODO probably need a CMake specific node structure Internal::CMakeProjectNode *m_rootNode;