Ref T709, changed to settings provider

* CPlugin is the provider
* it is "kept" in DBus object for traffic, service, weather
This commit is contained in:
Klaus Basan
2019-07-30 01:01:36 +02:00
committed by Mat Sutcliffe
parent 97926eee26
commit f9c87326fb
10 changed files with 63 additions and 46 deletions

View File

@@ -26,8 +26,6 @@ namespace
namespace XSwiftBus
{
CSettings CPlugin::s_pluginSettings = CSettings();
CPlugin::CPlugin()
: m_dbusConnection(std::make_shared<CDBusConnection>()), m_menu(CMenu::mainMenu().subMenu("XSwiftBus"))
{
@@ -99,9 +97,9 @@ namespace XSwiftBus
readConfig();
m_service = std::make_unique<CService>(&CPlugin::s_pluginSettings);
m_traffic = std::make_unique<CTraffic>(&CPlugin::s_pluginSettings);
m_weather = std::make_unique<CWeather>(&CPlugin::s_pluginSettings);
m_service = std::make_unique<CService>(this);
m_traffic = std::make_unique<CTraffic>(this);
m_weather = std::make_unique<CWeather>(this);
m_traffic->setPlaneViewMenu(m_planeViewSubMenu);