From acec3791513aaaec6510bebeea9f255287aca320 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 19 Apr 2015 16:48:41 +0200 Subject: [PATCH] refs #395, renamed to updateFastPositionEnabled (consistency with other member functions) --- src/blackcore/airspace_monitor.cpp | 2 +- src/blackcore/airspace_monitor.h | 6 ++---- src/blackcore/airspace_watchdog.cpp | 10 +++++----- src/blackcore/context_network.h | 2 +- src/blackcore/context_network_empty.h | 4 ++-- src/blackcore/context_network_impl.cpp | 4 ++-- src/blackcore/context_network_impl.h | 4 ++-- src/blackcore/context_network_proxy.cpp | 4 ++-- src/blackcore/context_network_proxy.h | 4 ++-- src/blackcore/interpolator.h | 3 +-- src/blackgui/components/mappingcomponent.cpp | 2 +- src/blackmisc/simulation/remoteaircraftprovider.h | 2 +- .../simulation/remoteaircraftproviderdummy.cpp | 2 +- src/blackmisc/simulation/remoteaircraftproviderdummy.h | 4 ++-- 14 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index 83711d895..1b2e288a8 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspace_monitor.cpp @@ -154,7 +154,7 @@ namespace BlackCore return c > 0; } - bool CAirspaceMonitor::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) + bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) { CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositonUpdates)); Q_UNUSED(originator); diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index e6ba0c941..d7d63ebff 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -30,9 +30,7 @@ namespace BlackCore { - /*! - * Keeps track of other entities in the airspace: aircraft, ATC stations, etc. - */ + //! Keeps track of other entities in the airspace: aircraft, ATC stations, etc. class BLACKCORE_EXPORT CAirspaceMonitor : public QObject, public BlackMisc::Simulation::IRemoteAircraftProvider, // those data will be provided from the class CAirspaceMonitor @@ -70,7 +68,7 @@ namespace BlackCore virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled - virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override; //! Returns the list of users we know about BlackMisc::Network::CUserList getUsers() const; diff --git a/src/blackcore/airspace_watchdog.cpp b/src/blackcore/airspace_watchdog.cpp index ff6ef67e8..2901fb992 100644 --- a/src/blackcore/airspace_watchdog.cpp +++ b/src/blackcore/airspace_watchdog.cpp @@ -10,13 +10,13 @@ #include "airspace_watchdog.h" #include "blackmisc/logmessage.h" +using namespace BlackMisc; +using namespace BlackMisc::Aviation; +using namespace BlackMisc::PhysicalQuantities; + namespace BlackCore { - using namespace BlackMisc; - using namespace BlackMisc::Aviation; - using namespace BlackMisc::PhysicalQuantities; - CAirspaceWatchdog::CAirspaceWatchdog(QObject *parent) : QObject(parent) { @@ -77,4 +77,4 @@ namespace BlackCore } } } -} +} // ns diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index aa4a9ffa6..501e6e6ca 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -242,7 +242,7 @@ namespace BlackCore virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0; //! Change fast position updates - virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) = 0; //! Create dummy ATC stations for performance tests etc. virtual void testCreateDummyOnlineAtcStations(int number) = 0; diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h index dd8b124f4..4851c6ab7 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/context_network_empty.h @@ -250,8 +250,8 @@ namespace BlackCore return false; } - //! \copydoc IContextNetwork::updateFastPositionUpdates - virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override + //! \copydoc IContextNetwork::updateFastPositionEnabled + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(callsign); diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index ff15dae0e..75d74ff3b 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -538,10 +538,10 @@ namespace BlackCore return c; } - bool CContextNetwork::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) + bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates << originator; } - bool c = this->m_airspace->updateFastPositionUpdates(callsign, enableFastPositonUpdates, originator); + bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator); if (c) { CSimulatedAircraft aircraft(this->remoteAircraft().findFirstByCallsign(callsign)); diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 5f5eaa02f..6d9d530b5 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -182,8 +182,8 @@ namespace BlackCore //! \copydoc IContextNetwork::updateAircraftModel virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; - //! \copydoc IContextNetwork::updateFastPositionUpdates - virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override; + //! \copydoc IContextNetwork::updateFastPositionEnabled + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override; //! \copydoc IContextNetwork::isFastPositionSendingEnabled virtual bool isFastPositionSendingEnabled() const override; diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index 68cfa8915..9f6252767 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -188,9 +188,9 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftModel"), callsign, model, originator); } - bool CContextNetworkProxy::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositionSending, const QString &originator) + bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const QString &originator) { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateFastPositionUpdates"), callsign, enableFastPositionSending, originator); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateFastPositionEnabled"), callsign, enableFastPositionSending, originator); } bool CContextNetworkProxy::isFastPositionSendingEnabled() const diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 71a41a0ff..5e6fc5f1f 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -135,8 +135,8 @@ namespace BlackCore //! \copydoc IContextNetwork::updateAircraftModel virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; - //! \copydoc IContextNetwork::updateFastPositionUpdates - virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override; + //! \copydoc IContextNetwork::updateFastPositionEnabled + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override; //! \copydoc IContextNetwork::isFastPositionSendingEnabled virtual bool isFastPositionSendingEnabled() const override; diff --git a/src/blackcore/interpolator.h b/src/blackcore/interpolator.h index 5face8d7c..54ae038ef 100644 --- a/src/blackcore/interpolator.h +++ b/src/blackcore/interpolator.h @@ -84,7 +84,6 @@ namespace BlackCore CSituationsPerCallsign getSituationsByCallsign() const; //! Parts before given offset time (aka pending parts) - //! \note //! \threadsafe virtual BlackMisc::Aviation::CAircraftPartsList getAndRemovePartsBeforeTime(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTime, PartsStatus &partsStatus); @@ -92,7 +91,7 @@ namespace BlackCore //! \threadsafe virtual void clear(); - //! Knows callsign? + //! Does know callsign? //! \threadsafe virtual bool hasDataForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const; diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 2ffa5fbfc..23fbfbbf5 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -338,7 +338,7 @@ namespace BlackGui { if (getIContextNetwork()) { - getIContextNetwork()->updateFastPositionUpdates(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingtOriginator()); + getIContextNetwork()->updateFastPositionEnabled(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingtOriginator()); } } diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index dd84901a3..1494b04dc 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -87,7 +87,7 @@ namespace BlackMisc virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0; //! Change fast position updates - virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0; }; //! Class which can be directly used to access an \sa IRemoteAircraftProviderReadOnly object diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index db89c434c..e68d10318 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -73,7 +73,7 @@ namespace BlackMisc return n > 0; } - bool CRemoteAircraftProviderDummy::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) + bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositionUpdates)); diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index 9bcc4337c..b1b1c522b 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.h +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.h @@ -63,8 +63,8 @@ namespace BlackMisc //! \copydoc IRemoteAircraftProvider::updateAircraftModel virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; - //! \copydoc IRemoteAircraftProvider::updateFastPositionUpdates - virtual bool updateFastPositionUpdates(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override; + //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled + virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override; //! For testing, add new situation and fire signals void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);