This commit is contained in:
Klaus Basan
2016-03-13 19:01:47 +00:00
committed by Mathew Sutcliffe
parent 6d79b7dc12
commit fdf41bcce3
6 changed files with 38 additions and 40 deletions

View File

@@ -466,9 +466,7 @@ namespace BlackCore
void CContextSimulator::ps_addRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
{
// todo:
// This was previously an assert and it should be one again in the future.
// This slot should not even be called when no simulator is available.
//! \todo This was previously an assert and it should be one again in the future. This slot should not even be called when no simulator is available.
if (m_simulatorPlugin.first.isUnspecified())
{
// Do something if no simulator is running

View File

@@ -33,11 +33,11 @@ namespace BlackCore
friend class CApplication;
public:
//! cookiesForUrl::setCookiesFromUrl
//! \copydoc QNetworkCookieJar::setCookiesFromUrl
//! \threadsafe
virtual bool setCookiesFromUrl(const QList<QNetworkCookie> &cookies, const QUrl &url) override;
//! QNetworkCookieJar::cookiesForUrl
//! \copydoc QNetworkCookieJar::cookiesForUrl
//! \threadsafe
virtual QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const override;

View File

@@ -28,15 +28,15 @@ namespace BlackCore
//! Which readers to init
enum WebReaderFlag
{
None = 0, ///< no reader at all
VatsimBookingReader = 1 << 0, ///< reader for VATSIM booking data
VatsimDataReader = 1 << 1, ///< reader for VATSIM data
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, ..
AllVatsimReaders = VatsimBookingReader | VatsimDataReader | VatsimMetarReader, ///< all readers
AllSwiftDbReaders = IcaoDataReader | ModelReader, ///< all swift data
AllReaders = AllSwiftDbReaders | AllVatsimReaders ///< everything
None = 0, //!< no reader at all
VatsimBookingReader = 1 << 0, //!< reader for VATSIM booking data
VatsimDataReader = 1 << 1, //!< reader for VATSIM data
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
AllVatsimReaders = VatsimBookingReader | VatsimDataReader | VatsimMetarReader, //!< all readers
AllSwiftDbReaders = IcaoDataReader | ModelReader, //!< all swift data
AllReaders = AllSwiftDbReaders | AllVatsimReaders //!< everything
};
Q_DECLARE_FLAGS(WebReader, WebReaderFlag)
@@ -44,9 +44,9 @@ namespace BlackCore
enum DbReaderHintFlag
{
NoHint = 0,
FromDb = 1 << 1, ///< directly from DB
FromJsonFile = 1 << 2, ///< from the JSON files
FromCache = 1 << 3, ///< try cache first
FromDb = 1 << 1, //!< directly from DB
FromJsonFile = 1 << 2, //!< from the JSON files
FromCache = 1 << 3, //!< try cache first
};
Q_DECLARE_FLAGS(DbReaderHint, DbReaderHintFlag)