diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-06-10 15:59:06 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-10 16:08:46 +0200 |
commit | 51edd2f573848bbc418d57967e488a81bf3cf0fb (patch) | |
tree | 8d995ade79823f33a4fc2c9ec4049fa671570330 /src/qml/qml/v8/qv8engine_p.h | |
parent | bc4380afde2f399b7ef6ac9c379d45a20a6c184c (diff) |
Don't include v8.h from qv8engine_p.h anymore
Change-Id: Idb0f5744f65b28acbe878a3e9d33b4a3946ecab8
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.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index c7508ba03b..c69c692c91 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -62,7 +62,6 @@ #include <QtCore/QElapsedTimer> #include <QtCore/QThreadStorage> -#include <private/qv8_p.h> #include <qjsengine.h> #include <qjsvalue.h> #include "qjsvalueiterator_p.h" @@ -70,7 +69,6 @@ #include <private/qqmlpropertycache_p.h> -#include "qv8objectresource_p.h" #include <private/qv4qobjectwrapper_p.h> #include <private/qv4value_p.h> #include <private/qv4object_p.h> @@ -137,19 +135,6 @@ namespace QV4 { return rv; \ } \ -template<class T> -inline T *v8_resource_cast(v8::Handle<v8::Object> object) { - QV8ObjectResource *resource = static_cast<QV8ObjectResource *>(object->GetExternalResource()); - return (resource && (quint32)resource->resourceType() == (quint32)T::V8ResourceType)?static_cast<T *>(resource):0; -} - -template<class T> -inline T *v8_resource_check(v8::Handle<v8::Object> object) { - T *resource = static_cast<T *>(object->GetExternalResource()); - Q_ASSERT(resource && resource->resourceType() == (quint32)T::V8ResourceType); - return resource; -} - // Used to allow a QObject method take and return raw V8 handles without having to expose // v8 in the public API. // Use like this: @@ -324,7 +309,7 @@ protected: QVariant toBasicVariant(const QV4::Value &); - void initializeGlobal(v8::Handle<v8::Object>); + void initializeGlobal(); private: QVariantList variantListFromJS(QV4::ArrayObject *array, V8ObjectSet &visitedObjects); |