Cleanups

Remove some more QV8Engine usage and fix the header guards

Change-Id: I6894fb8b55b254406c192e7c8d0c2ac466643f43
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/v4/qv4qobjectwrapper.cpp b/src/qml/qml/v4/qv4qobjectwrapper.cpp
index 2cd4767..5132d4f 100644 (file)
--- a/src/qml/qml/v4/qv4qobjectwrapper.cpp
+++ b/src/qml/qml/v4/qv4qobjectwrapper.cpp
@@ -138,20 +138,20 @@ struct ReadAccessor {
     }
 };
 
-static inline QV4::Value valueToHandle(QV8Engine *, int v)
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *, int v)
 { return QV4::Value::fromInt32(v); }
-static inline QV4::Value valueToHandle(QV8Engine *, uint v)
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *, uint v)
 { return QV4::Value::fromUInt32(v); }
-static inline QV4::Value valueToHandle(QV8Engine *, bool v)
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *, bool v)
 { return QV4::Value::fromBoolean(v); }
-static inline QV4::Value valueToHandle(QV8Engine *e, const QString &v)
-{ return e->toString(v); }
-static inline QV4::Value valueToHandle(QV8Engine *, float v)
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *e, const QString &v)
+{ return QV4::Value::fromString(e, v); }
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *, float v)
 { return QV4::Value::fromDouble(v); }
-static inline QV4::Value valueToHandle(QV8Engine *, double v)
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *, double v)
 { return QV4::Value::fromDouble(v); }
-static inline QV4::Value valueToHandle(QV8Engine *e, QObject *v)
-{ return QV4::QObjectWrapper::wrap(QV8Engine::getV4(e), v); }
+static inline QV4::Value valueToHandle(QV4::ExecutionEngine *e, QObject *v)
+{ return QV4::QObjectWrapper::wrap(e, v); }
 
 // Load value properties
 template<void (*ReadFunction)(QObject *, const QQmlPropertyData &,
@@ -172,31 +172,31 @@ static QV4::Value LoadProperty(QV8Engine *engine, QObject *object,
     } else if (property.propType == QMetaType::QReal) {
         qreal v = 0;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.propType == QMetaType::Int || property.isEnum()) {
         int v = 0;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.propType == QMetaType::Bool) {
         bool v = false;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.propType == QMetaType::QString) {
         QString v;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.propType == QMetaType::UInt) {
         uint v = 0;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.propType == QMetaType::Float) {
         float v = 0;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.propType == QMetaType::Double) {
         double v = 0;
         ReadFunction(object, property, &v, notifier);
-        return valueToHandle(engine, v);
+        return valueToHandle(v4, v);
     } else if (property.isV4Handle()) {
         QQmlV4Handle handle;
         ReadFunction(object, property, &handle, notifier);

diff --git a/src/qml/qml/v4/qv4qobjectwrapper_p.h b/src/qml/qml/v4/qv4qobjectwrapper_p.h
index b231bd3..08087e9 100644 (file)
--- a/src/qml/qml/v4/qv4qobjectwrapper_p.h
+++ b/src/qml/qml/v4/qv4qobjectwrapper_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QV8QOBJECTWRAPPER_P_H
-#define QV8QOBJECTWRAPPER_P_H
+#ifndef QV4QOBJECTWRAPPER_P_H
+#define QV4QOBJECTWRAPPER_P_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,6 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qhash.h>
-#include <private/qv8_p.h>
 #include <private/qhashedstring_p.h>
 #include <private/qqmldata_p.h>
 #include <private/qqmlpropertycache_p.h>
@@ -69,9 +68,7 @@
 QT_BEGIN_NAMESPACE
 
 class QObject;
-class QV8Engine;
 class QQmlData;
-class QV8ObjectResource;
 class QQmlPropertyCache;
 
 namespace QV4 {
@@ -198,6 +195,6 @@ private slots:
 
 QT_END_NAMESPACE
 
-#endif // QV8QOBJECTWRAPPER_P_H
+#endif // QV4QOBJECTWRAPPER_P_H