compile fix with namespaced Qt

5 files changed, 16 insertions, 10 deletions

diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp
index e87905c..4764f68 100644
--- a/src/script/bridge/qscriptfunction.cpp
+++ b/src/script/bridge/qscriptfunction.cpp
@@ -59,6 +59,8 @@ ASSERT_CLASS_FITS_IN_CELL(QScript::FunctionWrapper);
 ASSERT_CLASS_FITS_IN_CELL(QScript::FunctionWithArgWrapper);
 }
 
+QT_BEGIN_NAMESPACE
+
 namespace QScript
 {
 
diff --git a/src/script/bridge/qscriptglobalobject.cpp b/src/script/bridge/qscriptglobalobject.cpp
index 0a85ffa..c929e12 100644
--- a/src/script/bridge/qscriptglobalobject.cpp
+++ b/src/script/bridge/qscriptglobalobject.cpp
@@ -45,16 +45,17 @@
 #include "../api/qscriptengine.h"
 #include "../api/qscriptengine_p.h"
 
-QT_BEGIN_NAMESPACE
-
 namespace JSC
 {
+QT_USE_NAMESPACE
 
 ASSERT_CLASS_FITS_IN_CELL(QScript::GlobalObject);
 ASSERT_CLASS_FITS_IN_CELL(QScript::OriginalGlobalObjectProxy);
 
 } // namespace JSC
 
+QT_BEGIN_NAMESPACE
+
 namespace QScript
 {
 
diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp
index 0bf0b0b..2022baf 100644
--- a/src/script/bridge/qscriptobject.cpp
+++ b/src/script/bridge/qscriptobject.cpp
@@ -43,14 +43,15 @@
 #include "qscriptobject_p.h"
 #include "private/qobject_p.h"
 
-QT_BEGIN_NAMESPACE
-
 namespace JSC
 {
+//QT_USE_NAMESPACE
 ASSERT_CLASS_FITS_IN_CELL(QScriptObject);
 ASSERT_CLASS_FITS_IN_CELL(QScriptObjectPrototype);
 }
 
+QT_BEGIN_NAMESPACE
+
 // masquerading as JSC::JSObject
 const JSC::ClassInfo QScriptObject::info = { "Object", 0, 0, 0 };
 
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 34e6504..ac540ef 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -61,10 +61,9 @@
 #include "RegExpObject.h"
 #include "RegExpConstructor.h"
 
-QT_BEGIN_NAMESPACE
-
 namespace JSC
 {
+QT_USE_NAMESPACE
 ASSERT_CLASS_FITS_IN_CELL(QScript::QObjectPrototype);
 ASSERT_CLASS_FITS_IN_CELL(QScript::QMetaObjectWrapperObject);
 ASSERT_CLASS_FITS_IN_CELL(QScript::QMetaObjectPrototype);
@@ -72,6 +71,8 @@ ASSERT_CLASS_FITS_IN_CELL(QScript::QtFunction);
 ASSERT_CLASS_FITS_IN_CELL(QScript::QtPropertyFunction);
 }
 
+QT_BEGIN_NAMESPACE
+
 namespace QScript
 {
 
@@ -2209,12 +2210,12 @@ void QObjectData::registerWrapper(QScriptObject *wrapper,
 
 } // namespace QScript
 
+QT_END_NAMESPACE
+
 namespace JSC
 {
     ASSERT_CLASS_FITS_IN_CELL(QScript::QtFunction);
 }
 
-QT_END_NAMESPACE
-
 #include "moc_qscriptqobject_p.cpp"
 
diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp
index c7ecadd..c4a152a 100644
--- a/src/script/bridge/qscriptvariant.cpp
+++ b/src/script/bridge/qscriptvariant.cpp
@@ -49,13 +49,14 @@
 #include "PrototypeFunction.h"
 #include "JSString.h"
 
-QT_BEGIN_NAMESPACE
-
 namespace JSC
 {
+QT_USE_NAMESPACE
 ASSERT_CLASS_FITS_IN_CELL(QScript::QVariantPrototype);
 }
 
+QT_BEGIN_NAMESPACE
+
 namespace QScript
 {