From 9618073a04483551b40405c5d80ba843265cf763 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 15 Apr 2020 05:31:56 +0200 Subject: [PATCH] [Context] "isRemoteAircraftSupportingParts" as context function (not only provider function) --- src/blackcore/context/contextnetwork.h | 3 +++ src/blackcore/context/contextnetworkempty.h | 8 ++++++++ src/blackcore/context/contextnetworkimpl.h | 4 ++-- src/blackcore/context/contextnetworkproxy.cpp | 5 +++++ src/blackcore/context/contextnetworkproxy.h | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 4b0dfcc4c..75baea370 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -323,6 +323,9 @@ namespace BlackCore //! Get remote aircraft parts virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const = 0; + //! Parts supported? + virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const = 0; + //! Is storing the aircraft parts history enabled? virtual bool isAircraftPartsHistoryEnabled() const = 0; diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index d16a7b496..59cdd3477 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -475,6 +475,14 @@ namespace BlackCore return false; } + //! \copydoc IContextNetwork::isRemoteAircraftSupportingParts + virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override + { + logEmptyContextWarning(Q_FUNC_INFO); + Q_UNUSED(callsign) + return false; + } + //! \copydoc IContextNetwork::enableAircraftPartsHistory virtual void enableAircraftPartsHistory(bool enabled) override { diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 3b3eec55e..60a511a1c 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -105,7 +105,6 @@ namespace BlackCore virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual int remoteAircraftPartsCount(const BlackMisc::Aviation::CCallsign &callsign) const override; - virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override; virtual BlackMisc::Aviation::CAircraftSituationChangeList remoteAircraftSituationChanges(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual int remoteAircraftSituationChangesCount(const BlackMisc::Aviation::CCallsign &callsign) const override; @@ -162,7 +161,7 @@ namespace BlackCore //! @} public slots: - // from context and provider interface + // ------------ from context and provider interface ------------- //! \ingroup remoteaircraftprovider //! @{ @@ -193,6 +192,7 @@ namespace BlackCore virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual int getRemoteAircraftSupportingPartsCount() const override; virtual bool isAircraftPartsHistoryEnabled() const override; + virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual void enableAircraftPartsHistory(bool enabled) override; virtual int aircraftSituationsAdded() const override; virtual int aircraftPartsAdded() const override; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 5f96563e3..ee1e9eab2 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -297,6 +297,11 @@ namespace BlackCore return m_dBusInterface->callDBusRet(QLatin1String("isAircraftPartsHistoryEnabled")); } + bool CContextNetworkProxy::isRemoteAircraftSupportingParts(const CCallsign &callsign) const + { + return m_dBusInterface->callDBusRet(QLatin1String("isRemoteAircraftSupportingParts"), callsign); + } + void CContextNetworkProxy::enableAircraftPartsHistory(bool enabled) { m_dBusInterface->callDBus(QLatin1String("enableAircraftPartsHistory"), enabled); diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index 456b4e254..81c6f7023 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -124,6 +124,7 @@ namespace BlackCore virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual QString getLibraryInfo(bool detailed) const override; virtual bool isAircraftPartsHistoryEnabled() const override; + virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual void enableAircraftPartsHistory(bool enabled) override; virtual QString getNetworkStatistics(bool reset, const QString &separator) override; virtual bool setNetworkStatisticsEnable(bool enabled) override;