diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-10-30 22:30:01 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-10-31 15:42:42 +0100 |
| commit | 0704d2be63b484cb579c1507223db3f914b1338a (patch) | |
| tree | 66d4e616545d7f576125e85cc108c7e2988cecdd /src/qml/jsruntime/qv4variantobject.cpp | |
| parent | e67948823d6810c2de784859da52a261bf80b550 (diff) | |
Get rid of !this and similar constructs
The C++ standard doesn't allow calling member functions
on a mull object. Fix all such places, by moving the checks
to the caller where required.
Change-Id: I10fb22acaf0324d8ffd3a6d8e19152e5d32f56bb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4variantobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index 68b08fb3ca..3cde96992e 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -92,8 +92,8 @@ void VariantObject::destroy(Managed *that) bool VariantObject::isEqualTo(Managed *m, Managed *other) { - QV4::VariantObject *lv = m->as<QV4::VariantObject>(); - assert(lv); + Q_ASSERT(m->as<QV4::VariantObject>()); + QV4::VariantObject *lv = static_cast<QV4::VariantObject *>(m); if (QV4::VariantObject *rv = other->as<QV4::VariantObject>()) return lv->d()->data == rv->d()->data; |