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

refs #314, renamed convertFromQVariant, convertFromJson

Browse Source 
discussion: https://dev.vatsim-germany.org/issues/314#note-19
This commit is contained in:
Klaus Basan
2014-08-24 02:32:44 +02:00
parent f3b68afab5
commit 40b428a315
117 changed files with 324 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/context_settings_impl.cpp
View File

@@ -50,7 +50,7 @@ namespace BlackCore
// init network
if (jsonObject.contains(IContextSettings::PathNetworkSettings()))
{
this->m_settingsNetwork.fromJson(
this->m_settingsNetwork.convertFromJson(
jsonObject.value(IContextSettings::PathNetworkSettings()).toObject()
);
}
@@ -62,7 +62,7 @@ namespace BlackCore
// init audio
if (jsonObject.contains(IContextSettings::PathAudioSettings()))
{
this->m_settingsAudio.fromJson(
this->m_settingsAudio.convertFromJson(
jsonObject.value(IContextSettings::PathAudioSettings()).toObject()
);
}
@@ -74,7 +74,7 @@ namespace BlackCore
// init simulator
if (jsonObject.contains(IContextSettings::PathSimulatorSettings()))
{
this->m_settingsSimulator.fromJson(
this->m_settingsSimulator.convertFromJson(
jsonObject.value(IContextSettings::PathSimulatorSettings()).toObject()
);
}
@@ -86,7 +86,7 @@ namespace BlackCore
// init own members
if (jsonObject.contains(IContextSettings::PathHotkeys()))
{
this->m_hotkeys.fromJson(
this->m_hotkeys.convertFromJson(
jsonObject.value(IContextSettings::PathHotkeys()).toObject()
);
}