From d4d862927ec4768523747a3ea97f6eac5833ac25 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Fri, 5 Jun 2015 12:57:40 +0100 Subject: [PATCH] refs #441 Rename COriginator to CIdentifier and rename COriginatorAware to CIdentifiable. --- samples/cli_client/client.cpp | 5 +- samples/cli_client/client.h | 4 +- src/blackcore/airspace_monitor.cpp | 10 ++-- src/blackcore/airspace_monitor.h | 10 ++-- src/blackcore/context_application.h | 12 ++--- src/blackcore/context_application_impl.cpp | 8 +-- src/blackcore/context_application_impl.h | 12 ++--- src/blackcore/context_application_proxy.cpp | 18 +++---- src/blackcore/context_application_proxy.h | 8 +-- src/blackcore/context_audio.h | 4 +- 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 | 16 +++--- 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 | 14 ++--- src/blackcore/context_ownaircraft_impl.cpp | 18 +++---- src/blackcore/context_ownaircraft_impl.h | 12 ++--- 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 | 4 +- src/blackcore/context_simulator_impl.cpp | 6 +-- src/blackcore/context_simulator_impl.h | 6 +-- src/blackcore/simulator.h | 12 ++--- src/blackgui/commandinput.cpp | 4 +- src/blackgui/commandinput.h | 6 +-- .../components/atcstationcomponent.cpp | 4 +- src/blackgui/components/atcstationcomponent.h | 4 +- .../components/cockpitcomcomponent.cpp | 16 +++--- src/blackgui/components/cockpitcomcomponent.h | 8 +-- .../cockpittranspondermodeledscomponent.cpp | 8 +-- .../cockpittranspondermodeledscomponent.h | 6 +-- .../components/flightplancomponent.cpp | 10 ++-- src/blackgui/components/flightplancomponent.h | 10 ++-- .../components/mainkeypadareacomponent.cpp | 12 ++--- .../components/mainkeypadareacomponent.h | 12 ++--- src/blackgui/components/mappingcomponent.cpp | 24 ++++----- src/blackgui/components/mappingcomponent.h | 12 ++--- src/blackgui/components/registercomponent.ui | 6 +-- .../components/textmessagecomponent.cpp | 14 ++--- .../components/textmessagecomponent.h | 12 ++--- ...rlistmodel.cpp => identifierlistmodel.cpp} | 36 ++++++------- ...natorlistmodel.h => identifierlistmodel.h} | 12 ++--- src/blackgui/models/listmodelbase.cpp | 4 +- ...{originatorview.cpp => identifierview.cpp} | 6 +-- .../{originatorview.h => identifierview.h} | 10 ++-- src/blackgui/views/viewbase.cpp | 4 +- src/blackmisc/blackmiscfreefunctions.cpp | 4 +- src/blackmisc/eveventhotkeyfunction.h | 6 +-- .../{originatoraware.cpp => identifiable.cpp} | 16 +++--- src/blackmisc/identifiable.h | 52 +++++++++++++++++++ .../{originator.cpp => identifier.cpp} | 18 +++---- src/blackmisc/{originator.h => identifier.h} | 28 +++++----- ...{originatorlist.cpp => identifierlist.cpp} | 8 +-- src/blackmisc/identifierlist.h | 46 ++++++++++++++++ src/blackmisc/originatoraware.h | 51 ------------------ src/blackmisc/originatorlist.h | 45 ---------------- src/blackmisc/propertyindex.h | 2 +- .../simulation/ownaircraftprovider.cpp | 6 +-- .../simulation/ownaircraftprovider.h | 14 ++--- .../simulation/ownaircraftproviderdummy.cpp | 6 +-- .../simulation/ownaircraftproviderdummy.h | 6 +-- .../simulation/remoteaircraftprovider.cpp | 8 +-- .../simulation/remoteaircraftprovider.h | 20 +++---- .../remoteaircraftproviderdummy.cpp | 10 ++-- .../simulation/remoteaircraftproviderdummy.h | 10 ++-- src/blackmisc/timestampobjectlist.cpp | 4 +- src/blackmisc/timestampobjectlist.h | 6 +-- src/plugins/simulator/fs9/simulator_fs9.cpp | 14 ++--- src/plugins/simulator/fs9/simulator_fs9.h | 2 +- .../simulator/fscommon/simulator_fscommon.cpp | 8 +-- .../simulator/fscommon/simulator_fscommon.h | 4 +- src/plugins/simulator/fsx/simulator_fsx.cpp | 14 ++--- src/plugins/simulator/fsx/simulator_fsx.h | 2 +- .../simulator/xplane/simulator_xplane.cpp | 18 +++---- .../simulator/xplane/simulator_xplane.h | 6 +-- src/swiftcore/swiftcore.cpp | 2 +- src/swiftcore/swiftcore.h | 4 +- src/swiftgui_standard/swiftguistd.cpp | 6 +-- src/swiftgui_standard/swiftguistd.h | 4 +- tests/blackmisc/testblackmiscmain.cpp | 6 +-- ...{testoriginator.cpp => testidentifier.cpp} | 24 ++++----- .../{testoriginator.h => testidentifier.h} | 20 +++---- 90 files changed, 503 insertions(+), 500 deletions(-) rename src/blackgui/models/{originatorlistmodel.cpp => identifierlistmodel.cpp} (57%) rename src/blackgui/models/{originatorlistmodel.h => identifierlistmodel.h} (68%) rename src/blackgui/views/{originatorview.cpp => identifierview.cpp} (80%) rename src/blackgui/views/{originatorview.h => identifierview.h} (67%) rename src/blackmisc/{originatoraware.cpp => identifiable.cpp} (56%) create mode 100644 src/blackmisc/identifiable.h rename src/blackmisc/{originator.cpp => identifier.cpp} (85%) rename src/blackmisc/{originator.h => identifier.h} (80%) rename src/blackmisc/{originatorlist.cpp => identifierlist.cpp} (71%) create mode 100644 src/blackmisc/identifierlist.h delete mode 100644 src/blackmisc/originatoraware.h delete mode 100644 src/blackmisc/originatorlist.h rename tests/blackmisc/{testoriginator.cpp => testidentifier.cpp} (56%) rename tests/blackmisc/{testoriginator.h => testidentifier.h} (61%) diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index 6934758aa..d722e6ea3 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -9,7 +9,6 @@ #include "client.h" #include "blackcore/network_vatlib.h" -#include "blackmisc/originator.h" #include #include @@ -23,7 +22,7 @@ using namespace BlackMisc::Geo; Client::Client(QObject *parent) : QObject(parent), COwnAircraftAware(COwnAircraftProviderDummy::instance()), - COriginatorAware("samples:cmdClient"), + CIdentifiable("samples:cmdClient"), m_net(new BlackCore::CNetworkVatlib(COwnAircraftProviderDummy::instance(), this)) { connect(m_net, &INetwork::atcPositionUpdate, this, &Client::atcPositionUpdate); @@ -340,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), - originator()); + identifier()); Q_UNUSED(aircraft); } diff --git a/samples/cli_client/client.h b/samples/cli_client/client.h index b94974a5f..b91b800b0 100644 --- a/samples/cli_client/client.h +++ b/samples/cli_client/client.h @@ -14,7 +14,7 @@ #include "blackcore/network.h" #include "blackmisc/simulation/ownaircraftproviderdummy.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include #include #include @@ -23,7 +23,7 @@ class Client : public QObject, public BlackMisc::Simulation::COwnAircraftAware, - public BlackMisc::COriginatorAware + public BlackMisc::CIdentifiable { Q_OBJECT diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index de941f4b0..24ebfad24 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 BlackMisc::COriginator &originator) + bool CAirspaceMonitor::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) + bool CAirspaceMonitor::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) + bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) { //! \fixme CAirspaceMonitor: If in the long term originator is not used, remove from signature Q_UNUSED(originator); @@ -182,7 +182,7 @@ namespace BlackCore return c > 0; } - bool CAirspaceMonitor::updateAircraftRendered(const CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) + bool CAirspaceMonitor::updateAircraftRendered(const CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) { //! \fixme CAirspaceMonitor: If in the long term originator is not used, remove from signature Q_UNUSED(originator); @@ -192,7 +192,7 @@ namespace BlackCore return c > 0; } - void CAirspaceMonitor::updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) + void CAirspaceMonitor::updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) { //! \fixme CAirspaceMonitor: If in the long term originator is not used, remove from signature Q_UNUSED(originator); diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index e839a742b..2ca68dd10 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 BlackMisc::COriginator &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftModel //! \ingroup remoteaircraftprovider - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled //! \ingroup remoteaircraftprovider - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftRendered //! \ingroup remoteaircraftprovider - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) override; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered //! \ingroup remoteaircraftprovider - virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override; + virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override; //! Returns the list of users we know about BlackMisc::Network::CUserList getUsers() const; diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index b5b85259e..a49e7de3b 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -17,7 +17,7 @@ #include "blackmisc/statusmessagelist.h" #include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/eveventhotkeyfunction.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" #include #include @@ -76,7 +76,7 @@ namespace BlackCore //! A log message was logged //! \note Used with CLogMessage, do not use directly - void messageLogged(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin); + void messageLogged(const BlackMisc::CStatusMessage &message, const BlackMisc::CIdentifier &origin); //! Work around for audio context, #382 void fakedSetComVoiceRoom(const BlackMisc::Audio::CVoiceRoomList &requestedRooms); @@ -85,16 +85,16 @@ namespace BlackCore //! Log a log message //! \note Not pure because it can be called from the base class constructor. //! \note this is the function which relays CLogMessage via DBus - virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin) { Q_UNUSED(message); Q_UNUSED(origin); } + virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::CIdentifier &origin) { Q_UNUSED(message); Q_UNUSED(origin); } //! Register application, can also be used for ping - virtual BlackMisc::COriginator registerApplication(const BlackMisc::COriginator &application) = 0; + virtual BlackMisc::CIdentifier registerApplication(const BlackMisc::CIdentifier &application) = 0; //! Unregister application - virtual void unregisterApplication(const BlackMisc::COriginator &application) = 0; + virtual void unregisterApplication(const BlackMisc::CIdentifier &application) = 0; //! All registered applications - virtual BlackMisc::COriginatorList getRegisteredApplications() const = 0; + virtual BlackMisc::CIdentifierList getRegisteredApplications() const = 0; //! Remote enabled version of writing a text file virtual bool writeToFile(const QString &fileName, const QString &content) = 0; diff --git a/src/blackcore/context_application_impl.cpp b/src/blackcore/context_application_impl.cpp index bd16f5bc5..454f61b61 100644 --- a/src/blackcore/context_application_impl.cpp +++ b/src/blackcore/context_application_impl.cpp @@ -31,7 +31,7 @@ namespace BlackCore return this; } - void CContextApplication::logMessage(const CStatusMessage &message, const COriginator &origin) + void CContextApplication::logMessage(const CStatusMessage &message, const CIdentifier &origin) { if (!origin.isFromSameProcess()) { @@ -57,7 +57,7 @@ namespace BlackCore } } - COriginator CContextApplication::registerApplication(const COriginator &application) + CIdentifier CContextApplication::registerApplication(const CIdentifier &application) { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << application; } this->m_registeredApplications.replaceOrAdd(application, application); @@ -65,14 +65,14 @@ namespace BlackCore return application; } - void CContextApplication::unregisterApplication(const COriginator &application) + void CContextApplication::unregisterApplication(const CIdentifier &application) { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << application; } int r = this->m_registeredApplications.remove(application); if (r > 0) { emit registrationChanged(); } } - COriginatorList CContextApplication::getRegisteredApplications() const + CIdentifierList CContextApplication::getRegisteredApplications() const { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } return m_registeredApplications; diff --git a/src/blackcore/context_application_impl.h b/src/blackcore/context_application_impl.h index bd2202c38..57e236085 100644 --- a/src/blackcore/context_application_impl.h +++ b/src/blackcore/context_application_impl.h @@ -14,7 +14,7 @@ #include "context_application.h" #include "context_runtime.h" #include "dbus_server.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" namespace BlackCore { @@ -30,19 +30,19 @@ namespace BlackCore public slots: //! \copydoc IContextApplication::logMessage - virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin) override; + virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::CIdentifier &origin) override; //! \copydoc IContextApplication::writeToFile virtual bool writeToFile(const QString &fileName, const QString &content) override; //! \copydoc IContextApplication::registerApplication - virtual BlackMisc::COriginator registerApplication(const BlackMisc::COriginator &application) override; + virtual BlackMisc::CIdentifier registerApplication(const BlackMisc::CIdentifier &application) override; //! \copydoc IContextApplication::unRegisterApplication - virtual void unregisterApplication(const BlackMisc::COriginator &application) override; + virtual void unregisterApplication(const BlackMisc::CIdentifier &application) override; //! \copydoc IContextApplication::getRegisteredApplications - virtual BlackMisc::COriginatorList getRegisteredApplications() const override; + virtual BlackMisc::CIdentifierList getRegisteredApplications() const override; //! \copydoc IContextApplication::readFromFile virtual QString readFromFile(const QString &fileName) const override; @@ -64,7 +64,7 @@ namespace BlackCore CContextApplication *registerWithDBus(CDBusServer *server); private: - BlackMisc::COriginatorList m_registeredApplications; + BlackMisc::CIdentifierList m_registeredApplications; }; } // namespace diff --git a/src/blackcore/context_application_proxy.cpp b/src/blackcore/context_application_proxy.cpp index 892f6b97b..902e46bad 100644 --- a/src/blackcore/context_application_proxy.cpp +++ b/src/blackcore/context_application_proxy.cpp @@ -11,7 +11,7 @@ #include "blackcore/input_manager.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/loghandler.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" #include #include #include @@ -32,7 +32,7 @@ namespace BlackCore connect(inputManager, &CInputManager::hotkeyFuncEvent, this, &CContextApplicationProxy::processHotkeyFuncEvent); inputManager->setEventForwarding(true); - connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const COriginator & origin) + connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const CIdentifier & origin) { if (!origin.isFromSameProcess()) { @@ -45,7 +45,7 @@ namespace BlackCore { // signals originating from impl side bool s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), - "messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::COriginator))); + "messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::CIdentifier))); Q_ASSERT(s); s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), "registrationChanged", this, SIGNAL(registrationChanged())); @@ -56,24 +56,24 @@ namespace BlackCore Q_UNUSED(s); } - void CContextApplicationProxy::logMessage(const CStatusMessage &message, const COriginator &origin) + void CContextApplicationProxy::logMessage(const CStatusMessage &message, const CIdentifier &origin) { this->m_dBusInterface->callDBus(QLatin1Literal("logMessage"), message, origin); } - BlackMisc::COriginator CContextApplicationProxy::registerApplication(const COriginator &application) + BlackMisc::CIdentifier CContextApplicationProxy::registerApplication(const CIdentifier &application) { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("registerApplication"), application); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("registerApplication"), application); } - void CContextApplicationProxy::unregisterApplication(const COriginator &application) + void CContextApplicationProxy::unregisterApplication(const CIdentifier &application) { this->m_dBusInterface->callDBus(QLatin1Literal("unregisterApplication"), application); } - BlackMisc::COriginatorList CContextApplicationProxy::getRegisteredApplications() const + BlackMisc::CIdentifierList CContextApplicationProxy::getRegisteredApplications() const { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("getRegisteredApplications")); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("getRegisteredApplications")); } bool CContextApplicationProxy::writeToFile(const QString &fileName, const QString &content) diff --git a/src/blackcore/context_application_proxy.h b/src/blackcore/context_application_proxy.h index 111c21b45..e0d9dfacd 100644 --- a/src/blackcore/context_application_proxy.h +++ b/src/blackcore/context_application_proxy.h @@ -26,16 +26,16 @@ namespace BlackCore public slots: //! \copydoc IContextApplication::logMessage - virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin) override; + virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::CIdentifier &origin) override; //! \copydoc IContextApplication::registerApplication - virtual BlackMisc::COriginator registerApplication(const BlackMisc::COriginator &application) override; + virtual BlackMisc::CIdentifier registerApplication(const BlackMisc::CIdentifier &application) override; //! \copydoc IContextApplication::unRegisterApplication - virtual void unregisterApplication(const BlackMisc::COriginator &application) override; + virtual void unregisterApplication(const BlackMisc::CIdentifier &application) override; //! \copydoc IContextApplication::getRegisteredApplications - virtual BlackMisc::COriginatorList getRegisteredApplications() const override; + virtual BlackMisc::CIdentifierList getRegisteredApplications() const override; //! \copydoc IContextApplication::writeToFile virtual bool writeToFile(const QString &fileName, const QString &content) override; diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index a2d1bd3fc..f21d398ed 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -14,7 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/genericdbusinterface.h" #include "blackmisc/audio/audiodeviceinfolist.h" #include "blackmisc/audio/voiceroomlist.h" @@ -165,7 +165,7 @@ namespace BlackCore virtual bool isAudioLoopbackEnabled() const = 0; //! Command line was entered - virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) = 0; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) = 0; }; } diff --git a/src/blackcore/context_audio_empty.h b/src/blackcore/context_audio_empty.h index 1981ef05c..83b3af220 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 BlackMisc::COriginator &originator) override + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 8256de69e..b7aa31542 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 BlackMisc::COriginator &originator) + bool CContextAudio::parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 b615bd213..a066d237e 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 BlackMisc::COriginator &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override; protected: //! Constructor diff --git a/src/blackcore/context_audio_proxy.cpp b/src/blackcore/context_audio_proxy.cpp index 6f8f7237e..bf1f0a0aa 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 BlackMisc::COriginator &originator) + bool CContextAudioProxy::parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 3300b8e20..2af8c054f 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 BlackMisc::COriginator &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override; }; } diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index d70875313..c8c53e210 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -14,7 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/statusmessage.h" @@ -100,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 BlackMisc::COriginator &originator); + void changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator); + void changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Aircraft enabled / disabled - void changedFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void changedFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Connection status changed for online station void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected); @@ -219,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 BlackMisc::COriginator &originator) = 0; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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; @@ -237,13 +237,13 @@ namespace BlackCore virtual void requestAtisUpdates() = 0; //! Enable/disable rendering - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) = 0; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) = 0; //! Change model string - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) = 0; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0; //! Change fast position updates - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::COriginator &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::CIdentifier &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 112e7d514..95db313a0 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 BlackMisc::COriginator &originator) override + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::CIdentifier &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 a8bffb60c..83a2524a3 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -249,7 +249,7 @@ namespace BlackCore return INetwork::isPendingStatus(this->m_currentStatus); } - bool CContextNetwork::parseCommandLine(const QString &commandLine, const COriginator &originator) + bool CContextNetwork::parseCommandLine(const QString &commandLine, const CIdentifier &originator) { Q_UNUSED(originator;) if (commandLine.isEmpty()) { return false; } @@ -563,7 +563,7 @@ namespace BlackCore this->m_airspace->requestAtisUpdates(); } - bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator) + bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRedering << originator; } bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering, originator); @@ -575,7 +575,7 @@ namespace BlackCore return c; } - bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const BlackMisc::COriginator &originator) + bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const BlackMisc::CIdentifier &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model << originator; } bool c = this->m_airspace->updateAircraftModel(callsign, model, originator); @@ -587,7 +587,7 @@ namespace BlackCore return c; } - bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) + bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates << originator; } bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator); @@ -600,14 +600,14 @@ namespace BlackCore return c; } - bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered, const COriginator &originator) + bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered, const CIdentifier &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 COriginator &originator) + void CContextNetwork::updateMarkAllAsNotRendered(const CIdentifier &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 9dc7cdc35..429440276 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 BlackMisc::COriginator &originator) override; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered //! \ingroup remoteaircraftprovider - virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override; + virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextNetwork::updateAircraftModel //! \ingroup remoteaircraftprovider - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextNetwork::updateFastPositionEnabled //! \ingroup remoteaircraftprovider - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 ad3600b72..fb3502e21 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, BlackMisc::COriginator))); + "changedRemoteAircraftModel", this, SIGNAL(changedRemoteAircraftModel(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CIdentifier))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::COriginator))); + "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CIdentifier))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::COriginator))); + "changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CIdentifier))); 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 COriginator &originator) + bool CContextNetworkProxy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const CIdentifier &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftEnabled"), callsign, enabledForRedering, originator); } - bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const Simulation::CAircraftModel &model, const COriginator &originator) + bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const Simulation::CAircraftModel &model, const CIdentifier &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftModel"), callsign, model, originator); } - bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const COriginator &originator) + bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const CIdentifier &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 COriginator &originator) + bool CContextNetworkProxy::parseCommandLine(const QString &commandLine, const CIdentifier &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("parseCommandLine"), commandLine, originator); } diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 62d0f5d21..020dd7176 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 BlackMisc::COriginator &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextNetwork::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::COriginator &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::CIdentifier &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 ee1bdf759..1a702a98d 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -14,7 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/aircrafticaodata.h" #include "blackmisc/audio/voiceroomlist.h" @@ -67,10 +67,10 @@ namespace BlackCore signals: //! Aircraft cockpit update - void changedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void changedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Changed SELCAL code - void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator); + void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator); //! Own callsign was changed void changedCallsign(const BlackMisc::Aviation::CCallsign &callsign); @@ -90,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 BlackMisc::COriginator &originator) = 0; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0; //! Tune in a com frequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) = 0; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) = 0; //! Set current pilot virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0; @@ -105,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 BlackMisc::COriginator &originator) = 0; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) = 0; //! Output volume 0..300 virtual void setAudioOutputVolume(int outputVolume) = 0; @@ -119,7 +119,7 @@ namespace BlackCore virtual void enableAutomaticVoiceRoomResolution(bool enable) = 0; //! Parse command line - virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) = 0; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) = 0; protected: //! Constructor diff --git a/src/blackcore/context_ownaircraft_impl.cpp b/src/blackcore/context_ownaircraft_impl.cpp index efe8ac9b0..1df539681 100644 --- a/src/blackcore/context_ownaircraft_impl.cpp +++ b/src/blackcore/context_ownaircraft_impl.cpp @@ -29,7 +29,7 @@ namespace BlackCore { CContextOwnAircraft::CContextOwnAircraft(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : IContextOwnAircraft(mode, runtime), - COriginatorAware(this) + CIdentifiable(this) { Q_ASSERT(this->getRuntime()); Q_ASSERT(this->getRuntime()->getIContextSettings()); @@ -172,7 +172,7 @@ namespace BlackCore return changed; } - bool CContextOwnAircraft::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const COriginator &originator) + bool CContextOwnAircraft::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const CIdentifier &originator) { if (this->m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << com1 << com2 << transponder; } bool changed; @@ -189,7 +189,7 @@ namespace BlackCore return changed; } - bool CContextOwnAircraft::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const COriginator &originator) + bool CContextOwnAircraft::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const CIdentifier &originator) { CComSystem::ComUnit unit = static_cast(comUnit); if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return false; } @@ -246,7 +246,7 @@ namespace BlackCore return true; } - bool CContextOwnAircraft::updateSelcal(const CSelcal &selcal, const COriginator &originator) + bool CContextOwnAircraft::updateSelcal(const CSelcal &selcal, const CIdentifier &originator) { { QWriteLocker l(&m_lockAircraft); @@ -299,7 +299,7 @@ namespace BlackCore this->m_automaticVoiceRoomResolution = enable; } - bool CContextOwnAircraft::parseCommandLine(const QString &commandLine, const COriginator &originator) + bool CContextOwnAircraft::parseCommandLine(const QString &commandLine, const CIdentifier &originator) { Q_UNUSED(originator); if (commandLine.isEmpty()) { return false; } @@ -322,7 +322,7 @@ namespace BlackCore { transponder.setTransponderCode(xprCode); // todo RW: replace originator - this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, COriginator("commandline")); + this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, CIdentifier("commandline")); return true; } else @@ -330,7 +330,7 @@ namespace BlackCore CTransponder::TransponderMode mode = CTransponder::modeFromString(parser.part(1)); transponder.setTransponderMode(mode); // todo RW: replace originator - this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, COriginator("commandline")); + this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), transponder, CIdentifier("commandline")); return true; } } @@ -354,7 +354,7 @@ namespace BlackCore return false; } // todo RW: replace originator - this->updateCockpit(com1, com2, myAircraft.getTransponder(), COriginator("commandline")); + this->updateCockpit(com1, com2, myAircraft.getTransponder(), CIdentifier("commandline")); return true; } } @@ -362,7 +362,7 @@ namespace BlackCore { if (CSelcal::isValidCode(parser.part(1))) { - this->updateSelcal(parser.part(1), this->originator()); + this->updateSelcal(parser.part(1), this->identifier()); return true; } } diff --git a/src/blackcore/context_ownaircraft_impl.h b/src/blackcore/context_ownaircraft_impl.h index 33b057314..125d4152e 100644 --- a/src/blackcore/context_ownaircraft_impl.h +++ b/src/blackcore/context_ownaircraft_impl.h @@ -19,7 +19,7 @@ #include "blackcore/dbus_server.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/simulation/ownaircraftprovider.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" namespace BlackCore { @@ -29,7 +29,7 @@ namespace BlackCore class BLACKCORE_EXPORT CContextOwnAircraft : public IContextOwnAircraft, public BlackMisc::Simulation::IOwnAircraftProvider, - public BlackMisc::COriginatorAware + public BlackMisc::CIdentifiable { Q_OBJECT Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME) @@ -86,13 +86,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 BlackMisc::COriginator &originator) override; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) override; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updatePilot virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override; @@ -115,7 +115,7 @@ namespace BlackCore //! //! @} //! \copydoc IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &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 0511bc620..040cbe1f5 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, BlackMisc::COriginator))); + "changedAircraftCockpit", this, SIGNAL(changedAircraftCockpit(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CIdentifier))); 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 COriginator &originator) + bool CContextOwnAircraftProxy::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const CIdentifier &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateCockpit"), com1, com2, transponder, originator); } - bool CContextOwnAircraftProxy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const COriginator &originator) + bool CContextOwnAircraftProxy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const CIdentifier &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 COriginator &originator) + bool CContextOwnAircraftProxy::updateSelcal(const CSelcal &selcal, const CIdentifier &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 COriginator &originator) + bool CContextOwnAircraftProxy::parseCommandLine(const QString &commandLine, const CIdentifier &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 0e296ec95..ce12e37c8 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 BlackMisc::COriginator &originator) override; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) override; + virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override; protected: //! \brief Constructor diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp index dde226845..effc401c0 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/context_runtime.cpp @@ -122,7 +122,7 @@ namespace BlackCore BlackCore::registerMetadata(); } - bool CRuntime::parseCommandLine(const QString &commandLine, const COriginator &originator) + bool CRuntime::parseCommandLine(const QString &commandLine, const CIdentifier &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 495d215a1..2b31ed24e 100644 --- a/src/blackcore/context_runtime.h +++ b/src/blackcore/context_runtime.h @@ -14,7 +14,7 @@ #include "blackcoreexport.h" #include "blackcore/context_runtime_config.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/simulation/ownaircraftprovider.h" @@ -153,7 +153,7 @@ namespace BlackCore public slots: //! Parse command line in all contexts - bool parseCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator); + bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator); private: bool m_init = false; //!< flag diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp index 88b4272a8..01ffd5cc9 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/context_simulator_impl.cpp @@ -616,19 +616,19 @@ namespace BlackCore getIContextOwnAircraft()->changedAircraftCockpit(ownAircraft, IContextSimulator::InterfaceName()); } - void CContextSimulator::ps_changedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const COriginator &originator) + void CContextSimulator::ps_changedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { Q_ASSERT(this->m_simulatorPlugin); this->m_simulatorPlugin->simulator->changeRemoteAircraftModel(aircraft, originator); } - void CContextSimulator::ps_changedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) + void CContextSimulator::ps_changedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { Q_ASSERT(this->m_simulatorPlugin); this->m_simulatorPlugin->simulator->changeRemoteAircraftEnabled(aircraft, originator); } - void CContextSimulator::ps_updateSimulatorCockpitFromContext(const CAircraft &ownAircraft, const COriginator &originator) + void CContextSimulator::ps_updateSimulatorCockpitFromContext(const CAircraft &ownAircraft, const CIdentifier &originator) { // todo: // This was previously an assert and it should be one again in the future. diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h index c5f72934a..07a726572 100644 --- a/src/blackcore/context_simulator_impl.h +++ b/src/blackcore/context_simulator_impl.h @@ -168,14 +168,14 @@ namespace BlackCore void ps_cockpitChangedFromSimulator(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft); //! Changed remote aircraft model - void ps_changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Enable / disable aircraft - void ps_changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator); + void ps_updateSimulatorCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::CIdentifier &originator); private: //! A simple struct containing all info about the plugin. diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index f4815685e..06d48bf01 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -26,7 +26,7 @@ #include "blackmisc/network/textmessage.h" #include "blackmisc/network/client.h" #include "blackmisc/pixmap.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include namespace BlackCore @@ -35,7 +35,7 @@ namespace BlackCore //! Interface to a simulator. class BLACKCORE_EXPORT ISimulator : public QObject, - public BlackMisc::COriginatorAware + public BlackMisc::CIdentifiable { Q_OBJECT @@ -85,13 +85,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 BlackMisc::COriginator &originator) = 0; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) = 0; //! Aircraft got enabled / disabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) = 0; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) = 0; //! Update own aircraft cockpit (usually from context) - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator) = 0; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::CIdentifier &originator) = 0; //! ICAO data for model string virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const = 0; @@ -202,7 +202,7 @@ namespace BlackCore //! Default constructor ISimulator(QObject *parent = nullptr) : QObject(parent), - BlackMisc::COriginatorAware(this) + BlackMisc::CIdentifiable(this) {} //! Are we connected to the simulator? diff --git a/src/blackgui/commandinput.cpp b/src/blackgui/commandinput.cpp index 685c5f865..f3ac00383 100644 --- a/src/blackgui/commandinput.cpp +++ b/src/blackgui/commandinput.cpp @@ -17,7 +17,7 @@ namespace BlackGui CCommandInput::CCommandInput(QWidget *parent) : QLineEdit(parent), - COriginatorAware(this) + CIdentifiable(this) { connect(this, &CCommandInput::returnPressed, this, &CCommandInput::ps_validateCommand); } @@ -28,7 +28,7 @@ namespace BlackGui this->setText(QString()); if (commandLine.startsWith('.')) { - emit commandEntered(commandLine, originator()); + emit commandEntered(commandLine, identifier()); } } } // ns diff --git a/src/blackgui/commandinput.h b/src/blackgui/commandinput.h index bddfc3b08..432438cb7 100644 --- a/src/blackgui/commandinput.h +++ b/src/blackgui/commandinput.h @@ -13,7 +13,7 @@ #define BLACKGUI_COMMANDINPUT_H #include "blackguiexport.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include #include @@ -22,7 +22,7 @@ namespace BlackGui //! Specialized LineEdit for command inputs class BLACKGUI_EXPORT CCommandInput : public QLineEdit, - public BlackMisc::COriginatorAware + public BlackMisc::CIdentifiable { Q_OBJECT @@ -35,7 +35,7 @@ namespace BlackGui signals: //! Command was entered - void commandEntered(const QString &command, const BlackMisc::COriginator &originator); + void commandEntered(const QString &command, const BlackMisc::CIdentifier &originator); private slots: //! Basic command validation diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index e811f51b2..cc4255968 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -29,7 +29,7 @@ namespace BlackGui { CAtcStationComponent::CAtcStationComponent(QWidget *parent) : QTabWidget(parent), - COriginatorAware(this), + CIdentifiable(this), ui(new Ui::CAtcStationComponent), m_updateTimer(new CUpdateTimer("CAtcStationComponent", &CAtcStationComponent::update, this)) { @@ -257,7 +257,7 @@ namespace BlackGui { if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return; } if (!CComSystem::isValidComFrequency(frequency)) { return; } - this->getIContextOwnAircraft()->updateActiveComFrequency(frequency, static_cast(unit), originator()); + this->getIContextOwnAircraft()->updateActiveComFrequency(frequency, static_cast(unit), identifier()); } void CAtcStationComponent::updateTreeView() diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h index f80143acb..91d400728 100644 --- a/src/blackgui/components/atcstationcomponent.h +++ b/src/blackgui/components/atcstationcomponent.h @@ -16,7 +16,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include "blackmisc/aviation/atcstation.h" #include #include @@ -33,7 +33,7 @@ namespace BlackGui public QTabWidget, public CEnableForDockWidgetInfoArea, public CEnableForRuntime, - public BlackMisc::COriginatorAware + public BlackMisc::CIdentifiable { Q_OBJECT diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index 23e9e9bf1..a4fd365bb 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -33,7 +33,7 @@ namespace BlackGui { CCockpitComComponent::CCockpitComComponent(QWidget *parent) : QFrame(parent), - BlackMisc::COriginatorAware(this), + BlackMisc::CIdentifiable(this), ui(new Ui::CCockpitMainComponent) { ui->setupUi(this); @@ -63,7 +63,7 @@ namespace BlackGui // init from aircraft CAircraft ownAircraft = this->getOwnAircraft(); - this->ps_updateCockpitFromContext(ownAircraft, COriginator("dummyInitialValues")); // intentionally different name here + this->ps_updateCockpitFromContext(ownAircraft, CIdentifier("dummyInitialValues")); // intentionally different name here // SELCAL pairs in cockpit this->ui->frp_ComPanelSelcalBottom->clear(); @@ -112,12 +112,12 @@ namespace BlackGui void CCockpitComComponent::ps_guiChangedSelcal() { - this->getIContextOwnAircraft()->updateSelcal(this->getSelcal(), originator()); + this->getIContextOwnAircraft()->updateSelcal(this->getSelcal(), identifier()); } - void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const COriginator &originator) + void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const CIdentifier &originator) { - if (isMyOriginator(originator)) { return; } // comes from myself + if (isMyIdentifier(originator)) { return; } // comes from myself // update GUI elements // avoid unnecessary change events as far as possible @@ -183,9 +183,9 @@ namespace BlackGui } } - void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const COriginator &originator) + void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const CIdentifier &originator) { - if (isMyOriginator(originator)) { return; } // comes from myself + if (isMyIdentifier(originator)) { return; } // comes from myself this->ui->frp_ComPanelSelcalBottom->setSelcalCode(selcal); } @@ -247,7 +247,7 @@ namespace BlackGui bool CCockpitComComponent::updateOwnCockpitInContext(const CAircraft &ownAircraft) { - return this->getIContextOwnAircraft()->updateCockpit(ownAircraft.getCom1System(), ownAircraft.getCom2System(), ownAircraft.getTransponder(), originator()); + return this->getIContextOwnAircraft()->updateCockpit(ownAircraft.getCom1System(), ownAircraft.getCom2System(), ownAircraft.getTransponder(), identifier()); } void CCockpitComComponent::updateFrequencyDisplaysFromComSystems(const CComSystem &com1, const CComSystem &com2) diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/blackgui/components/cockpitcomcomponent.h index 4839f7d26..fd7aca1a7 100644 --- a/src/blackgui/components/cockpitcomcomponent.h +++ b/src/blackgui/components/cockpitcomcomponent.h @@ -13,7 +13,7 @@ #include "blackgui/blackguiexport.h" #include "enablefordockwidgetinfoarea.h" #include "enableforruntime.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/transponder.h" #include "blackmisc/audio/voiceroomlist.h" @@ -29,7 +29,7 @@ namespace BlackGui //! The main cockpit area class BLACKGUI_EXPORT CCockpitComComponent : public QFrame, - public BlackMisc::COriginatorAware, + public BlackMisc::CIdentifiable, public CEnableForDockWidgetInfoArea, public CEnableForRuntime { @@ -68,13 +68,13 @@ namespace BlackGui void ps_guiChangedSelcal(); //! Update cockpit from context - void ps_updateCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator); + void ps_updateCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::CIdentifier &originator); //! Cockpit values have been changed in GUI void ps_testSelcal(); //! SELCAL was changed - void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator); + void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator); //! Update voice room related information void ps_onChangedVoiceRoomStatus(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected); diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp index 5abaaea22..a4a4ed336 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp @@ -22,7 +22,7 @@ namespace BlackGui { CCockpitTransponderModeLedsComponent::CCockpitTransponderModeLedsComponent(QWidget *parent) : QFrame(parent), - COriginatorAware(this), + CIdentifiable(this), m_ledStandby(new CLedWidget(false, CLedWidget::Blue, CLedWidget::Black, CLedWidget::Rounded, "standby", "", LedWidth, this)), m_ledModes(new CLedWidget(false, CLedWidget::Green, CLedWidget::Black, CLedWidget::Rounded, "mode C", "", LedWidth, this)), m_ledIdent(new CLedWidget(false, CLedWidget::Yellow, CLedWidget::Black, CLedWidget::Rounded, "ident", "", LedWidth, this)) @@ -37,9 +37,9 @@ namespace BlackGui this->setMode(getOwnTransponder().getTransponderMode()); } - void CCockpitTransponderModeLedsComponent::ps_onAircraftCockpitChanged(const CAircraft &aircraft, const BlackMisc::COriginator &originator) + void CCockpitTransponderModeLedsComponent::ps_onAircraftCockpitChanged(const CAircraft &aircraft, const BlackMisc::CIdentifier &originator) { - if (isMyOriginator(originator)) { return; } + if (isMyIdentifier(originator)) { return; } this->setMode(aircraft.getTransponderMode()); } @@ -71,7 +71,7 @@ namespace BlackGui this->setMode(mode); CTransponder xpdr = ownAircraft.getTransponder(); xpdr.setTransponderMode(mode); - this->getIContextOwnAircraft()->updateCockpit(ownAircraft.getCom1System(), ownAircraft.getCom2System(), xpdr, originator()); + this->getIContextOwnAircraft()->updateCockpit(ownAircraft.getCom1System(), ownAircraft.getCom2System(), xpdr, identifier()); } void CCockpitTransponderModeLedsComponent::init(bool horizontal) diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.h b/src/blackgui/components/cockpittranspondermodeledscomponent.h index e795c4bd2..379048199 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.h +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.h @@ -15,7 +15,7 @@ #include "blackgui/blackguiexport.h" #include "enableforruntime.h" #include "../led.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/transponder.h" #include @@ -29,7 +29,7 @@ namespace BlackGui class BLACKGUI_EXPORT CCockpitTransponderModeLedsComponent : public QFrame, public CEnableForRuntime, - public BlackMisc::COriginatorAware + public BlackMisc::CIdentifiable { Q_OBJECT @@ -43,7 +43,7 @@ namespace BlackGui private slots: //! \copydoc IContextOwnAircraft::changedAircraftCockpit - void ps_onAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_onAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! LED clicked void ps_onLedClicked(); diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 2e98cce4a..2292158ed 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -324,7 +324,7 @@ namespace BlackGui { if (!this->getIContextOwnAircraft()) return; if (!this->ui->frp_SelcalCode->hasValidCode()) return; - this->getIContextOwnAircraft()->updateSelcal(this->ui->frp_SelcalCode->getSelcal(), flightPlanOriginator()); + this->getIContextOwnAircraft()->updateSelcal(this->ui->frp_SelcalCode->getSelcal(), flightPlanIdentifier()); } void CFlightPlanComponent::ps_loadFlightPlanFromNetwork() @@ -417,12 +417,12 @@ namespace BlackGui this->setCurrentWidget(this->ui->tb_RemarksGenerator); } - COriginator CFlightPlanComponent::flightPlanOriginator() + CIdentifier CFlightPlanComponent::flightPlanIdentifier() { - if (m_originator.getName().isEmpty()) - m_originator = COriginator(QStringLiteral("FLIGHTPLANCOMPONENT")); + if (m_identifier.getName().isEmpty()) + m_identifier = CIdentifier(QStringLiteral("FLIGHTPLANCOMPONENT")); - return m_originator; + return m_identifier; } } // namespace diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index 5aff6aa25..eb2767660 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -14,7 +14,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/components/enableforruntime.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/flightplan.h" @@ -66,8 +66,8 @@ namespace BlackGui //! Validate, generates status messages BlackMisc::CStatusMessageList validateAndInitializeFlightPlan(BlackMisc::Aviation::CFlightPlan &fligtPlan); - //! Flightplan originator - BlackMisc::COriginator m_originator; + //! Flightplan identifier + BlackMisc::CIdentifier m_identifier; //! Default value for airport ICAO airports static const QString &defaultIcao() { static QString d("ICAO"); return d; } @@ -75,8 +75,8 @@ namespace BlackGui //! Default value for time static const QString &defaultTime() { static QString t("00:00"); return t; } - //! Originator - BlackMisc::COriginator flightPlanOriginator(); + //! Identifier + BlackMisc::CIdentifier flightPlanIdentifier(); 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 125d3345e..eef9282e9 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -156,11 +156,11 @@ namespace BlackGui { QString c(this->ui->le_CommandLineInput->text().trimmed().simplified()); if (c.isEmpty()) { return; } - emit this->commandEntered(c, keypadOriginator()); + emit this->commandEntered(c, keypadIdentifier()); this->ui->le_CommandLineInput->clear(); } - void CMainKeypadAreaComponent::ps_ownAircraftCockpitChanged(const CAircraft &aircraft, const COriginator &originator) + void CMainKeypadAreaComponent::ps_ownAircraftCockpitChanged(const CAircraft &aircraft, const CIdentifier &originator) { Q_UNUSED(originator); bool ident = aircraft.getTransponder().getTransponderMode() == CTransponder::StateIdent; @@ -238,12 +238,12 @@ namespace BlackGui ui->pb_MainWeather->setChecked(false); } - COriginator CMainKeypadAreaComponent::keypadOriginator() + CIdentifier CMainKeypadAreaComponent::keypadIdentifier() { - if (m_originator.getName().isEmpty()) - m_originator = COriginator(QStringLiteral("KEYPADAREACOMPONENT")); + if (m_identifier.getName().isEmpty()) + m_identifier = CIdentifier(QStringLiteral("KEYPADAREACOMPONENT")); - return m_originator; + return m_identifier; } } // namespace diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h index dee9f1c9c..acfd43b8d 100644 --- a/src/blackgui/components/mainkeypadareacomponent.h +++ b/src/blackgui/components/mainkeypadareacomponent.h @@ -15,7 +15,7 @@ #include "blackgui/blackguiexport.h" #include "maininfoareacomponent.h" #include "enableforruntime.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/aviation/aircraft.h" #include @@ -44,8 +44,8 @@ namespace BlackGui //! Destructor ~CMainKeypadAreaComponent(); - //! Originator - BlackMisc::COriginator keypadOriginator(); + //! Identifier + BlackMisc::CIdentifier keypadIdentifier(); signals: //! Button to select main info area has been pressed @@ -56,7 +56,7 @@ namespace BlackGui void changedOpacity(int opacity); //! Command was entered - void commandEntered(const QString &commandLine, const BlackMisc::COriginator &originator); + void commandEntered(const QString &commandLine, const BlackMisc::CIdentifier &originator); //! Connect was pressed void connectPressed(); @@ -83,7 +83,7 @@ namespace BlackGui void ps_commandEntered(); //! \copydoc BlackCore::IContextOwnAircraft::changedAircraftCockpit - void ps_ownAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_ownAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! \copydoc BlackCore::IContextAudio::changedMute void ps_muteChanged(bool muted); @@ -102,7 +102,7 @@ namespace BlackGui void unsetInfoAreaButtons(); QScopedPointer ui; - BlackMisc::COriginator m_originator; + BlackMisc::CIdentifier m_identifier; }; } // namespace diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 9557f1aa6..bcd85dff1 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -156,7 +156,7 @@ namespace BlackGui bool enabled = sa.propertyByIndex(index).toBool(); if (saFromBackend.isEnabled() == enabled) { return; } CLogMessage(this).info("Request to %1 aircraft %2") << (enabled ? "enable" : "disable") << saFromBackend.getCallsign().toQString(); - this->getIContextNetwork()->updateAircraftEnabled(saFromBackend.getCallsign(), enabled, mappingtOriginator()); + this->getIContextNetwork()->updateAircraftEnabled(saFromBackend.getCallsign(), enabled, mappingIdentifier()); } else { @@ -256,12 +256,12 @@ namespace BlackGui CAircraftModel model(models.front()); model.setModelType(CAircraftModel::TypeManuallySet); CLogMessage(this).info("Requesting changes for %1") << callsign.asString(); - this->getIContextNetwork()->updateAircraftModel(aircraftFromBackend.getCallsign(), model, mappingtOriginator()); + this->getIContextNetwork()->updateAircraftModel(aircraftFromBackend.getCallsign(), model, mappingIdentifier()); changed = true; } if (aircraftFromBackend.isEnabled() != enabled) { - this->getIContextNetwork()->updateAircraftEnabled(aircraftFromBackend.getCallsign(), enabled, mappingtOriginator()); + this->getIContextNetwork()->updateAircraftEnabled(aircraftFromBackend.getCallsign(), enabled, mappingIdentifier()); changed = true; } @@ -308,21 +308,21 @@ namespace BlackGui this->ui->le_AircraftModel->setCompleter(this->m_modelCompleter); } - void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const COriginator &originator) + void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { this->updateSimulatedAircraftView(); Q_UNUSED(originator); Q_UNUSED(aircraft); } - void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) + void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { this->updateSimulatedAircraftView(); Q_UNUSED(originator); Q_UNUSED(aircraft); } - void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) + void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { this->updateSimulatedAircraftView(); Q_UNUSED(originator); @@ -349,7 +349,7 @@ namespace BlackGui { if (getIContextNetwork()) { - getIContextNetwork()->updateFastPositionEnabled(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingtOriginator()); + getIContextNetwork()->updateFastPositionEnabled(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingIdentifier()); } } @@ -365,7 +365,7 @@ namespace BlackGui { if (getIContextNetwork()) { - getIContextNetwork()->updateAircraftEnabled(aircraft.getCallsign(), aircraft.isEnabled(), mappingtOriginator()); + getIContextNetwork()->updateAircraftEnabled(aircraft.getCallsign(), aircraft.isEnabled(), mappingIdentifier()); } } @@ -378,12 +378,12 @@ namespace BlackGui } } - COriginator CMappingComponent::mappingtOriginator() + CIdentifier CMappingComponent::mappingIdentifier() { - if (m_originator.getName().isEmpty()) - m_originator = COriginator(QStringLiteral("MAPPINGCOMPONENT")); + if (m_identifier.getName().isEmpty()) + m_identifier = CIdentifier(QStringLiteral("MAPPINGCOMPONENT")); - return m_originator; + return m_identifier; } void CMappingComponent::updateSimulatedAircraftView(bool forceUpdate) diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h index a0b63a6dd..307707b1c 100644 --- a/src/blackgui/components/mappingcomponent.h +++ b/src/blackgui/components/mappingcomponent.h @@ -17,7 +17,7 @@ #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" #include "blackgui/views/checkboxdelegate.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/aircraftmodellist.h" #include @@ -95,13 +95,13 @@ namespace BlackGui void ps_onModelsUpdateRequested(); //! Rendered aircraft changed in backend - void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Aircraft enabled, disabled in backend - void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Fast position updates on/off in backend - void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator); + void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); //! Connection status has been changed void ps_onConnectionStatusChanged(uint from, uint to); @@ -122,14 +122,14 @@ namespace BlackGui void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); private: - BlackMisc::COriginator mappingtOriginator(); + BlackMisc::CIdentifier mappingIdentifier(); 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; + BlackMisc::CIdentifier m_identifier; private slots: void ps_backgroundUpdate(); diff --git a/src/blackgui/components/registercomponent.ui b/src/blackgui/components/registercomponent.ui index aa40fb15c..0e8e55afe 100644 --- a/src/blackgui/components/registercomponent.ui +++ b/src/blackgui/components/registercomponent.ui @@ -33,7 +33,7 @@ 0 - + false @@ -43,9 +43,9 @@ - BlackGui::Views::COriginatorView + BlackGui::Views::CIdentifierView QTableView -
blackgui/views/originatorview.h
+
blackgui/views/identifierview.h
 diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index bdc21ca38..dc25daec5 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -148,12 +148,12 @@ namespace BlackGui } } - COriginator CTextMessageComponent::componentOriginator() + CIdentifier CTextMessageComponent::componentIdentifier() { - if (m_originator.getName().isEmpty()) - m_originator = COriginator(QStringLiteral("TEXTMESSAGECOMPONENT")); + if (m_identifier.getName().isEmpty()) + m_identifier = CIdentifier(QStringLiteral("TEXTMESSAGECOMPONENT")); - return m_originator; + return m_identifier; } void CTextMessageComponent::ps_onChangedAircraftCockpit() @@ -366,7 +366,7 @@ namespace BlackGui // relay the command if (cl.isEmpty()) { return; } - emit commandEntered(cl, componentOriginator()); + emit commandEntered(cl, componentIdentifier()); } QString CTextMessageComponent::textMessageToCommand(const QString &enteredLine) @@ -433,9 +433,9 @@ namespace BlackGui this->displayTextMessage(sentMessage); } - bool CTextMessageComponent::handleGlobalCommandLine(const QString &commandLine, const COriginator &originator) + bool CTextMessageComponent::handleGlobalCommandLine(const QString &commandLine, const CIdentifier &originator) { - if (originator == componentOriginator()) { return false; } + if (originator == componentIdentifier()) { return false; } if (commandLine.isEmpty() || commandLine.startsWith(".")) { return false; } // non command input diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 77db9d6b1..d370f4f73 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -16,7 +16,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/textmessagetextedit.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/network/textmessage.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/network/textmessagelist.h" @@ -60,7 +60,7 @@ namespace BlackGui void displayInInfoWindow(const BlackMisc::CVariant &message, int displayDurationMs) const; //! Command line was entered - void commandEntered(const QString commandLine, const BlackMisc::COriginator &orignator); + void commandEntered(const QString commandLine, const BlackMisc::CIdentifier &orignator); public slots: //! Text messages received @@ -70,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 BlackMisc::COriginator &originator); + bool handleGlobalCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator); //! Display the tab for given callsign void showCorrespondingTab(const BlackMisc::Aviation::CCallsign &callsign); @@ -81,7 +81,7 @@ namespace BlackGui private: QScopedPointer ui; - BlackMisc::COriginator m_originator; + BlackMisc::CIdentifier m_identifier; //! Enum to widget QWidget *getTabWidget(Tab tab) const; @@ -124,8 +124,8 @@ namespace BlackGui //! \copydoc IContextOwnAircraft::parseCommandLine QString textMessageToCommand(const QString &enteredLine); - //! Originator - BlackMisc::COriginator componentOriginator(); + //! Identifier + BlackMisc::CIdentifier componentIdentifier(); //! Handle a text message entered void handleEnteredTextMessage(const QString &textMessage); diff --git a/src/blackgui/models/originatorlistmodel.cpp b/src/blackgui/models/identifierlistmodel.cpp similarity index 57% rename from src/blackgui/models/originatorlistmodel.cpp rename to src/blackgui/models/identifierlistmodel.cpp index 63d57c887..53daa908d 100644 --- a/src/blackgui/models/originatorlistmodel.cpp +++ b/src/blackgui/models/identifierlistmodel.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "originatorlistmodel.h" +#include "identifierlistmodel.h" #include "blackmisc/blackmiscfreefunctions.h" #include #include @@ -18,26 +18,26 @@ namespace BlackGui { namespace Models { - COriginatorListModel::COriginatorListModel(QObject *parent) : - CListModelBase("ModelOriginatorList", parent) + CIdentifierListModel::CIdentifierListModel(QObject *parent) : + CListModelBase("ModelIdentifierList", parent) { - this->m_columns.addColumn(CColumn::standardString("name", COriginator::IndexName)); - this->m_columns.addColumn(CColumn::standardString("machine", COriginator::IndexMachineName)); - this->m_columns.addColumn(CColumn::standardString("process", COriginator::IndexProcessName)); - this->m_columns.addColumn(CColumn::standardString("p.id", "process id", COriginator::IndexProcessId)); - this->m_columns.addColumn(CColumn("time", "received", COriginator::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHms()))); - this->m_columns.addColumn(CColumn("lcl m.", "local machine", COriginator::IndexIsFromLocalMachine, new CBoolIconFormatter("local", "remote"))); - this->m_columns.addColumn(CColumn("same p.", "same process", COriginator::IndexIsFromSameProcess, new CBoolIconFormatter("same process", "other process"))); - this->m_columns.addColumn(CColumn::standardString("m.id", "machine id", COriginator::IndexMachineIdBase64)); + this->m_columns.addColumn(CColumn::standardString("name", CIdentifier::IndexName)); + this->m_columns.addColumn(CColumn::standardString("machine", CIdentifier::IndexMachineName)); + this->m_columns.addColumn(CColumn::standardString("process", CIdentifier::IndexProcessName)); + this->m_columns.addColumn(CColumn::standardString("p.id", "process id", CIdentifier::IndexProcessId)); + this->m_columns.addColumn(CColumn("time", "received", CIdentifier::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHms()))); + this->m_columns.addColumn(CColumn("lcl m.", "local machine", CIdentifier::IndexIsFromLocalMachine, new CBoolIconFormatter("local", "remote"))); + this->m_columns.addColumn(CColumn("same p.", "same process", CIdentifier::IndexIsFromSameProcess, new CBoolIconFormatter("same process", "other process"))); + this->m_columns.addColumn(CColumn::standardString("m.id", "machine id", CIdentifier::IndexMachineIdBase64)); // force strings for translation in resource files - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "name"); - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "machine"); - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "process"); - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "p.id"); - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "m.id"); - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "lcl m."); - (void)QT_TRANSLATE_NOOP("ModelOriginatorList", "same p."); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "name"); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "machine"); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "process"); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "p.id"); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "m.id"); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "lcl m."); + (void)QT_TRANSLATE_NOOP("ModelIdentifierList", "same p."); } } // class diff --git a/src/blackgui/models/originatorlistmodel.h b/src/blackgui/models/identifierlistmodel.h similarity index 68% rename from src/blackgui/models/originatorlistmodel.h rename to src/blackgui/models/identifierlistmodel.h index 6afdf0712..12b03030c 100644 --- a/src/blackgui/models/originatorlistmodel.h +++ b/src/blackgui/models/identifierlistmodel.h @@ -9,11 +9,11 @@ //! \file -#ifndef BLACKGUI_ORIGINATORLISTMODEL_H -#define BLACKGUI_ORIGINATORLISTMODEL_H +#ifndef BLACKGUI_IDENTIFIERLISTMODEL_H +#define BLACKGUI_IDENTIFIERLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" #include "blackgui/models/listmodelbase.h" #include @@ -22,15 +22,15 @@ namespace BlackGui namespace Models { //! Originator list model - class BLACKGUI_EXPORT COriginatorListModel : public CListModelBase + class BLACKGUI_EXPORT CIdentifierListModel : public CListModelBase { public: //! Constructor - explicit COriginatorListModel(QObject *parent = nullptr); + explicit CIdentifierListModel(QObject *parent = nullptr); //! Destructor - virtual ~COriginatorListModel() {} + virtual ~CIdentifierListModel() {} }; } // ns } // ns diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index 72f0dcd7e..dc256cb31 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -21,7 +21,7 @@ #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/namevariantpairlist.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" #include "blackmisc/variant.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -459,7 +459,7 @@ namespace BlackGui // see here for the reason of thess forward instantiations // http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html - template class CListModelBase; + template class CListModelBase; template class CListModelBase; template class CListModelBase; template class CListModelBase; diff --git a/src/blackgui/views/originatorview.cpp b/src/blackgui/views/identifierview.cpp similarity index 80% rename from src/blackgui/views/originatorview.cpp rename to src/blackgui/views/identifierview.cpp index b26fd1896..17ac11419 100644 --- a/src/blackgui/views/originatorview.cpp +++ b/src/blackgui/views/identifierview.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "originatorview.h" +#include "identifierview.h" #include using namespace BlackMisc; @@ -17,9 +17,9 @@ namespace BlackGui { namespace Views { - COriginatorView::COriginatorView(QWidget *parent) : CViewBase(parent) + CIdentifierView::CIdentifierView(QWidget *parent) : CViewBase(parent) { - this->standardInit(new COriginatorListModel(this)); + this->standardInit(new CIdentifierListModel(this)); } } } // namespace diff --git a/src/blackgui/views/originatorview.h b/src/blackgui/views/identifierview.h similarity index 67% rename from src/blackgui/views/originatorview.h rename to src/blackgui/views/identifierview.h index 4014c62bd..35df04272 100644 --- a/src/blackgui/views/originatorview.h +++ b/src/blackgui/views/identifierview.h @@ -9,25 +9,25 @@ //! \file -#ifndef BLACKGUI_ORIGINATORVIEW_H -#define BLACKGUI_ORIGINATORVIEW_H +#ifndef BLACKGUI_IDENTIFIERVIEW_H +#define BLACKGUI_IDENTIFIERVIEW_H #include "blackgui/blackguiexport.h" #include "viewbase.h" -#include "../models/originatorlistmodel.h" +#include "../models/identifierlistmodel.h" namespace BlackGui { namespace Views { //! Originator servers - class BLACKGUI_EXPORT COriginatorView : public CViewBase + class BLACKGUI_EXPORT CIdentifierView : public CViewBase { public: //! Constructor - explicit COriginatorView(QWidget *parent = nullptr); + explicit CIdentifierView(QWidget *parent = nullptr); }; } } diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 86f1dd69e..1baf827a3 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -9,7 +9,7 @@ #include "viewbase.h" #include "../models/statusmessagelistmodel.h" -#include "../models/originatorlistmodel.h" +#include "../models/identifierlistmodel.h" #include "../models/namevariantpairlistmodel.h" #include "../models/atcstationlistmodel.h" #include "../models/aircraftmodellistmodel.h" @@ -402,7 +402,7 @@ namespace BlackGui // http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html template class CViewBase; template class CViewBase; - template class CViewBase; + template class CViewBase; template class CViewBase; template class CViewBase; diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 67ea3fb88..df0b94c20 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -20,7 +20,7 @@ #include "statusmessagelist.h" #include "pixmap.h" #include "iconlist.h" -#include "originator.h" +#include "identifier.h" #include "eventallclasses.h" #include #include @@ -105,7 +105,7 @@ void BlackMisc::registerMetadata() CLogCategory::registerMetadata(); CLogCategoryList::registerMetadata(); CPixmap::registerMetadata(); - COriginator::registerMetadata(); + CIdentifier::registerMetadata(); // sub namespaces PhysicalQuantities::registerMetadata(); diff --git a/src/blackmisc/eveventhotkeyfunction.h b/src/blackmisc/eveventhotkeyfunction.h index 9f9862e9c..6165b5be6 100644 --- a/src/blackmisc/eveventhotkeyfunction.h +++ b/src/blackmisc/eveventhotkeyfunction.h @@ -14,7 +14,7 @@ #include "blackmiscexport.h" #include "valueobject.h" -#include "originator.h" +#include "identifier.h" #include "hotkeyfunction.h" #include "blackmiscfreefunctions.h" @@ -33,7 +33,7 @@ namespace BlackMisc CEventHotkeyFunction(CHotkeyFunction func, bool argument); //! Get the event originator - const COriginator &getEventOriginator() const {return m_eventOriginator;} + const CIdentifier &getEventOriginator() const {return m_eventOriginator;} //! Get the event key const BlackMisc::CHotkeyFunction &getFunction() const {return m_hotkeyFunc;} @@ -46,7 +46,7 @@ namespace BlackMisc private: BLACK_ENABLE_TUPLE_CONVERSION(CEventHotkeyFunction) - COriginator m_eventOriginator; + CIdentifier m_eventOriginator; CHotkeyFunction m_hotkeyFunc; // This is the required argument to call a registered function per CHotkeyFunction diff --git a/src/blackmisc/originatoraware.cpp b/src/blackmisc/identifiable.cpp similarity index 56% rename from src/blackmisc/originatoraware.cpp rename to src/blackmisc/identifiable.cpp index 836d97544..957e1762e 100644 --- a/src/blackmisc/originatoraware.cpp +++ b/src/blackmisc/identifiable.cpp @@ -7,29 +7,29 @@ * contained in the LICENSE file. */ -#include "originatoraware.h" +#include "identifiable.h" namespace BlackMisc { - COriginator COriginatorAware::getCurrentTimestampOriginator() const + CIdentifier CIdentifiable::getCurrentTimestampIdentifier() const { - COriginator o(m_originator); + CIdentifier o(m_identifier); o.setCurrentUtcTime(); return o; } - COriginatorAware::COriginatorAware(QObject *object) : m_originator(object->objectName()) + CIdentifiable::CIdentifiable(QObject *object) : m_identifier(object->objectName()) { // if the object name changes we update our origiginator - this->m_originatorConnection = QObject::connect(object, &QObject::objectNameChanged, [this, object]() + this->m_connection = QObject::connect(object, &QObject::objectNameChanged, [this, object]() { - this->m_originator = COriginator(object->objectName()); + this->m_identifier = CIdentifier(object->objectName()); }); } - COriginatorAware::~COriginatorAware() + CIdentifiable::~CIdentifiable() { - QObject::disconnect(m_originatorConnection); + QObject::disconnect(m_connection); } } // ns diff --git a/src/blackmisc/identifiable.h b/src/blackmisc/identifiable.h new file mode 100644 index 000000000..062dcea24 --- /dev/null +++ b/src/blackmisc/identifiable.h @@ -0,0 +1,52 @@ +/* Copyright (C) 2015 + * swift Project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + +#ifndef BLACKMISC_IDENTIFIABLE_H +#define BLACKMISC_IDENTIFIABLE_H + +//! \file + +#include "blackmiscexport.h" +#include "identifier.h" +#include + +namespace BlackMisc +{ + /*! + * Base class with a member CIdentifier to be inherited by a class which has an identity in the environment of modular distributed swift processes + */ + class BLACKMISC_EXPORT CIdentifiable + { + public: + //! Get identifier + const CIdentifier &identifier() const { return m_identifier; } + + //! Identifier with current timestamp + CIdentifier getCurrentTimestampIdentifier() const; + + //! My identifier? + bool isMyIdentifier(const CIdentifier &otherIdentifier) { return m_identifier == otherIdentifier; } + + protected: + //! Use literal based object name + CIdentifiable(const QString &objectName) : m_identifier(objectName) {} + + //! Connect with QObject providing then name + CIdentifiable(QObject *nameProvider); + + //! Destructor + ~CIdentifiable(); + + private: + CIdentifier m_identifier; + QMetaObject::Connection m_connection; + }; +} // namespace + +#endif // guard diff --git a/src/blackmisc/originator.cpp b/src/blackmisc/identifier.cpp similarity index 85% rename from src/blackmisc/originator.cpp rename to src/blackmisc/identifier.cpp index 2f0847319..67c75fc75 100644 --- a/src/blackmisc/originator.cpp +++ b/src/blackmisc/identifier.cpp @@ -7,14 +7,14 @@ * contained in the LICENSE file. */ -#include "originator.h" +#include "identifier.h" #include #include #include namespace BlackMisc { - COriginator::COriginator(const QString &name) + CIdentifier::CIdentifier(const QString &name) : m_name(name.trimmed()), m_machineIdBase64(QDBusConnection::localMachineId().toBase64()), m_machineName(QHostInfo::localHostName()), @@ -22,27 +22,27 @@ namespace BlackMisc m_processId(QCoreApplication::applicationPid()) { } - QByteArray COriginator::getMachineId() const + QByteArray CIdentifier::getMachineId() const { return QByteArray::fromBase64(m_machineIdBase64.toLocal8Bit()); } - bool COriginator::isFromLocalMachine() const + bool CIdentifier::isFromLocalMachine() const { return QDBusConnection::localMachineId() == getMachineId(); } - bool COriginator::isFromSameProcess() const + bool CIdentifier::isFromSameProcess() const { return QCoreApplication::applicationPid() == getProcessId() && isFromLocalMachine(); } - bool COriginator::isFromSameProcessName() const + bool CIdentifier::isFromSameProcessName() const { return QCoreApplication::applicationName() == getProcessName(); } - QString COriginator::convertToQString(bool i18n) const + QString CIdentifier::convertToQString(bool i18n) const { Q_UNUSED(i18n); QString s(m_name); @@ -53,7 +53,7 @@ namespace BlackMisc return s; } - CVariant COriginator::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CIdentifier::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return CVariant::from(*this); } @@ -85,7 +85,7 @@ namespace BlackMisc } } - void COriginator::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) + void CIdentifier::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { CValueObject::setPropertyByIndex(variant, index); } diff --git a/src/blackmisc/originator.h b/src/blackmisc/identifier.h similarity index 80% rename from src/blackmisc/originator.h rename to src/blackmisc/identifier.h index 5ff1e1146..1e054a6b1 100644 --- a/src/blackmisc/originator.h +++ b/src/blackmisc/identifier.h @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#ifndef BLACKMISC_ORIGINATOR_H -#define BLACKMISC_ORIGINATOR_H +#ifndef BLACKMISC_IDENTIFIER_H +#define BLACKMISC_IDENTIFIER_H //! \file @@ -21,16 +21,18 @@ namespace BlackMisc { - //! Value object encapsulating information about the originiator - class BLACKMISC_EXPORT COriginator : - public CValueObject, + /*! + * Value object encapsulating information identifying a component of a modular distributed swift process (core, GUI, audio) + */ + class BLACKMISC_EXPORT CIdentifier : + public CValueObject, public ITimestampBased { public: //! Properties by index enum ColumnIndex { - IndexName = BlackMisc::CPropertyIndex::GlobalIndexOriginator, + IndexName = BlackMisc::CPropertyIndex::GlobalIndexIdentifier, IndexMachineId, IndexMachineIdBase64, IndexMachineName, @@ -42,7 +44,7 @@ namespace BlackMisc }; //! Constructor. - COriginator(const QString &name = QString()); + CIdentifier(const QString &name = QString()); //! Name QString getName() const { return m_name; } @@ -84,16 +86,16 @@ namespace BlackMisc void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); private: - BLACK_ENABLE_TUPLE_CONVERSION(COriginator) - QString m_name; //!< originator name + BLACK_ENABLE_TUPLE_CONVERSION(CIdentifier) + QString m_name; //!< object name QString m_machineIdBase64; //!< base 64 encoded machine id QString m_machineName; //!< human readable machine name - QString m_processName; - qint64 m_processId; + QString m_processName; //!< process name + qint64 m_processId; //!< PID }; } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::COriginator, ( +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::CIdentifier, ( attr(o.m_name), attr(o.m_machineIdBase64), attr(o.m_machineName, flags ()), @@ -102,6 +104,6 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::COriginator, ( attr(o.m_timestampMSecsSinceEpoch, flags ()) )) -Q_DECLARE_METATYPE(BlackMisc::COriginator) +Q_DECLARE_METATYPE(BlackMisc::CIdentifier) #endif // guard diff --git a/src/blackmisc/originatorlist.cpp b/src/blackmisc/identifierlist.cpp similarity index 71% rename from src/blackmisc/originatorlist.cpp rename to src/blackmisc/identifierlist.cpp index e640939dc..984151a44 100644 --- a/src/blackmisc/originatorlist.cpp +++ b/src/blackmisc/identifierlist.cpp @@ -7,14 +7,14 @@ * contained in the LICENSE file. */ -#include "originatorlist.h" +#include "identifierlist.h" #include "predicates.h" namespace BlackMisc { - COriginatorList::COriginatorList() { } + CIdentifierList::CIdentifierList() { } - COriginatorList::COriginatorList(const CSequence &other) : - CSequence(other) + CIdentifierList::CIdentifierList(const CSequence &other) : + CSequence(other) { } } // namespace diff --git a/src/blackmisc/identifierlist.h b/src/blackmisc/identifierlist.h new file mode 100644 index 000000000..3984fd00c --- /dev/null +++ b/src/blackmisc/identifierlist.h @@ -0,0 +1,46 @@ +/* Copyright (C) 2015 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKMISC_IDENTIFIERLIST_H +#define BLACKMISC_IDENTIFIERLIST_H + +#include "blackmiscexport.h" +#include "blackmisc/identifier.h" +#include "collection.h" +#include "sequence.h" +#include "timestampobjectlist.h" + +namespace BlackMisc +{ + /*! + * Value object encapsulating a list of object identifiers + */ + class BLACKMISC_EXPORT CIdentifierList : + public CSequence, + public BlackMisc::Mixin::MetaType, + public BlackMisc::ITimestampObjectList + { + public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CIdentifierList) + + //! Default constructor. + CIdentifierList(); + + //! Construct from a base class object. + CIdentifierList(const CSequence &other); + }; +} //namespace + +Q_DECLARE_METATYPE(BlackMisc::CIdentifierList) +Q_DECLARE_METATYPE(BlackMisc::CCollection) +Q_DECLARE_METATYPE(BlackMisc::CSequence) + +#endif //guard diff --git a/src/blackmisc/originatoraware.h b/src/blackmisc/originatoraware.h deleted file mode 100644 index c073fc587..000000000 --- a/src/blackmisc/originatoraware.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 2015 - * swift Project Community / Contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, - * including this file, may be copied, modified, propagated, or distributed except according to the terms - * contained in the LICENSE file. - */ - -#ifndef BLACKMISC_ORIGINATORAWARE_H -#define BLACKMISC_ORIGINATORAWARE_H - -//! \file - -#include "blackmiscexport.h" -#include "originator.h" -#include - -namespace BlackMisc -{ - //! Value object encapsulating information about the originiator - class BLACKMISC_EXPORT COriginatorAware - { - public: - //! Get originator - const COriginator &originator() const { return m_originator; } - - //! Originator with current timestamp - COriginator getCurrentTimestampOriginator() const; - - //! My originator? - bool isMyOriginator(const COriginator &otherOriginator) { return m_originator == otherOriginator; } - - protected: - //! Use literal based originator name - COriginatorAware(const QString &originatorName) : m_originator(originatorName) {} - - //! Connect with QObject providing then name - COriginatorAware(QObject *nameProvider); - - //! Destructor - ~COriginatorAware(); - - private: - COriginator m_originator; - QMetaObject::Connection m_originatorConnection; - - }; -} // namespace - -#endif // guard diff --git a/src/blackmisc/originatorlist.h b/src/blackmisc/originatorlist.h deleted file mode 100644 index 14d44ba1b..000000000 --- a/src/blackmisc/originatorlist.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 2015 - * swift project Community / Contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, - * including this file, may be copied, modified, propagated, or distributed except according to the terms - * contained in the LICENSE file. - */ - -//! \file - -#ifndef BLACKMISC_ORIGINATORLIST_H -#define BLACKMISC_ORIGINATORLIST_H - -#include "blackmiscexport.h" -#include "blackmisc/originator.h" -#include "collection.h" -#include "sequence.h" -#include "timestampobjectlist.h" - -namespace BlackMisc -{ - //! Value object encapsulating a list of originator objects - class BLACKMISC_EXPORT COriginatorList : - public CSequence, - public BlackMisc::Mixin::MetaType, - public BlackMisc::ITimestampObjectList - { - public: - BLACKMISC_DECLARE_USING_MIXIN_METATYPE(COriginatorList) - - //! Default constructor. - COriginatorList(); - - //! Construct from a base class object. - COriginatorList(const CSequence &other); - - }; -} //namespace - -Q_DECLARE_METATYPE(BlackMisc::COriginatorList) -Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) - -#endif //guard diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index b772af44e..d92903155 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -50,7 +50,7 @@ namespace BlackMisc GlobalIndexCStatusMessage = 200, GlobalIndexCNameVariantPair = 300, GlobalIndexTimestampBased = 400, - GlobalIndexOriginator = 500, + GlobalIndexIdentifier = 500, GlobalIndexCCallsign = 1000, GlobalIndexCAircraft = 1100, GlobalIndexCAircraftSituation = 1200, diff --git a/src/blackmisc/simulation/ownaircraftprovider.cpp b/src/blackmisc/simulation/ownaircraftprovider.cpp index 48271ff2a..636d0703f 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 COriginator &originator) + bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const CIdentifier &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 COriginator &originator) + bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const CIdentifier &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 COriginator &originator) + bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const CIdentifier &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 724c6511b..c44cee2ee 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.h +++ b/src/blackmisc/simulation/ownaircraftprovider.h @@ -13,7 +13,7 @@ #define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/simulation/simulatedaircraft.h" namespace BlackMisc @@ -71,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 BlackMisc::COriginator &originator) = 0; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0; //! Update cockpit, but send signals when applicable //! \threadsafe - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) = 0; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) = 0; //! Update cockpit, but send signals when applicable //! \threadsafe - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) = 0; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) = 0; }; @@ -103,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 BlackMisc::COriginator &originator); + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator); //! \copydoc IOwnAircraftProvider::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator); + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator); //! \copydoc IOwnAircraftProvider::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator); + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &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 bf584328a..c7cad8f46 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 COriginator &originator) + bool COwnAircraftProviderDummy::updateCockpit(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder, const CIdentifier &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 BlackMisc::COriginator &originator) + bool COwnAircraftProviderDummy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &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 BlackMisc::COriginator &originator) + bool COwnAircraftProviderDummy::updateSelcal(const CSelcal &selcal, const BlackMisc::CIdentifier &originator) { m_ownAircraft.setSelcal(selcal); Q_UNUSED(originator); diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.h b/src/blackmisc/simulation/ownaircraftproviderdummy.h index 29bbed8c0..c9b61ff6d 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 BlackMisc::COriginator &originator) override; + virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override; //! \copydoc IOwnAircraftProvider::updateComFrequency - virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override; + virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) override; //! \copydoc IOwnAircraftProvider::updateSelcal - virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) override; + virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &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 51a1e162a..d0056bd47 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 COriginator &originator) + bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const CIdentifier &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 COriginator &originator) + bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const CIdentifier &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 COriginator &originator) + void CRemoteAircraftAware::updateMarkAllAsNotRendered(const CIdentifier &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 COriginator &originator) + bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const CIdentifier &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 12b3af775..b2005365e 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -13,7 +13,7 @@ #define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/originator.h" +#include "blackmisc/identifier.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" @@ -79,23 +79,23 @@ namespace BlackMisc //! Enable/disable rendering //! \threadsafe - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::COriginator &originator) = 0; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::CIdentifier &originator) = 0; //! Rendered? //! \threadsafe - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) = 0; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) = 0; //! Mark all as not rendered //! \threadsafe - virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) = 0; + virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) = 0; //! Change model string //! \threadsafe - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) = 0; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0; //! Change fast position updates //! \threadsafe - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) = 0; //! Destructor virtual ~IRemoteAircraftProvider() {} @@ -144,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 BlackMisc::COriginator &originator); + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator); //! \copydoc IRemoteAircraftProvider::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator); + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator); //! \copydoc IRemoteAircraftProvider::updateAircraftRendered - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator); + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator); //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered - virtual void updateMarkAllAsNotRendered(const COriginator &originator); + virtual void updateMarkAllAsNotRendered(const CIdentifier &originator); //! Destructor virtual ~CRemoteAircraftAware() {} diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index 6ef65f193..dec5bcf4d 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 COriginator &originator) + bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering, const CIdentifier &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 COriginator &originator) + bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, CVariant::from(model)); @@ -98,7 +98,7 @@ namespace BlackMisc return n > 0; } - bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const COriginator &originator) + bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const CIdentifier &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 COriginator &originator) + bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const CIdentifier &originator) { Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered)); @@ -114,7 +114,7 @@ namespace BlackMisc return n > 0; } - void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const COriginator &originator) + void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const CIdentifier &originator) { Q_UNUSED(originator); this->m_aircraft.markAllAsNotRendered(); diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index fd590e495..c6369e5ef 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 BlackMisc::COriginator &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const BlackMisc::COriginator &originator) override; + virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateAircraftRendered - virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) override; + virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered - virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override; + virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override; //! For testing, add new situation and fire signals void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation); diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp index f32b6d9a1..13e918b54 100644 --- a/src/blackmisc/timestampobjectlist.cpp +++ b/src/blackmisc/timestampobjectlist.cpp @@ -13,7 +13,7 @@ #include "blackmisc/aviation/aircraftpartslist.h" #include "blackmisc/network/textmessagelist.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" #include #include @@ -173,6 +173,6 @@ namespace BlackMisc template class ITimestampObjectList; template class ITimestampObjectList; template class ITimestampObjectList; - template class ITimestampObjectList; + template class ITimestampObjectList; } // namespace diff --git a/src/blackmisc/timestampobjectlist.h b/src/blackmisc/timestampobjectlist.h index 1bc4610c2..f4b0a9e2a 100644 --- a/src/blackmisc/timestampobjectlist.h +++ b/src/blackmisc/timestampobjectlist.h @@ -100,14 +100,14 @@ namespace BlackMisc class CStatusMessage; class CStatusMessageList; - class COriginator; - class COriginatorList; + class CIdentifier; + class CIdentifierList; extern template class BLACKMISC_EXPORT_TEMPLATE ITimestampObjectList; extern template class BLACKMISC_EXPORT_TEMPLATE ITimestampObjectList; extern template class BLACKMISC_EXPORT_TEMPLATE ITimestampObjectList; extern template class BLACKMISC_EXPORT_TEMPLATE ITimestampObjectList; - extern template class BLACKMISC_EXPORT_TEMPLATE ITimestampObjectList; + extern template class BLACKMISC_EXPORT_TEMPLATE ITimestampObjectList; //! \endcond } //namespace diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp index 8bb42b99b..4a874d4e8 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.cpp +++ b/src/plugins/simulator/fs9/simulator_fs9.cpp @@ -118,8 +118,8 @@ namespace BlackSimPlugin // matched models CAircraftModel aircraftModel = getClosestMatch(newRemoteAircraftCopy); Q_ASSERT(newRemoteAircraft.getCallsign() == aircraftModel.getCallsign()); - updateAircraftModel(newRemoteAircraft.getCallsign(), aircraftModel, originator()); - updateAircraftRendered(newRemoteAircraft.getCallsign(), true, originator()); + updateAircraftModel(newRemoteAircraft.getCallsign(), aircraftModel, identifier()); + updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier()); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); aircraftAfterModelApplied.setRendered(true); emit modelMatchingCompleted(aircraftAfterModelApplied); @@ -130,7 +130,7 @@ namespace BlackSimPlugin client->start(); m_hashFs9Clients.insert(callsign, client); - updateAircraftRendered(callsign, true, this->originator()); + updateAircraftRendered(callsign, true, this->identifier()); CLogMessage(this).info("FS9: Added aircraft %1") << callsign.toQString(); return true; } @@ -142,7 +142,7 @@ namespace BlackSimPlugin auto fs9Client = m_hashFs9Clients.value(callsign); fs9Client->quit(); m_hashFs9Clients.remove(callsign); - updateAircraftRendered(callsign, false, this->originator()); + updateAircraftRendered(callsign, false, this->identifier()); CLogMessage(this).info("FS9: Removed aircraft %1") << callsign.toQString(); return true; } @@ -165,9 +165,9 @@ namespace BlackSimPlugin return CCollection(this->m_hashFs9Clients.keys()); } - bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const COriginator &originator) + bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const CIdentifier &originator) { - if (originator == this->originator()) { return false; } + if (originator == this->identifier()) { return false; } if (!this->isSimulating()) { return false; } // actually those data should be the same as ownAircraft @@ -301,7 +301,7 @@ namespace BlackSimPlugin simDataOwnAircraft.getCom1System(), simDataOwnAircraft.getCom2System(), simDataOwnAircraft.getTransponder(), - this->originator()); + this->identifier()); } void CSimulatorFs9::disconnectAllClients() diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h index 91b1a1b9d..341fd5b81 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/src/plugins/simulator/fs9/simulator_fs9.h @@ -71,7 +71,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 BlackMisc::COriginator &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::CIdentifier &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 55e0e2638..1d1a5077f 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp +++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp @@ -180,18 +180,18 @@ namespace BlackSimPlugin return empty; } - bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const COriginator &originator) + bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { - if (originator == this->originator()) { return false; } + if (originator == this->identifier()) { return false; } // remove upfront, and then enable / disable again this->physicallyRemoveRemoteAircraft(aircraft.getCallsign()); return this->changeRemoteAircraftEnabled(aircraft, originator); } - bool CSimulatorFsCommon::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) + bool CSimulatorFsCommon::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { - if (originator == this->originator()) { return false; } + if (originator == this->identifier()) { return false; } if (aircraft.isEnabled()) { this->physicallyAddRemoteAircraft(aircraft); diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.h b/src/plugins/simulator/fscommon/simulator_fscommon.h index 09eb1e96e..1d0a648c5 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.h +++ b/src/plugins/simulator/fscommon/simulator_fscommon.h @@ -68,10 +68,10 @@ namespace BlackSimPlugin virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override; //! \copydoc ISimulator::changeRenderedAircraftModel - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc ISimulator::changeAircraftEnabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &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 7344bebaf..b212a8169 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -149,7 +149,7 @@ namespace BlackSimPlugin CAircraftModel aircraftModel = getClosestMatch(newRemoteAircraft); Q_ASSERT_X(newRemoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "mismatching callsigns"); - this->updateAircraftModel(callsign, aircraftModel, originator()); + this->updateAircraftModel(callsign, aircraftModel, identifier()); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); // create AI @@ -173,15 +173,15 @@ namespace BlackSimPlugin } aircraftAfterModelApplied.setRendered(rendered); - this->updateAircraftRendered(callsign, rendered, originator()); + this->updateAircraftRendered(callsign, rendered, identifier()); emit modelMatchingCompleted(aircraftAfterModelApplied); return rendered; } - bool CSimulatorFsx::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const COriginator &originator) + bool CSimulatorFsx::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const CIdentifier &originator) { - if (originator == this->originator()) { return false; } + if (originator == this->identifier()) { return false; } if (!this->isSimulating()) { return false; } // actually those data should be the same as ownAircraft @@ -419,7 +419,7 @@ namespace BlackSimPlugin if (changedCom1 || changedCom2 || changedXpr) { - this->updateCockpit(com1, com2, transponder, originator()); + this->updateCockpit(com1, com2, transponder, identifier()); } } else @@ -444,7 +444,7 @@ namespace BlackSimPlugin if (!changed) { return; } CTransponder xpdr = myAircraft.getTransponder(); xpdr.setTransponderMode(newMode); - this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), xpdr, this->originator()); + this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), xpdr, this->identifier()); } void CSimulatorFsx::setSimConnectObjectID(DWORD requestID, DWORD objectID) @@ -529,7 +529,7 @@ namespace BlackSimPlugin CCallsign callsign(simObject.getCallsign()); m_simConnectObjects.remove(callsign); SimConnect_AIRemoveObject(m_hSimConnect, static_cast(simObject.getObjectId()), static_cast(simObject.getRequestId())); - updateAircraftRendered(callsign, false, originator()); + updateAircraftRendered(callsign, false, identifier()); CLogMessage(this).info("FSX: Removed aircraft %1") << simObject.getCallsign().toQString(); return true; } diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 8f438a83a..0c82f16e2 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -103,7 +103,7 @@ namespace BlackSimPlugin virtual int physicallyRemoveAllRemoteAircraft() override; //! \copydoc ISimulator::updateOwnCockpit - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::CIdentifier &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 86968c62f..94af517ef 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -110,7 +110,7 @@ namespace BlackSimPlugin Aviation::CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }), Aviation::CComSystem::getCom2System({ m_xplaneData.com2Active, CFrequencyUnit::kHz() }, { m_xplaneData.com2Standby, CFrequencyUnit::kHz() }), Aviation::CTransponder::getStandardTransponder(m_xplaneData.xpdrCode, xpdrMode(m_xplaneData.xpdrMode, m_xplaneData.xpdrIdent)), - originator() + identifier() ); } } @@ -307,10 +307,10 @@ namespace BlackSimPlugin return getAircraftInRangeForCallsign(callsign).isRendered(); } - bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const COriginator &originator) + bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const CIdentifier &originator) { Q_ASSERT(isConnected()); - if (originator == this->originator()) { return false; } + if (originator == this->identifier()) { return false; } auto com1 = Aviation::CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }); auto com2 = Aviation::CComSystem::getCom2System({ m_xplaneData.com2Active, CFrequencyUnit::kHz() }, { m_xplaneData.com2Standby, CFrequencyUnit::kHz() }); auto xpdr = Aviation::CTransponder::getStandardTransponder(m_xplaneData.xpdrCode, xpdrMode(m_xplaneData.xpdrMode, m_xplaneData.xpdrIdent)); @@ -344,7 +344,7 @@ namespace BlackSimPlugin // Is there any model matching required ???? CAircraftIcaoData icao = newRemoteAircraft.getIcaoInfo(); m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), icao.getAircraftDesignator(), icao.getAirlineDesignator(), icao.getLivery()); - updateAircraftRendered(newRemoteAircraft.getCallsign(), true, originator()); + updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier()); CLogMessage(this).info("XP: Added aircraft %1") << newRemoteAircraft.getCallsign().toQString(); return true; } @@ -379,7 +379,7 @@ namespace BlackSimPlugin { Q_ASSERT(isConnected()); m_traffic->removePlane(callsign.asString()); - updateAircraftRendered(callsign, false, originator()); + updateAircraftRendered(callsign, false, identifier()); CLogMessage(this).info("XP: Removed aircraft %1") << callsign.toQString(); return true; } @@ -389,7 +389,7 @@ namespace BlackSimPlugin //! \todo XP driver obtain number of removed aircraft int r = getAircraftInRangeCount(); m_traffic->removeAllPlanes(); - updateMarkAllAsNotRendered(originator()); + updateMarkAllAsNotRendered(identifier()); CLogMessage(this).info("XP: Removed all aircraft"); return r; } @@ -400,7 +400,7 @@ namespace BlackSimPlugin return getAircraftInRange().findByRendered(true).getCallsigns(); // just a poor workaround } - bool CSimulatorXPlane::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const COriginator &originator) + bool CSimulatorXPlane::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { return this->changeRemoteAircraftEnabled(aircraft, originator); } @@ -411,9 +411,9 @@ namespace BlackSimPlugin return CAircraftIcaoData(); } - bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator) + bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { - if (originator == this->originator()) { return false; } + if (originator == this->identifier()) { return false; } if (aircraft.isEnabled()) { this->physicallyAddRemoteAircraft(aircraft); diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h index 4ad910612..a1eb1cfda 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/src/plugins/simulator/xplane/simulator_xplane.h @@ -67,13 +67,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 BlackMisc::COriginator &originator) override; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc ISimulator::changeAircraftEnabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator) override; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc BlackCore::ISimulator::displayStatusMessage virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp index f235dea44..847d7e0f4 100644 --- a/src/swiftcore/swiftcore.cpp +++ b/src/swiftcore/swiftcore.cpp @@ -27,7 +27,7 @@ using namespace BlackGui::Components; CSwiftCore::CSwiftCore(const SetupInfo &info, QWidget *parent) : CSystemTrayWindow(CIcons::swiftNova24(), parent), - COriginatorAware(this), + CIdentifiable(this), ui(new Ui::CSwiftCore) { ui->setupUi(this); diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h index dd6f0db50..84ff03103 100644 --- a/src/swiftcore/swiftcore.h +++ b/src/swiftcore/swiftcore.h @@ -16,7 +16,7 @@ #include "blackgui/systemtraywindow.h" #include "blackgui/components/enableforruntime.h" #include "blackmisc/statusmessage.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include @@ -25,7 +25,7 @@ namespace Ui { class CSwiftCore; } //! swift core control class CSwiftCore : public BlackGui::CSystemTrayWindow, - public BlackMisc::COriginatorAware, + public BlackMisc::CIdentifiable, public BlackGui::Components::CEnableForRuntime { Q_OBJECT diff --git a/src/swiftgui_standard/swiftguistd.cpp b/src/swiftgui_standard/swiftguistd.cpp index 30f3adefa..9fd34a301 100644 --- a/src/swiftgui_standard/swiftguistd.cpp +++ b/src/swiftgui_standard/swiftguistd.cpp @@ -43,7 +43,7 @@ using namespace BlackMisc::Hardware; */ SwiftGuiStd::SwiftGuiStd(BlackGui::CEnableForFramelessWindow::WindowMode windowMode, QWidget *parent) : QMainWindow(parent, CEnableForFramelessWindow::modeToWindowFlags(windowMode)), - COriginatorAware(this), + CIdentifiable(this), CEnableForFramelessWindow(windowMode, true, "framelessMainWindow", this), ui(new Ui::SwiftGuiStd) { @@ -115,7 +115,7 @@ void SwiftGuiStd::performGracefulShutdown() // tell context GUI is going down if (this->getIContextApplication()) { - this->getIContextApplication()->unregisterApplication(originator()); + this->getIContextApplication()->unregisterApplication(identifier()); } // allow some other parts to react @@ -313,7 +313,7 @@ void SwiftGuiStd::setContextAvailability() } else { - this->m_coreAvailable = isMyOriginator(this->getIContextApplication()->registerApplication(getCurrentTimestampOriginator())); + this->m_coreAvailable = isMyIdentifier(this->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier())); } this->m_contextNetworkAvailable = this->m_coreAvailable || this->getIContextNetwork()->isUsingImplementingObject(); this->m_contextAudioAvailable = this->m_coreAvailable || this->getIContextAudio()->isUsingImplementingObject(); diff --git a/src/swiftgui_standard/swiftguistd.h b/src/swiftgui_standard/swiftguistd.h index 05ca05ce2..20da748d1 100644 --- a/src/swiftgui_standard/swiftguistd.h +++ b/src/swiftgui_standard/swiftguistd.h @@ -32,7 +32,7 @@ #include "blackgui/managedstatusbar.h" #include "blackmisc/network/textmessage.h" #include "blackmisc/loghandler.h" -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include "blacksound/soundgenerator.h" #include #include @@ -46,7 +46,7 @@ namespace Ui { class SwiftGuiStd; } //! swift GUI class SwiftGuiStd : public QMainWindow, - public BlackMisc::COriginatorAware, + public BlackMisc::CIdentifiable, public BlackGui::CEnableForFramelessWindow, public BlackGui::Components::CEnableForRuntime { diff --git a/tests/blackmisc/testblackmiscmain.cpp b/tests/blackmisc/testblackmiscmain.cpp index 6c14d7dc5..e2fe7537d 100644 --- a/tests/blackmisc/testblackmiscmain.cpp +++ b/tests/blackmisc/testblackmiscmain.cpp @@ -10,7 +10,7 @@ #include "testphysicalquantities.h" #include "testaviation.h" #include "testgeo.h" -#include "testoriginator.h" +#include "testidentifier.h" #include "testcontainers.h" #include "testvariantandmap.h" #include "testhardware.h" @@ -31,11 +31,11 @@ namespace BlackMiscTest CTestContainers containerTests; CTestVariantAndMap variantAndMap; CTestHardware hardwareTests; - CTestOriginator originatorTests; + CTestIdentifier identifierTests; status |= QTest::qExec(&pqBaseTests, argc, argv); status |= QTest::qExec(&avBaseTests, argc, argv); status |= QTest::qExec(&geoTests, argc, argv); - status |= QTest::qExec(&originatorTests, argc, argv); + status |= QTest::qExec(&identifierTests, argc, argv); status |= QTest::qExec(&containerTests, argc, argv); status |= QTest::qExec(&variantAndMap, argc, argv); status |= QTest::qExec(&hardwareTests, argc, argv); diff --git a/tests/blackmisc/testoriginator.cpp b/tests/blackmisc/testidentifier.cpp similarity index 56% rename from tests/blackmisc/testoriginator.cpp rename to tests/blackmisc/testidentifier.cpp index aab7f7c24..32b513326 100644 --- a/tests/blackmisc/testoriginator.cpp +++ b/tests/blackmisc/testidentifier.cpp @@ -7,33 +7,33 @@ * contained in the LICENSE file. */ -#include "testoriginator.h" +#include "testidentifier.h" #include "blackmisc/blackmiscfreefunctions.h" -#include "blackmisc/originatorlist.h" +#include "blackmisc/identifierlist.h" using namespace BlackMisc; namespace BlackMiscTest { - void CTestOriginator::originatorBasics() + void CTestIdentifier::identifierBasics() { - COriginator o1; - COriginator o2; - COriginator o3("foobar"); - QVERIFY2(o1 == o2, "Two default originators shall be equal"); - QVERIFY2(o1 != o3, "Those originators shall be unequal"); + CIdentifier o1; + CIdentifier o2; + CIdentifier o3("foobar"); + QVERIFY2(o1 == o2, "Two default identifiers shall be equal"); + QVERIFY2(o1 != o3, "Those identifiers shall be unequal"); // test object name change QObject q; q.setObjectName("foo"); - CTestOriginatorAware oa(&q); - QVERIFY2(oa.originator().getName() == q.objectName(), "Names shall be equal"); + CTestIdentifiable oa(&q); + QVERIFY2(oa.identifier().getName() == q.objectName(), "Names shall be equal"); q.setObjectName("bar"); - QVERIFY2(oa.originator().getName() == q.objectName(), "Names shall be equal"); + QVERIFY2(oa.identifier().getName() == q.objectName(), "Names shall be equal"); } - CTestOriginatorAware::CTestOriginatorAware(QObject *nameObject) : COriginatorAware(nameObject) + CTestIdentifiable::CTestIdentifiable(QObject *nameObject) : CIdentifiable(nameObject) { } } //namespace diff --git a/tests/blackmisc/testoriginator.h b/tests/blackmisc/testidentifier.h similarity index 61% rename from tests/blackmisc/testoriginator.h rename to tests/blackmisc/testidentifier.h index 07c38b2a5..b4219f0ee 100644 --- a/tests/blackmisc/testoriginator.h +++ b/tests/blackmisc/testidentifier.h @@ -9,33 +9,33 @@ //! \file -#ifndef BLACKMISCTEST_TESTORIGINATOR_H -#define BLACKMISCTEST_TESTORIGINATOR_H +#ifndef BLACKMISCTEST_TESTIDENTIFIER_H +#define BLACKMISCTEST_TESTIDENTIFIER_H -#include "blackmisc/originatoraware.h" +#include "blackmisc/identifiable.h" #include namespace BlackMiscTest { - //! Testing orignator - class CTestOriginator : public QObject + //! Testing object identifier + class CTestIdentifier : public QObject { Q_OBJECT public: //! Constructor - explicit CTestOriginator(QObject *parent = nullptr) : QObject(parent) {} + explicit CTestIdentifier(QObject *parent = nullptr) : QObject(parent) {} private slots: - void originatorBasics(); + void identifierBasics(); }; - //! Test originator aware - class CTestOriginatorAware : public BlackMisc::COriginatorAware + //! Test identifiable object + class CTestIdentifiable : public BlackMisc::CIdentifiable { public: //! Constructor - CTestOriginatorAware(QObject *nameObject); + CTestIdentifiable(QObject *nameObject); }; } // namespace