aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8engine_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-24 12:13:42 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-26 09:05:19 +0200
commita57085f00b146798a0cca0d52dfa127232c3e659 (patch)
tree7b4df3f155d431aeb6f3aae01943a3411c812a7b /src/qml/qml/v8/qv8engine_p.h
parent12fd2ccd3fa2dc0133b5a3fb89f9fdf5cf721232 (diff)
Fix API of QQmlV4Handle
Change-Id: Iac4a3fefebd33a5990408598486231a5add8e639 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine_p.h')
-rw-r--r--src/qml/qml/v8/qv8engine_p.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 3209e55434..90c4745d49 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -151,23 +151,16 @@ private:
QV8Engine *e;
};
-// ### GC
class Q_QML_PRIVATE_EXPORT QQmlV4Handle
{
public:
- QQmlV4Handle() : d(0) {}
- QQmlV4Handle(const QQmlV4Handle &other) : d(other.d) {}
- QQmlV4Handle &operator=(const QQmlV4Handle &other) { d = other.d; return *this; }
- explicit QQmlV4Handle(const QV4::Value &v) : d(v.val) {}
+ QQmlV4Handle() : d(QV4::Encode::undefined()) {}
+ explicit QQmlV4Handle(QV4::ValueRef v) : d(v.asReturnedValue()) {}
+ explicit QQmlV4Handle(QV4::ReturnedValue v) : d(v) {}
- QV4::Value toValue() const {
- QV4::Value v;
- v.val = d;
- return v;
- }
+ operator QV4::ReturnedValue() const { return d; }
private:
- QQmlV4Handle(quint64 h) : d(h) {}
quint64 d;
};