introduce scriptEngineFromExec() helper function

No need to expose the fact that we go via the Global Object
to get an engine pointer.

2 files changed, 27 insertions, 27 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 524a250..7ffb178 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -307,6 +307,29 @@ public:
 
 namespace QScript
 {
+
+class GlobalObject : public JSC::JSGlobalObject
+{
+public:
+    GlobalObject(QScriptEnginePrivate*);
+    virtual ~GlobalObject();
+    virtual JSC::UString className() const { return "global"; }
+    virtual void mark();
+    virtual bool getOwnPropertySlot(JSC::ExecState*,
+                                    const JSC::Identifier& propertyName,
+                                    JSC::PropertySlot&);
+    virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName,
+                     JSC::JSValue, JSC::PutPropertySlot&);
+    virtual bool deleteProperty(JSC::ExecState*,
+                                const JSC::Identifier& propertyName);
+    virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&,
+                                       unsigned&) const;
+    virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&);
+
+public:
+    QScriptEnginePrivate *engine;
+};
+
 static int toDigit(char c)
 {
     if ((c >= '0') && (c <= '9'))
@@ -387,6 +410,10 @@ QString qtStringFromJSCUString(const JSC::UString &str)
     return QString(reinterpret_cast<const QChar*>(str.data()), str.size());
 }
 
+QScriptEnginePrivate *scriptEngineFromExec(JSC::ExecState *exec)
+{
+    return static_cast<QScript::GlobalObject*>(exec->lexicalGlobalObject())->engine;
+}
 
 bool isFunction(JSC::JSValue value)
 {
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index e6db40e..b7109b0 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -196,33 +196,6 @@ public:
 #endif
 };
 
-namespace QScript
-{
-
-class GlobalObject : public JSC::JSGlobalObject
-{
-public:
-    GlobalObject(QScriptEnginePrivate*);
-    virtual ~GlobalObject();
-    virtual JSC::UString className() const { return "global"; }
-    virtual void mark();
-    virtual bool getOwnPropertySlot(JSC::ExecState*,
-                                    const JSC::Identifier& propertyName,
-                                    JSC::PropertySlot&);
-    virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName,
-                     JSC::JSValue, JSC::PutPropertySlot&);
-    virtual bool deleteProperty(JSC::ExecState*,
-                                const JSC::Identifier& propertyName);
-    virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&,
-                                       unsigned&) const;
-    virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&);
-
-public:
-    QScriptEnginePrivate *engine;
-};
-
-} // namespace QScript
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_SCRIPT