QVariant::Type casts are not necessary in Qt5.
Change-Id: Ia2e7d8fa367a59c23bd06993db36d96a0a46a229
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
v = QQmlStringConverters::variantFromString(value.toString(), propertyType, &ok);
if (!ok) {
v = value;
- if (v.convert((QVariant::Type)propertyType)) {
+ if (v.convert(propertyType)) {
ok = true;
} else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) {
QQmlMetaType::StringConverter con = QQmlMetaType::customStringConverter(propertyType);
QVariant qtscript = qtscriptRaw;
if (qtscript.userType() == v4.userType()) {
- } else if (qtscript.canConvert((QVariant::Type)v4.userType())) {
- qtscript.convert((QVariant::Type)v4.userType());
+ } else if (qtscript.canConvert(v4.userType())) {
+ qtscript.convert(v4.userType());
} else if (qtscript.userType() == QVariant::Invalid && v4.userType() == QMetaType::QObjectStar) {
qtscript = qVariantFromValue<QObject *>(0);
} else {
QMetaType::constructInPlace(type, data, var.constData());
return true;
}
- if (var.canConvert(QVariant::Type(type))) {
+ if (var.canConvert(type)) {
QVariant vv = var;
- vv.convert(QVariant::Type(type));
+ vv.convert(type);
Q_ASSERT(vv.userType() == type);
QMetaType::constructInPlace(type, data, vv.constData());
return true;
if (v.userType() == callType) {
*qvariantPtr = v;
- } else if (v.canConvert((QVariant::Type)callType)) {
+ } else if (v.canConvert(callType)) {
*qvariantPtr = v;
- qvariantPtr->convert((QVariant::Type)callType);
+ qvariantPtr->convert(callType);
} else if (const QMetaObject *mo = ep ? ep->rawMetaObjectForType(callType) : 0) {
QObject *obj = ep->toQObject(v);
void QQuickPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
{
if (variant.userType() != QVariant::String) {
- variant.convert((QVariant::Type)type);
+ variant.convert(type);
return;
}
break;
default:
if (QQmlValueTypeFactory::isValueType((uint)type)) {
- variant.convert((QVariant::Type)type);
+ variant.convert(type);
} else {
QQmlMetaType::StringConverter converter = QQmlMetaType::customStringConverter(type);
if (converter)