diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-02-13 12:19:04 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-21 13:01:41 +0000 |
| commit | fc5a11aadcf7a12ee5a1f91f567daefce28ada60 (patch) | |
| tree | 4beeb467cddebfba77cc5bebd7d996a7d260911e /src/qml/jsruntime/qv4managed_p.h | |
| parent | 99b15c8f47c6ce5f7d63e19b2e2429536c254064 (diff) | |
Get rid of asManaged()
Change-Id: I853417fdf1cc339f7d43a006c20e1626b6bfb288
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4managed_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 4b455cbb4f..31e52dff79 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -150,7 +150,6 @@ public: }; Q_MANAGED_TYPE(Invalid) - String *asString() { return d()->vtable->isString ? reinterpret_cast<String *>(this) : 0; } Object *asObject() { return d()->vtable->isObject ? reinterpret_cast<Object *>(this) : 0; } FunctionObject *asFunctionObject() { return d()->vtable->isFunctionObject ? reinterpret_cast<FunctionObject *>(this) : 0; } BooleanObject *asBooleanObject() { return d()->vtable->type == Type_BooleanObject ? reinterpret_cast<BooleanObject *>(this) : 0; } @@ -181,7 +180,9 @@ private: template<> inline const Managed *Value::as() const { - return asManaged(); + if (isManaged()) + return managed(); + return 0; } template<typename T> @@ -193,7 +194,7 @@ inline T *managed_cast(Managed *m) template<> inline String *managed_cast(Managed *m) { - return m ? m->asString() : 0; + return m ? m->as<String>() : 0; } template<> inline Object *managed_cast(Managed *m) |