flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 06:35:52 +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

4
src/blackmisc/setkeyboardhotkey.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackMisc
/*
* From Json
*/
void CSettingKeyboardHotkey::fromJson(const QJsonObject &json)
void CSettingKeyboardHotkey::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CSettingKeyboardHotkey>::toMetaTuple(*this));
}
@@ -163,7 +163,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();