diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-08 16:22:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-08 19:57:01 +0200 |
commit | 995d65f3f4f348757363ba2a3a3c3444aa281b4e (patch) | |
tree | cae5c176847609abc33f51c065aa38b38cd6b9b9 /src/imports | |
parent | 2b0d3bf812273e762e7aa27a58909ade59590c0f (diff) |
Cleanup v8 dependencies from QQmlV8Function
... and rename it to QQmlV4Function
Change-Id: Iad72347babf62691e26306877d4f229fda127eb7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/localstorage/plugin.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index d1eb3377b8..f5627984d8 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -607,10 +607,10 @@ public: ~QQuickLocalStorage() { } - Q_INVOKABLE void openDatabaseSync(QQmlV8Function* args); + Q_INVOKABLE void openDatabaseSync(QQmlV4Function* args); }; -void QQuickLocalStorage::openDatabaseSync(QQmlV8Function *args) +void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) { #ifndef QT_NO_SETTINGS QV8Engine *engine = args->engine(); @@ -621,10 +621,10 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV8Function *args) QSqlDatabase database; - QString dbname = (*args)[0]->v4Value().toQString(); - QString dbversion = (*args)[1]->v4Value().toQString(); - QString dbdescription = (*args)[2]->v4Value().toQString(); - int dbestimatedsize = (*args)[3]->Int32Value(); + QString dbname = (*args)[0].toQString(); + QString dbversion = (*args)[1].toQString(); + QString dbdescription = (*args)[2].toQString(); + int dbestimatedsize = (*args)[3].toInt32(); v8::Handle<v8::Value> dbcreationCallback = (*args)[4]; QCryptographicHash md5(QCryptographicHash::Md5); @@ -685,7 +685,7 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV8Function *args) } } - args->returnValue(instance); + args->setReturnValue(instance->v4Value()); #endif // QT_NO_SETTINGS } |