mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-09 05:28:09 +08:00
refs #314, renamed convertFromQVariant, convertFromJson
discussion: https://dev.vatsim-germany.org/issues/314#note-19
This commit is contained in:
@@ -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>();
|
||||
|
||||
Reference in New Issue
Block a user