diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-10 13:39:32 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 20:27:11 +0000 |
commit | 6cd0001054faa9c7c20dcd5e9c7512367b2c1f5f (patch) | |
tree | 3d7468705795b5bb52ea629f4f59312ba9f0d979 /src/qml/qml/qqmlvmemetaobject_p.h | |
parent | 0ed9784082b1e21cd8fcc49ef4afbe52af3fdef4 (diff) |
Get rid of special handling of var properties
These can be handled in a simple way now by using a special
propertyType value indicating that we have a var property.
Also remove the additional write calls in the different
readProperty implementations. If the stored data doesn't
match, we can simply return the default value directly.
Change-Id: I3823a971df24bd78f0acdc4c0042776277b3c55f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject_p.h')
-rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 5d4d7055a1..3f289c2cc6 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -72,7 +72,6 @@ QT_BEGIN_NAMESPACE struct QQmlVMEMetaData { - short varPropertyCount; short propertyCount; short aliasCount; short signalCount; @@ -109,6 +108,10 @@ struct QQmlVMEMetaData } }; + enum { + VarPropertyType = -1 + }; + struct PropertyData { int propertyType; }; @@ -198,7 +201,6 @@ public: QQmlVMEMetaObjectEndpoint *aliasEndpoints; QV4::WeakValue properties; - int firstVarPropertyIndex; bool propertiesInitialized; inline void allocateProperties(); inline bool ensurePropertiesAllocated(); |