diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-27 15:19:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 18:28:53 +0100 |
| commit | a83444c1370a75733c47bd4f87a5a1248ab983c6 (patch) | |
| tree | 15465554e3a2d640bc1a24e942b76396f8938d7b | |
| parent | 3466bcd8fb345f4ed7d696354bbd8bcedaea15a1 (diff) | |
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 <simon.hausmann@digia.com>
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index fa78ce5a64..a26a211ae8 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 40f4ff855b..c98147284a 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() { |