summaryrefslogtreecommitdiffstats
path: root/src/script/api
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-08-24 14:57:01 (GMT)
committerhjk <qtc-committer@nokia.com>2009-08-24 15:32:14 (GMT)
commitcf354eb2bb24de1076f126c526317ac7e1d9ac4d (patch)
tree75d721fa5b94a4d15cb9d6d612bd18b868b54ec3 /src/script/api
parent5b680a3c2c5e59fe899fa19e4d1c4cb251325f29 (diff)
downloadQt-cf354eb2bb24de1076f126c526317ac7e1d9ac4d.zip
Qt-cf354eb2bb24de1076f126c526317ac7e1d9ac4d.tar.gz
Qt-cf354eb2bb24de1076f126c526317ac7e1d9ac4d.tar.bz2
compile fix with namespaced Qt
Diffstat (limited to 'src/script/api')
-rw-r--r--src/script/api/qscriptclass.cpp4
-rw-r--r--src/script/api/qscriptcontext_p.h8
-rw-r--r--src/script/api/qscriptengine_p.h4
-rw-r--r--src/script/api/qscriptvalue.cpp4
-rw-r--r--src/script/api/qscriptvalue_p.h4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp
index c81677b..9ad5ad6 100644
--- a/src/script/api/qscriptclass.cpp
+++ b/src/script/api/qscriptclass.cpp
@@ -42,8 +42,6 @@
#include "qscriptclass.h"
#include "qscriptstring.h"
-QT_BEGIN_NAMESPACE
-
/*!
\since 4.4
\class QScriptClass
@@ -131,6 +129,8 @@ QT_BEGIN_NAMESPACE
\sa queryProperty()
*/
+QT_BEGIN_NAMESPACE
+
class QScriptClassPrivate
{
Q_DECLARE_PUBLIC(QScriptClass)
diff --git a/src/script/api/qscriptcontext_p.h b/src/script/api/qscriptcontext_p.h
index e8cc47e..c40f3de 100644
--- a/src/script/api/qscriptcontext_p.h
+++ b/src/script/api/qscriptcontext_p.h
@@ -55,8 +55,6 @@
#include <QtCore/qobjectdefs.h>
-QT_BEGIN_NAMESPACE
-
namespace JSC
{
class JSObject;
@@ -64,8 +62,7 @@ namespace JSC
class ExecState;
}
-#include "wtf/Platform.h"
-#include "JSValue.h"
+QT_BEGIN_NAMESPACE
class QScriptEnginePrivate;
@@ -73,4 +70,7 @@ class QScriptContext;
QT_END_NAMESPACE
+#include "wtf/Platform.h"
+#include "JSValue.h"
+
#endif
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 1142fcb..c20589f 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -63,8 +63,6 @@
#include "JSGlobalObject.h"
#include "JSValue.h"
-QT_BEGIN_NAMESPACE
-
namespace JSC
{
class ExecState;
@@ -75,6 +73,8 @@ namespace JSC
}
+QT_BEGIN_NAMESPACE
+
class QString;
class QStringList;
class QScriptContext;
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 21aebd0..5f11239 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -72,8 +72,6 @@
#include "bridge/qscriptvariant_p.h"
#include "bridge/qscriptqobject_p.h"
-QT_BEGIN_NAMESPACE
-
/*!
\since 4.3
\class QScriptValue
@@ -203,6 +201,8 @@ QT_BEGIN_NAMESPACE
#include <QtCore/qnumeric.h>
#include <math.h>
+QT_BEGIN_NAMESPACE
+
namespace QScript
{
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 9773ba0..274586f 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -55,11 +55,11 @@
#include <QtCore/qobjectdefs.h>
-QT_BEGIN_NAMESPACE
-
#include "wtf/Platform.h"
#include "JSValue.h"
+QT_BEGIN_NAMESPACE
+
class QString;
class QScriptEnginePrivate;