flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T182, formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-11-08 02:50:31 +01:00
parent 9048ff0977
commit 095e11d288
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackcore/aircraftmatcher.cpp
View File

@@ -27,15 +27,15 @@
#include <QStringBuilder> #include <QStringBuilder>
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
namespace BlackCore namespace BlackCore
{ {
const CLogCategoryList &CAircraftMatcher::getLogCategories() const CLogCategoryList &CAircraftMatcher::getLogCategories()
{ {
static const BlackMisc::CLogCategoryList cats { CLogCategory::matching() }; static const CLogCategoryList cats { CLogCategory::matching() };
return cats; return cats;
} }
@@ -464,7 +464,7 @@ namespace BlackCore
return m_defaultModel; return m_defaultModel;
} }
void CAircraftMatcher::setDefaultModel(const BlackMisc::Simulation::CAircraftModel &defaultModel) void CAircraftMatcher::setDefaultModel(const CAircraftModel &defaultModel)
{ {
m_defaultModel = defaultModel; m_defaultModel = defaultModel;
m_defaultModel.setModelType(CAircraftModel::TypeModelMatchingDefaultModel); m_defaultModel.setModelType(CAircraftModel::TypeModelMatchingDefaultModel);
@@ -522,9 +522,9 @@ namespace BlackCore
m_statistics.addAircraftAirlineCombination(type, sessionId, m_modelSetInfo, description, aircraftIcao, airlineIcao); m_statistics.addAircraftAirlineCombination(type, sessionId, m_modelSetInfo, description, aircraftIcao, airlineIcao);
} }
CAircraftModel CAircraftMatcher::getClosestMatchSearchImplementation(MatchingMode mode, const BlackMisc::Simulation::CAircraftModelList &modelSet, const CSimulatedAircraft &remoteAircraft, CStatusMessageList *log) const CAircraftModel CAircraftMatcher::getClosestMatchSearchImplementation(MatchingMode mode, const CAircraftModelList &modelSet, const CSimulatedAircraft &remoteAircraft, CStatusMessageList *log) const
{ {
BlackMisc::Simulation::CAircraftModelList matchedModels(modelSet); CAircraftModelList matchedModels(modelSet);
CAircraftModel matchedModel(remoteAircraft.getModel()); CAircraftModel matchedModel(remoteAircraft.getModel());
// primary reduction // primary reduction
bool reduced = false; bool reduced = false;
@@ -796,7 +796,7 @@ namespace BlackCore
return inList; return inList;
} }
BlackMisc::Simulation::CAircraftModelList searchModels(inList.findByIcaoDesignators( CAircraftModelList searchModels(inList.findByIcaoDesignators(
remoteAircraft.getAircraftIcaoCode(), remoteAircraft.getAircraftIcaoCode(),
ignoreAirline ? CAirlineIcaoCode() : remoteAircraft.getAirlineIcaoCode())); ignoreAirline ? CAirlineIcaoCode() : remoteAircraft.getAirlineIcaoCode()));
@@ -970,7 +970,7 @@ namespace BlackCore
return byCombinedCode; return byCombinedCode;
} }
CAircraftModelList CAircraftMatcher::ifPossibleReduceByMilitaryFlag(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, const CAircraftModelList &inList, bool &reduced, CStatusMessageList *log) CAircraftModelList CAircraftMatcher::ifPossibleReduceByMilitaryFlag(const CSimulatedAircraft &remoteAircraft, const CAircraftModelList &inList, bool &reduced, CStatusMessageList *log)
{ {
reduced = false; reduced = false;
const bool military = remoteAircraft.getModel().isMilitary(); const bool military = remoteAircraft.getModel().isMilitary();