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

@@ -209,7 +209,7 @@ namespace BlackMisc
/*
* From Json
*/
template <class ImplVector> void CVector3DBase<ImplVector>::fromJson(const QJsonObject &json)
template <class ImplVector> void CVector3DBase<ImplVector>::convertFromJson(const QJsonObject &json)
{
QJsonArray jsonArray = json.value("vector").toArray();
this->m_i = jsonArray.at(0).toDouble();
@@ -235,7 +235,7 @@ namespace BlackMisc
/*
* From Json
*/
template <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::fromJson(const QJsonObject &json)
template <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::convertFromJson(const QJsonObject &json)
{
QJsonArray jsonArray = json.value("matrix").toArray();
QList<double> list;