From 09eacce5aaf6ef2612ebe9c239527f46a67b9995 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 24 Aug 2009 16:57:01 +0200 Subject: compile fix with namespaced Qt --- src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h | 2 ++ src/3rdparty/webkit/JavaScriptCore/runtime/UString.h | 5 +++-- src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h | 1 + src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp | 2 ++ src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp | 2 ++ src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h | 2 ++ src/script/api/qscriptclass.cpp | 4 ++-- src/script/api/qscriptcontext_p.h | 8 ++++---- src/script/api/qscriptengine_p.h | 4 ++-- src/script/api/qscriptvalue.cpp | 4 ++-- src/script/api/qscriptvalue_p.h | 4 ++-- src/script/bridge/qscriptfunction.cpp | 2 ++ src/script/bridge/qscriptglobalobject.cpp | 5 +++-- src/script/bridge/qscriptobject.cpp | 5 +++-- src/script/bridge/qscriptqobject.cpp | 9 +++++---- src/script/bridge/qscriptvariant.cpp | 5 +++-- 16 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h b/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h index baed3ba..da58edb 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h @@ -28,6 +28,8 @@ namespace JSC { + QT_USE_NAMESPACE + class SourceCode; class Debugger; diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h b/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h index 0a53c50..ab64f52 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h @@ -366,12 +366,13 @@ namespace JSC { } #if PLATFORM(QT) - operator QString() const + operator QT_PREPEND_NAMESPACE(QString)() const { + QT_USE_NAMESPACE; return QString(reinterpret_cast(this->data()), this->size()); } - UString(const QString& str) + UString(const QT_PREPEND_NAMESPACE(QString)& str) { *this = JSC::UString(reinterpret_cast(str.constData()), str.length()); } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h index bff770c..e3cb718 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h @@ -580,6 +580,7 @@ namespace WTF { }; #if PLATFORM(QT) + QT_USE_NAMESPACE template QDataStream& operator<<(QDataStream& stream, const Vector& data) { diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp index 7b2d0f2..0ac2717 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -37,6 +37,8 @@ namespace WTF { +QT_USE_NAMESPACE + class MainThreadInvoker : public QObject { Q_OBJECT public: diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp index 1fdd2bb..5a84764 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp @@ -41,6 +41,8 @@ namespace WTF { +QT_USE_NAMESPACE + class ThreadPrivate : public QThread { public: ThreadPrivate(ThreadFunction entryPoint, void* data); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h index 1531694..65b3e79 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h @@ -108,6 +108,8 @@ typedef uint32_t UChar32; namespace WTF { namespace Unicode { +QT_USE_NAMESPACE + enum Direction { LeftToRight = QChar::DirL, RightToLeft = QChar::DirR, 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 -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 #include +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 -QT_BEGIN_NAMESPACE - #include "wtf/Platform.h" #include "JSValue.h" +QT_BEGIN_NAMESPACE + class QString; class QScriptEnginePrivate; 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 d45a6d8..3485bf9 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 { @@ -2210,12 +2211,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 { -- cgit v0.12