aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8engine_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-01-02 14:37:26 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-09 10:27:55 +0100
commit7041eb353a4ad416f51245cc17342e16b3a02a9b (patch)
tree5870620166ae82d23f0e22ce64c8b9ed4788f39f /src/qml/qml/v8/qv8engine_p.h
parent8a779f65ae3fb830415b9f39d803be57b7f56d50 (diff)
Move the variant conversion methods from qv8engine to qv4::ExecutionEngine
Change-Id: Ibd529ae5cc3ba06f46152e9daa9119a4e7a2561c 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.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index f8e8624496..1d3e427877 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -210,24 +210,6 @@ public:
inline Deletable *extensionData(int) const;
void setExtensionData(int, Deletable *);
- static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::ValueRef value, int typeHint, bool createJSValueForObjects = true, V8ObjectSet *visitedObjects = 0);
- static QV4::ReturnedValue fromVariant(QV4::ExecutionEngine *e, const QVariant &);
-
- static QVariantMap variantMapFromJS(QV4::Object *o)
- { return objectToVariant(o->engine(), o).toMap(); }
-
- static bool metaTypeFromJS(QV4::ExecutionEngine *e, const QV4::ValueRef value, int type, void *data);
-
-private:
- static QVariant objectToVariant(QV4::ExecutionEngine *e, QV4::Object *o, V8ObjectSet *visitedObjects = 0);
- static bool convertToNativeQObject(QV4::ExecutionEngine *e, const QV4::ValueRef value,
- const QByteArray &targetType,
- void **result);
- static QV4::ReturnedValue variantListToJS(QV4::ExecutionEngine *v4, const QVariantList &lst);
- static QV4::ReturnedValue variantMapToJS(QV4::ExecutionEngine *v4, const QVariantMap &vmap);
- static QV4::ReturnedValue metaTypeToJS(QV4::ExecutionEngine *v4, int type, const void *data);
- static QV4::ReturnedValue variantToJS(QV4::ExecutionEngine *v4, const QVariant &value);
-
public:
// used for console.time(), console.timeEnd()
void startTimer(const QString &timerName);
@@ -236,8 +218,6 @@ public:
// used for console.count()
int consoleCountHelper(const QString &file, quint16 line, quint16 column);
- static QObject *qtObjectFromJS(QV4::ExecutionEngine *engine, const QV4::ValueRef value);
-
protected:
QJSEngine* q;
QQmlEngine *m_engine;