refs #402, post merge feedback by MS

This commit is contained in:
Klaus Basan
2015-04-09 13:59:40 +02:00
parent e7c8c28252
commit aafee8eafd
31 changed files with 105 additions and 119 deletions

View File

@@ -28,7 +28,7 @@ namespace BlackCore
CAirspaceMonitor::CAirspaceMonitor(QObject *parent, const BlackMisc::Simulation::IOwnAircraftProviderReadOnly *ownAircraftProvider, INetwork *network, CVatsimBookingReader *bookings, CVatsimDataFileReader *dataFile)
: QObject(parent),
COwnAircraftProviderSupportReadOnly(ownAircraftProvider),
COwnAircraftAwareReadOnly(ownAircraftProvider),
m_network(network), m_vatsimBookingReader(bookings), m_vatsimDataFileReader(dataFile),
m_atcWatchdog(this), m_aircraftWatchdog(this)
{
@@ -144,8 +144,7 @@ namespace BlackCore
CSimulatedAircraft aircraft = m_aircraftInRange.findFirstByCallsign(callsign);
if (!aircraft.hasValidCallsign()) { return false; }
CAircraftModel newModel(model);
aircraft.setModel(newModel); // this consolidates all common data such as callsign, ICAO ...
aircraft.setModel(model); // this consolidates all common data such as callsign, ICAO ...
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, aircraft.getModel().toCVariant());
int c = m_aircraftInRange.applyIfCallsign(callsign, vm);