aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4value_def_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-25 12:24:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 13:33:24 +0200
commitcf2a253f2f60c9f0c61682527d80143e72b355d4 (patch)
treed60e8be50437e6f15513e25155817b902a2062c7 /src/qml/jsruntime/qv4value_def_p.h
parent7872b380063d0497ba62fecfdc92148f1ea947af (diff)
Move Value::fromBool, ... to a new Primitive class
This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value_def_p.h')
-rw-r--r--src/qml/jsruntime/qv4value_def_p.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h
index ae176292da..188952bdd7 100644
--- a/src/qml/jsruntime/qv4value_def_p.h
+++ b/src/qml/jsruntime/qv4value_def_p.h
@@ -274,12 +274,6 @@ struct Q_QML_EXPORT Value
}
static Value emptyValue();
- static Value undefinedValue();
- static Value nullValue();
- static Value fromBoolean(Bool b);
- static Value fromDouble(double d);
- static Value fromInt32(int i);
- static Value fromUInt32(uint i);
static Value fromString(String *s);
static Value fromObject(Object *o);
static Value fromManaged(Managed *o);
@@ -362,6 +356,19 @@ struct SafeValue : public Value
Returned<T> *as();
};
+struct Primitive : public Value
+{
+ static Primitive fromBoolean(bool b);
+ static Primitive fromInt32(int i);
+ static Value undefinedValue();
+ static Primitive nullValue();
+ static Primitive fromDouble(double d);
+ static Primitive fromUInt32(uint i);
+
+ inline operator ValueRef();
+ Value asValue() const { return *this; }
+};
+
template <typename T>
struct Safe : public SafeValue
{