From 054b30c306a666eef2ea3b624e4bc1e5206304a5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 29 Jan 2015 17:31:00 +0100 Subject: [PATCH] Removed "return const" from some functions --- src/blackcore/context_network.h | 11 ++++------- src/blackcore/context_network_empty.h | 6 +++--- src/blackcore/context_network_impl.h | 6 +++--- src/blackcore/context_network_proxy.cpp | 6 +++--- src/blackcore/context_network_proxy.h | 6 +++--- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 0fe3c8d5c..22e133fc2 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -118,17 +118,14 @@ namespace BlackCore //! Reload bookings from booking service virtual void readAtcBookingsFromSource() const = 0; - /*! - * The ATC list with online ATC controllers - * \remarks If I make this &getAtcStations XML is not generated correctly - */ - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const = 0; + //! The ATC list with online ATC controllers + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const = 0; //! ATC list, with booked controllers - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const = 0 ; + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const = 0 ; //! Aircraft list - virtual const BlackMisc::Aviation::CAircraftList getAircraftInRange() const = 0; + virtual BlackMisc::Aviation::CAircraftList getAircraftInRange() const = 0; //! Get all users virtual BlackMisc::Network::CUserList getUsers() const = 0; diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h index f995a488b..d776fa70a 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/context_network_empty.h @@ -40,21 +40,21 @@ namespace BlackCore } //! \copydoc IContextNetwork::getAtcStationsOnline() - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override { logEmptyContextWarning(Q_FUNC_INFO); return BlackMisc::Aviation::CAtcStationList(); } //! \copydoc IContextNetwork::getAtcStationsBooked() - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override { logEmptyContextWarning(Q_FUNC_INFO); return BlackMisc::Aviation::CAtcStationList(); } //! \copydoc IContextNetwork::getAircraftInRange() - virtual const BlackMisc::Aviation::CAircraftList getAircraftInRange() const override + virtual BlackMisc::Aviation::CAircraftList getAircraftInRange() const override { logEmptyContextWarning(Q_FUNC_INFO); return BlackMisc::Aviation::CAircraftList(); diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 8e1e94c68..957a6aaef 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -54,21 +54,21 @@ namespace BlackCore virtual void readAtcBookingsFromSource() const override; //! \copydoc IContextNetwork::getAtcStationsOnline() - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override { BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; return this->m_airspace->getAtcStationsOnline(); } //! \copydoc IContextNetwork::getAtcStationsBooked() - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override { BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; return this->m_airspace->getAtcStationsBooked(); } //! \copydoc IContextNetwork::getAircraftInRange() - virtual const BlackMisc::Aviation::CAircraftList getAircraftInRange() const override + virtual BlackMisc::Aviation::CAircraftList getAircraftInRange() const override { BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; return this->m_airspace->getAircraftInRange(); diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index 1d3b2bf1c..c76cd6356 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -80,17 +80,17 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("readAtcBookingsFromSource")); } - const BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsOnline() const + BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsOnline() const { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAtcStationsOnline")); } - const BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsBooked() const + CAtcStationList CContextNetworkProxy::getAtcStationsBooked() const { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAtcStationsBooked")); } - const BlackMisc::Aviation::CAircraftList CContextNetworkProxy::getAircraftInRange() const + BlackMisc::Aviation::CAircraftList CContextNetworkProxy::getAircraftInRange() const { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAircraftInRange")); } diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 2c74fe521..618be100b 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -57,13 +57,13 @@ namespace BlackCore virtual void readAtcBookingsFromSource() const override; //! \copydoc IContextNetwork::getAtcStationsOnline() - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override; + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override; //! \copydoc IContextNetwork::getAtcStationsBooked() - virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override; + virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override; //! \copydoc IContextNetwork::getAircraftInRange() - virtual const BlackMisc::Aviation::CAircraftList getAircraftInRange() const override; + virtual BlackMisc::Aviation::CAircraftList getAircraftInRange() const override; //! \copydoc IContextNetwork::connectToNetwork virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, uint mode) override;