refs #844, request booking updates from airspace monitor

* removed blocks of \copydoc
* renamed to requestAtcBookingUpdate

src/blackcore/context/contextnetwork.h

@@ -164,13 +164,13 @@ namespace BlackCore
 
         public slots:
             //! Reload bookings from booking service
-            virtual void readAtcBookingsFromSource() const = 0;
+            virtual void requestAtcBookingsUpdate() const = 0;
 
             //! The ATC list with online ATC controllers
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const = 0;
 
             //! ATC list, with booked controllers
-            virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const = 0 ;
+            virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const = 0;
 
             //! Aircraft list
             virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const = 0;

src/blackcore/context/contextnetworkempty.h

@@ -31,8 +31,8 @@ namespace BlackCore
 
         public slots: // IContextNetwork overrides
 
-            //! \copydoc IContextNetwork::readAtcBookingsFromSource()
+            //! \copydoc IContextNetwork::requestAtcBookingsUpdate()
-            virtual void readAtcBookingsFromSource() const override
+            virtual void requestAtcBookingsUpdate() const override
             {
                 logEmptyContextWarning(Q_FUNC_INFO);
             }

src/blackcore/context/contextnetworkimpl.cpp

@@ -628,11 +628,10 @@ namespace BlackCore
             return c;
         }
 
-        void CContextNetwork::readAtcBookingsFromSource() const
+        void CContextNetwork::requestAtcBookingsUpdate() const
         {
             if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
-            Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "missing reader");
+            this->m_airspace->requestAtcBookingsUpdate();
-            sApp->getWebDataServices()->readInBackground(BlackMisc::Network::CEntityFlags::BookingEntity);
         }
 
         bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered)

src/blackcore/context/contextnetworkimpl.h

@@ -134,6 +134,7 @@ namespace BlackCore
             //! \remarks Intentionally only running locally, not in interface
             bool isPendingConnection() const;
 
+            // --------------------- IContextNetwork implementations ---------------------
             //! \ingroup commandline
             //! @{
             //! <pre>
@@ -143,89 +144,38 @@ namespace BlackCore
             //! \copydoc IContextNetwork::parseCommandLine
             virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
 
-            //! \copydoc IContextNetwork::getAtcStationsBooked()
+            //! \publicsection
+            //! @{
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override;
-
+            virtual void requestAtcBookingsUpdate() const override;
-            //! \copydoc IContextNetwork::readAtcBookingsFromSource()
-            virtual void readAtcBookingsFromSource() const override;
-
-            //! \copydoc IContextNetwork::getAtcStationsOnline()
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override;
-
-            //! \copydoc IContextNetwork::getOnlineStationForCallsign
             virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::connectToNetwork()
             virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override;
-
-            //! \copydoc IContextNetwork::getConnectedServer
             virtual BlackMisc::Network::CServer getConnectedServer() const override;
-
-            //! \copydoc IContextNetwork::disconnectFromNetwork()
             virtual BlackMisc::CStatusMessage disconnectFromNetwork() override;
-
-            //! \copydoc IContextNetwork::isConnected()
             virtual bool isConnected() const override;
-
-            //! \copydoc IContextNetwork::sendTextMessages()
             virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
-
-            //! \copydoc IContextNetwork::sendFlightPlan()
             virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override;
-
-            //! \copydoc IContextNetwork::loadFlightPlanFromNetwork()
             virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::getMetarForAirport
             BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override;
-
-            //! \copydoc IContextNetwork::getSelectedVoiceRooms()
             virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;
-
-            //! \copydoc IContextNetwork::getSelectedAtcStations
             virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;
-
-            //! \copydoc IContextNetwork::getUsers()
             virtual BlackMisc::Network::CUserList getUsers() const override;
-
-            //! \copydoc IContextNetwork::getUsersForCallsigns
             virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
-
-            //! \copydoc IContextNetwork::getUserForCallsign
             virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::getOtherClients
             virtual BlackMisc::Network::CClientList getOtherClients() const override;
-
-            //! \copydoc IContextNetwork::getOtherClientsForCallsigns
             virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
-
-            //! \copydoc IContextNetwork::getVatsimFsdServers
             virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
-
-            //! \copydoc IContextNetwork::getVatsimVoiceServers
             virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
-
-            //! \copydoc IContextNetwork::requestDataUpdates
             virtual void requestDataUpdates()override;
-
-            //! \copydoc IContextNetwork::requestAtisUpdates
             virtual void requestAtisUpdates() override;
-
-            //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns
             virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override;
-
-            //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns
             virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override;
-
-            //! \copydoc IContextNetwork::testCreateDummyOnlineAtcStations
             virtual void testCreateDummyOnlineAtcStations(int number) override;
-
-            //! \copydoc IContextNetwork::testAddAircraftParts
             virtual void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental) override;
-
-            //! \copydoc IContextNetwork::testReceivedTextMessages
             virtual void testReceivedTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
+            //! @}
+            // --------------------- IContextNetwork implementations ---------------------
 
             //! Gracefully shut down, e.g. for thread safety
             void gracefulShutdown();

src/blackcore/context/contextnetworkproxy.cpp

@@ -91,9 +91,9 @@ namespace BlackCore
             this->relayBaseClassSignals(serviceName, connection, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName());
         }
 
-        void CContextNetworkProxy::readAtcBookingsFromSource() const
+        void CContextNetworkProxy::requestAtcBookingsUpdate() const
         {
-            this->m_dBusInterface->callDBus(QLatin1Literal("readAtcBookingsFromSource"));
+            this->m_dBusInterface->callDBus(QLatin1Literal("requestAtcBookingsUpdate"));
         }
 
         BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsOnline() const

src/blackcore/context/contextnetworkproxy.h

@@ -72,7 +72,7 @@ namespace BlackCore
         public slots:
             //! \name Interface overrides
             //! @{
-            virtual void readAtcBookingsFromSource() const override;
+            virtual void requestAtcBookingsUpdate() const override;
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override;
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override;
             virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;