From a83444c1370a75733c47bd4f87a5a1248ab983c6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 27 Jan 2014 15:19:23 +0100 Subject: [PATCH] Remove an unused constructor Fortunately we don't use this constructor anymore. This also allows us to fix the assert in qv4managed. Now we finally enforce that every managed object must have an internal class and a vtable. Change-Id: Idf9081c20633b44b79970fec4cc4d1ec5e6a6f7c Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4managed_p.h | 2 +- src/qml/jsruntime/qv4string_p.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index fa78ce5..a26a211 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -230,7 +230,7 @@ protected: Managed(InternalClass *internal) : internalClass(internal), _data(0) { - Q_ASSERT(!internalClass || internalClass->vtable); + Q_ASSERT(internalClass && internalClass->vtable); inUse = 1; extensible = 1; } diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 40f4ff8..c981472 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -66,10 +66,6 @@ struct Q_QML_EXPORT String : public Managed { StringType_ArrayIndex }; - String() - : Managed(0), _text(QStringData::sharedNull()), identifier(0) - , stringHash(UINT_MAX), largestSubLength(0), len(0) - { subtype = StringType_Unknown; } String(ExecutionEngine *engine, const QString &text); String(ExecutionEngine *engine, String *l, String *n); ~String() { -- 2.7.4