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

@@ -303,7 +303,7 @@ namespace BlackMisc
/*
* JSON Object
*/
template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::fromJson(const QJsonObject &json)
template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::convertFromJson(const QJsonObject &json)
{
const QString unitSymbol = json.value("unit").toString();
this->setUnitBySymbol(unitSymbol);
@@ -345,7 +345,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();