From e5e8cf00ef43d3ce48c1c9fd0aac8142a3586ac7 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 10 Apr 2015 21:56:45 +0200 Subject: [PATCH] refs #403 use own sessionDBusServer method This patch fixes a dependency between BlackCore and BlackMisc. BlackMisc is the base library and cannot dependend on anything else. --- src/blackmisc/setnetwork.cpp | 3 +-- src/blackmisc/setnetwork.h | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/setnetwork.cpp b/src/blackmisc/setnetwork.cpp index b1351a4b6..433656af2 100644 --- a/src/blackmisc/setnetwork.cpp +++ b/src/blackmisc/setnetwork.cpp @@ -8,7 +8,6 @@ */ #include "setnetwork.h" -#include "blackcore/dbus_server.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/settingutilities.h" @@ -26,7 +25,7 @@ namespace BlackMisc */ CSettingsNetwork::CSettingsNetwork() : m_bookingServiceUrl("http://vatbook.euroutepro.com/xml2.php"), - m_dbusServerAddress(BlackCore::CDBusServer::sessionDBusServer()) + m_dbusServerAddress(sessionDBusServer()) { // settings } diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index f663d0c40..8ac2dd7e1 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -64,6 +64,13 @@ namespace BlackMisc return value; } + //! Denotes a session DBus server + static const QString &sessionDBusServer() + { + static QString session("session"); + return session; + } + //! Value object, traffic network server objects BlackMisc::Network::CServerList getTrafficNetworkServers() const { return m_trafficNetworkServers; }