flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T129, fixed formatting and minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2017-10-04 01:12:26 +02:00
committed by Mathew Sutcliffe
parent f95a0b60cc
commit f98b612797
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/airspacemonitor.cpp
View File

@@ -382,8 +382,7 @@ namespace BlackCore
const CUserList usersByCallsign = sApp->getWebDataServices()->getUsersForCallsign(callsign); const CUserList usersByCallsign = sApp->getWebDataServices()->getUsersForCallsign(callsign);
if (usersByCallsign.isEmpty()) if (usersByCallsign.isEmpty())
{ {
CUser user; const CUser user(callsign);
user.setCallsign(callsign);
users.push_back(user); users.push_back(user);
} }
else else
@@ -1040,9 +1039,11 @@ namespace BlackCore
this->onCustomFSInnPacketReceived(callsign, packet.airlineIcaoDesignator, packet.aircraftIcaoDesignator, packet.combinedCode, packet.modelString); this->onCustomFSInnPacketReceived(callsign, packet.airlineIcaoDesignator, packet.aircraftIcaoDesignator, packet.combinedCode, packet.modelString);
} }
CSimulatedAircraft CAirspaceMonitor::addOrUpdateAircraftInRange(const CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery, const QString &modelString, CAircraftModel::ModelType type, CStatusMessageList *log) CSimulatedAircraft CAirspaceMonitor::addOrUpdateAircraftInRange(
const CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery,
const QString &modelString, CAircraftModel::ModelType modelType, CStatusMessageList *log)
{ {
CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log); CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao, livery, modelString, modelType, log);
const CSimulatedAircraft aircraft = this->getAircraftInRangeForCallsign(callsign); const CSimulatedAircraft aircraft = this->getAircraftInRangeForCallsign(callsign);
if (aircraft.hasValidCallsign()) if (aircraft.hasValidCallsign())
@@ -1367,5 +1368,4 @@ namespace BlackCore
CAirspaceMonitor::FsInnPacket::FsInnPacket(const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &combinedCode, const QString &modelString) : CAirspaceMonitor::FsInnPacket::FsInnPacket(const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &combinedCode, const QString &modelString) :
aircraftIcaoDesignator(aircraftIcaoDesignator.trimmed().toUpper()), airlineIcaoDesignator(airlineIcaoDesignator.trimmed().toUpper()), combinedCode(combinedCode.trimmed().toUpper()), modelString(modelString.trimmed()) aircraftIcaoDesignator(aircraftIcaoDesignator.trimmed().toUpper()), airlineIcaoDesignator(airlineIcaoDesignator.trimmed().toUpper()), combinedCode(combinedCode.trimmed().toUpper()), modelString(modelString.trimmed())
{ } { }
} // namespace } // namespace

2
src/blackcore/airspacemonitor.h
View File

@@ -315,7 +315,7 @@ namespace BlackCore
BlackMisc::Simulation::CSimulatedAircraft addOrUpdateAircraftInRange( BlackMisc::Simulation::CSimulatedAircraft addOrUpdateAircraftInRange(
const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CCallsign &callsign,
const QString &aircraftIcao, const QString &airlineIcao, const QString &livery, const QString &modelString, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery, const QString &modelString,
BlackMisc::Simulation::CAircraftModel::ModelType, BlackMisc::Simulation::CAircraftModel::ModelType modelType,
BlackMisc::CStatusMessageList *log = nullptr); BlackMisc::CStatusMessageList *log = nullptr);
//! Update aircraft //! Update aircraft

1
src/blackmisc/simulation/matchingutils.h
View File

@@ -40,7 +40,6 @@ namespace BlackMisc
const QString &message, const BlackMisc::CLogCategoryList &categories = {}, const QString &message, const BlackMisc::CLogCategoryList &categories = {},
BlackMisc::CStatusMessage::StatusSeverity s = BlackMisc::CStatusMessage::SeverityInfo); BlackMisc::CStatusMessage::StatusSeverity s = BlackMisc::CStatusMessage::SeverityInfo);
//! Specialized log message for matching / reverse lookup //! Specialized log message for matching / reverse lookup
//! \threadsafe //! \threadsafe
static BlackMisc::CStatusMessage logMessage( static BlackMisc::CStatusMessage logMessage(