refs #314, renamed convertFromQVariant, convertFromJson

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

View File

@@ -189,7 +189,7 @@ namespace BlackMisc
/*
* From Json
*/
void CAtcStation::fromJson(const QJsonObject &json)
void CAtcStation::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CAtcStation::jsonMembers(), TupleConverter<CAtcStation>::toTuple(*this));
}
@@ -364,7 +364,7 @@ namespace BlackMisc
*/
void CAtcStation::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself()) { this->fromQVariant(variant); return; }
if (index.isMyself()) { this->convertFromQVariant(variant); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{