From ec2eaab5d35a7d16fee1484a9945b065b7191e7e Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 9 Jun 2011 12:52:17 +1000 Subject: [PATCH] Remove QtScript code from QDeclarativeEngine --- .../debugger/qdeclarativedebughelper.cpp | 5 ---- .../debugger/qdeclarativedebughelper_p.h | 2 -- src/declarative/debugger/qjsdebuggeragent.cpp | 2 +- src/declarative/qml/qdeclarativeengine.cpp | 33 +++------------------- src/declarative/qml/qdeclarativeengine_p.h | 25 ---------------- 5 files changed, 5 insertions(+), 62 deletions(-) diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp index 6f5df76..6eea82c 100644 --- a/src/declarative/debugger/qdeclarativedebughelper.cpp +++ b/src/declarative/debugger/qdeclarativedebughelper.cpp @@ -52,11 +52,6 @@ QT_BEGIN_NAMESPACE -QScriptEngine *QDeclarativeDebugHelper::getScriptEngine(QDeclarativeEngine *engine) -{ - return QDeclarativeEnginePrivate::getScriptEngine(engine); -} - void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor) { QUnifiedTimer *timer = QUnifiedTimer::instance(); diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h index db4d5dc..6018711 100644 --- a/src/declarative/debugger/qdeclarativedebughelper_p.h +++ b/src/declarative/debugger/qdeclarativedebughelper_p.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QScriptEngine; class QDeclarativeEngine; // Helper methods to access private API through a stable interface @@ -58,7 +57,6 @@ class QDeclarativeEngine; class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { public: - static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); static void setAnimationSlowDownFactor(qreal factor); // Enables remote debugging functionality diff --git a/src/declarative/debugger/qjsdebuggeragent.cpp b/src/declarative/debugger/qjsdebuggeragent.cpp index 9b76592..9c92f27 100644 --- a/src/declarative/debugger/qjsdebuggeragent.cpp +++ b/src/declarative/debugger/qjsdebuggeragent.cpp @@ -237,7 +237,7 @@ QJSDebuggerAgent::QJSDebuggerAgent(QScriptEngine *engine, QObject *parent) QJSDebuggerAgent::QJSDebuggerAgent(QDeclarativeEngine *engine, QObject *parent) : QObject(parent) - , QScriptEngineAgent(QDeclarativeDebugHelper::getScriptEngine(engine)) + , QScriptEngineAgent(0) , d(new QJSDebuggerAgentPrivate(this)) { QJSDebuggerAgent::engine()->setAgent(this); diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index c34987e..c0db982 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -95,7 +95,6 @@ #include #include -#include #include #include @@ -344,7 +343,7 @@ the same object as is returned from the Qt.include() call. QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e) : captureProperties(false), rootContext(0), isDebugging(false), outputWarningsToStdErr(true), sharedContext(0), sharedScope(0), - cleanup(0), erroredBindings(0), inProgressCreations(0), scriptEngine(this), + cleanup(0), erroredBindings(0), inProgressCreations(0), workerScriptEngine(0), componentAttached(0), inBeginCreate(false), networkAccessManager(0), networkAccessManagerFactory(0), scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1), @@ -360,30 +359,6 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e) } } -QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv) -: p(priv) -{ - // Note that all documentation for stuff put on the global object goes in - // doc/src/declarative/globalobject.qdoc - - QScriptValue qtObject = - newQMetaObject(StaticQtMetaObject::get()); - globalObject().setProperty(QLatin1String("Qt"), qtObject); - - // translation functions need to be installed - // before the global script class is constructed (QTBUG-6437) - installTranslatorFunctions(); -} - -QDeclarativeScriptEngine::~QDeclarativeScriptEngine() -{ -} - -QNetworkAccessManager *QDeclarativeScriptEngine::networkAccessManager() -{ - return p->getNetworkAccessManager(); -} - QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate() { Q_ASSERT(inProgressCreations == 0); @@ -1085,10 +1060,10 @@ void QDeclarativeData::destroyed(QObject *object) delete this; } -void QDeclarativeData::parentChanged(QObject *, QObject *parent) +void QDeclarativeData::parentChanged(QObject *object, QObject *parent) { - // XXX aakenned -// if (!parent && scriptValue) { delete scriptValue; scriptValue = 0; } + Q_UNUSED(object); + Q_UNUSED(parent); } void QDeclarativeData::objectNameChanged(QObject *) diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 4aa54be..ba22ba9 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -70,14 +70,11 @@ #include "private/qdeclarativedirparser_p.h" #include "private/qintrusivelist_p.h" -#include -#include #include #include #include #include #include -#include #include @@ -91,12 +88,10 @@ class QDeclarativeContextPrivate; class QDeclarativeExpression; class QDeclarativeImportDatabase; class ScarceResourceData; -class QScriptEngineDebugger; class QNetworkReply; class QNetworkAccessManager; class QDeclarativeNetworkAccessManagerFactory; class QDeclarativeAbstractBinding; -class QScriptDeclarativeClass; class QDeclarativeTypeNameCache; class QDeclarativeComponentAttached; class QDeclarativeCleanup; @@ -106,21 +101,6 @@ class QDir; class QSGTexture; class QSGContext; -class QDeclarativeScriptEngine : public QScriptEngine -{ -public: - QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv); - virtual ~QDeclarativeScriptEngine(); - - static QDeclarativeScriptEngine *get(QScriptEngine* e) { return static_cast(e); } - - QDeclarativeEnginePrivate *p; - - QUrl baseUrl; - - virtual QNetworkAccessManager *networkAccessManager(); -}; - class Q_AUTOTEST_EXPORT QDeclarativeEnginePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QDeclarativeEngine) @@ -162,8 +142,6 @@ public: // V8 Engine QV8Engine v8engine; - QDeclarativeScriptEngine scriptEngine; - QDeclarativeWorkerScriptEngine *getWorkerScriptEngine(); QDeclarativeWorkerScriptEngine *workerScriptEngine; @@ -279,12 +257,9 @@ public: static void warning(QDeclarativeEnginePrivate *, const QList &); static QV8Engine *getV8Engine(QDeclarativeEngine *e) { return &e->d_func()->v8engine; } - static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { return &e->d_func()->scriptEngine; } - static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast(e)->p->q_func(); } static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); } static QDeclarativeEnginePrivate *get(QDeclarativeContext *c) { return (c && c->engine()) ? QDeclarativeEnginePrivate::get(c->engine()) : 0; } static QDeclarativeEnginePrivate *get(QDeclarativeContextData *c) { return (c && c->engine) ? QDeclarativeEnginePrivate::get(c->engine) : 0; } - static QDeclarativeEnginePrivate *get(QScriptEngine *e) { return static_cast(e)->p; } static QDeclarativeEngine *get(QDeclarativeEnginePrivate *p) { return p->q_func(); } static QString urlToLocalFileOrQrc(const QUrl& url); -- 2.7.4