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

Qbs: Rename a couple of members to make them more obviously Qbs related

Browse Source 
This is to avoid confusion between methods referring to Qt Creator classes
and Qbs classes of the same name.

Change-Id: I25b40c6fe1d2272a9d9b0f7fab2a4cafa079df8c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-05-16 16:20:06 +02:00
parent 728a06aa04
commit 82a341da14
3 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,9 @@ namespace Internal {
// --------------------------------------------------------------------
QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
m_manager(manager), m_projectName(QFileInfo(fileName).completeBaseName()), m_fileName(fileName),
m_manager(manager),
m_projectName(QFileInfo(fileName).completeBaseName()),
m_fileName(fileName),
m_rootProjectNode(new QbsProjectNode(fileName)),
m_qbsSetupProjectJob(0),
m_qbsUpdateFutureInterface(0),
@@ -155,8 +157,8 @@ QStringList QbsProject::files(ProjectExplorer::Project::FilesMode fileMode) cons
{
Q_UNUSED(fileMode);
QSet<QString> result;
if (m_rootProjectNode && m_rootProjectNode->projectData()) {
foreach (const qbs::ProductData &prd, m_rootProjectNode->projectData()->products()) {
if (m_rootProjectNode && m_rootProjectNode->qbsProjectData()) {
foreach (const qbs::ProductData &prd, m_rootProjectNode->qbsProjectData()->products()) {
foreach (const qbs::GroupData &grp, prd.groups()) {
foreach (const QString &file, grp.allFilePaths())
result.insert(file);
@@ -164,7 +166,7 @@ QStringList QbsProject::files(ProjectExplorer::Project::FilesMode fileMode) cons
}
result.insert(prd.location().fileName);
}
result.insert(m_rootProjectNode->projectData()->location().fileName);
result.insert(m_rootProjectNode->qbsProjectData()->location().fileName);
}
return result.toList();
}
@@ -229,14 +231,14 @@ const qbs::Project *QbsProject::qbsProject() const
{
if (!m_rootProjectNode)
return 0;
return m_rootProjectNode->project();
return m_rootProjectNode->qbsProject();
}
const qbs::ProjectData *QbsProject::qbsProjectData() const
{
if (!m_rootProjectNode)
return 0;
return m_rootProjectNode->projectData();
return m_rootProjectNode->qbsProjectData();
}
bool QbsProject::needsSpecialDeployment() const
@@ -265,10 +267,10 @@ void QbsProject::handleQbsParsingDone(bool success)
m_rootProjectNode->update(project);
updateDocuments(m_rootProjectNode->projectData());
updateDocuments(m_rootProjectNode->qbsProjectData());
updateCppCodeModel(m_rootProjectNode->projectData());
updateQmlJsCodeModel(m_rootProjectNode->projectData());
updateCppCodeModel(m_rootProjectNode->qbsProjectData());
updateQmlJsCodeModel(m_rootProjectNode->qbsProjectData());
foreach (ProjectExplorer::Target *t, targets())
t->updateDefaultRunConfigurations();