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

QbsProjectManager: Get rid of some redirections when accessing members.

Browse Source 
Change-Id: I3f2c7717179bf1654c6bdafd2088f5384287f90e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-09-11 13:58:47 +02:00
parent 38320b15f5
commit 222fbdb58b
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -484,12 +484,11 @@ void QbsProject::readQbsData()
m_rootProjectNode->update(); m_rootProjectNode->update();
qbs::Project project = m_rootProjectNode->qbsProject(); updateDocuments(m_qbsProject.isValid()
updateDocuments(project.isValid() ? project.buildSystemFiles() : QSet<QString>() << m_fileName); ? m_qbsProject.buildSystemFiles() : QSet<QString>() << m_fileName);
qbs::ProjectData data = m_rootProjectNode->qbsProjectData(); updateCppCodeModel();
updateCppCodeModel(data); updateQmlJsCodeModel();
updateQmlJsCodeModel(data);
updateBuildTargetData(); updateBuildTargetData();
emit fileListChanged(); emit fileListChanged();
@@ -654,9 +653,9 @@ void QbsProject::updateDocuments(const QSet<QString> &files)
m_qbsDocuments.unite(toAdd); m_qbsDocuments.unite(toAdd);
} }
void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj) void QbsProject::updateCppCodeModel()
{ {
if (!prj.isValid()) if (!m_projectData.isValid())
return; return;
QtSupport::BaseQtVersion *qtVersion = QtSupport::BaseQtVersion *qtVersion =
@@ -683,7 +682,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
} }
QHash<QString, QString> uiFiles; QHash<QString, QString> uiFiles;
foreach (const qbs::ProductData &prd, prj.allProducts()) { foreach (const qbs::ProductData &prd, m_projectData.allProducts()) {
foreach (const qbs::GroupData &grp, prd.groups()) { foreach (const qbs::GroupData &grp, prd.groups()) {
const qbs::PropertyMap &props = grp.properties(); const qbs::PropertyMap &props = grp.properties();
@@ -764,9 +763,8 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
m_codeModelFuture = modelmanager->updateProjectInfo(pinfo); m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
} }
void QbsProject::updateQmlJsCodeModel(const qbs::ProjectData &prj) void QbsProject::updateQmlJsCodeModel()
{ {
Q_UNUSED(prj);
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
if (!modelManager) if (!modelManager)
return; return;

4
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -133,8 +133,8 @@ private:
void prepareForParsing(); void prepareForParsing();
void updateDocuments(const QSet<QString> &files); void updateDocuments(const QSet<QString> &files);
void updateCppCodeModel(const qbs::ProjectData &prj); void updateCppCodeModel();
void updateQmlJsCodeModel(const qbs::ProjectData &prj); void updateQmlJsCodeModel();
void updateApplicationTargets(); void updateApplicationTargets();
void updateDeploymentInfo(); void updateDeploymentInfo();
void updateBuildTargetData(); void updateBuildTargetData();