summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-05-28 11:05:37 +0200
committerEike Ziller <eike.ziller@qt.io>2018-05-28 13:45:20 +0000
commit6e66b2a078c53c3c2ce18578acfd346274213762 (patch)
treef775c74fcf1a149654ac51e2084259bae81ea621 /src/plugins/projectexplorer
parent8d9942300f715a4b9355062c3b709698ec6ea1f1 (diff)
downloadqt-creator-6e66b2a078c53c3c2ce18578acfd346274213762.tar.gz
Remove some lambdas from Utils::transform calls
It is often possible to user (member) functions or members directly. That improves readablility and potentially reduces the total number of symbols. Also use qobject_container_cast at places where it is appropriate. Change-Id: Ia2591bca356591e001e2c53eeebcf753e5bc3c37 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp3
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp2
-rw-r--r--src/plugins/projectexplorer/kitmanager.cpp2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp3
-rw-r--r--src/plugins/projectexplorer/projectmodels.cpp2
-rw-r--r--src/plugins/projectexplorer/target.cpp6
-rw-r--r--src/plugins/projectexplorer/toolchainmanager.cpp4
7 files changed, 9 insertions, 13 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index 840c59d0f2..9f9844c01e 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -166,8 +166,7 @@ void JsonSummaryPage::cleanupPage()
void JsonSummaryPage::triggerCommit(const JsonWizard::GeneratorFiles &files)
{
GeneratedFiles coreFiles
- = Utils::transform(files, [](const JsonWizard::GeneratorFile &f) -> GeneratedFile
- { return f.file; });
+ = Utils::transform(files, &JsonWizard::GeneratorFile::file);
QString errorMessage;
if (!runVersionControl(coreFiles, &errorMessage)) {
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
index ab0f31e1e0..5e599c39de 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
@@ -189,7 +189,7 @@ Core::GeneratedFiles JsonWizardFileGenerator::fileList(Utils::MacroExpander *exp
= Utils::partition(concreteFiles, [](const File &f) { return !QFileInfo(f.source).isDir(); });
const QSet<QString> knownFiles
- = QSet<QString>::fromList(Utils::transform(fileList, [](const File &f) { return f.target; }));
+ = QSet<QString>::fromList(Utils::transform(fileList, &File::target));
foreach (const File &dir, dirList) {
QDir sourceDir(dir.source);
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 26448021f9..8e9b3653ce 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -321,7 +321,7 @@ QList<Kit *> KitManager::sortKits(const QList<Kit *> kits)
return a.second < b.second;
return a. first < b.first;
});
- return Utils::transform(sortList, [](const QPair<QString, Kit *> &a) { return a.second; });
+ return Utils::transform(sortList, &QPair<QString, Kit *>::second);
}
KitManager::KitList KitManager::restoreKits(const FileName &fileName)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 99af2ba885..d4cd718659 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -3211,8 +3211,7 @@ void ProjectExplorerPlugin::addExistingFiles(FolderNode *folderNode, const QStri
const QString message = tr("Could not add following files to project %1:")
.arg(folderNode->managingProject()->displayName()) + QLatin1Char('\n');
const QStringList nativeFiles
- = Utils::transform(notAdded,
- [](const QString &f) { return QDir::toNativeSeparators(f); });
+ = Utils::transform(notAdded, &QDir::toNativeSeparators);
QMessageBox::warning(ICore::mainWindow(), tr("Adding Files to Project Failed"),
message + nativeFiles.join(QLatin1Char('\n')));
fileNames = Utils::filtered(fileNames,
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 6111928c05..6ceab6673f 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -338,7 +338,7 @@ WrapperNode *FlatModel::nodeForProject(const Project *project) const
void FlatModel::loadExpandData()
{
const QList<QVariant> data = SessionManager::value("ProjectTree.ExpandData").value<QList<QVariant>>();
- m_toExpand = Utils::transform<QSet>(data, [](const QVariant &v) { return ExpandData::fromSettings(v); });
+ m_toExpand = Utils::transform<QSet>(data, &ExpandData::fromSettings);
m_toExpand.remove(ExpandData());
}
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index de47a67f26..52afed0347 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -358,9 +358,9 @@ BuildTargetInfoList Target::applicationTargets() const
QList<ProjectConfiguration *> Target::projectConfigurations() const
{
QList<ProjectConfiguration *> result;
- result.append(Utils::transform(buildConfigurations(), [](BuildConfiguration *bc) { return qobject_cast<ProjectConfiguration *>(bc); }));
- result.append(Utils::transform(deployConfigurations(), [](DeployConfiguration *dc) { return qobject_cast<ProjectConfiguration *>(dc); }));
- result.append(Utils::transform(runConfigurations(), [](RunConfiguration *rc) { return qobject_cast<ProjectConfiguration *>(rc); }));
+ result.append(Utils::qobject_container_cast<ProjectConfiguration *>(buildConfigurations()));
+ result.append(Utils::qobject_container_cast<ProjectConfiguration *>(deployConfigurations()));
+ result.append(Utils::qobject_container_cast<ProjectConfiguration *>(runConfigurations()));
return result;
}
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index 7bc3274f21..acaeb8b7d7 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -223,9 +223,7 @@ void ToolChainManager::deregisterToolChain(ToolChain *tc)
QSet<Core::Id> ToolChainManager::allLanguages()
{
- return Utils::transform<QSet>(d->m_languages, [](const LanguageDisplayPair &pair) {
- return pair.id;
- });
+ return Utils::transform<QSet>(d->m_languages, &LanguageDisplayPair::id);
}
bool ToolChainManager::registerLanguage(const Core::Id &language, const QString &displayName)