diff options
Diffstat (limited to 'src/qml/qml/qqmlscript_p.h')
| -rw-r--r-- | src/qml/qml/qqmlscript_p.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h index ddf4c9a392..8705f2aef9 100644 --- a/src/qml/qml/qqmlscript_p.h +++ b/src/qml/qml/qqmlscript_p.h @@ -406,10 +406,8 @@ public: DynamicProperty *nextProperty; // Used by the compiler - QByteArray *resolvedCustomTypeName; - QFastMetaBuilder::StringRef typeRef; QFastMetaBuilder::StringRef nameRef; - QFastMetaBuilder::StringRef changedSignatureRef; + QFastMetaBuilder::StringRef changedNameRef; }; struct DynamicSignal : public QQmlPool::POD @@ -417,18 +415,15 @@ public: DynamicSignal(); QHashedStringRef name; - QQmlPool::List<QHashedCStringRef> parameterTypes; + QQmlPool::List<DynamicProperty::Type> parameterTypes; QQmlPool::List<QHashedStringRef> parameterNames; - int parameterTypesLength() const; - int parameterNamesLength() const; - // Used by Object::DynamicSignalList DynamicSignal *nextSignal; // Used by the compiler - QFastMetaBuilder::StringRef signatureRef; - QFastMetaBuilder::StringRef parameterNamesRef; + QFastMetaBuilder::StringRef nameRef; + QQmlPool::List<QFastMetaBuilder::StringRef> parameterNamesRef; LocationSpan location; }; @@ -447,8 +442,8 @@ public: DynamicSlot *nextSlot; // Used by the compiler - QFastMetaBuilder::StringRef signatureRef; - QFastMetaBuilder::StringRef parameterNamesRef; + QFastMetaBuilder::StringRef nameRef; + QQmlPool::List<QFastMetaBuilder::StringRef> parameterNamesRef; }; // The list of dynamic properties @@ -461,6 +456,9 @@ public: typedef QFieldList<DynamicSlot, &DynamicSlot::nextSlot> DynamicSlotList; DynamicSlotList dynamicSlots; + int aggregateDynamicSignalParameterCount() const; + int aggregateDynamicSlotParameterCount() const; + // Used by compiler QQmlCompilerTypes::ComponentCompileState *componentCompileState; |