Delay setting the DBusConnection for a DBusObject

Previously, the DBusconnection had to be set at construction time and could
not be changed over the DBusObject life time. Now a new connection can be
set anytime and as often as required.
The shared ownership is now also properly implemented by shared pointers.

ref T291
This commit is contained in:
Roland Winklmeier
2018-07-26 21:52:45 +02:00
committed by Klaus Basan
parent 01085f24b3
commit 59da68da5e
10 changed files with 45 additions and 28 deletions

View File

@@ -53,10 +53,10 @@ namespace XSwiftBus
void onAircraftRepositioned();
private:
std::unique_ptr<CDBusConnection> m_dbusConnection;
CService *m_service = nullptr;
CTraffic *m_traffic = nullptr;
CWeather *m_weather = nullptr;
std::shared_ptr<CDBusConnection> m_dbusConnection;
std::unique_ptr<CService> m_service;
std::unique_ptr<CTraffic> m_traffic;
std::unique_ptr<CWeather> m_weather;
CMenu m_menu;
CMenuItem m_startServerMenuItem;
CMenuItem m_toggleMessageWindowMenuItem;