diff options
| author | hjk <qtc-committer@nokia.com> | 2009-08-24 14:57:01 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-08-24 14:58:07 (GMT) |
| commit | 09eacce5aaf6ef2612ebe9c239527f46a67b9995 (patch) | |
| tree | 65f9999a9c4fca2d1bccbaa31c6798417e6434be /src/script/api | |
| parent | 4a64bbc856e8bed831d1e0accff0aa722f5c64c8 (diff) | |
| download | Qt-09eacce5aaf6ef2612ebe9c239527f46a67b9995.zip Qt-09eacce5aaf6ef2612ebe9c239527f46a67b9995.tar.gz Qt-09eacce5aaf6ef2612ebe9c239527f46a67b9995.tar.bz2 | |
compile fix with namespaced Qt
Diffstat (limited to 'src/script/api')
| -rw-r--r-- | src/script/api/qscriptclass.cpp | 4 | ||||
| -rw-r--r-- | src/script/api/qscriptcontext_p.h | 8 | ||||
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 4 | ||||
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 4 | ||||
| -rw-r--r-- | src/script/api/qscriptvalue_p.h | 4 |
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 eb660e2..ff974c7 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 73c8d1b..080149e 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -71,8 +71,6 @@ #include "bridge/qscriptvariant_p.h" #include "bridge/qscriptqobject_p.h" -QT_BEGIN_NAMESPACE - /*! \since 4.3 \class QScriptValue @@ -202,6 +200,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 ee471c7..bbe0ed0 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; |