From 1b587c2ee8f2c83bab12577fc37c3ba58faae8cd Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 16 Feb 2016 03:41:18 +0100 Subject: [PATCH] refs #485 removed some dependencies from CDBusServer --- samples/blackmiscdbus/servicetool.h | 6 +++--- src/blackcore/contextapplication.cpp | 1 + src/blackcore/contextapplicationimpl.cpp | 1 + src/blackcore/contextapplicationimpl.h | 2 +- src/blackcore/contextaudio.cpp | 1 + src/blackcore/contextaudioempty.h | 1 - src/blackcore/contextaudioimpl.cpp | 9 ++++++++- src/blackcore/contextaudioimpl.h | 10 ++-------- src/blackcore/contextownaircraft.cpp | 1 + src/blackcore/contextownaircraftimpl.cpp | 8 ++++++++ src/blackcore/contextownaircraftimpl.h | 10 ++-------- src/blackcore/contextsimulator.cpp | 1 + src/blackcore/contextsimulator.h | 2 +- src/blackcore/contextsimulatorimpl.cpp | 8 ++++++++ src/blackcore/contextsimulatorimpl.h | 8 ++------ src/blackmisc/dbusserver.cpp | 2 +- src/blackmisc/dbusserver.h | 1 - 17 files changed, 41 insertions(+), 31 deletions(-) diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h index 9930bf128..5786d6cda 100644 --- a/samples/blackmiscdbus/servicetool.h +++ b/samples/blackmiscdbus/servicetool.h @@ -13,7 +13,6 @@ #ifndef BLACKSAMPLE_SERVICETOOL_H #define BLACKSAMPLE_SERVICETOOL_H -#include "blackmisc/dbusserver.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/network/clientlist.h" @@ -22,8 +21,9 @@ #include #include -namespace BlackSample -{ +namespace BlackMisc { class CDBusServer; } +namespace BlackSample { + class Testservice; // forward declaration /*! diff --git a/src/blackcore/contextapplication.cpp b/src/blackcore/contextapplication.cpp index c5e5dd47f..8582aba11 100644 --- a/src/blackcore/contextapplication.cpp +++ b/src/blackcore/contextapplication.cpp @@ -12,6 +12,7 @@ #include "blackcore/contextapplicationproxy.h" #include "blackcore/contextapplicationempty.h" #include "blackcore/inputmanager.h" +#include "blackmisc/dbusserver.h" #include "blackmisc/settingscache.h" #include "blackmisc/statusmessage.h" #include "blackmisc/loghandler.h" diff --git a/src/blackcore/contextapplicationimpl.cpp b/src/blackcore/contextapplicationimpl.cpp index 8b8bdd4a0..e46327b2d 100644 --- a/src/blackcore/contextapplicationimpl.cpp +++ b/src/blackcore/contextapplicationimpl.cpp @@ -10,6 +10,7 @@ #include "contextapplicationimpl.h" #include "corefacade.h" #include "inputmanager.h" +#include "blackmisc/dbusserver.h" #include "blackmisc/settingscache.h" #include "blackmisc/logmessage.h" #include "blackmisc/loghandler.h" diff --git a/src/blackcore/contextapplicationimpl.h b/src/blackcore/contextapplicationimpl.h index 84c18539c..05d94f2fb 100644 --- a/src/blackcore/contextapplicationimpl.h +++ b/src/blackcore/contextapplicationimpl.h @@ -13,9 +13,9 @@ #include "blackcoreexport.h" #include "contextapplication.h" #include "corefacade.h" -#include "blackmisc/dbusserver.h" #include "blackmisc/identifierlist.h" +namespace BlackMisc { class CDBusServer; } namespace BlackCore { class CCoreFacade; diff --git a/src/blackcore/contextaudio.cpp b/src/blackcore/contextaudio.cpp index 2064b7ec1..c1db51734 100644 --- a/src/blackcore/contextaudio.cpp +++ b/src/blackcore/contextaudio.cpp @@ -11,6 +11,7 @@ #include "contextaudioimpl.h" #include "contextaudioproxy.h" #include "contextaudioempty.h" +#include "blackmisc/dbusserver.h" namespace BlackCore { diff --git a/src/blackcore/contextaudioempty.h b/src/blackcore/contextaudioempty.h index 6b5a15828..996091888 100644 --- a/src/blackcore/contextaudioempty.h +++ b/src/blackcore/contextaudioempty.h @@ -15,7 +15,6 @@ #include "blackcoreexport.h" #include "contextaudio.h" #include "voice.h" -#include "blackmisc/dbusserver.h" namespace BlackCore { diff --git a/src/blackcore/contextaudioimpl.cpp b/src/blackcore/contextaudioimpl.cpp index b778b7e9b..07b9fc9d2 100644 --- a/src/blackcore/contextaudioimpl.cpp +++ b/src/blackcore/contextaudioimpl.cpp @@ -13,8 +13,8 @@ #include "contextapplication.h" #include "voicechannel.h" #include "voicevatlib.h" - #include "blacksound/soundgenerator.h" +#include "blackmisc/dbusserver.h" #include "blackmisc/audio/notificationsounds.h" #include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/logmessage.h" @@ -72,6 +72,13 @@ namespace BlackCore m_unusedVoiceChannels.push_back(m_channel2); } + CContextAudio *CContextAudio::registerWithDBus(CDBusServer *server) + { + if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; } + server->addObject(IContextAudio::ObjectPath(), this); + return this; + } + CContextAudio::~CContextAudio() { this->leaveAllVoiceRooms(); diff --git a/src/blackcore/contextaudioimpl.h b/src/blackcore/contextaudioimpl.h index 614a09624..704920e0e 100644 --- a/src/blackcore/contextaudioimpl.h +++ b/src/blackcore/contextaudioimpl.h @@ -22,7 +22,6 @@ #include "blackcore/actionbind.h" #include "blackinput/keyboard.h" #include "blackcore/settings/audio.h" -#include "blackmisc/dbusserver.h" #include "blackmisc/audio/voiceroomlist.h" #include @@ -30,6 +29,7 @@ #include #include +namespace BlackMisc { class CDBusServer; } namespace BlackCore { class IVoiceChannel; @@ -44,7 +44,6 @@ namespace BlackCore friend class IContextAudio; public: - //! Destructor virtual ~CContextAudio(); @@ -122,12 +121,7 @@ namespace BlackCore CContextAudio(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime); //! Register myself in DBus - CContextAudio *registerWithDBus(BlackMisc::CDBusServer *server) - { - if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; } - server->addObject(IContextAudio::ObjectPath(), this); - return this; - } + CContextAudio *registerWithDBus(BlackMisc::CDBusServer *server); private slots: diff --git a/src/blackcore/contextownaircraft.cpp b/src/blackcore/contextownaircraft.cpp index 230ec47f2..44be20320 100644 --- a/src/blackcore/contextownaircraft.cpp +++ b/src/blackcore/contextownaircraft.cpp @@ -11,6 +11,7 @@ #include "contextownaircraftimpl.h" #include "contextownaircraftproxy.h" #include "contextownaircraftempty.h" +#include "blackmisc/dbusserver.h" namespace BlackCore { diff --git a/src/blackcore/contextownaircraftimpl.cpp b/src/blackcore/contextownaircraftimpl.cpp index 8510040e8..01c655053 100644 --- a/src/blackcore/contextownaircraftimpl.cpp +++ b/src/blackcore/contextownaircraftimpl.cpp @@ -13,6 +13,7 @@ #include "contextaudio.h" #include "contextapplication.h" #include "corefacade.h" +#include "blackmisc/dbusserver.h" #include "blackmisc/simplecommandparser.h" #include "blackmisc/logmessage.h" @@ -37,6 +38,13 @@ namespace BlackCore this->initOwnAircraft(); } + CContextOwnAircraft *CContextOwnAircraft::registerWithDBus(CDBusServer *server) + { + if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) return this; + server->addObject(IContextOwnAircraft::ObjectPath(), this); + return this; + } + CContextOwnAircraft::~CContextOwnAircraft() { } CSimulatedAircraft CContextOwnAircraft::getOwnAircraft() const diff --git a/src/blackcore/contextownaircraftimpl.h b/src/blackcore/contextownaircraftimpl.h index 7598e84ac..b121202e9 100644 --- a/src/blackcore/contextownaircraftimpl.h +++ b/src/blackcore/contextownaircraftimpl.h @@ -16,14 +16,13 @@ #include "blackcore/contextownaircraft.h" #include "blackcore/corefacade.h" #include "blackcore/settings/network.h" -#include "blackmisc/dbusserver.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/simulation/ownaircraftprovider.h" #include "blackmisc/identifiable.h" +namespace BlackMisc { class CDbusServer; } namespace BlackCore { - //! Own aircraft context implementation. //! Central instance of data for \sa IOwnAircraftProvider . class BLACKCORE_EXPORT CContextOwnAircraft : @@ -122,12 +121,7 @@ namespace BlackCore CContextOwnAircraft(CCoreFacadeConfig::ContextMode, CCoreFacade *runtime); //! Register myself in DBus - CContextOwnAircraft *registerWithDBus(BlackMisc::CDBusServer *server) - { - if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) return this; - server->addObject(IContextOwnAircraft::ObjectPath(), this); - return this; - } + CContextOwnAircraft *registerWithDBus(BlackMisc::CDBusServer *server); private slots: //! Station has been changed, needed to tune in/out voice room diff --git a/src/blackcore/contextsimulator.cpp b/src/blackcore/contextsimulator.cpp index aabeb97ac..25516c020 100644 --- a/src/blackcore/contextsimulator.cpp +++ b/src/blackcore/contextsimulator.cpp @@ -11,6 +11,7 @@ #include "contextsimulatorimpl.h" #include "contextsimulatorproxy.h" #include "contextsimulatorempty.h" +#include "blackmisc/dbusserver.h" using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackcore/contextsimulator.h b/src/blackcore/contextsimulator.h index 0a4711af4..d9d794438 100644 --- a/src/blackcore/contextsimulator.h +++ b/src/blackcore/contextsimulator.h @@ -27,7 +27,6 @@ #include "context.h" #include "blackcore/simulator.h" #include "blackcore/corefacade.h" -#include "blackmisc/dbusserver.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorsetup.h" @@ -39,6 +38,7 @@ #include "blackmisc/pq/time.h" #include +namespace BlackMisc { class CDBusServer; } namespace BlackCore { //! Network context diff --git a/src/blackcore/contextsimulatorimpl.cpp b/src/blackcore/contextsimulatorimpl.cpp index 794f0869b..9e61d3483 100644 --- a/src/blackcore/contextsimulatorimpl.cpp +++ b/src/blackcore/contextsimulatorimpl.cpp @@ -15,6 +15,7 @@ #include "pluginmanagersimulator.h" #include "corefacade.h" #include "blackcore/registermetadata.h" +#include "blackmisc/dbusserver.h" #include "blackmisc/propertyindexvariantmap.h" #include "blackmisc/logmessage.h" #include "blackmisc/loghandler.h" @@ -40,6 +41,13 @@ namespace BlackCore m_plugins->collectPlugins(); } + CContextSimulator *CContextSimulator::registerWithDBus(CDBusServer *server) + { + if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) return this; + server->addObject(CContextSimulator::ObjectPath(), this); + return this; + } + CContextSimulator::~CContextSimulator() { this->gracefulShutdown(); diff --git a/src/blackcore/contextsimulatorimpl.h b/src/blackcore/contextsimulatorimpl.h index 1f2f1b1fa..a3b47a3c5 100644 --- a/src/blackcore/contextsimulatorimpl.h +++ b/src/blackcore/contextsimulatorimpl.h @@ -24,6 +24,7 @@ #include #include +namespace BlackMisc { class CDBusServer; } namespace BlackCore { class CPluginManagerSimulator; @@ -128,12 +129,7 @@ namespace BlackCore CContextSimulator(CCoreFacadeConfig::ContextMode, CCoreFacade *runtime); //! Register myself in DBus - CContextSimulator *registerWithDBus(BlackMisc::CDBusServer *server) - { - if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) return this; - server->addObject(CContextSimulator::ObjectPath(), this); - return this; - } + CContextSimulator *registerWithDBus(BlackMisc::CDBusServer *server); private slots: //! Remote aircraft added diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index 378fbb9b3..219f3a34a 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -17,7 +17,6 @@ using namespace BlackMisc::Network; namespace BlackMisc { - CDBusServer::CDBusServer(const QString &service, const QString &address, QObject *parent) : QObject(parent) { m_serverMode = modeOfAddress(address); @@ -248,6 +247,7 @@ namespace BlackMisc void CDBusServer::removeAllObjects() { + if (m_objects.isEmpty()) { return; } for (const QString &path : m_objects.keys()) { switch (m_serverMode) diff --git a/src/blackmisc/dbusserver.h b/src/blackmisc/dbusserver.h index 1a9023dfe..7d2fda4e2 100644 --- a/src/blackmisc/dbusserver.h +++ b/src/blackmisc/dbusserver.h @@ -26,7 +26,6 @@ namespace BlackMisc { - /*! * Custom DBusServer * \details This class implements a custom DBusServer for DBus peer connections, but can also be used