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

Qbs: Move updating of files from a project to own method

Browse Source 
Change-Id: I88b41ff450dac4e0c2e5a34e3332e559c1919e6e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-06-24 12:06:13 +02:00
parent 53bfe6e0d8
commit 21cccaa1c9
4 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -768,12 +768,19 @@ bool QbsProjectNode::addFiles(const QStringList &filePaths, QStringList *notAdde
return prd ? prd->addFiles(filePaths, notAdded) : false;
}
void QbsProjectNode::update(const qbs::Project &prj)
void QbsProjectNode::setProject(const qbs::Project &prj)
{
update(prj.isValid() ? prj.projectData() : qbs::ProjectData());
m_qbsProject = prj;
}
void QbsProjectNode::update()
{
if (m_qbsProject.isValid())
update(m_qbsProject.projectData());
else
update(qbs::ProjectData());
}
void QbsProjectNode::update(const qbs::ProjectData &prjData)
{
QList<ProjectExplorer::ProjectNode *> toAdd;
@@ -808,8 +815,6 @@ void QbsProjectNode::update(const qbs::ProjectData &prjData)
removeProjectNodes(toRemove);
addProjectNodes(toAdd);
m_qbsProjectData = prjData;
}
QbsProject *QbsProjectNode::project() const
@@ -829,7 +834,7 @@ const qbs::Project QbsProjectNode::qbsProject() const
const qbs::ProjectData QbsProjectNode::qbsProjectData() const
{
return m_qbsProjectData;
return m_qbsProject.projectData();
}
bool QbsProjectNode::showInSimpleTree() const