diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-29 11:32:19 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:05 +0200 |
| commit | 541da479754e6da07463cd6f0dd0e24bc6746494 (patch) | |
| tree | e4d949f1e1d8a71f8f868e02d01e0742fb8b55c2 /src/qml/jsruntime/qv4internalclass.cpp | |
| parent | 233b339c480e313bc49d16f9b85bc4318f4c3f48 (diff) | |
Convert String to the new storage layout
Change-Id: Ifa9aac63fdb270fb449f11832a1792caeb6c6724
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4internalclass.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4internalclass.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp index 354bedd311..35efd3c022 100644 --- a/src/qml/jsruntime/qv4internalclass.cpp +++ b/src/qml/jsruntime/qv4internalclass.cpp @@ -181,7 +181,7 @@ InternalClass *InternalClass::changeMember(String *string, PropertyAttributes da if (data == propertyData.at(idx)) return this; - Transition t = { { string->stringData()->identifier }, (int)data.flags() }; + Transition t = { { string->d()->identifier }, (int)data.flags() }; QHash<Transition, InternalClass *>::const_iterator tit = transitions.constFind(t); if (tit != transitions.constEnd()) return tit.value(); @@ -280,7 +280,7 @@ void InternalClass::addMember(Object *object, String *string, PropertyAttributes { data.resolve(); object->internalClass()->engine->identifierTable->identifier(string); - if (object->internalClass()->propertyTable.lookup(string->stringData()->identifier) < object->internalClass()->size) { + if (object->internalClass()->propertyTable.lookup(string->d()->identifier) < object->internalClass()->size) { changeMember(object, string, data, index); return; } @@ -304,7 +304,7 @@ InternalClass *InternalClass::addMember(String *string, PropertyAttributes data, data.resolve(); engine->identifierTable->identifier(string); - if (propertyTable.lookup(string->stringData()->identifier) < size) + if (propertyTable.lookup(string->d()->identifier) < size) return changeMember(string, data, index); return addMemberImpl(string, data, index); @@ -312,7 +312,7 @@ InternalClass *InternalClass::addMember(String *string, PropertyAttributes data, InternalClass *InternalClass::addMemberImpl(String *string, PropertyAttributes data, uint *index) { - Transition t = { { string->stringData()->identifier }, (int)data.flags() }; + Transition t = { { string->d()->identifier }, (int)data.flags() }; QHash<Transition, InternalClass *>::const_iterator tit = transitions.constFind(t); if (index) @@ -322,7 +322,7 @@ InternalClass *InternalClass::addMemberImpl(String *string, PropertyAttributes d // create a new class and add it to the tree InternalClass *newClass = engine->newClass(*this); - PropertyHash::Entry e = { string->stringData()->identifier, newClass->size }; + PropertyHash::Entry e = { string->d()->identifier, newClass->size }; newClass->propertyTable.addEntry(e, newClass->size); // The incoming string can come from anywhere, so make sure to @@ -382,7 +382,7 @@ uint InternalClass::find(const StringRef string) uint InternalClass::find(const String *string) { engine->identifierTable->identifier(string); - const Identifier *id = string->stringData()->identifier; + const Identifier *id = string->d()->identifier; uint index = propertyTable.lookup(id); if (index < size) |