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/qml/qqmllocale_p.h | |
| 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/qml/qqmllocale_p.h')
| -rw-r--r-- | src/qml/qml/qqmllocale_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 24cb3a8c42..a29b86fbea 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -134,7 +134,8 @@ struct QQmlLocaleData : public QV4::Object V4_OBJECT(Object) static QLocale *getThisLocale(QV4::CallContext *ctx) { - QQmlLocaleData *thisObject = ctx->d()->callData->thisObject.asObject()->as<QQmlLocaleData>(); + QV4::Object *o = ctx->d()->callData->thisObject.asObject(); + QQmlLocaleData *thisObject = o ? o->as<QQmlLocaleData>() : 0; if (!thisObject) { ctx->throwTypeError(); return 0; |