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

refs #649, refs #656, adjusted flags

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackcore/webreaderflags.cpp
View File

@@ -7,9 +7,7 @@
* contained in the LICENSE file.
*/
//! \cond PRIVATE
#include "blackcore/webreaderflags.h"
#include "webreaderflags.h"
using namespace BlackMisc::Network;
@@ -32,6 +30,11 @@ namespace BlackCore
f |= ModelReader;
}
if (entity.testFlag(CEntityFlags::InfoObjectEntity))
{
f |= InfoDataReader;
}
if (entity.testFlag(CEntityFlags::BookingEntity))
{
f |= VatsimBookingReader;
@@ -56,9 +59,7 @@ namespace BlackCore
bool CWebReaderFlags::isFromSwiftDb(WebReader reader)
{
return reader.testFlag(ModelReader) || reader.testFlag(IcaoDataReader);
return reader.testFlag(ModelReader) || reader.testFlag(IcaoDataReader) || reader.testFlag(InfoDataReader);
}
} // namespace
//! \endcond

20
src/blackcore/webreaderflags.h
View File

@@ -35,38 +35,26 @@ namespace BlackCore
VatsimMetarReader = 1 << 2, //!< reader for VATSIM metar data
IcaoDataReader = 1 << 3, //!< reader for ICAO data
ModelReader = 1 << 4, //!< reader for model data such as liveries, models, etc
InfoDataReader = 1 << 5, //!< DB info data (metdata, how many data, when updated)
AllVatsimReaders = VatsimBookingReader | VatsimDataReader | VatsimMetarReader, //!< all readers
AllSwiftDbReaders = IcaoDataReader | ModelReader, //!< all swift data
AllSwiftDbReaders = IcaoDataReader | ModelReader | InfoDataReader, //!< all swift data
AllReaders = AllSwiftDbReaders | AllVatsimReaders //!< everything
};
Q_DECLARE_FLAGS(WebReader, WebReaderFlag)
//! How to read DB data
enum DbReaderHintFlag
{
NoHint = 0,
FromDb = 1 << 1, //!< directly from DB
FromJsonFile = 1 << 2, //!< from the JSON files
FromCache = 1 << 3, //!< try cache first
};
Q_DECLARE_FLAGS(DbReaderHint, DbReaderHintFlag)
//! Relationship between reader and entity
static WebReader entityToReader(BlackMisc::Network::CEntityFlags::Entity entity);
//! Read from swift DB
//! Reads from swift DB?
static bool isFromSwiftDb(BlackMisc::Network::CEntityFlags::Entity entity);
//! Read from swift DB
//! Reader for swift DB?
static bool isFromSwiftDb(WebReader reader);
};
} // namespace
Q_DECLARE_METATYPE(BlackCore::CWebReaderFlags::WebReaderFlag)
Q_DECLARE_METATYPE(BlackCore::CWebReaderFlags::WebReader)
Q_DECLARE_METATYPE(BlackCore::CWebReaderFlags::DbReaderHintFlag)
Q_DECLARE_METATYPE(BlackCore::CWebReaderFlags::DbReaderHint)
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::CWebReaderFlags::WebReader)
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::CWebReaderFlags::DbReaderHint)
#endif