diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-02 17:40:35 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-25 22:04:42 +0100 |
| commit | 62c906059516bb829f05073096fd3e12f5103fba (patch) | |
| tree | 92176ac795e64dff690ed100f61935f301189871 /src/qml/compiler/qv4jsir.cpp | |
| parent | 71e498adc4d8af11205de2eeefc50ab9eb1ad497 (diff) | |
Cleanup, get rid of MemberOfQObject V4IR::Member specialization
It is technically redundant to the Member::property field.
Change-Id: If0ee35b2c94a2c9373784d36a1f8dfe8ad7dcfb3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4jsir.cpp')
| -rw-r--r-- | src/qml/compiler/qv4jsir.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/qml/compiler/qv4jsir.cpp b/src/qml/compiler/qv4jsir.cpp index dc982e72cc..949a73432d 100644 --- a/src/qml/compiler/qv4jsir.cpp +++ b/src/qml/compiler/qv4jsir.cpp @@ -550,7 +550,7 @@ void Member::dump(QTextStream &out) const { base->dump(out); out << '.' << *name; - if (type == MemberOfQObject) + if (property) out << " (meta-property " << property->coreIndex << " <" << QMetaType::typeName(property->propType) << ">)"; } @@ -834,10 +834,10 @@ Expr *BasicBlock::SUBSCRIPT(Expr *base, Expr *index) return e; } -Expr *BasicBlock::MEMBER(Expr *base, const QString *name) +Expr *BasicBlock::MEMBER(Expr *base, const QString *name, QQmlPropertyData *property) { Member*e = function->New<Member>(); - e->init(base, name); + e->init(base, name, property); return e; } @@ -848,13 +848,6 @@ Expr *BasicBlock::QML_CONTEXT_MEMBER(Expr *base, const QString *id, int memberIn return e; } -Expr *BasicBlock::QML_QOBJECT_PROPERTY(Expr *base, const QString *id, QQmlPropertyData *property) -{ - Member*e = function->New<Member>(); - e->initMetaProperty(base, id, property); - return e; -} - Stmt *BasicBlock::EXP(Expr *expr) { if (isTerminated()) @@ -1042,11 +1035,9 @@ void CloneExpr::visitSubscript(Subscript *e) void CloneExpr::visitMember(Member *e) { if (e->type == Member::MemberByName) - cloned = block->MEMBER(clone(e->base), e->name); + cloned = block->MEMBER(clone(e->base), e->name, e->property); else if (e->type == Member::MemberOfQmlContext) cloned = block->QML_CONTEXT_MEMBER(clone(e->base), e->name, e->memberIndex); - else if (e->type == Member::MemberOfQObject) - cloned = block->QML_QOBJECT_PROPERTY(clone(e->base), e->name, e->property); else Q_ASSERT(!"Unimplemented!"); } |