flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-08 21:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709 Made settings provider non-static.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-08-12 22:41:28 +01:00
parent dbba3ccf6f
commit b90327cf07
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/xswiftbus/dbusobject.cpp
View File

@@ -9,18 +9,10 @@
#include "dbusobject.h"
#include <cassert>
XSwiftBus::CSettingsProvider *XSwiftBus::CDBusObject::s_settingsProvider = nullptr;
namespace XSwiftBus
{
CDBusObject::CDBusObject(CSettingsProvider *settingsProvider)
{
if (!CDBusObject::s_settingsProvider)
{
// we expect a single pointer
CDBusObject::s_settingsProvider = settingsProvider;
}
}
CDBusObject::CDBusObject(CSettingsProvider *settingsProvider) : m_settingsProvider(settingsProvider)
{}
CDBusObject::~CDBusObject()
{
@@ -83,13 +75,13 @@ namespace XSwiftBus
CSettings CDBusObject::getSettings() const
{
if (s_settingsProvider) { return s_settingsProvider->getSettings(); }
if (m_settingsProvider) { return m_settingsProvider->getSettings(); }
return CSettings();
}
bool CDBusObject::setSettings(const CSettings &s)
{
if (s_settingsProvider) { s_settingsProvider->setSettings(s); }
if (m_settingsProvider) { m_settingsProvider->setSettings(s); }
return false;
}