From 93909171b6f578f6bfabf16b76cd36115485e9fb Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 19 Nov 2017 19:21:10 +0100 Subject: [PATCH] Ref T192, init for P2P via CDBusServer::coreServiceName(connection) --- src/blackcore/context/contextapplication.cpp | 8 ++++---- src/blackcore/context/contextapplication.h | 2 +- src/blackcore/context/contextaudio.cpp | 4 ++-- src/blackcore/context/contextaudio.h | 2 +- src/blackcore/context/contextnetwork.cpp | 2 +- src/blackcore/context/contextnetwork.h | 3 --- src/blackcore/context/contextnetworkimpl.cpp | 2 +- src/blackcore/context/contextnetworkproxy.cpp | 2 +- src/blackcore/context/contextownaircraft.cpp | 5 +++-- src/blackcore/context/contextownaircraft.h | 2 +- src/blackcore/context/contextsimulator.cpp | 7 ++++--- src/blackcore/context/contextsimulator.h | 2 +- 12 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/blackcore/context/contextapplication.cpp b/src/blackcore/context/contextapplication.cpp index 52725ea87..25789ec4c 100644 --- a/src/blackcore/context/contextapplication.cpp +++ b/src/blackcore/context/contextapplication.cpp @@ -32,7 +32,7 @@ namespace BlackCore { namespace Context { - IContextApplication *IContextApplication::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection) + IContextApplication *IContextApplication::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { switch (mode) { @@ -40,7 +40,7 @@ namespace BlackCore case CCoreFacadeConfig::LocalInDBusServer: return (new CContextApplication(mode, parent))->registerWithDBus(server); case CCoreFacadeConfig::Remote: - return new CContextApplicationProxy(BlackMisc::CDBusServer::coreServiceName(), connection, mode, parent); + return new CContextApplicationProxy(CDBusServer::coreServiceName(connection), connection, mode, parent); case CCoreFacadeConfig::NotUsed: default: return new CContextApplicationEmpty(parent); @@ -136,14 +136,14 @@ namespace BlackCore qFatal("Not implemented"); // avoid losing a change during context interface construction } - void IContextApplication::registerHotkeyActions(const QStringList &actions, const BlackMisc::CIdentifier &origin) + void IContextApplication::registerHotkeyActions(const QStringList &actions, const CIdentifier &origin) { Q_UNUSED(actions); Q_UNUSED(origin); qFatal("Not implemented"); // avoid losing a change during context interface construction } - void IContextApplication::callHotkeyAction(const QString &action, bool argument, const BlackMisc::CIdentifier &origin) + void IContextApplication::callHotkeyAction(const QString &action, bool argument, const CIdentifier &origin) { Q_UNUSED(action); Q_UNUSED(argument); diff --git a/src/blackcore/context/contextapplication.h b/src/blackcore/context/contextapplication.h index 55a86db99..d38235162 100644 --- a/src/blackcore/context/contextapplication.h +++ b/src/blackcore/context/contextapplication.h @@ -88,7 +88,7 @@ namespace BlackCore virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } //! Factory method - static IContextApplication *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn); + static IContextApplication *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection); //! Destructor virtual ~IContextApplication() {} diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index 3cbac047f..4623bc3ee 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -45,7 +45,7 @@ namespace BlackCore return CIcons::radio16(); } - IContextAudio *IContextAudio::create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn) + IContextAudio *IContextAudio::create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { switch (mode) { @@ -53,7 +53,7 @@ namespace BlackCore case CCoreFacadeConfig::LocalInDBusServer: return (new CContextAudio(mode, runtime))->registerWithDBus(server); case CCoreFacadeConfig::Remote: - return new CContextAudioProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, runtime); + return new CContextAudioProxy(CDBusServer::coreServiceName(connection), connection, mode, runtime); default: return new CContextAudioEmpty(runtime); // audio not mandatory } diff --git a/src/blackcore/context/contextaudio.h b/src/blackcore/context/contextaudio.h index 3c16d5b10..e60b0ac71 100644 --- a/src/blackcore/context/contextaudio.h +++ b/src/blackcore/context/contextaudio.h @@ -80,7 +80,7 @@ namespace BlackCore virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } //! Factory method - static IContextAudio *create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn); + static IContextAudio *create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection); //! Destructor virtual ~IContextAudio() {} diff --git a/src/blackcore/context/contextnetwork.cpp b/src/blackcore/context/contextnetwork.cpp index 131a00191..a2358a1f8 100644 --- a/src/blackcore/context/contextnetwork.cpp +++ b/src/blackcore/context/contextnetwork.cpp @@ -28,7 +28,7 @@ namespace BlackCore case CCoreFacadeConfig::LocalInDBusServer: return (new CContextNetwork(mode, runtime))->registerWithDBus(server); case CCoreFacadeConfig::Remote: - return new CContextNetworkProxy(CDBusServer::coreServiceName(), connection, mode, runtime); + return new CContextNetworkProxy(CDBusServer::coreServiceName(connection), connection, mode, runtime); case CCoreFacadeConfig::NotUsed: default: return new CContextNetworkEmpty(runtime); diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 4ed425270..41a3dba27 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -141,9 +141,6 @@ namespace BlackCore //! Connection status changed for online station void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected); - //! Terminated connection - void connectionTerminated(); - //! User has been kicked from network void kicked(const QString &kickMessage); diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 6e10bf955..7f75a4f01 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -400,7 +400,7 @@ namespace BlackCore return sApp->getWebDataServices()->getVatsimVoiceServers(); } - void CContextNetwork::fsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to) + void CContextNetwork::fsdConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << from << to; } auto fromOld = m_currentStatus; // own status cached diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 544e5a985..74644c89f 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -32,7 +32,7 @@ namespace BlackCore { CContextNetworkProxy::CContextNetworkProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextNetwork(mode, runtime), m_dBusInterface(nullptr) { - m_dBusInterface = new BlackMisc::CGenericDBusInterface( + m_dBusInterface = new CGenericDBusInterface( serviceName , IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), connection, this); this->relaySignals(serviceName, connection); diff --git a/src/blackcore/context/contextownaircraft.cpp b/src/blackcore/context/contextownaircraft.cpp index 57b53be1f..6a3626dae 100644 --- a/src/blackcore/context/contextownaircraft.cpp +++ b/src/blackcore/context/contextownaircraft.cpp @@ -16,6 +16,7 @@ #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/dbusserver.h" +using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; @@ -25,7 +26,7 @@ namespace BlackCore { namespace Context { - IContextOwnAircraft *IContextOwnAircraft::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn) + IContextOwnAircraft *IContextOwnAircraft::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { switch (mode) { @@ -33,7 +34,7 @@ namespace BlackCore case CCoreFacadeConfig::LocalInDBusServer: return (new CContextOwnAircraft(mode, parent))->registerWithDBus(server); case CCoreFacadeConfig::Remote: - return new CContextOwnAircraftProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, parent); + return new CContextOwnAircraftProxy(CDBusServer::coreServiceName(), connection, mode, parent); case CCoreFacadeConfig::NotUsed: default: return new CContextOwnAircraftEmpty(parent); diff --git a/src/blackcore/context/contextownaircraft.h b/src/blackcore/context/contextownaircraft.h index 184bb98b3..8b7ff2469 100644 --- a/src/blackcore/context/contextownaircraft.h +++ b/src/blackcore/context/contextownaircraft.h @@ -81,7 +81,7 @@ namespace BlackCore virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } //! Factory method - static IContextOwnAircraft *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn); + static IContextOwnAircraft *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection); //! Destructor virtual ~IContextOwnAircraft() {} diff --git a/src/blackcore/context/contextsimulator.cpp b/src/blackcore/context/contextsimulator.cpp index d21152eae..ac0eea01b 100644 --- a/src/blackcore/context/contextsimulator.cpp +++ b/src/blackcore/context/contextsimulator.cpp @@ -16,6 +16,7 @@ #include +using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; namespace BlackCore @@ -34,13 +35,13 @@ namespace BlackCore return s; } - const BlackMisc::PhysicalQuantities::CTime &IContextSimulator::HighlightTime() + const PhysicalQuantities::CTime &IContextSimulator::HighlightTime() { static const CTime t(10.0, CTimeUnit::s()); return t; } - IContextSimulator *IContextSimulator::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn) + IContextSimulator *IContextSimulator::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { switch (mode) { @@ -48,7 +49,7 @@ namespace BlackCore case CCoreFacadeConfig::LocalInDBusServer: return (new CContextSimulator(mode, parent))->registerWithDBus(server); case CCoreFacadeConfig::Remote: - return new CContextSimulatorProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, parent); + return new CContextSimulatorProxy(CDBusServer::coreServiceName(connection), connection, mode, parent); case CCoreFacadeConfig::NotUsed: default: return new CContextSimulatorEmpty(parent); diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h index 380789877..d5d909149 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/src/blackcore/context/contextsimulator.h @@ -77,7 +77,7 @@ namespace BlackCore virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } //! Factory method - static IContextSimulator *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &conn); + static IContextSimulator *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection); //! Destructor virtual ~IContextSimulator() {}