flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +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/aviomodulator.cpp
View File

@@ -51,7 +51,7 @@ namespace BlackMisc
/*
* To JSON
*/
template <class AVIO> void CModulator<AVIO>::fromJson(const QJsonObject &json)
template <class AVIO> void CModulator<AVIO>::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CModulator::jsonMembers(), TupleConverter<CModulator>::toTuple(*this));
}
@@ -87,7 +87,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();