From 331033c77416daf41532fc9ac20cd560428fe648 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 13 Feb 2015 14:02:09 +0100 Subject: [PATCH] Move some methods from qv4value_inl_p.h to qv4value_p.h Change-Id: If8fe9907ad1cc479f7615ceabd419e74b4da0d11 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4value_inl_p.h | 18 ------------------ src/qml/jsruntime/qv4value_p.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/qml/jsruntime/qv4value_inl_p.h b/src/qml/jsruntime/qv4value_inl_p.h index d150828..9297f2c 100644 --- a/src/qml/jsruntime/qv4value_inl_p.h +++ b/src/qml/jsruntime/qv4value_inl_p.h @@ -45,24 +45,6 @@ QT_BEGIN_NAMESPACE namespace QV4 { -inline bool Value::isString() const -{ - if (!isManaged()) - return false; - return m && m->vtable->isString; -} -inline bool Value::isObject() const -{ - if (!isManaged()) - return false; - return m && m->vtable->isObject; -} - -inline bool Value::isPrimitive() const -{ - return !isObject(); -} - inline void Value::mark(ExecutionEngine *e) { if (!val) diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 7f09fc7..ae1e8fb 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -371,6 +371,24 @@ struct Q_QML_PRIVATE_EXPORT Value } }; +inline bool Value::isString() const +{ + if (!isManaged()) + return false; + return m && m->vtable->isString; +} +inline bool Value::isObject() const +{ + if (!isManaged()) + return false; + return m && m->vtable->isObject; +} + +inline bool Value::isPrimitive() const +{ + return !isObject(); +} + struct Q_QML_PRIVATE_EXPORT Primitive : public Value { -- 2.7.4