diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-15 16:00:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-17 04:03:21 +0000 |
| commit | 88af61180be2636e9b2f0714bed448d7d9270adc (patch) | |
| tree | 557f496bea2f8cb77f4946623b0b97d7d7ed26c6 /src/qml/compiler/qqmltypecompiler_p.h | |
| parent | 2997b7ea99906801c9cb92a7e095c8044c86dc0a (diff) | |
Minor QQmlPropertyValidator/QQmlCustomParser cleanup
The QQmlCustomParser already has an imports bi-pointer, so there's no
need for the property validator to implement an interface anymore.
Change-Id: Iabe9810ff26afdbc0c51efde3b20383c8f4f2348
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler_p.h')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index f00a940808..f0909d56fa 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -307,9 +307,6 @@ public: bool validate(); - const QQmlImports &imports() const; - QQmlEnginePrivate *engine() const { return enginePrivate; } - private: bool validateObject(int objectIndex, const QV4::CompiledData::Binding *instantiatingBinding, bool populatingValueTypeGroupProperty = false) const; bool validateLiteralBinding(QQmlPropertyCache *propertyCache, QQmlPropertyData *property, const QV4::CompiledData::Binding *binding) const; @@ -318,9 +315,9 @@ private: bool canCoerce(int to, QQmlPropertyCache *fromMo) const; QQmlEnginePrivate *enginePrivate; + const QQmlImports &imports; const QV4::CompiledData::Unit *qmlUnit; const QHash<int, QV4::CompiledData::CompilationUnit::ResolvedTypeReference*> &resolvedTypes; - const QHash<int, QQmlCustomParser*> &customParsers; const QQmlPropertyCacheVector * const propertyCaches; // collected state variables, essentially write-only |