aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4value_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4value_p.h')
-rw-r--r--src/qml/jsruntime/qv4value_p.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 58e82f8fe2..22f0e1e4d5 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -394,7 +394,6 @@ struct Q_QML_PRIVATE_EXPORT Value
template<typename T>
Value &operator=(const Scoped<T> &t);
- Value &operator=(const ValueRef v);
Value &operator=(const Value &v) {
val = v.val;
return *this;
@@ -423,7 +422,6 @@ struct Q_QML_PRIVATE_EXPORT Primitive : public Value
static unsigned int toUInt32(double value);
inline operator ValueRef();
- Value asValue() const { return *this; }
};
inline Primitive Primitive::undefinedValue()
@@ -545,6 +543,9 @@ struct ValueRef {
return ptr;
}
+ operator Value &() { return *ptr; }
+ operator const Value &() const { return *ptr; }
+
operator Value *() {
return ptr;
}
@@ -555,7 +556,7 @@ struct ValueRef {
static ValueRef fromRawValue(Value *v) {
return ValueRef(v);
}
- static const ValueRef fromRawValue(const Value *v) {
+ static const Value &fromRawValue(const Value *v) {
return ValueRef(const_cast<Value *>(v));
}