From 3c2285e46bdc1e1f760475122e054bdd302b9487 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sun, 20 Mar 2016 00:40:03 +0000 Subject: [PATCH] refs #624 Use generic lambda to reduce redundancy in relation to CWorker::thenWithResult. --- src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp | 2 +- src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp index 515aafe18..e9cd16b8b 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp @@ -115,7 +115,7 @@ namespace BlackMisc auto aircraftCfgEntriesList = this->performParsing(rootDirectory, excludedDirectories, &ok); return std::make_pair(aircraftCfgEntriesList, ok); }); - m_parserWorker->thenWithResult>(this, [this](const std::pair &pair) + m_parserWorker->thenWithResult>(this, [this](const auto &pair) { if (pair.second) { this->updateCfgEntriesList(pair.first); } }); diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index 9a4d064bd..3bda32904 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -95,9 +95,9 @@ namespace BlackMisc auto models = performParsing(rootDirectory, excludedDirectories); return models; }); - m_parserWorker->thenWithResult(this, [this](const CAircraftModelList & models) + m_parserWorker->thenWithResult(this, [this](const auto & models) { - updateInstalledModels(models); + this->updateInstalledModels(models); }); } else if (mode == ModeBlocking)