diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-09 15:10:52 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-12 11:04:28 +0100 |
commit | 7a0d121f9eafee9dfb948dce01de8204c4385e94 (patch) | |
tree | 07a5d345248b86fbc978afc244881e7b3b422282 /src/qml/jsruntime | |
parent | a8e74cc2185e786ff0ae96135251354964417f95 (diff) |
Move subType from Heap::Base into Heap::String
This is the only place it's still being used
Change-Id: I7341986278b1ae47d898cae3df605a23b34eebe2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index df1b0f2d64..28b7059e4c 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -290,9 +290,6 @@ public: InternalClass *internalClass() const { return d()->internalClass; } void setInternalClass(InternalClass *ic) { d()->internalClass = ic; } - uchar subtype() const { return d()->subtype; } - void setSubtype(uchar subtype) const { d()->subtype = subtype; } - bool inUse() const { return d()->inUse; } bool markBit() const { return d()->markBit; } diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 8c3030b8e0..3af945fc1d 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -103,6 +103,7 @@ struct Q_QML_PRIVATE_EXPORT String : Base { mutable Identifier *identifier; mutable String *right; }; + mutable uint subtype; mutable uint stringHash; mutable uint largestSubLength; uint len; @@ -123,6 +124,9 @@ struct Q_QML_PRIVATE_EXPORT String : public Managed { IsString = true }; + uchar subtype() const { return d()->subtype; } + void setSubtype(uchar subtype) const { d()->subtype = subtype; } + bool equals(String *other) const { return d()->isEqualTo(other->d()); } diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index f7855b0e91..02a4fcf6e0 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -66,7 +66,7 @@ struct Q_QML_EXPORT Base { uchar _bindingKeyFlag : 1; uchar _hasAccessorProperty : 1; uchar _unused : 1; - mutable uchar subtype; + mutable uchar _subtype; uchar _unused2; uchar _unused3; |