mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-17 02:45:33 +08:00
refactor: Remove ecosystem provider from WebDataServices
Spreading the information about the ecosystem into all "low-level" readers, just to deactivate them when not using a non-VATSIM ecosystem, should be avoided. Instead, the readers should be disabled entirely from the outside . This will be done in a upcoming refactoring (separate PR).
This commit is contained in:
@@ -19,7 +19,6 @@
|
||||
#include "blackmisc/aviation/airporticaocode.h"
|
||||
#include "blackmisc/aviation/atcstationlist.h"
|
||||
#include "blackmisc/aviation/liverylist.h"
|
||||
#include "blackmisc/network/ecosystemprovider.h"
|
||||
#include "blackmisc/network/serverlist.h"
|
||||
#include "blackmisc/network/urllist.h"
|
||||
#include "blackmisc/network/userlist.h"
|
||||
@@ -80,11 +79,9 @@ namespace BlackCore
|
||||
* Encapsulates reading data from web sources
|
||||
*/
|
||||
class BLACKCORE_EXPORT CWebDataServices :
|
||||
public QObject,
|
||||
public BlackMisc::Network::IEcosystemProvider
|
||||
public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(BlackMisc::Network::IEcosystemProvider)
|
||||
|
||||
public:
|
||||
//! Log categories
|
||||
@@ -604,13 +601,6 @@ namespace BlackCore
|
||||
//! \return true means info objects available
|
||||
bool waitForInfoObjectsThenRead(BlackMisc::Network::CEntityFlags::Entity entities, const QString &info, BlackCore::Db::CInfoDataReader *infoReader, QDateTime &timeOut);
|
||||
|
||||
//! \copydoc BlackCore::CApplication::coreFacadeStarted
|
||||
void onCoreFacadeStarted();
|
||||
|
||||
//! \copydoc BlackCore::Context::IContextNetwork::connectedServerChanged
|
||||
//! \remark sets the ecosystem
|
||||
void onConnectedNetworkServerChanged(const BlackMisc::Network::CServer &server);
|
||||
|
||||
BlackMisc::Network::CEntityFlags::Entity m_entitiesPeriodicallyRead = BlackMisc::Network::CEntityFlags::NoEntity; //!< entities permanently updated by timers
|
||||
BlackMisc::Network::CEntityFlags::Entity m_swiftDbEntitiesRead = BlackMisc::Network::CEntityFlags::NoEntity; //!< entities read
|
||||
BlackCore::Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< how to read DB data
|
||||
|
||||
Reference in New Issue
Block a user