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

ProjectExplorer: Drop the target argument

Browse Source 
... from ProjectNode::targetData and setTargetData, and rename them
to data and setData.

It was only used in the implementation to retrieve the right node,
instead move the responsibility to find the right node to the caller.

Current assumption is that the functions were always called on
the right node already.

Change-Id: I9ae7e8a7ed5c79b924b99fd9a6a652bad56d114a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-12-18 17:52:19 +01:00
parent 51f93c0dfc
commit 5d1114fe52
10 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -247,27 +247,18 @@ QStringList QmakeProFileNode::targetApplications() const
return apps;
}
QVariant QmakeProFileNode::targetData(Core::Id role, const Target *target) const
QVariant QmakeProFileNode::data(Core::Id role) const
{
RunConfiguration *rc = target->activeRunConfiguration();
if (!rc)
return {};
const FileName projectFilePath = FileName::fromString(rc->buildKey());
const ProjectNode *projectNode = target->project()->findNodeForBuildKey(rc->buildKey());
auto profileNode = dynamic_cast<const QmakeProFileNode *>(projectNode);
QTC_ASSERT(profileNode, return {});
if (role == Android::Constants::AndroidPackageSourceDir)
return profileNode->singleVariableValue(Variable::AndroidPackageSourceDir);
return singleVariableValue(Variable::AndroidPackageSourceDir);
if (role == Android::Constants::AndroidDeploySettingsFile)
return profileNode->singleVariableValue(Variable::AndroidDeploySettingsFile);
return singleVariableValue(Variable::AndroidDeploySettingsFile);
if (role == Android::Constants::AndroidExtraLibs)
return profileNode->variableValue(Variable::AndroidExtraLibs);
return variableValue(Variable::AndroidExtraLibs);
if (role == Android::Constants::AndroidArch)
return profileNode->singleVariableValue(Variable::AndroidArch);
return singleVariableValue(Variable::AndroidArch);
if (role == Android::Constants::AndroidSoLibPath) {
TargetInformation info = profileNode->targetInformation();
TargetInformation info = targetInformation();
QStringList res = {info.buildDir.toString()};
Utils::FileName destDir = info.destDir;
if (!destDir.isEmpty()) {
@@ -283,18 +274,9 @@ QVariant QmakeProFileNode::targetData(Core::Id role, const Target *target) const
return {};
}
static QmakeProFile *applicationProFile(const Target *target)
bool QmakeProFileNode::setData(Core::Id role, const QVariant &value) const
{
ProjectExplorer::RunConfiguration *rc = target->activeRunConfiguration();
if (!rc)
return nullptr;
auto project = static_cast<QmakeProject *>(target->project());
return project->rootProFile()->findProFile(FileName::fromString(rc->buildKey()));
}
bool QmakeProFileNode::setTargetData(Core::Id role, const QVariant &value, const Target *target) const
{
QmakeProFile *pro = applicationProFile(target);
QmakeProFile *pro = proFile();
if (!pro)
return false;