aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4string.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2016-09-09 10:43:08 +0200
committerErik Verbruggen <erik.verbruggen@qt.io>2016-10-05 14:40:59 +0000
commit1b90dc4482d001512f09a5785d4cbd8030879d82 (patch)
tree6c2b0816b6e8bf1aa781c44bacd15ce11825a66a /src/qml/jsruntime/qv4string.cpp
parent64afa01c32fc1824b280452ceb1ade4f655487f2 (diff)
QML: Make Heap::RegExp and Heap::String trivial
Change-Id: Ia8eda67c9d59069d3a64363699720a79ba1348a1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4string.cpp')
-rw-r--r--src/qml/jsruntime/qv4string.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 8bc867e2cd..3365ffe637 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -74,10 +74,10 @@ bool String::isEqualTo(Managed *t, Managed *o)
}
-Heap::String::String(MemoryManager *mm, const QString &t)
- : mm(mm)
+void Heap::String::init(MemoryManager *mm, const QString &t)
{
Base::init();
+ this->mm = mm;
subtype = String::StringType_Unknown;
@@ -89,10 +89,10 @@ Heap::String::String(MemoryManager *mm, const QString &t)
len = text->size;
}
-Heap::String::String(MemoryManager *mm, String *l, String *r, bool) // TODO: remove the dummy bool when String is trivial
- : mm(mm)
+void Heap::String::init(MemoryManager *mm, String *l, String *r)
{
Base::init();
+ this->mm = mm;
subtype = String::StringType_Unknown;