From da6930a7b4c1d9baeec15ad8a738b9daaae9ab23 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 22 Nov 2017 04:30:16 +0100 Subject: [PATCH] Ref T189, database reader renamings / status renamings * plural "entities" where multiple values can occur * LED member renamings --- src/blackcore/db/databasereader.h | 1 + src/blackcore/db/icaodatareader.cpp | 2 +- .../infobarwebreadersstatuscomponent.h | 26 +++++++++---------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/blackcore/db/databasereader.h b/src/blackcore/db/databasereader.h index e509862c3..d85776376 100644 --- a/src/blackcore/db/databasereader.h +++ b/src/blackcore/db/databasereader.h @@ -269,6 +269,7 @@ namespace BlackCore void swiftDbDataRead(bool success); //! Combined read signal + //! \remark normally in success case state for a single case, skipped cases can be reported for 1..n enities void dataRead(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number); //! Header of shared file read diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp index 781e2d7ed..f7905e4ae 100644 --- a/src/blackcore/db/icaodatareader.cpp +++ b/src/blackcore/db/icaodatareader.cpp @@ -154,7 +154,7 @@ namespace BlackCore return this->getCountries().size(); } - void CIcaoDataReader::ps_read(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) + void CIcaoDataReader::ps_read(CEntityFlags::Entity entities, CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) { this->threadAssertCheck(); // runs in background thread if (!this->doWorkCheck()) { return; } diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.h b/src/blackgui/components/infobarwebreadersstatuscomponent.h index 933b78b63..7d9de0a2c 100644 --- a/src/blackgui/components/infobarwebreadersstatuscomponent.h +++ b/src/blackgui/components/infobarwebreadersstatuscomponent.h @@ -59,18 +59,18 @@ namespace BlackGui void setLedReadState(CLedWidget *led, BlackMisc::Network::CEntityFlags::ReadState readState); //! Maps entity to its id - QList entityToLeds(BlackMisc::Network::CEntityFlags::Entity entity) const; + QList entitiesToLeds(BlackMisc::Network::CEntityFlags::Entity entities) const; //! All data read bool hasAllData() const; //! Initial setup of leds void setLeds(BlackGui::CLedWidget *ledDb, BlackGui::CLedWidget *ledDataReady, CLedWidget *ledConsolidation, - BlackGui::CLedWidget *led_IcaoAircraft, BlackGui::CLedWidget *led_IcaoAirline, BlackGui::CLedWidget *led_Countries, - BlackGui::CLedWidget *led_Distributors, BlackGui::CLedWidget *led_Liveries, BlackGui::CLedWidget *led_Models); + BlackGui::CLedWidget *ledIcaoAircraft, BlackGui::CLedWidget *ledIcaoAirline, BlackGui::CLedWidget *ledCountries, + BlackGui::CLedWidget *ledDistributors, BlackGui::CLedWidget *ledLiveries, BlackGui::CLedWidget *ledModels); //! Data have been read - void dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count); + void dataRead(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState readState, int count); //! DB or network accessibility changed void accessibilityChanged(bool accessible); @@ -83,15 +83,15 @@ namespace BlackGui private: QTimer m_timer { this }; //!< check timer - BlackGui::CLedWidget *led_SwiftDb = nullptr; - BlackGui::CLedWidget *led_DataReady = nullptr; - BlackGui::CLedWidget *led_Consolidation = nullptr; - BlackGui::CLedWidget *led_IcaoAircraft = nullptr; - BlackGui::CLedWidget *led_IcaoAirline = nullptr; - BlackGui::CLedWidget *led_Countries = nullptr; - BlackGui::CLedWidget *led_Distributors = nullptr; - BlackGui::CLedWidget *led_Liveries = nullptr; - BlackGui::CLedWidget *led_Models = nullptr; + BlackGui::CLedWidget *m_ledSwiftDb = nullptr; + BlackGui::CLedWidget *m_ledDataReady = nullptr; + BlackGui::CLedWidget *m_ledConsolidation = nullptr; + BlackGui::CLedWidget *m_ledIcaoAircraft = nullptr; + BlackGui::CLedWidget *m_ledIcaoAirline = nullptr; + BlackGui::CLedWidget *m_ledCountries = nullptr; + BlackGui::CLedWidget *m_ledDistributors = nullptr; + BlackGui::CLedWidget *m_ledLiveries = nullptr; + BlackGui::CLedWidget *m_ledModels = nullptr; }; //! Info bar displaying status of web readers(swift DB, ...)