flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #624 Use std::make_unique instead of BlackMisc::make_unique.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-03-19 23:35:01 +00:00
parent bb7cf80a20
commit 3001ca1f44
8 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/fscommon/simulatorfscommon.cpp
View File

@@ -9,9 +9,7 @@
#include "simulatorfscommon.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/makeunique.h"
#include "blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h"
#include "blackmisc/makeunique.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
@@ -39,7 +37,7 @@ namespace BlackSimPlugin
{
// hack to init mapper
connect(&m_modelMatcher, &CAircraftMatcher::initializationFinished, this, &CSimulatorFsCommon::ps_mapperInitialized);
auto modelMappingsProvider = std::unique_ptr<IModelMappingsProvider> { BlackMisc::make_unique<CModelMappingsProviderVPilot>(true) };
auto modelMappingsProvider = std::unique_ptr<IModelMappingsProvider> { std::make_unique<CModelMappingsProviderVPilot>(true) };
m_modelMatcher.setModelMappingProvider(std::move(modelMappingsProvider));
bool c = connect(m_aircraftCfgParser.get(), &CAircraftCfgParser::loadingFinished, this, &CSimulatorFsCommon::ps_aircraftCfgParsingFinished);

3
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -15,7 +15,6 @@
#include "blackmisc/logmessage.h"
#include "blackmisc/simulation/modelmappingsprovider.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/makeunique.h"
#include <QDBusServiceWatcher>
#include <QTimer>
#include <QString>
@@ -64,7 +63,7 @@ namespace BlackSimPlugin
m_fastTimer->start(100);
m_slowTimer->start(1000);
m_modelMatcher.setModelMappingProvider(BlackMisc::make_unique<CModelMappingsProviderDummy>());
m_modelMatcher.setModelMappingProvider(std::make_unique<CModelMappingsProviderDummy>());
m_modelMatcher.setDefaultModel(CAircraftModel(
"__XPFW_Jets/A320_a/A320_a_Austrian_Airlines.obj __XPFW_Jets/A320_a/A320_a_Austrian_Airlines.png",
CAircraftModel::TypeModelMatchingDefaultModel,