flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 11:05:33 +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

8
src/blackmisc/dictionary.h
View File

@@ -210,8 +210,8 @@ namespace BlackMisc
//! \copydoc CValueObject::toQVariant()
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::fromQVariant
virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc BlackMisc::CValueObject::getValueHash
virtual uint getValueHash() const override { return qHash(this); }
@@ -230,8 +230,8 @@ namespace BlackMisc
return json;
}
//! \copydoc CValueObject::fromJson
void fromJson(const QJsonObject &json) override
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override
{
QJsonArray array = json.value("associativecontainerbase").toArray();
for (auto it = array.begin(); it != array.end(); ++it)