From 13edffa303c0a4514035857b4a61b2665ede7b2c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 28 Aug 2015 13:33:10 +0200 Subject: Move remaining objects to new constructor syntax Also disable the old way of constructing objects. Change-Id: Ib4e69087cd563ae1481da116d6caf97876239798 Reviewed-by: Simon Hausmann --- src/imports/localstorage/plugin.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/imports') diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index ba763827d2..ada50774a7 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -97,7 +97,10 @@ namespace QV4 { namespace Heap { struct QQmlSqlDatabaseWrapper : public Object { enum Type { Database, Query, Rows }; - QQmlSqlDatabaseWrapper(ExecutionEngine *e); + QQmlSqlDatabaseWrapper() + { + type = Database; + } Type type; QSqlDatabase database; @@ -120,7 +123,7 @@ public: static Heap::QQmlSqlDatabaseWrapper *create(QV4::ExecutionEngine *engine) { - return engine->memoryManager->alloc(engine); + return engine->memoryManager->allocObject(); } ~QQmlSqlDatabaseWrapper() { @@ -135,11 +138,7 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(QV4::QQmlSqlDatabaseWrapper); -QV4::Heap::QQmlSqlDatabaseWrapper::QQmlSqlDatabaseWrapper(ExecutionEngine *e) - : QV4::Heap::Object(e) -{ - type = Database; -} + static ReturnedValue qmlsqldatabase_version(CallContext *ctx) { -- cgit v1.2.3