refs #678 and slack discussion, renamed enum name

https://dev.vatsim-germany.org/issues/678#note-7
This commit is contained in:
Klaus Basan
2016-06-25 02:48:06 +02:00
parent fe600e3557
commit 3087a94ea8
5 changed files with 7 additions and 7 deletions

View File

@@ -228,9 +228,9 @@ namespace BlackSample
user.setCallsign(cs); user.setCallsign(cs);
CClient client(user); CClient client(user);
client.setCapability(true, CClient::FsdWithInterimPositions); client.setCapability(true, CClient::FsdWithInterimPositions);
client.setCapability(true, CClient::FsdWithModelDescription); client.setCapability(true, CClient::FsdWithIcaoCodes);
QString myFooModel = QString("fooModel %1").arg(i); const QString myFooModel = QString("fooModel %1").arg(i);
client.setAircraftModel(CAircraftModel(myFooModel, CAircraftModel::TypeQueriedFromNetwork)); client.setQueriedModelString(myFooModel);
list.push_back(client); list.push_back(client);
} }
return list; return list;

View File

@@ -77,7 +77,7 @@ namespace BlackCore
{ {
AcceptsAtisResponses = 1 << 0, AcceptsAtisResponses = 1 << 0,
SupportsInterimPosUpdates = 1 << 1, SupportsInterimPosUpdates = 1 << 1,
SupportsModelDescriptions = 1 << 2, SupportsIcaoCodes = 1 << 2,
SupportsAircraftConfigs = 1 << 3 SupportsAircraftConfigs = 1 << 3
}; };

View File

@@ -956,7 +956,7 @@ namespace BlackCore
int flags = 0; int flags = 0;
if (capabilityFlags & vatCapsAtcInfo) { flags |= AcceptsAtisResponses; } if (capabilityFlags & vatCapsAtcInfo) { flags |= AcceptsAtisResponses; }
if (capabilityFlags & vatCapsInterminPos) { flags |= SupportsInterimPosUpdates; } if (capabilityFlags & vatCapsInterminPos) { flags |= SupportsInterimPosUpdates; }
if (capabilityFlags & vatCapsModelDesc) { flags |= SupportsModelDescriptions; } if (capabilityFlags & vatCapsModelDesc) { flags |= SupportsIcaoCodes; }
if (capabilityFlags & vatCapsAircraftConfig) { flags |= SupportsAircraftConfigs; } if (capabilityFlags & vatCapsAircraftConfig) { flags |= SupportsAircraftConfigs; }
emit cbvar_cast(cbvar)->capabilitiesReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), flags); emit cbvar_cast(cbvar)->capabilitiesReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), flags);
} }

View File

@@ -50,7 +50,7 @@ namespace BlackMisc
QStringList sl; QStringList sl;
if (this->hasCapability(FsdAtisCanBeReceived)) sl << "ATIS"; if (this->hasCapability(FsdAtisCanBeReceived)) sl << "ATIS";
if (this->hasCapability(FsdWithInterimPositions)) sl << "interim pos."; if (this->hasCapability(FsdWithInterimPositions)) sl << "interim pos.";
if (this->hasCapability(FsdWithModelDescription)) sl << "model"; if (this->hasCapability(FsdWithIcaoCodes)) sl << "ICAO";
if (this->hasCapability(FsdWithAircraftConfig)) sl << "aircraft config"; if (this->hasCapability(FsdWithAircraftConfig)) sl << "aircraft config";
if (sl.isEmpty()) return ""; if (sl.isEmpty()) return "";
return sl.join(", "); return sl.join(", ");

View File

@@ -54,7 +54,7 @@ namespace BlackMisc
enum Capabilities enum Capabilities
{ {
FsdWithInterimPositions = BlackMisc::CPropertyIndex::GlobalIndexAbuseMode, FsdWithInterimPositions = BlackMisc::CPropertyIndex::GlobalIndexAbuseMode,
FsdWithModelDescription, FsdWithIcaoCodes, //!< basically means it is a pilot client handling ICAO code pacakages
FsdAtisCanBeReceived, FsdAtisCanBeReceived,
FsdWithAircraftConfig FsdWithAircraftConfig
}; };