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

Ref T709, changed DBus function to get/setSettingsJson, disambiguate from get/setSettings (returning CSettings)

Browse Source
This commit is contained in:
Klaus Basan
2019-07-31 16:45:19 +02:00
committed by Mat Sutcliffe
parent 77883edf9c
commit 79f347cc1b
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -1063,7 +1063,7 @@ namespace BlackSimPlugin
if (!m_serviceProxy) { return false; }
CXSwiftBusSettings s = m_xSwiftBusServerSettings.get();
s.setCurrentUtcTime();
m_serviceProxy->setSettings(s.toXSwiftBusJsonStringQt());
m_serviceProxy->setSettingsJson(s.toXSwiftBusJsonStringQt());
CLogMessage(this).info(u"Send settings: %1") << s.toQString(true);
return true;
}
@@ -1076,7 +1076,7 @@ namespace BlackSimPlugin
if (!this->isConnected()) { return s; }
if (!m_serviceProxy) { return s; }
const QString json = m_serviceProxy->getSettings();
const QString json = m_serviceProxy->getSettingsJson();
s.parseXSwiftBusStringQt(json);
ok = true;
return s;

12
src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp
View File

@@ -506,19 +506,19 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("getSpeedBrakeRatio"), setterCallback(o_speedBrakeRatio));
}
QString CXSwiftBusServiceProxy::getSettings() const
QString CXSwiftBusServiceProxy::getSettingsJson() const
{
return m_dbusInterface->callDBusRet<QString>(QLatin1String("getSettings"));
return m_dbusInterface->callDBusRet<QString>(QLatin1String("getSettingsJson"));
}
void CXSwiftBusServiceProxy::getSettingsAsync(QString *o_jsonSettings)
void CXSwiftBusServiceProxy::getSettingsJsonAsync(QString *o_jsonSettings)
{
m_dbusInterface->callDBusAsync(QLatin1String("getSettings"), setterCallback(o_jsonSettings));
m_dbusInterface->callDBusAsync(QLatin1String("getSettingsJson"), setterCallback(o_jsonSettings));
}
void CXSwiftBusServiceProxy::setSettings(const QString &json)
void CXSwiftBusServiceProxy::setSettingsJson(const QString &json)
{
m_dbusInterface->callDBus(QLatin1String("setSettings"), json);
m_dbusInterface->callDBus(QLatin1String("setSettingsJson"), json);
}
} // ns
} // ns

6
src/plugins/simulator/xplane/xswiftbusserviceproxy.h
View File

@@ -389,12 +389,12 @@ namespace BlackSimPlugin
//! \copydoc XSwiftBus::CService::getSettings
//! @{
QString getSettings() const;
void getSettingsAsync(QString *o_jsonSettings);
QString getSettingsJson() const;
void getSettingsJsonAsync(QString *o_jsonSettings);
//! @}
//! \copydoc XSwiftBus::CService::setSettings
void setSettings(const QString &json);
void setSettingsJson(const QString &json);
};
} // ns
} // ns