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

4
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -186,7 +186,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
RunConfiguration *rc = target()->activeRunConfiguration();
const ProjectNode *node = rc ? target()->project()->findNodeForBuildKey(rc->buildKey()) : nullptr;
QFileInfo sourceDirInfo(node ? node->targetData(Constants::AndroidPackageSourceDir, target()).toString() : QString());
QFileInfo sourceDirInfo(node ? node->data(Constants::AndroidPackageSourceDir).toString() : QString());
parser->setSourceDirectory(Utils::FileName::fromString(sourceDirInfo.canonicalFilePath()));
parser->setBuildDirectory(Utils::FileName::fromString(bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString()));
setOutputParser(parser);
@@ -209,7 +209,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
QString inputFile;
if (node)
inputFile = node->targetData(Constants::AndroidDeploySettingsFile, target()).toString();
inputFile = node->data(Constants::AndroidDeploySettingsFile).toString();
if (inputFile.isEmpty()) {
m_skipBuilding = true;

8
src/plugins/android/androiddebugsupport.cpp
View File

@@ -100,11 +100,11 @@ static QStringList getSoLibSearchPath(const RunConfiguration *rc)
return {};
QStringList res;
node->forEachProjectNode([&res, target](const ProjectNode *node) {
res.append(node->targetData(Constants::AndroidSoLibPath, target).toStringList());
node->forEachProjectNode([&res](const ProjectNode *node) {
res.append(node->data(Constants::AndroidSoLibPath).toStringList());
});
const QString jsonFile = node->targetData(Android::Constants::AndroidDeploySettingsFile, target).toString();
const QString jsonFile = node->data(Android::Constants::AndroidDeploySettingsFile).toString();
QFile deploymentSettings(jsonFile);
if (deploymentSettings.open(QIODevice::ReadOnly)) {
QJsonParseError error;
@@ -127,7 +127,7 @@ static QStringList getExtraLibs(const RunConfiguration *rc)
if (!node)
return {};
return node->targetData(Android::Constants::AndroidExtraLibs, rc->target()).toStringList();
return node->data(Android::Constants::AndroidExtraLibs).toStringList();
}
static QString toNdkArch(const QString &arch)

2
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -194,7 +194,7 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
QString jsonFile;
if (const ProjectNode *node = target()->project()->findNodeForBuildKey(rc->buildKey()))
jsonFile = node->targetData(Constants::AndroidDeploySettingsFile, target()).toString();
jsonFile = node->data(Constants::AndroidDeploySettingsFile).toString();
if (jsonFile.isEmpty()) {
emit addOutput(tr("Cannot find the androiddeploy Json file."), OutputFormat::Stderr);
return false;

6
src/plugins/android/androidextralibrarylistmodel.cpp
View File

@@ -99,7 +99,7 @@ void AndroidExtraLibraryListModel::updateModel()
bool enabled;
beginResetModel();
if (node->validParse()) {
m_entries = node->targetData(Constants::AndroidExtraLibs, m_target).toStringList();
m_entries = node->data(Constants::AndroidExtraLibs).toStringList();
enabled = true;
} else {
// parsing error
@@ -125,7 +125,7 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
for (const QString &path : list)
m_entries += "$$PWD/" + dir.relativeFilePath(path);
node->setTargetData(Constants::AndroidExtraLibs, m_entries, m_target);
node->setData(Constants::AndroidExtraLibs, m_entries);
endInsertRows();
}
@@ -159,7 +159,7 @@ void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
QTC_ASSERT(rc, return);
const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
QTC_ASSERT(node, return);
node->setTargetData(Constants::AndroidExtraLibs, m_entries, m_target);
node->setData(Constants::AndroidExtraLibs, m_entries);
}
} // Android

4
src/plugins/android/androidmanager.cpp
View File

@@ -304,7 +304,7 @@ Utils::FileName AndroidManager::manifestSourcePath(ProjectExplorer::Target *targ
{
if (const ProjectNode *node = currentProjectNode(target)) {
const QString packageSource
= node->targetData(Android::Constants::AndroidPackageSourceDir, target).toString();
= node->data(Android::Constants::AndroidPackageSourceDir).toString();
if (!packageSource.isEmpty()) {
const FileName manifest = FileName::fromUserInput(packageSource + "/AndroidManifest.xml");
if (manifest.exists())
@@ -627,7 +627,7 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target)
if (!node)
return false;
QFileInfo sourceDirInfo(node->targetData(Constants::AndroidPackageSourceDir, target).toString());
QFileInfo sourceDirInfo(node->data(Constants::AndroidPackageSourceDir).toString());
FileName packageSourceDir = FileName::fromString(sourceDirInfo.canonicalFilePath());
if (!packageSourceDir.appendPath("gradlew").exists())
return false;

6
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -186,7 +186,7 @@ void ChooseDirectoryPage::initializePage()
QString androidPackageDir;
if (const ProjectNode *node = target->project()->findNodeForBuildKey(buildKey))
androidPackageDir = node->targetData(Android::Constants::AndroidPackageSourceDir, target).toString();
androidPackageDir = node->data(Android::Constants::AndroidPackageSourceDir).toString();
if (androidPackageDir.isEmpty()) {
m_label->setText(tr("Select the Android package source directory.\n\n"
@@ -352,14 +352,14 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
ProjectNode *node = m_target->project()->findNodeForBuildKey(m_buildKey);
if (node) {
node->addFiles(addedFiles);
androidPackageDir = node->targetData(Android::Constants::AndroidPackageSourceDir, m_target).toString();
androidPackageDir = node->data(Android::Constants::AndroidPackageSourceDir).toString();
}
if (androidPackageDir.isEmpty()) {
// and now time for some magic
const BuildTargetInfo bti = m_target->applicationTargets().buildTargetInfo(m_buildKey);
const QString value = "$$PWD/" + bti.projectFilePath.toFileInfo().absoluteDir().relativeFilePath(m_directory);
bool result = node->setTargetData(Android::Constants::AndroidPackageSourceDir, value, m_target);
bool result = node->setData(Android::Constants::AndroidPackageSourceDir, value);
if (!result) {
QMessageBox::warning(this, tr("Project File not Updated"),