refs #649, refs #656, adjusted flags

* removed now outdated enums
* sorted enums (better debugging)
* utility functions
This commit is contained in:
Klaus Basan
2016-05-24 00:28:03 +02:00
parent 0be85cf4fe
commit e5f8a5108f
4 changed files with 92 additions and 47 deletions

View File

@@ -32,22 +32,23 @@ namespace BlackMisc
//! Which data to read, requires corresponding readers
enum EntityFlag
{
NoEntity = 0, //!< no data at all
BookingEntity = 1 << 0, //!< bookings
MetarEntity = 1 << 1, //!< METAR
AircraftIcaoEntity = 1 << 2, //!< ICAO codes for aircraft
AirlineIcaoEntity = 1 << 3, //!< ICAO codes for airlines
CountryEntity = 1 << 4, //!< country codes
DistributorEntity = 1 << 5, //!< distributors
LiveryEntity = 1 << 6, //!< liveries
ModelEntity = 1 << 7, //!< models
VatsimDataFile = 1 << 8, //!< the VATSIM data file (multiple data entities)
VatsimStatusFile = 1 << 9, //!< the VATSIM status file (URLs for data files etc.)
AllEntities = ((1<<10)-1), //!< everything
AllIcaoEntities = AircraftIcaoEntity | AirlineIcaoEntity, //!< all ICAO codes
AllIcaoAndCountries = AircraftIcaoEntity | AirlineIcaoEntity | CountryEntity, //!< all ICAO codes and countries
DistributorLiveryModel = DistributorEntity | LiveryEntity | ModelEntity, //!< Combinded
AllDbEntities = AllIcaoEntities | DistributorLiveryModel, //!< All DB stuff
NoEntity = 0, //!< no data at all
InfoObjectEntity = 1 << 0, //!< info about DB data (kinf of metadata)
AircraftIcaoEntity = 1 << 1, //!< ICAO codes for aircraft
AirlineIcaoEntity = 1 << 2, //!< ICAO codes for airlines
CountryEntity = 1 << 3, //!< country codes
DistributorEntity = 1 << 4, //!< distributors
LiveryEntity = 1 << 5, //!< liveries
ModelEntity = 1 << 6, //!< models
BookingEntity = 1 << 7, //!< bookings
MetarEntity = 1 << 8, //!< METAR
VatsimDataFile = 1 << 9, //!< the VATSIM data file (multiple data entities)
VatsimStatusFile = 1 << 10, //!< the VATSIM status file (URLs for data files etc.)
AllEntities = ((1 << 11) - 1), //!< everything
AllIcaoEntities = AircraftIcaoEntity | AirlineIcaoEntity, //!< all ICAO codes
AllIcaoAndCountries = AircraftIcaoEntity | AirlineIcaoEntity | CountryEntity, //!< all ICAO codes and countries
DistributorLiveryModel = DistributorEntity | LiveryEntity | ModelEntity, //!< Combinded
AllDbEntities = AllIcaoEntities | DistributorLiveryModel | InfoObjectEntity //!< All DB stuff
};
Q_DECLARE_FLAGS(Entity, EntityFlag)
@@ -66,15 +67,30 @@ namespace BlackMisc
//! Convert to string
static QString flagToString(BlackMisc::Network::CEntityFlags::Entity flag);
//! Representing single entity?
static bool isSingleEntity(BlackMisc::Network::CEntityFlags::Entity flag);
//! Represented number of entities
static int numberOfEntities(BlackMisc::Network::CEntityFlags::Entity flag);
//! Convert to string
static QString flagToString(ReadState flag);
//! Flag to severity
static BlackMisc::CStatusMessage::StatusSeverity flagToSeverity(ReadState state);
//! To flag
static EntityFlag entityToEntityFlag(Entity entity);
//! Return single entity and remove it from entities
static Entity iterateDbEntities(Entity &entities);
//! Read state representing warning or above?
static bool isWarningOrAbove(ReadState state);
//! Representing at least one DB entity
static bool anySwiftDbEntity(Entity entities);
//! Register metadata
static void registerMetadata();
};