refs #597, removed setup loading in CWebDataServices

* no longer needed, as initial load happens in CApplication
* adjusted classes
This commit is contained in:
Klaus Basan
2016-02-23 02:00:33 +01:00
committed by Mathew Sutcliffe
parent c649c1b7ed
commit 4b7ba4f117
7 changed files with 23 additions and 57 deletions

View File

@@ -51,8 +51,7 @@ namespace BlackCore
public:
//! Constructor
CWebDataServices(CWebReaderFlags::WebReader readerFlags,
int autoReadAfterSetupSynchronizedMs, QObject *parent = nullptr);
CWebDataServices(CWebReaderFlags::WebReader readerFlags, QObject *parent = nullptr);
//! Shutdown
void gracefulShutdown();
@@ -155,15 +154,9 @@ namespace BlackCore
//! Read from model reader
void ps_readFromSwiftDb(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
//! Setup has been read
void ps_setupRead(bool success);
//! Setup has been changed
//! Setup changed
void ps_setupChanged();
//! Setup timed out
void ps_setupTimedOut();
private:
//! Init the readers
void initReaders(CWebReaderFlags::WebReader flags);
@@ -172,7 +165,6 @@ namespace BlackCore
void initWriters();
CWebReaderFlags::WebReader m_readerFlags = CWebReaderFlags::WebReaderFlag::None; //!< which readers are available
int m_autoReadAfterSetupMs = -1; //!< directly read all known readers after setup was syncronized
bool m_initialRead = false; //!< Initial read conducted
BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CWebDataServices::ps_setupChanged}; //!< setup cache