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

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

@@ -267,20 +267,20 @@ QList<ProjectExplorer::RunConfiguration *> QbsBaseProjectNode::runConfigurations
QbsGroupNode::QbsGroupNode(const qbs::GroupData *grp, const QString &productPath) :
QbsBaseProjectNode(QString()),
m_group(0)
m_qbsGroupData(0)
{
setIcon(m_groupIcon);
setGroup(grp, productPath);
setQbsGroupData(grp, productPath);
}
bool QbsGroupNode::isEnabled() const
{
return static_cast<QbsProductNode *>(parentFolderNode())->isEnabled() && group()->isEnabled();
return static_cast<QbsProductNode *>(parentFolderNode())->isEnabled() && qbsGroupData()->isEnabled();
}
void QbsGroupNode::setGroup(const qbs::GroupData *group, const QString &productPath)
void QbsGroupNode::setQbsGroupData(const qbs::GroupData *group, const QString &productPath)
{
if (group == m_group && productPath == m_productPath)
if (group == m_qbsGroupData && productPath == m_productPath)
return;
m_productPath = productPath;
@@ -291,7 +291,7 @@ void QbsGroupNode::setGroup(const qbs::GroupData *group, const QString &productP
// set up file node...
QbsFileNode *indexFile = 0;
if (!m_group) {
if (!m_qbsGroupData) {
indexFile = new QbsFileNode(group->location().fileName,
ProjectExplorer::ProjectFileType, false,
group->location().line);
@@ -303,14 +303,14 @@ void QbsGroupNode::setGroup(const qbs::GroupData *group, const QString &productP
indexFile->emitNodeUpdated();
}
m_group = group;
m_qbsGroupData = group;
setGroup(this, group, productPath, QList<ProjectExplorer::Node *>() << indexFile);
setQbsGroupData(this, group, productPath, QList<ProjectExplorer::Node *>() << indexFile);
emitNodeUpdated();
}
void QbsGroupNode::setGroup(QbsBaseProjectNode *root, const qbs::GroupData *group,
const QString &productPath, QList<ProjectExplorer::Node *> keepers)
void QbsGroupNode::setQbsGroupData(QbsBaseProjectNode *root, const qbs::GroupData *group,
const QString &productPath, QList<ProjectExplorer::Node *> keepers)
{
// Build up a tree of nodes:
FileTreeNode *tree = new FileTreeNode(QString());
@@ -395,20 +395,20 @@ void QbsGroupNode::setupFolders(QbsBaseProjectNode *topLevel, ProjectExplorer::F
QbsProductNode::QbsProductNode(const qbs::ProductData *prd) :
QbsBaseProjectNode(prd->location().fileName),
m_product(0)
m_qbsProductData(0)
{
setIcon(m_productIcon);
setProduct(prd);
setQbsProductData(prd);
}
bool QbsProductNode::isEnabled() const
{
return product()->isEnabled();
return qbsProductData()->isEnabled();
}
void QbsProductNode::setProduct(const qbs::ProductData *prd)
void QbsProductNode::setQbsProductData(const qbs::ProductData *prd)
{
if (m_product == prd)
if (m_qbsProductData == prd)
return;
setDisplayName(prd->name());
@@ -437,14 +437,14 @@ void QbsProductNode::setProduct(const qbs::ProductData *prd)
foreach (const qbs::GroupData &grp, prd->groups()) {
if (grp.name() == prd->name() && grp.location() == prd->location()) {
// Set implicit product group right onto this node:
QbsGroupNode::setGroup(this, &grp, productPath, toKeep);
QbsGroupNode::setQbsGroupData(this, &grp, productPath, toKeep);
continue;
}
QbsGroupNode *qn = findGroupNode(grp.name());
if (qn) {
toRemove.removeAll(qn);
toKeep.append(qn);
qn->setGroup(&grp, productPath);
qn->setQbsGroupData(&grp, productPath);
} else {
qn = new QbsGroupNode(&grp, productPath);
toAdd.append(qn);
@@ -455,7 +455,7 @@ void QbsProductNode::setProduct(const qbs::ProductData *prd)
addProjectNodes(toAdd);
removeProjectNodes(toRemove);
m_product = prd;
m_qbsProductData = prd;
emitNodeUpdated();
}
@@ -463,7 +463,7 @@ QbsGroupNode *QbsProductNode::findGroupNode(const QString &name)
{
foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) {
QbsGroupNode *qn = static_cast<QbsGroupNode *>(n);
if (qn->group()->name() == name)
if (qn->qbsGroupData()->name() == name)
return qn;
}
return 0;
@@ -475,7 +475,7 @@ QbsGroupNode *QbsProductNode::findGroupNode(const QString &name)
QbsProjectNode::QbsProjectNode(const QString &projectFile) :
QbsBaseProjectNode(projectFile),
m_project(0), m_projectData(0)
m_qbsProject(0), m_qbsProjectData(0)
{
setIcon(m_projectIcon);
addFileNodes(QList<ProjectExplorer::FileNode *>()
@@ -484,8 +484,8 @@ QbsProjectNode::QbsProjectNode(const QString &projectFile) :
QbsProjectNode::~QbsProjectNode()
{
delete m_projectData;
delete m_project;
delete m_qbsProjectData;
delete m_qbsProject;
}
void QbsProjectNode::update(const qbs::Project *prj)
@@ -502,37 +502,37 @@ void QbsProjectNode::update(const qbs::Project *prj)
if (!qn) {
toAdd << new QbsProductNode(&prd);
} else {
qn->setProduct(&prd);
qn->setQbsProductData(&prd);
toRemove.removeOne(qn);
}
}
}
delete m_projectData;
m_projectData = newData;
delete m_qbsProjectData;
m_qbsProjectData = newData;
delete m_project;
m_project = prj;
delete m_qbsProject;
m_qbsProject = prj;
removeProjectNodes(toRemove);
addProjectNodes(toAdd);
}
const qbs::Project *QbsProjectNode::project() const
const qbs::Project *QbsProjectNode::qbsProject() const
{
return m_project;
return m_qbsProject;
}
const qbs::ProjectData *QbsProjectNode::projectData() const
const qbs::ProjectData *QbsProjectNode::qbsProjectData() const
{
return m_projectData;
return m_qbsProjectData;
}
QbsProductNode *QbsProjectNode::findProductNode(const QString &name)
{
foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) {
QbsProductNode *qn = static_cast<QbsProductNode *>(n);
if (qn->product()->name() == name)
if (qn->qbsProductData()->name() == name)
return qn;
}
return 0;