1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

Fixed conversion warnings caused by Qt

This commit is contained in:
Ivan Savenko 2014-11-12 22:41:52 +02:00
parent 24efb9b413
commit a3d4f9d22f

View File

@ -84,9 +84,9 @@ JsonNode toJson(QVariant object)
ret.Struct() = VariantToMap(object.toMap()); ret.Struct() = VariantToMap(object.toMap());
else if (object.canConvert<QVariantList>()) else if (object.canConvert<QVariantList>())
ret.Vector() = VariantToList(object.toList()); ret.Vector() = VariantToList(object.toList());
else if (object.type() == QMetaType::QString) else if (static_cast<QMetaType::Type>(object.type()) == QMetaType::QString)
ret.String() = object.toString().toUtf8().data(); ret.String() = object.toString().toUtf8().data();
else if (object.type() == QMetaType::Bool) else if (static_cast<QMetaType::Type>(object.type()) == QMetaType::Bool)
ret.Bool() = object.toBool(); ret.Bool() = object.toBool();
else if (object.canConvert<double>()) else if (object.canConvert<double>())
ret.Float() = object.toFloat(); ret.Float() = object.toFloat();