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

@@ -35,7 +35,7 @@ namespace BlackMisc
return BlackMisc::serializeJson(TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
void CKeyboardKey::fromJson(const QJsonObject &json)
void CKeyboardKey::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
@@ -344,7 +344,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();