From ee0bfd62fa086d9113870b5a93eedd2437ab7446 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 24 May 2015 13:36:20 +0200 Subject: [PATCH] refs #428 Use COriginator instead of QString in internal API --- samples/cli_client/client.cpp | 4 +++- src/blackcore/airspace_monitor.cpp | 10 +++++----- src/blackcore/airspace_monitor.h | 10 +++++----- src/blackcore/context_application_proxy.cpp | 2 +- src/blackcore/context_audio.h | 3 ++- src/blackcore/context_audio_empty.h | 2 +- src/blackcore/context_audio_impl.cpp | 2 +- src/blackcore/context_audio_impl.h | 2 +- src/blackcore/context_audio_proxy.cpp | 2 +- src/blackcore/context_audio_proxy.h | 2 +- src/blackcore/context_network.h | 15 +++++++------- src/blackcore/context_network_empty.h | 8 ++++---- src/blackcore/context_network_impl.cpp | 12 +++++------ src/blackcore/context_network_impl.h | 12 +++++------ src/blackcore/context_network_proxy.cpp | 14 ++++++------- src/blackcore/context_network_proxy.h | 8 ++++---- src/blackcore/context_ownaircraft.h | 13 ++++++------ src/blackcore/context_ownaircraft_impl.cpp | 20 +++++++++++-------- src/blackcore/context_ownaircraft_impl.h | 8 ++++---- src/blackcore/context_ownaircraft_proxy.cpp | 10 +++++----- src/blackcore/context_ownaircraft_proxy.h | 8 ++++---- src/blackcore/context_runtime.cpp | 2 +- src/blackcore/context_runtime.h | 3 ++- src/blackcore/context_simulator_impl.cpp | 8 ++++---- src/blackcore/context_simulator_impl.h | 6 +++--- src/blackcore/simulator.cpp | 10 +++++----- src/blackcore/simulator.h | 12 +++++++---- src/blackgui/commandinput.cpp | 12 ++++++----- src/blackgui/commandinput.h | 8 ++++++-- .../components/atcstationcomponent.cpp | 10 +++++----- src/blackgui/components/atcstationcomponent.h | 4 +++- .../components/cockpitcomcomponent.cpp | 16 +++++++-------- src/blackgui/components/cockpitcomcomponent.h | 8 +++++--- .../cockpittranspondermodeledscomponent.cpp | 13 ++++++------ .../cockpittranspondermodeledscomponent.h | 6 ++++-- .../components/flightplancomponent.cpp | 10 +++++----- src/blackgui/components/flightplancomponent.h | 6 +++++- .../components/mainkeypadareacomponent.cpp | 12 +++++------ .../components/mainkeypadareacomponent.h | 8 +++++--- src/blackgui/components/mappingcomponent.cpp | 16 +++++++-------- src/blackgui/components/mappingcomponent.h | 10 ++++++---- .../components/textmessagecomponent.cpp | 12 +++++------ .../components/textmessagecomponent.h | 8 +++++--- .../simulation/ownaircraftprovider.cpp | 6 +++--- .../simulation/ownaircraftprovider.h | 13 ++++++------ .../simulation/ownaircraftproviderdummy.cpp | 6 +++--- .../simulation/ownaircraftproviderdummy.h | 6 +++--- .../simulation/remoteaircraftprovider.cpp | 8 ++++---- .../simulation/remoteaircraftprovider.h | 19 +++++++++--------- .../remoteaircraftproviderdummy.cpp | 10 +++++----- .../simulation/remoteaircraftproviderdummy.h | 10 +++++----- src/plugins/simulator/fs9/simulator_fs9.cpp | 2 +- src/plugins/simulator/fs9/simulator_fs9.h | 2 +- .../simulator/fscommon/simulator_fscommon.cpp | 4 ++-- .../simulator/fscommon/simulator_fscommon.h | 4 ++-- src/plugins/simulator/fsx/simulator_fsx.cpp | 2 +- src/plugins/simulator/fsx/simulator_fsx.h | 2 +- .../simulator/xplane/simulator_xplane.cpp | 6 +++--- .../simulator/xplane/simulator_xplane.h | 6 +++--- src/swiftcore/tool.cpp | 2 +- src/swiftgui_standard/swiftguistd.h | 12 +++++++---- 61 files changed, 265 insertions(+), 222 deletions(-) diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index 4d584ee67..a9ad2c22f 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -9,10 +9,12 @@ #include "client.h" #include "blackcore/network_vatlib.h" +#include "blackmisc/originator.h" #include #include using namespace BlackCore; +using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; @@ -337,7 +339,7 @@ void Client::setOwnAircraftCmd(QTextStream &args) BlackMisc::Aviation::CComSystem("COM1", BlackMisc::PhysicalQuantities::CFrequency(com1, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz())), BlackMisc::Aviation::CComSystem("COM2", BlackMisc::PhysicalQuantities::CFrequency(com2, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz())), BlackMisc::Aviation::CTransponder(xpdrCode, xpdrMode), - "cmdClient"); + COriginator("cmdClient")); } void Client::setOwnAircraftPositionCmd(QTextStream &args) diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index 3a9fb2c11..3b9edffd8 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspace_monitor.cpp @@ -154,7 +154,7 @@ namespace BlackCore return QList({ c1, c2, c3, c4}); } - bool CAirspaceMonitor::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const QString &originator) + bool CAirspaceMonitor::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexEnabled, CVariant::fromValue(enabledForRedering)); @@ -163,7 +163,7 @@ namespace BlackCore return c > 0; } - bool CAirspaceMonitor::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const QString &originator) + bool CAirspaceMonitor::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const BlackMisc::COriginator &originator) { Q_UNUSED(originator); QWriteLocker l(&m_lockAircraft); @@ -172,7 +172,7 @@ namespace BlackCore return c > 0; } - bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) + bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositonUpdates)); @@ -181,7 +181,7 @@ namespace BlackCore return c > 0; } - bool CAirspaceMonitor::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator) + bool CAirspaceMonitor::updateAircraftRendered(const CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered)); @@ -190,7 +190,7 @@ namespace BlackCore return c > 0; } - void CAirspaceMonitor::updateMarkAllAsNotRendered(const QString &originator) + void CAirspaceMonitor::updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) { Q_UNUSED(originator); QWriteLocker l(&m_lockAircraft); diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index d243eeec4..e839a742b 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -82,23 +82,23 @@ namespace BlackCore //! \copydoc IRemoteAircraftProvider::updateAircraftEnabled //! \ingroup remoteaircraftprovider - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftModel //! \ingroup remoteaircraftprovider - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled //! \ingroup remoteaircraftprovider - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftRendered //! \ingroup remoteaircraftprovider - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) override; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered //! \ingroup remoteaircraftprovider - virtual void updateMarkAllAsNotRendered(const QString &originator) override; + virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override; //! Returns the list of users we know about BlackMisc::Network::CUserList getUsers() const; diff --git a/src/blackcore/context_application_proxy.cpp b/src/blackcore/context_application_proxy.cpp index bf353e053..d1cc7c6eb 100644 --- a/src/blackcore/context_application_proxy.cpp +++ b/src/blackcore/context_application_proxy.cpp @@ -51,7 +51,7 @@ namespace BlackCore { // signals originating from impl side bool s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), - "messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::Event::COriginator))); + "messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::COriginator))); Q_ASSERT(s); s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), "componentChanged", this, SIGNAL(componentChanged(uint, uint))); diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index 708d28f4d..a2d1bd3fc 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -14,6 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context.h" +#include "blackmisc/originator.h" #include "blackmisc/genericdbusinterface.h" #include "blackmisc/audio/audiodeviceinfolist.h" #include "blackmisc/audio/voiceroomlist.h" @@ -164,7 +165,7 @@ namespace BlackCore virtual bool isAudioLoopbackEnabled() const = 0; //! Command line was entered - virtual bool parseCommandLine(const QString &commandLine, const QString &orignator) = 0; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) = 0; }; } diff --git a/src/blackcore/context_audio_empty.h b/src/blackcore/context_audio_empty.h index c63a2d89f..1981ef05c 100644 --- a/src/blackcore/context_audio_empty.h +++ b/src/blackcore/context_audio_empty.h @@ -168,7 +168,7 @@ namespace BlackCore } //! \copydoc IContextAudio::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override { Q_UNUSED(commandLine); Q_UNUSED(originator); diff --git a/src/blackcore/context_audio_impl.cpp b/src/blackcore/context_audio_impl.cpp index 313396416..8256de69e 100644 --- a/src/blackcore/context_audio_impl.cpp +++ b/src/blackcore/context_audio_impl.cpp @@ -474,7 +474,7 @@ namespace BlackCore return this->m_audioMixer->hasMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputOutputDevice1); } - bool CContextAudio::parseCommandLine(const QString &commandLine, const QString &originator) + bool CContextAudio::parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) { Q_UNUSED(originator); if (commandLine.isEmpty()) { return false; } diff --git a/src/blackcore/context_audio_impl.h b/src/blackcore/context_audio_impl.h index b01fefbce..b615bd213 100644 --- a/src/blackcore/context_audio_impl.h +++ b/src/blackcore/context_audio_impl.h @@ -115,7 +115,7 @@ namespace BlackCore //! //! @} //! \copydoc IContextAudio::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; protected: //! Constructor diff --git a/src/blackcore/context_audio_proxy.cpp b/src/blackcore/context_audio_proxy.cpp index 5aec8389d..6f8f7237e 100644 --- a/src/blackcore/context_audio_proxy.cpp +++ b/src/blackcore/context_audio_proxy.cpp @@ -199,7 +199,7 @@ namespace BlackCore /* * Parse command line */ - bool CContextAudioProxy::parseCommandLine(const QString &commandLine, const QString &originator) + bool CContextAudioProxy::parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("parseCommandLine"), commandLine, originator); } diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index e81d98f70..3300b8e20 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -110,7 +110,7 @@ namespace BlackCore virtual bool isAudioLoopbackEnabled() const override; //! \copydoc IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; }; } diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index a1709de35..d70875313 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -14,6 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context.h" +#include "blackmisc/originator.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/statusmessage.h" @@ -99,15 +100,15 @@ namespace BlackCore //! Aircraft model was changed //! \details All remote aircraft are stored in the network context. The model can be updated here //! via \sa updateAircraftModel and then this signal is fired - void changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Aircraft enabled / disabled //! \details All remote aircraft are stored in the network context. The aircraft can be enabled (for rendering) here //! via \sa updateAircraftEnabled and then this signal is fired - void changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Aircraft enabled / disabled - void changedFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void changedFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Connection status changed for online station void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected); @@ -218,7 +219,7 @@ namespace BlackCore virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const = 0; //! Command line was entered - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) = 0; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) = 0; //! Get METAR, if not available request it (code such as EDDF, KLAX) virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) = 0; @@ -236,13 +237,13 @@ namespace BlackCore virtual void requestAtisUpdates() = 0; //! Enable/disable rendering - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) = 0; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) = 0; //! Change model string - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) = 0; //! Change fast position updates - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::COriginator &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 1d578bfd7..112e7d514 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/context_network_empty.h @@ -222,7 +222,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override { Q_UNUSED(commandLine); Q_UNUSED(originator); @@ -245,7 +245,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) override { Q_UNUSED(callsign); Q_UNUSED(originator); @@ -255,7 +255,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override { Q_UNUSED(callsign); Q_UNUSED(originator); @@ -265,7 +265,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::COriginator &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 9b666b8cb..1b448c225 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -248,7 +248,7 @@ namespace BlackCore return INetwork::isPendingStatus(this->m_currentStatus); } - bool CContextNetwork::parseCommandLine(const QString &commandLine, const QString &originator) + bool CContextNetwork::parseCommandLine(const QString &commandLine, const COriginator &originator) { Q_UNUSED(originator;) if (commandLine.isEmpty()) { return false; } @@ -561,7 +561,7 @@ namespace BlackCore this->m_airspace->requestAtisUpdates(); } - bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const QString &originator) + bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRedering << originator; } bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering, originator); @@ -573,7 +573,7 @@ namespace BlackCore return c; } - bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const QString &originator) + bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const BlackMisc::COriginator &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model << originator; } bool c = this->m_airspace->updateAircraftModel(callsign, model, originator); @@ -585,7 +585,7 @@ namespace BlackCore return c; } - bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) + bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates << originator; } bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator); @@ -598,14 +598,14 @@ namespace BlackCore return c; } - bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator) + bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered, const COriginator &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << rendered << originator; } bool c = this->m_airspace->updateAircraftRendered(callsign, rendered, originator); return c; } - void CContextNetwork::updateMarkAllAsNotRendered(const QString &originator) + void CContextNetwork::updateMarkAllAsNotRendered(const COriginator &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << originator; } this->m_airspace->updateMarkAllAsNotRendered(originator); diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 9f49d5ef1..75853ab45 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -83,11 +83,11 @@ namespace BlackCore //! \copydoc IRemoteAircraftProvider::updateAircraftRendered //! \ingroup remoteaircraftprovider - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) override; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered //! \ingroup remoteaircraftprovider - virtual void updateMarkAllAsNotRendered(const QString &originator) override; + virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot //! \ingroup remoteaircraftprovider @@ -99,15 +99,15 @@ namespace BlackCore public slots: //! \copydoc IContextNetwork::updateAircraftEnabled //! \ingroup remoteaircraftprovider - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::updateAircraftModel //! \ingroup remoteaircraftprovider - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::updateFastPositionEnabled //! \ingroup remoteaircraftprovider - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::readAtcBookingsFromSource() virtual void readAtcBookingsFromSource() const override; @@ -157,7 +157,7 @@ namespace BlackCore //! //! @} //! \copydoc IContextNetwork::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::sendTextMessages() virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override; diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index 5ac05edc3..ae56d459c 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -76,13 +76,13 @@ namespace BlackCore "vatsimBookingsRead", this, SIGNAL(vatsimBookingsRead())); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedRemoteAircraftModel", this, SIGNAL(changedRemoteAircraftModel(BlackMisc::Simulation::CSimulatedAircraft, QString))); + "changedRemoteAircraftModel", this, SIGNAL(changedRemoteAircraftModel(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::COriginator))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft, QString))); + "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::COriginator))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft, QString))); + "changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::COriginator))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), "addedAircraft", this, SIGNAL(addedAircraft(BlackMisc::Simulation::CSimulatedAircraft))); @@ -183,17 +183,17 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("requestAtisUpdates")); } - bool CContextNetworkProxy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const QString &originator) + bool CContextNetworkProxy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftEnabled"), callsign, enabledForRedering, originator); } - bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const Simulation::CAircraftModel &model, const QString &originator) + bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const Simulation::CAircraftModel &model, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftModel"), callsign, model, originator); } - bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const QString &originator) + bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateFastPositionEnabled"), callsign, enableFastPositionSending, originator); } @@ -248,7 +248,7 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("getConnectedServer")); } - bool CContextNetworkProxy::parseCommandLine(const QString &commandLine, const QString &originator) + bool CContextNetworkProxy::parseCommandLine(const QString &commandLine, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("commandLineEntered"), commandLine, originator); } diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 943490c1f..62d0f5d21 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -88,7 +88,7 @@ namespace BlackCore virtual BlackMisc::Network::CServer getConnectedServer() const override; //! \copydoc IContextNetwork::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::sendTextMessages() virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override; @@ -136,13 +136,13 @@ namespace BlackCore virtual void requestAtisUpdates() override; //! \copydoc IContextNetwork::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::COriginator &originator) override; //! \copydoc IContextNetwork::isFastPositionSendingEnabled virtual bool isFastPositionSendingEnabled() const override; diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h index 5f41e86ac..ee1bdf759 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -14,6 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context.h" +#include "blackmisc/originator.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/aircrafticaodata.h" #include "blackmisc/audio/voiceroomlist.h" @@ -66,10 +67,10 @@ namespace BlackCore signals: //! Aircraft cockpit update - void changedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void changedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Changed SELCAL code - void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator); + void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator); //! Own callsign was changed void changedCallsign(const BlackMisc::Aviation::CCallsign &callsign); @@ -89,10 +90,10 @@ namespace BlackCore virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) = 0; //! Update own cockpit - virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) = 0; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) = 0; //! Tune in a com frequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) = 0; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) = 0; //! Set current pilot virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0; @@ -104,7 +105,7 @@ namespace BlackCore virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0; //! Own SELCAL code - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) = 0; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) = 0; //! Output volume 0..300 virtual void setAudioOutputVolume(int outputVolume) = 0; @@ -118,7 +119,7 @@ namespace BlackCore virtual void enableAutomaticVoiceRoomResolution(bool enable) = 0; //! Parse command line - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) = 0; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) = 0; protected: //! Constructor diff --git a/src/blackcore/context_ownaircraft_impl.cpp b/src/blackcore/context_ownaircraft_impl.cpp index 1b581fd32..a189c4f34 100644 --- a/src/blackcore/context_ownaircraft_impl.cpp +++ b/src/blackcore/context_ownaircraft_impl.cpp @@ -170,7 +170,7 @@ namespace BlackCore return changed; } - bool CContextOwnAircraft::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) + bool CContextOwnAircraft::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const COriginator &originator) { if (this->m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << com1 << com2 << transponder; } bool changed; @@ -187,7 +187,7 @@ namespace BlackCore return changed; } - bool CContextOwnAircraft::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const QString &originator) + bool CContextOwnAircraft::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const COriginator &originator) { CComSystem::ComUnit unit = static_cast(comUnit); if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return false; } @@ -244,7 +244,7 @@ namespace BlackCore return true; } - bool CContextOwnAircraft::updateSelcal(const CSelcal &selcal, const QString &originator) + bool CContextOwnAircraft::updateSelcal(const CSelcal &selcal, const COriginator &originator) { { QWriteLocker l(&m_lockAircraft); @@ -297,7 +297,7 @@ namespace BlackCore this->m_automaticVoiceRoomResolution = enable; } - bool CContextOwnAircraft::parseCommandLine(const QString &commandLine, const QString &originator) + bool CContextOwnAircraft::parseCommandLine(const QString &commandLine, const COriginator &originator) { Q_UNUSED(originator); if (commandLine.isEmpty()) { return false; } @@ -319,14 +319,16 @@ namespace BlackCore if (CTransponder::isValidTransponderCode(xprCode)) { transponder.setTransponderCode(xprCode); - this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, "commandline"); + // todo RW: replace originator + this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, COriginator("commandline")); return true; } else { CTransponder::TransponderMode mode = CTransponder::modeFromString(parser.part(1)); transponder.setTransponderMode(mode); - this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, "commandline"); + // todo RW: replace originator + this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, COriginator("commandline")); return true; } } @@ -349,7 +351,8 @@ namespace BlackCore { return false; } - this->updateCockpit(com1, com2, myAircraft.getTransponder(), "commandline"); + // todo RW: replace originator + this->updateCockpit(com1, com2, myAircraft.getTransponder(), COriginator("commandline")); return true; } } @@ -357,7 +360,8 @@ namespace BlackCore { if (CSelcal::isValidCode(parser.part(1))) { - this->updateSelcal(parser.part(1), "commandline"); + // todo RW: replace originator + this->updateSelcal(parser.part(1), COriginator("commandline")); return true; } } diff --git a/src/blackcore/context_ownaircraft_impl.h b/src/blackcore/context_ownaircraft_impl.h index 27c453361..31fc01450 100644 --- a/src/blackcore/context_ownaircraft_impl.h +++ b/src/blackcore/context_ownaircraft_impl.h @@ -84,13 +84,13 @@ namespace BlackCore virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override; //! \copydoc IContextOwnAircraft::updateCockpit - virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) override; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) override; //! \copydoc IContextOwnAircraft::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) override; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) override; //! \copydoc IContextOwnAircraft::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) override; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override; //! \copydoc IContextOwnAircraft::updatePilot virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override; @@ -113,7 +113,7 @@ namespace BlackCore //! //! @} //! \copydoc IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; protected: //! Constructor, with link to runtime diff --git a/src/blackcore/context_ownaircraft_proxy.cpp b/src/blackcore/context_ownaircraft_proxy.cpp index 9171ba82c..0511bc620 100644 --- a/src/blackcore/context_ownaircraft_proxy.cpp +++ b/src/blackcore/context_ownaircraft_proxy.cpp @@ -30,7 +30,7 @@ namespace BlackCore void CContextOwnAircraftProxy::relaySignals(const QString &serviceName, QDBusConnection &connection) { bool s = connection.connect(serviceName, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName(), - "changedAircraftCockpit", this, SIGNAL(changedAircraftCockpit(BlackMisc::Simulation::CSimulatedAircraft, QString))); + "changedAircraftCockpit", this, SIGNAL(changedAircraftCockpit(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::COriginator))); Q_ASSERT(s); Q_UNUSED(s); } @@ -40,12 +40,12 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("getOwnAircraft")); } - bool CContextOwnAircraftProxy::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) + bool CContextOwnAircraftProxy::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateCockpit"), com1, com2, transponder, originator); } - bool CContextOwnAircraftProxy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) + bool CContextOwnAircraftProxy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateActiveComFrequency"), frequency, comUnit, originator); } @@ -55,7 +55,7 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateOwnAircraftPilot"), pilot); } - bool CContextOwnAircraftProxy::updateSelcal(const CSelcal &selcal, const QString &originator) + bool CContextOwnAircraftProxy::updateSelcal(const CSelcal &selcal, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateSelcal"), selcal, originator); } @@ -90,7 +90,7 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("enableAutomaticVoiceRoomResolution"), enable); } - bool CContextOwnAircraftProxy::parseCommandLine(const QString &commandLine, const QString &originator) + bool CContextOwnAircraftProxy::parseCommandLine(const QString &commandLine, const COriginator &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("parseCommandLine"), commandLine, originator); } diff --git a/src/blackcore/context_ownaircraft_proxy.h b/src/blackcore/context_ownaircraft_proxy.h index 784e676aa..0e296ec95 100644 --- a/src/blackcore/context_ownaircraft_proxy.h +++ b/src/blackcore/context_ownaircraft_proxy.h @@ -42,16 +42,16 @@ namespace BlackCore virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override; //! \copydoc IContextOwnAircraft::updateCockpit - virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) override; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) override; //! \copydoc IContextOwnAircraft::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) override; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override; //! \copydoc IContextOwnAircraft::updatePilot virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override; //! \copydoc IContextOwnAircraft::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) override; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) override; //! \copydoc IContextOwnAircraft::updateOwnCallsign virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override; @@ -69,7 +69,7 @@ namespace BlackCore virtual void enableAutomaticVoiceRoomResolution(bool enable); //! \copydoc IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const QString &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; protected: //! \brief Constructor diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp index 419af7906..23dbb6896 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/context_runtime.cpp @@ -129,7 +129,7 @@ namespace BlackCore BlackCore::registerMetadata(); } - bool CRuntime::parseCommandLine(const QString commandLine, const QString &originator) + bool CRuntime::parseCommandLine(const QString &commandLine, const COriginator &originator) { bool handled = false; if (this->getIContextAudio()) { handled = handled || this->getIContextAudio()->parseCommandLine(commandLine, originator); } diff --git a/src/blackcore/context_runtime.h b/src/blackcore/context_runtime.h index e1eeea01a..65dca860a 100644 --- a/src/blackcore/context_runtime.h +++ b/src/blackcore/context_runtime.h @@ -14,6 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context_runtime_config.h" +#include "blackmisc/originator.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/simulation/ownaircraftprovider.h" @@ -155,7 +156,7 @@ namespace BlackCore public slots: //! Parse command line in all contexts - bool parseCommandLine(const QString commandLine, const QString &originator); + bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator); private: bool m_init = false; //!< flag diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp index b6b397b7c..3f4da9038 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/context_simulator_impl.cpp @@ -615,19 +615,19 @@ namespace BlackCore getIContextOwnAircraft()->changedAircraftCockpit(ownAircraft, IContextSimulator::InterfaceName()); } - void CContextSimulator::ps_changedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const QString &originator) + void CContextSimulator::ps_changedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const COriginator &originator) { Q_ASSERT(this->m_simulatorPlugin); this->m_simulatorPlugin->simulator->changeRemoteAircraftModel(aircraft, originator); } - void CContextSimulator::ps_changedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const QString &originator) + void CContextSimulator::ps_changedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) { Q_ASSERT(this->m_simulatorPlugin); this->m_simulatorPlugin->simulator->changeRemoteAircraftEnabled(aircraft, originator); } - void CContextSimulator::ps_updateSimulatorCockpitFromContext(const CAircraft &ownAircraft, const QString &originator) + void CContextSimulator::ps_updateSimulatorCockpitFromContext(const CAircraft &ownAircraft, const COriginator &originator) { // todo: // This was previously an assert and it should be one again in the future. @@ -641,7 +641,7 @@ namespace BlackCore Q_ASSERT(m_simulatorPlugin->simulator); // avoid loops - if (originator.isEmpty() || originator == IContextSimulator::InterfaceName()) { return; } + if (originator.getName().isEmpty() || originator == IContextSimulator::InterfaceName()) { return; } // update this->m_simulatorPlugin->simulator->updateOwnSimulatorCockpit(ownAircraft, originator); diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h index e213658d6..a09ac8103 100644 --- a/src/blackcore/context_simulator_impl.h +++ b/src/blackcore/context_simulator_impl.h @@ -177,14 +177,14 @@ namespace BlackCore void ps_cockpitChangedFromSimulator(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft); //! Changed remote aircraft model - void ps_changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void ps_changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Enable / disable aircraft - void ps_changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void ps_changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Update simulator cockpit from context, because someone else has changed cockpit (e.g. GUI, 3rd party) //! \remarks set by runtime, only to be used locally (not via DBus) - void ps_updateSimulatorCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const QString &originator); + void ps_updateSimulatorCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator); private: //! A simple struct containing all info about the plugin. diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index f17d6ae79..9e8d4ba85 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -29,12 +29,12 @@ namespace BlackCore return status; } - const QString &ISimulator::simulatorOriginator() + COriginator ISimulator::simulatorOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("SIMULATOR:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("SIMULATOR")); + + return m_originator; } QString ISimulator::statusToString(int status) diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 69a8a6126..104be3610 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -82,13 +82,13 @@ namespace BlackCore virtual bool logicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) = 0; //! Change remote aircraft per property - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator) = 0; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) = 0; //! Aircraft got enabled / disabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator) = 0; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) = 0; //! Update own aircraft cockpit (usually from context) - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator) = 0; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator) = 0; //! ICAO data for model string virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const = 0; @@ -169,7 +169,7 @@ namespace BlackCore virtual void unload() = 0; //! Originator - const QString &simulatorOriginator(); + BlackMisc::COriginator simulatorOriginator(); //! Status to string static QString statusToString(int status); @@ -222,6 +222,10 @@ namespace BlackCore //! Emit the combined status //! \sa simulatorStatusChanged; void emitSimulatorCombinedStatus(); + + private: + + BlackMisc::COriginator m_originator; }; //! Interface to a simulator listener. diff --git a/src/blackgui/commandinput.cpp b/src/blackgui/commandinput.cpp index 75cddaae7..d7ab36a4d 100644 --- a/src/blackgui/commandinput.cpp +++ b/src/blackgui/commandinput.cpp @@ -10,6 +10,8 @@ #include "commandinput.h" #include +using namespace BlackMisc; + namespace BlackGui { @@ -30,12 +32,12 @@ namespace BlackGui } } - const QString &CCommandInput::commandInputOriginator() + COriginator CCommandInput::commandInputOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QStringLiteral("COMMANDINPUT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("COMMANDINPUT")); + + return m_originator; } } diff --git a/src/blackgui/commandinput.h b/src/blackgui/commandinput.h index 6c1cd6900..2cfd9dde2 100644 --- a/src/blackgui/commandinput.h +++ b/src/blackgui/commandinput.h @@ -13,6 +13,7 @@ #define BLACKGUI_COMMANDINPUT_H #include "blackguiexport.h" +#include "blackmisc/originator.h" #include #include @@ -32,10 +33,13 @@ namespace BlackGui //! Destructor ~CCommandInput() {} + //! Originator + BlackMisc::COriginator commandInputOriginator(); + signals: //! Command was entered - void commandEntered(const QString &command, const QString &originator); + void commandEntered(const QString &command, const BlackMisc::COriginator &originator); private slots: @@ -44,7 +48,7 @@ namespace BlackGui private: - const QString &commandInputOriginator(); + BlackMisc::COriginator m_originator; }; } diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 7401c203f..29b4752a6 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -275,12 +275,12 @@ namespace BlackGui } } - const QString &CAtcStationComponent::originator() + COriginator CAtcStationComponent::originator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("ATCSTATIOCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("ATCSTATIOCOMPONENT")); + + return m_originator; } void CAtcStationComponent::ps_onlineAtcStationSelected(QModelIndex index) diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h index cffc4747b..5edd86a7a 100644 --- a/src/blackgui/components/atcstationcomponent.h +++ b/src/blackgui/components/atcstationcomponent.h @@ -16,6 +16,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" +#include "blackmisc/originator.h" #include "blackmisc/aviation/atcstation.h" #include #include @@ -111,7 +112,7 @@ namespace BlackGui private: void updateTreeView(); - const QString &originator(); + BlackMisc::COriginator originator(); QScopedPointer ui; QScopedPointer m_updateTimer; @@ -119,6 +120,7 @@ namespace BlackGui QDateTime m_timestampOnlineStationsChanged = CUpdateTimer::epoch(); //!< stations marked as changed QDateTime m_timestampLastReadBookedStations = CUpdateTimer::epoch(); //!< stations read QDateTime m_timestampBookedStationsChanged = CUpdateTimer::epoch(); //!< stations marked as changed + BlackMisc::COriginator m_originator; }; } // namespace diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index daa0cf095..5f368fd82 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -62,7 +62,7 @@ namespace BlackGui // init from aircraft CAircraft ownAircraft = this->getOwnAircraft(); - this->ps_updateCockpitFromContext(ownAircraft, "dummyInitialValues"); + this->ps_updateCockpitFromContext(ownAircraft, COriginator("dummyInitialValues")); // SELCAL pairs in cockpit this->ui->frp_ComPanelSelcalBottom->clear(); @@ -114,7 +114,7 @@ namespace BlackGui this->getIContextOwnAircraft()->updateSelcal(this->getSelcal(), cockpitOriginator()); } - void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const QString &originator) + void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const COriginator &originator) { if (originator == CCockpitComComponent::cockpitOriginator()) return; // comes from myself @@ -182,7 +182,7 @@ namespace BlackGui } } - void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const QString &originator) + void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const COriginator &originator) { if (originator == CCockpitComComponent::cockpitOriginator()) return; // comes from myself this->ui->frp_ComPanelSelcalBottom->setSelcalCode(selcal); @@ -286,12 +286,12 @@ namespace BlackGui Q_UNUSED(connected); } - const QString &CCockpitComComponent::cockpitOriginator() + COriginator CCockpitComComponent::cockpitOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("COCKPITCOMCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("COCKPITCOMCOMPONENT")); + + return m_originator; } } // namespace diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/blackgui/components/cockpitcomcomponent.h index 1978135a9..99a2c3ee2 100644 --- a/src/blackgui/components/cockpitcomcomponent.h +++ b/src/blackgui/components/cockpitcomcomponent.h @@ -13,6 +13,7 @@ #include "blackgui/blackguiexport.h" #include "enablefordockwidgetinfoarea.h" #include "enableforruntime.h" +#include "blackmisc/originator.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/transponder.h" #include "blackmisc/audio/voiceroomlist.h" @@ -66,13 +67,13 @@ namespace BlackGui void ps_guiChangedSelcal(); //! Update cockpit from context - void ps_updateCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const QString &originator); + void ps_updateCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator); //! Cockpit values have been changed in GUI void ps_testSelcal(); //! SELCAL was changed - void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator); + void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator); //! Update voice room related information void ps_onChangedVoiceRoomStatus(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected); @@ -97,9 +98,10 @@ namespace BlackGui void updateFrequencyDisplaysFromComSystems(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2); //! Identifies sender of cockpit updates - static const QString &cockpitOriginator(); + BlackMisc::COriginator cockpitOriginator(); QScopedPointer ui; + BlackMisc::COriginator m_originator; }; } // namespace diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp index b4c5743a0..257896537 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp @@ -12,6 +12,7 @@ #include #include +using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackCore; @@ -35,7 +36,7 @@ namespace BlackGui this->setMode(getOwnTransponder().getTransponderMode()); } - void CCockpitTransponderModeLedsComponent::ps_onAircraftCockpitChanged(const CAircraft &aircraft, const QString &originator) + void CCockpitTransponderModeLedsComponent::ps_onAircraftCockpitChanged(const CAircraft &aircraft, const BlackMisc::COriginator &originator) { if (ledsOriginator() == originator) { return; } this->setMode(aircraft.getTransponderMode()); @@ -132,12 +133,12 @@ namespace BlackGui return getIContextOwnAircraft()->getOwnAircraft(); } - const QString &CCockpitTransponderModeLedsComponent::ledsOriginator() + BlackMisc::COriginator CCockpitTransponderModeLedsComponent::ledsOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("XPDRLEDSCOMCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("XPDRLEDSCOMCOMPONENT")); + + return m_originator; } } // namespace diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.h b/src/blackgui/components/cockpittranspondermodeledscomponent.h index 300b41399..a5b4b237d 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.h +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.h @@ -15,6 +15,7 @@ #include "blackgui/blackguiexport.h" #include "enableforruntime.h" #include "../led.h" +#include "blackmisc/originator.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/transponder.h" #include @@ -39,7 +40,7 @@ namespace BlackGui private slots: //! \copydoc IContextOwnAircraft::changedAircraftCockpit - void ps_onAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator); + void ps_onAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator); //! LED clicked void ps_onLedClicked(); @@ -60,11 +61,12 @@ namespace BlackGui BlackMisc::Aviation::CAircraft getOwnAircraft() const; //! Identifies sender of cockpit updates - static const QString &ledsOriginator(); + BlackMisc::COriginator ledsOriginator(); QScopedPointer m_ledStandby; QScopedPointer m_ledModes; QScopedPointer m_ledIdent; + BlackMisc::COriginator m_originator; }; diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index c7e7440e5..2e98cce4a 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -417,12 +417,12 @@ namespace BlackGui this->setCurrentWidget(this->ui->tb_RemarksGenerator); } - const QString &CFlightPlanComponent::flightPlanOriginator() + COriginator CFlightPlanComponent::flightPlanOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("FLIGHTPLANCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("FLIGHTPLANCOMPONENT")); + + return m_originator; } } // namespace diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index cb37673dd..5aff6aa25 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -14,6 +14,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/components/enableforruntime.h" +#include "blackmisc/originator.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/flightplan.h" @@ -65,6 +66,9 @@ namespace BlackGui //! Validate, generates status messages BlackMisc::CStatusMessageList validateAndInitializeFlightPlan(BlackMisc::Aviation::CFlightPlan &fligtPlan); + //! Flightplan originator + BlackMisc::COriginator m_originator; + //! Default value for airport ICAO airports static const QString &defaultIcao() { static QString d("ICAO"); return d; } @@ -72,7 +76,7 @@ namespace BlackGui static const QString &defaultTime() { static QString t("00:00"); return t; } //! Originator - static const QString &flightPlanOriginator(); + BlackMisc::COriginator flightPlanOriginator(); private slots: //! Call \sa ps_buildRemarksString from combo box signal diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp index e466512d0..0e0b1c158 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -158,7 +158,7 @@ namespace BlackGui this->ui->le_CommandLineInput->clear(); } - void CMainKeypadAreaComponent::ps_ownAircraftCockpitChanged(const CAircraft &aircraft, const QString &originator) + void CMainKeypadAreaComponent::ps_ownAircraftCockpitChanged(const CAircraft &aircraft, const COriginator &originator) { Q_UNUSED(originator); bool ident = aircraft.getTransponder().getTransponderMode() == CTransponder::StateIdent; @@ -236,12 +236,12 @@ namespace BlackGui ui->pb_MainWeather->setChecked(false); } - const QString &CMainKeypadAreaComponent::keypadOriginator() + COriginator CMainKeypadAreaComponent::keypadOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("KEYPADAREACOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("KEYPADAREACOMPONENT")); + + return m_originator; } } // namespace diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h index 23ac3a8f7..dee9f1c9c 100644 --- a/src/blackgui/components/mainkeypadareacomponent.h +++ b/src/blackgui/components/mainkeypadareacomponent.h @@ -15,6 +15,7 @@ #include "blackgui/blackguiexport.h" #include "maininfoareacomponent.h" #include "enableforruntime.h" +#include "blackmisc/originator.h" #include "blackmisc/aviation/aircraft.h" #include @@ -44,7 +45,7 @@ namespace BlackGui ~CMainKeypadAreaComponent(); //! Originator - static const QString &keypadOriginator(); + BlackMisc::COriginator keypadOriginator(); signals: //! Button to select main info area has been pressed @@ -55,7 +56,7 @@ namespace BlackGui void changedOpacity(int opacity); //! Command was entered - void commandEntered(const QString &commandLine, const QString &originator); + void commandEntered(const QString &commandLine, const BlackMisc::COriginator &originator); //! Connect was pressed void connectPressed(); @@ -82,7 +83,7 @@ namespace BlackGui void ps_commandEntered(); //! \copydoc BlackCore::IContextOwnAircraft::changedAircraftCockpit - void ps_ownAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator); + void ps_ownAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator); //! \copydoc BlackCore::IContextAudio::changedMute void ps_muteChanged(bool muted); @@ -101,6 +102,7 @@ namespace BlackGui void unsetInfoAreaButtons(); QScopedPointer ui; + BlackMisc::COriginator m_originator; }; } // namespace diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 0022e5e6a..9557f1aa6 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -308,21 +308,21 @@ namespace BlackGui this->ui->le_AircraftModel->setCompleter(this->m_modelCompleter); } - void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const QString &originator) + void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const COriginator &originator) { this->updateSimulatedAircraftView(); Q_UNUSED(originator); Q_UNUSED(aircraft); } - void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const QString &originator) + void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) { this->updateSimulatedAircraftView(); Q_UNUSED(originator); Q_UNUSED(aircraft); } - void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const QString &originator) + void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) { this->updateSimulatedAircraftView(); Q_UNUSED(originator); @@ -378,12 +378,12 @@ namespace BlackGui } } - const QString &CMappingComponent::mappingtOriginator() + COriginator CMappingComponent::mappingtOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("MAPPINGCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("MAPPINGCOMPONENT")); + + return m_originator; } void CMappingComponent::updateSimulatedAircraftView(bool forceUpdate) diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h index cbefe5888..a0b63a6dd 100644 --- a/src/blackgui/components/mappingcomponent.h +++ b/src/blackgui/components/mappingcomponent.h @@ -17,6 +17,7 @@ #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" #include "blackgui/views/checkboxdelegate.h" +#include "blackmisc/originator.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/aircraftmodellist.h" #include @@ -94,13 +95,13 @@ namespace BlackGui void ps_onModelsUpdateRequested(); //! Rendered aircraft changed in backend - void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Aircraft enabled, disabled in backend - void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Fast position updates on/off in backend - void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator); + void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); //! Connection status has been changed void ps_onConnectionStatusChanged(uint from, uint to); @@ -121,13 +122,14 @@ namespace BlackGui void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); private: - static const QString &mappingtOriginator(); + BlackMisc::COriginator mappingtOriginator(); void updateSimulatedAircraftView(bool forceUpdate = false); QScopedPointer ui; QScopedPointer m_updateTimer; QCompleter *m_modelCompleter = nullptr; bool m_missedSimulatedAircraftUpdate = true; BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; + BlackMisc::COriginator m_originator; private slots: void ps_backgroundUpdate(); diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 11bbc29ff..e5353b654 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -148,12 +148,12 @@ namespace BlackGui } } - const QString &CTextMessageComponent::componentOriginator() + COriginator CTextMessageComponent::componentOriginator() { - // string is generated once, the timestamp allows to use multiple - // components (as long as they are not generated at the same ms) - static const QString o = QString("TEXTMESSAGECOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = COriginator(QStringLiteral("TEXTMESSAGECOMPONENT")); + + return m_originator; } void CTextMessageComponent::ps_onChangedAircraftCockpit() @@ -433,7 +433,7 @@ namespace BlackGui this->displayTextMessage(sentMessage); } - bool CTextMessageComponent::handleGlobalCommandLine(const QString &commandLine, const QString &originator) + bool CTextMessageComponent::handleGlobalCommandLine(const QString &commandLine, const COriginator &originator) { if (originator == componentOriginator()) { return false; } if (commandLine.isEmpty() || commandLine.startsWith(".")) { return false; } diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 3001ba990..77db9d6b1 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -16,6 +16,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/textmessagetextedit.h" +#include "blackmisc/originator.h" #include "blackmisc/network/textmessage.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/network/textmessagelist.h" @@ -59,7 +60,7 @@ namespace BlackGui void displayInInfoWindow(const BlackMisc::CVariant &message, int displayDurationMs) const; //! Command line was entered - void commandEntered(const QString commandLine, const QString &orignator); + void commandEntered(const QString commandLine, const BlackMisc::COriginator &orignator); public slots: //! Text messages received @@ -69,7 +70,7 @@ namespace BlackGui void onTextMessageSent(const BlackMisc::Network::CTextMessage &sentMessage); //! Used to allow direct input from global command line when visible - bool handleGlobalCommandLine(const QString &commandLine, const QString &originator); + bool handleGlobalCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator); //! Display the tab for given callsign void showCorrespondingTab(const BlackMisc::Aviation::CCallsign &callsign); @@ -80,6 +81,7 @@ namespace BlackGui private: QScopedPointer ui; + BlackMisc::COriginator m_originator; //! Enum to widget QWidget *getTabWidget(Tab tab) const; @@ -123,7 +125,7 @@ namespace BlackGui QString textMessageToCommand(const QString &enteredLine); //! Originator - static const QString &componentOriginator(); + BlackMisc::COriginator componentOriginator(); //! Handle a text message entered void handleEnteredTextMessage(const QString &textMessage); diff --git a/src/blackmisc/simulation/ownaircraftprovider.cpp b/src/blackmisc/simulation/ownaircraftprovider.cpp index 66d637afd..48271ff2a 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.cpp +++ b/src/blackmisc/simulation/ownaircraftprovider.cpp @@ -48,19 +48,19 @@ namespace BlackMisc return this->m_ownAircraftProvider->getDistanceToOwnAircraft(position); } - bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const QString &originator) + bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const COriginator &originator) { Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_ownAircraftProvider->updateCockpit(com1, com2, transponder, originator); } - bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const QString &originator) + bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const COriginator &originator) { Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_ownAircraftProvider->updateActiveComFrequency(frequency, comUnit, originator); } - bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const QString &originator) + bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const COriginator &originator) { Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_ownAircraftProvider->updateSelcal(selcal, originator); diff --git a/src/blackmisc/simulation/ownaircraftprovider.h b/src/blackmisc/simulation/ownaircraftprovider.h index 349c9e05c..724c6511b 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.h +++ b/src/blackmisc/simulation/ownaircraftprovider.h @@ -13,6 +13,7 @@ #define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/originator.h" #include "blackmisc/simulation/simulatedaircraft.h" namespace BlackMisc @@ -70,15 +71,15 @@ namespace BlackMisc //! Update cockpit, but send signals when applicable //! \threadsafe - virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) = 0; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) = 0; //! Update cockpit, but send signals when applicable //! \threadsafe - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) = 0; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) = 0; //! Update cockpit, but send signals when applicable //! \threadsafe - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) = 0; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) = 0; }; @@ -102,13 +103,13 @@ namespace BlackMisc virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const; //! \copydoc IOwnAircraftProvider::updateCockpit - virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator); + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator); //! \copydoc IOwnAircraftProvider::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator); + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator); //! \copydoc IOwnAircraftProvider::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator); + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator); //! \copydoc IOwnAircraftProvider::updateOwnCallsign virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign); diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.cpp b/src/blackmisc/simulation/ownaircraftproviderdummy.cpp index 32788198b..bf584328a 100644 --- a/src/blackmisc/simulation/ownaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/ownaircraftproviderdummy.cpp @@ -37,7 +37,7 @@ namespace BlackMisc return m_ownAircraft.calculateGreatCircleDistance(position); } - bool COwnAircraftProviderDummy::updateCockpit(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder, const QString &originator) + bool COwnAircraftProviderDummy::updateCockpit(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder, const COriginator &originator) { m_ownAircraft.setCom1System(com1); m_ownAircraft.setCom2System(com2); @@ -46,7 +46,7 @@ namespace BlackMisc return true; } - bool COwnAircraftProviderDummy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) + bool COwnAircraftProviderDummy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) { if (!CComSystem::isValidComFrequency(frequency)) { return false; } CComSystem::ComUnit comUnitEnum = static_cast(comUnit); @@ -57,7 +57,7 @@ namespace BlackMisc return true; } - bool COwnAircraftProviderDummy::updateSelcal(const CSelcal &selcal, const QString &originator) + bool COwnAircraftProviderDummy::updateSelcal(const CSelcal &selcal, const BlackMisc::COriginator &originator) { m_ownAircraft.setSelcal(selcal); Q_UNUSED(originator); diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.h b/src/blackmisc/simulation/ownaircraftproviderdummy.h index 60f616490..29bbed8c0 100644 --- a/src/blackmisc/simulation/ownaircraftproviderdummy.h +++ b/src/blackmisc/simulation/ownaircraftproviderdummy.h @@ -50,13 +50,13 @@ namespace BlackMisc public slots: //! \copydoc IOwnAircraftProvider::updateCockpit - virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) override; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) override; //! \copydoc IOwnAircraftProvider::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) override; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override; //! \copydoc IOwnAircraftProvider::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) override; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) override; //! \copydoc IOwnAircraftProvider::updateOwnCallsign virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override; diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index b725d3e37..51a1e162a 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -64,19 +64,19 @@ namespace BlackMisc return this->m_remoteAircraftProvider->remoteAircraftSituationsCount(callsign); } - bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const QString &originator) + bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const COriginator &originator) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_remoteAircraftProvider->updateAircraftModel(callsign, model, originator); } - bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator) + bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const COriginator &originator) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_remoteAircraftProvider->updateAircraftRendered(callsign, rendered, originator); } - void CRemoteAircraftAware::updateMarkAllAsNotRendered(const QString &originator) + void CRemoteAircraftAware::updateMarkAllAsNotRendered(const COriginator &originator) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_remoteAircraftProvider->updateMarkAllAsNotRendered(originator); @@ -88,7 +88,7 @@ namespace BlackMisc return this->m_remoteAircraftProvider->isRemoteAircraftSupportingParts(callsign); } - bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) + bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const COriginator &originator) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_remoteAircraftProvider->updateAircraftEnabled(callsign, enabledForRedering, originator); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 783293841..12b3af775 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -13,6 +13,7 @@ #define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/originator.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" @@ -78,23 +79,23 @@ namespace BlackMisc //! Enable/disable rendering //! \threadsafe - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const QString &originator) = 0; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::COriginator &originator) = 0; //! Rendered? //! \threadsafe - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) = 0; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) = 0; //! Mark all as not rendered //! \threadsafe - virtual void updateMarkAllAsNotRendered(const QString &originator) = 0; + virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) = 0; //! Change model string //! \threadsafe - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) = 0; //! Change fast position updates //! \threadsafe - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) = 0; //! Destructor virtual ~IRemoteAircraftProvider() {} @@ -143,16 +144,16 @@ namespace BlackMisc virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator); + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator); //! \copydoc IRemoteAircraftProvider::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator); + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator); //! \copydoc IRemoteAircraftProvider::updateAircraftRendered - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator); + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator); //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered - virtual void updateMarkAllAsNotRendered(const QString &originator); + virtual void updateMarkAllAsNotRendered(const COriginator &originator); //! Destructor virtual ~CRemoteAircraftAware() {} diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index d5d0e4855..28710c1a3 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -82,7 +82,7 @@ namespace BlackMisc return c; } - bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering, const QString &originator) + bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering, const COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexEnabled, CVariant::fromValue(enabledForRendering)); @@ -90,7 +90,7 @@ namespace BlackMisc return n > 0; } - bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const QString &originator) + bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, model.toCVariant()); @@ -98,7 +98,7 @@ namespace BlackMisc return n > 0; } - bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) + bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositionUpdates)); @@ -106,7 +106,7 @@ namespace BlackMisc return n > 0; } - bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator) + bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const COriginator &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered)); @@ -114,7 +114,7 @@ namespace BlackMisc return n > 0; } - void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const QString &originator) + void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const COriginator &originator) { Q_UNUSED(originator); this->m_aircraft.markAllAsNotRendered(); diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index 9fbe5af91..fd590e495 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.h +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.h @@ -68,19 +68,19 @@ namespace BlackMisc ) override; //! \copydoc IRemoteAircraftProvider::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const QString &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override; + virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftRendered - virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const QString &originator) override; + virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered - virtual void updateMarkAllAsNotRendered(const QString &originator) override; + virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override; //! For testing, add new situation and fire signals void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation); diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp index 7a9c6b044..57c6fc370 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.cpp +++ b/src/plugins/simulator/fs9/simulator_fs9.cpp @@ -151,7 +151,7 @@ namespace BlackSimPlugin return CCollection(this->m_hashFs9Clients.keys()); } - bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const QString &originator) + bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const COriginator &originator) { if (originator == this->simulatorOriginator()) { return false; } if (!this->isSimulating()) { return false; } diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h index d9378cdec..a9d00f915 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/src/plugins/simulator/fs9/simulator_fs9.h @@ -73,7 +73,7 @@ namespace BlackSimPlugin virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc ISimulator::updateOwnSimulatorCockpit() - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const QString &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator) override; //! \copydoc ISimulator::displayStatusMessage() virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulator_fscommon.cpp index ac687d99e..bfdd1a31f 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp +++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp @@ -259,7 +259,7 @@ namespace BlackSimPlugin return empty; } - bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const QString &originator) + bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const COriginator &originator) { if (originator == simulatorOriginator()) { return false; } @@ -268,7 +268,7 @@ namespace BlackSimPlugin return this->changeRemoteAircraftEnabled(aircraft, originator); } - bool CSimulatorFsCommon::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const QString &originator) + bool CSimulatorFsCommon::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) { if (originator == simulatorOriginator()) { return false; } if (aircraft.isEnabled()) diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.h b/src/plugins/simulator/fscommon/simulator_fscommon.h index fa81b2b6e..c77e84e46 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.h +++ b/src/plugins/simulator/fscommon/simulator_fscommon.h @@ -70,10 +70,10 @@ namespace BlackSimPlugin virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override; //! \copydoc ISimulator::changeRenderedAircraftModel - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator) override; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; //! \copydoc ISimulator::changeAircraftEnabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator) override; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; //! \copydoc ISimulator::enableDebuggingMessages virtual void enableDebugMessages(bool driver, bool interpolator) override; diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index ceffa175a..b58f65628 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -188,7 +188,7 @@ namespace BlackSimPlugin return rendered; } - bool CSimulatorFsx::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const QString &originator) + bool CSimulatorFsx::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const COriginator &originator) { if (originator == this->simulatorOriginator()) { return false; } if (!this->isSimulating()) { return false; } diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index c560dca57..3802e2ae9 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -105,7 +105,7 @@ namespace BlackSimPlugin virtual int physicallyRemoveAllRemoteAircraft() override; //! \copydoc ISimulator::updateOwnCockpit - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const QString &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator) override; //! \copydoc ISimulator::displayStatusMessage virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index bd0fd1bb8..76ca77861 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -316,7 +316,7 @@ namespace BlackSimPlugin return getAircraftInRangeForCallsign(callsign).isRendered(); } - bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator) + bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const COriginator &originator) { Q_ASSERT(isConnected()); if (originator == this->simulatorOriginator()) { return false; } @@ -409,7 +409,7 @@ namespace BlackSimPlugin return getAircraftInRange().findByRendered(true).getCallsigns(); // just a poor workaround } - bool CSimulatorXPlane::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const QString &originator) + bool CSimulatorXPlane::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const COriginator &originator) { return this->changeRemoteAircraftEnabled(aircraft, originator); } @@ -420,7 +420,7 @@ namespace BlackSimPlugin return CAircraftIcaoData(); } - bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const QString &originator) + bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) { if (originator == simulatorOriginator()) { return false; } if (aircraft.isEnabled()) diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h index 3aef4c861..997c8e9ae 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/src/plugins/simulator/xplane/simulator_xplane.h @@ -69,13 +69,13 @@ namespace BlackSimPlugin virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc ISimulator::changeRenderedAircraftModel - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator) override; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; //! \copydoc ISimulator::changeAircraftEnabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator) override; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; //! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator) override; //! \copydoc BlackCore::ISimulator::displayStatusMessage virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; diff --git a/src/swiftcore/tool.cpp b/src/swiftcore/tool.cpp index 87d2e2f8f..d69167ef7 100644 --- a/src/swiftcore/tool.cpp +++ b/src/swiftcore/tool.cpp @@ -135,7 +135,7 @@ namespace BlackMiscTest else if (line.startsWith(".")) { // handle dot commands - bool c = runtime->parseCommandLine(line, "foo"); + bool c = runtime->parseCommandLine(line, COriginator("foo")); if (c) { qtout << "Handled command " << line; } else { qtout << "Not handled " << line; } qtout << endl; diff --git a/src/swiftgui_standard/swiftguistd.h b/src/swiftgui_standard/swiftguistd.h index 3d99d04cb..ca26f5adb 100644 --- a/src/swiftgui_standard/swiftguistd.h +++ b/src/swiftgui_standard/swiftguistd.h @@ -30,6 +30,7 @@ #include "blackgui/models/keyboardkeylistmodel.h" #include "blackgui/enableforframelesswindow.h" #include "blackgui/managedstatusbar.h" +#include "blackmisc/originator.h" #include "blackmisc/network/textmessage.h" #include "blackmisc/loghandler.h" #include "blacksound/soundgenerator.h" @@ -128,6 +129,8 @@ private: QString m_transponderResetValue; //!< Temp. storage of XPdr mode to reset, req. until timer allows singleShoot with Lambdas QWidget *m_inputFocusedWidget = nullptr; //!< currently used widget for input, mainly used with cockpit + BlackMisc::COriginator m_originator; + //! GUI status update void updateGuiStatusInformation(); @@ -182,11 +185,12 @@ private: void playNotifcationSound(BlackSound::CNotificationSounds::Notification notification) const; //! Originator for aircraft context - static const QString &swiftGuiStandardOriginator() + BlackMisc::COriginator swiftGuiStandardOriginator() { - // one time init, timestamp allows "multiple swift GUIs" - static const QString o = QString("SWIFTGUISTANDARD:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); - return o; + if (m_originator.getName().isEmpty()) + m_originator = BlackMisc::COriginator(QStringLiteral("SWIFTGUISTANDARD")); + + return m_originator; } private slots: