summaryrefslogtreecommitdiff
path: root/src/script/bridge/qscriptqobject.cpp
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2012-05-18 17:38:44 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-21 09:24:47 +0200
commit8796a2ce06fc12e9d190f9d109a92d8dfcc964cd (patch)
treebbf5680fb54b8bf27fc477a4fde2a402b1cdd700 /src/script/bridge/qscriptqobject.cpp
parentf8bdb6fd195ec04e5b49e84a5077c012d95ff58d (diff)
downloadqtscript-8796a2ce06fc12e9d190f9d109a92d8dfcc964cd.tar.gz
Simplify QVariant::convert and QVariant::canConvert calls.
QVariant::Type casts are not necessary in Qt5. Change-Id: I43833e869379db8937839612dfb6162f878870cb Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
-rw-r--r--src/script/bridge/qscriptqobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index ca2f4c6..72c23d2 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -603,9 +603,9 @@ static JSC::JSValue callQtMethod(JSC::ExecState *exec, QMetaMethod::MethodType c
if (tid == -1)
tid = argType.typeId();
QVariant vv = QScriptEnginePrivate::variantValue(actual);
- if (vv.canConvert(QVariant::Type(tid))) {
+ if (vv.canConvert(tid)) {
v = vv;
- converted = v.convert(QVariant::Type(tid));
+ converted = v.convert(tid);
if (converted && (vv.userType() != tid))
matchDistance += 10;
} else {