diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-05-18 17:30:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 15:54:56 +0200 |
| commit | fdc55ec837c79f1b42896b56f5be2c4abb5183ed (patch) | |
| tree | 3223e96473b5fe05354674dee1262a6d4803e3a6 /src/qml/qml/v4 | |
| parent | da0c8b6cd5c824e063c96ba54724ccf13ca2d808 (diff) | |
Simplify QVariant::convert and QVariant::canConvert calls.
QVariant::Type casts are not necessary in Qt5.
Change-Id: Ia2e7d8fa367a59c23bd06993db36d96a0a46a229
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/qml/qml/v4')
| -rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index f25bfccce4..d4665ac9be 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -455,8 +455,8 @@ static bool testCompareVariants(const QVariant &qtscriptRaw, const QVariant &v4) 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 { |