From aef7135e28a590b61872db715ffa4877f4e1a0a3 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 25 Sep 2014 21:43:40 +0100 Subject: [PATCH] refs #316 Removed old statusMessage signals and sendStatusMessage slots. --- samples/cli_client/client.cpp | 7 ------ samples/cli_client/client.h | 1 - src/blackcore/context_application.h | 14 ------------ src/blackcore/context_application_impl.cpp | 16 -------------- src/blackcore/context_application_impl.h | 6 ------ src/blackcore/context_application_proxy.cpp | 22 ------------------- src/blackcore/context_application_proxy.h | 6 ------ src/blackcore/context_audio_impl.cpp | 1 - src/blackcore/context_network_impl.cpp | 6 ------ src/blackcore/context_runtime.cpp | 24 --------------------- src/blackcore/context_runtime.h | 8 ------- src/blackcore/context_simulator_impl.cpp | 10 --------- src/blackcore/network.h | 6 ------ src/blackcore/simulator.h | 6 ------ src/swiftgui_standard/mainwindow_init.cpp | 2 -- 15 files changed, 135 deletions(-) diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index 3cd40cb52..ef81256bc 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -30,7 +30,6 @@ Client::Client(QObject *parent) connect(m_net, &INetwork::pongReceived, this, &Client::pongReceived); connect(m_net, &INetwork::textMessagesReceived, this, &Client::textMessagesReceived); connect(m_net, &INetwork::customPacketReceived, this, &Client::customPacketReceived); - connect(m_net, &INetwork::statusMessage, this, &Client::statusMessage); connect(this, &Client::presetServer, m_net, &INetwork::presetServer); connect(this, &Client::presetCallsign, m_net, &INetwork::presetCallsign); @@ -565,9 +564,3 @@ void Client::customPacketReceived(const BlackMisc::Aviation::CCallsign &callsign } std::cout << std::endl; } - -void Client::statusMessage(const BlackMisc::CStatusMessage &message) -{ - std::cout << "STATUS " << message.getSeverityAsString().toStdString() << " " << message.getTypeAsString().toStdString() << " " - << message.getMessage().toStdString() << "\n"; -} diff --git a/samples/cli_client/client.h b/samples/cli_client/client.h index 2732eda6e..2d8dc5cf1 100644 --- a/samples/cli_client/client.h +++ b/samples/cli_client/client.h @@ -109,7 +109,6 @@ public slots: //to receive from INetwork void pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime); void textMessagesReceived(const BlackMisc::Network::CTextMessageList &messages); void customPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data); - void statusMessage(const BlackMisc::CStatusMessage &message); private: QMap> m_commands; diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index 2f80286ea..e4b1aaf7d 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -83,14 +83,6 @@ namespace BlackCore virtual ~IContextApplication() {} signals: - //! \brief Status message - //! \remarks not to be called directly, use IContextApplication::sendStatusMessage - void statusMessage(const BlackMisc::CStatusMessage &message); - - //! Send status messages - //! \remarks not to be called directly, use IContextApplication::sendStatusMessage(s) - void statusMessages(const BlackMisc::CStatusMessageList &messages); - //! A component changes void componentChanged(uint component, uint action); @@ -99,12 +91,6 @@ namespace BlackCore //! \brief Ping a token, used to check if application is alive virtual qint64 ping(qint64 token) const = 0; - //! Status message - virtual void sendStatusMessage(const BlackMisc::CStatusMessage &message) = 0; - - //! Send status messages - virtual void sendStatusMessages(const BlackMisc::CStatusMessageList &messages) = 0; - //! A component has changed its state virtual void notifyAboutComponentChange(uint component, uint action) = 0; diff --git a/src/blackcore/context_application_impl.cpp b/src/blackcore/context_application_impl.cpp index 537a07437..4e07b8f3d 100644 --- a/src/blackcore/context_application_impl.cpp +++ b/src/blackcore/context_application_impl.cpp @@ -30,22 +30,6 @@ namespace BlackCore return token; } - /* - * Status message - */ - void CContextApplication::sendStatusMessage(const CStatusMessage &message) - { - emit this->statusMessage(message); - } - - /* - * Status messages - */ - void CContextApplication::sendStatusMessages(const CStatusMessageList &messages) - { - emit this->statusMessages(messages); - } - /* * Component has changed */ diff --git a/src/blackcore/context_application_impl.h b/src/blackcore/context_application_impl.h index 11099891f..59d3c0777 100644 --- a/src/blackcore/context_application_impl.h +++ b/src/blackcore/context_application_impl.h @@ -28,12 +28,6 @@ namespace BlackCore //! \copydoc IContextApplication::ping() virtual qint64 ping(qint64 token) const override; - //! Status message - virtual void sendStatusMessage(const BlackMisc::CStatusMessage &message) override; - - //! Send status messages - virtual void sendStatusMessages(const BlackMisc::CStatusMessageList &messages) override; - //! \copydoc IContextApplication::notifyAboutComponentChange virtual void notifyAboutComponentChange(uint component, uint action) override; diff --git a/src/blackcore/context_application_proxy.cpp b/src/blackcore/context_application_proxy.cpp index 6df5f22f1..9a143e391 100644 --- a/src/blackcore/context_application_proxy.cpp +++ b/src/blackcore/context_application_proxy.cpp @@ -34,12 +34,6 @@ namespace BlackCore { // signals originating from impl side bool s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), - "statusMessage", this, SIGNAL(statusMessage(BlackMisc::CStatusMessage))); - Q_ASSERT(s); - s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), - "statusMessages", this, SIGNAL(statusMessages(BlackMisc::CStatusMessageList))); - Q_ASSERT(s); - s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), "componentChanged", this, SIGNAL(componentChanged(uint, uint))); Q_ASSERT(s); @@ -54,22 +48,6 @@ namespace BlackCore return t; } - /* - * Status messages - */ - void CContextApplicationProxy::sendStatusMessage(const BlackMisc::CStatusMessage &message) - { - this->m_dBusInterface->callDBus(QLatin1Literal("sendStatusMessage"), message); - } - - /* - * Status messages - */ - void CContextApplicationProxy::sendStatusMessages(const BlackMisc::CStatusMessageList &messages) - { - this->m_dBusInterface->callDBus(QLatin1Literal("sendStatusMessages"), messages); - } - /* * Component has changed */ diff --git a/src/blackcore/context_application_proxy.h b/src/blackcore/context_application_proxy.h index 50babfe19..1e6713a27 100644 --- a/src/blackcore/context_application_proxy.h +++ b/src/blackcore/context_application_proxy.h @@ -27,12 +27,6 @@ namespace BlackCore //! \copydoc IContextApplication::ping() virtual qint64 ping(qint64 token) const override; - //! Status message - virtual void sendStatusMessage(const BlackMisc::CStatusMessage &message) override; - - //! Send status messages - virtual void sendStatusMessages(const BlackMisc::CStatusMessageList &messages) override; - //! \copydoc IContextApplication::notifyAboutComponentChange virtual void notifyAboutComponentChange(uint component, uint action) override; diff --git a/src/blackcore/context_audio_impl.cpp b/src/blackcore/context_audio_impl.cpp index 90fb5d215..68e228857 100644 --- a/src/blackcore/context_audio_impl.cpp +++ b/src/blackcore/context_audio_impl.cpp @@ -48,7 +48,6 @@ namespace BlackCore connect(this->m_voice, &CVoiceVatlib::micTestFinished, this, &CContextAudio::audioTestCompleted); connect(this->m_voice, &CVoiceVatlib::squelchTestFinished, this, &CContextAudio::audioTestCompleted); //connect(this->m_voice, &CVoiceVatlib::connectionStatusChanged, this, &CContextAudio::ps_connectionStatusChanged); - if (this->getIContextApplication()) this->connect(this->m_voice, &IVoice::statusMessage, this->getIContextApplication(), &IContextApplication::sendStatusMessage); m_channelCom1 = m_voice->getVoiceChannel(0); m_channelCom1->setMyAircraftCallsign(getIContextOwnAircraft()->getOwnAircraft().getCallsign()); diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index 5aecb1f9f..1f7aa3fe2 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -76,12 +76,6 @@ namespace BlackCore this->connect(this->m_airspace, &CAirspaceMonitor::changedAircraftSituation, this, &CContextNetwork::changedAircraftSituation); this->connect(this->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraft, this->m_airspace, &CAirspaceMonitor::setOwnAircraft); this->connect(this->getIContextSimulator(), &IContextSimulator::ownAircraftModelChanged, this->m_airspace, &CAirspaceMonitor::setOwnAircraftModel); - - // FIXME (MS) conditional increases the number of scenarios which must be considered and continuously tested - if (this->getIContextApplication()) - { - this->connect(this->m_network, &INetwork::statusMessage, this->getIContextApplication(), &IContextApplication::sendStatusMessage); - } } /* diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp index 1741beac9..708e4ce2f 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/context_runtime.cpp @@ -159,18 +159,6 @@ namespace BlackCore Q_ASSERT(c); } - // only if application runs locally - if (this->m_contextApplication && this->m_contextApplication->usingLocalObjects()) - { - c = connect(this->m_contextApplication, &IContextApplication::statusMessage, - this->getCContextSimulator(), &CContextSimulator::ps_statusMessageReceived); - Q_ASSERT(c); - - c = connect(this->m_contextApplication, &IContextApplication::statusMessages, - this->getCContextSimulator(), &CContextSimulator::ps_statusMessagesReceived); - Q_ASSERT(c); - } - // connect local simulator and settings and load plugin if (this->m_contextSettings) { @@ -258,18 +246,6 @@ namespace BlackCore } } - void CRuntime::sendStatusMessage(const CStatusMessage &message) - { - if (!this->getIContextApplication()) return; - this->getIContextApplication()->sendStatusMessage(message); - } - - void CRuntime::sendStatusMessages(const CStatusMessageList &messages) - { - if (!this->getIContextApplication()) return; - this->getIContextApplication()->sendStatusMessages(messages); - } - void CRuntime::initDBusConnection(const QString &address) { if (this->m_initDBusConnection) return; diff --git a/src/blackcore/context_runtime.h b/src/blackcore/context_runtime.h index 13322c311..66c16c9bc 100644 --- a/src/blackcore/context_runtime.h +++ b/src/blackcore/context_runtime.h @@ -52,14 +52,6 @@ namespace BlackCore //! Clean up (will be connected to signal QCoreApplication::aboutToQuit) void gracefulShutdown(); - //! \copydoc IContextApplication::sendStatusMessage - //! \remarks fail safe - void sendStatusMessage(const BlackMisc::CStatusMessage &message); - - //! \copydoc IContextApplication::sendStatusMessage - //! \remarks fail safe - void sendStatusMessages(const BlackMisc::CStatusMessageList &messages); - // ------- Context as interface, normal way to access a context //! Context for network diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp index 351fe6d7f..3691daca0 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/context_simulator_impl.cpp @@ -165,16 +165,6 @@ namespace BlackCore connect(m_simulator, &ISimulator::statusChanged, this, &CContextSimulator::ps_setConnectionStatus); connect(m_simulator, &ISimulator::aircraftModelChanged, this, &IContextSimulator::ownAircraftModelChanged); - if (this->getIContextApplication() && this->getIContextApplication()->usingLocalObjects()) - { - // relay status messages - connect(m_simulator, &ISimulator::sendStatusMessage, this->getIContextApplication(), &IContextApplication::sendStatusMessage); - connect(m_simulator, &ISimulator::sendStatusMessages, this->getIContextApplication(), &IContextApplication::sendStatusMessages); - } - else - { - qFatal("No application context or application context not local"); - } CAirspaceMonitor *airspace = this->getRuntime()->getCContextNetwork()->getAirspaceMonitor(); connect(airspace, &CAirspaceMonitor::addedAircraft, this, &CContextSimulator::ps_addRemoteAircraft); diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 6a4cd25d1..2b64138a9 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -17,7 +17,6 @@ #include "blackmisc/pqtime.h" #include "blackmisc/nwserverlist.h" #include "blackmisc/nwtextmessagelist.h" -#include "blackmisc/statusmessagelist.h" #include "blackmisc/avinformationmessage.h" #include "blackmisc/avflightplan.h" #include @@ -476,11 +475,6 @@ namespace BlackCore //! @{ //////////////////////////////////////////////////////////////// - /*! - * We sent a message about the status of the network connection, for the attention of the user. - */ - void statusMessage(const BlackMisc::CStatusMessage &message); - /*! * We were kicked from the network. (A connectionStatusChanged signal will also be sent.) */ diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 1aa0f6c28..10f8d04c8 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -118,12 +118,6 @@ namespace BlackCore //! Simulator stopped; void simulatorStopped(); - - //! Send a message to be displayed (from simulator to contexts) - void sendStatusMessage(const BlackMisc::CStatusMessage &message); - - //! Send messages to be displayed (from simulator to contexts) - void sendStatusMessages(const BlackMisc::CStatusMessageList &messages); }; //! Factory pattern class to create instances of ISimulator diff --git a/src/swiftgui_standard/mainwindow_init.cpp b/src/swiftgui_standard/mainwindow_init.cpp index 30586e366..128651fbe 100644 --- a/src/swiftgui_standard/mainwindow_init.cpp +++ b/src/swiftgui_standard/mainwindow_init.cpp @@ -96,8 +96,6 @@ void MainWindow::init(const CRuntimeConfig &runtimeConfig) // signal / slots contexts / timers bool connect; - this->connect(this->getIContextApplication(), &IContextApplication::statusMessage, this, &MainWindow::ps_displayStatusMessageInGui); - this->connect(this->getIContextApplication(), &IContextApplication::statusMessages, this, &MainWindow::ps_displayStatusMessagesInGui); this->connect(this->getIContextNetwork(), &IContextNetwork::connectionTerminated, this, &MainWindow::ps_onConnectionTerminated); this->connect(this->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &MainWindow::ps_onConnectionStatusChanged); connect = this->connect(this->getIContextNetwork(), SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)), this->ui->comp_MainInfoArea->getTextMessageComponent(), SLOT(appendTextMessagesToGui(BlackMisc::Network::CTextMessageList)));