diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-27 05:20:37 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-27 05:20:37 (GMT) |
| commit | 752a15ca59b1b209aa67c3fbee53868b3a22df80 (patch) | |
| tree | 1403cb3d0c3ff3dbadb201bedfe079db7c021b9b /src/declarative/qml/qmlengine_p.h | |
| parent | ef1a5d6bad05b99765658b3ca916bd3c5f507db0 (diff) | |
| download | Qt-752a15ca59b1b209aa67c3fbee53868b3a22df80.zip Qt-752a15ca59b1b209aa67c3fbee53868b3a22df80.tar.gz Qt-752a15ca59b1b209aa67c3fbee53868b3a22df80.tar.bz2 | |
Make private stuff private
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index b8d49aa..18cdd83 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -114,7 +114,6 @@ public: QmlContext *rootContext; QmlContext *currentBindContext; QmlExpression *currentExpression; - QmlEngine *q; bool isDebugging; #ifdef QT_SCRIPTTOOLS_LIB QScriptEngineDebugger *debugger; @@ -127,7 +126,13 @@ public: QmlContext *setCurrentBindContext(QmlContext *); QStack<QmlContext *> activeContexts; - QScriptEngine scriptEngine; + struct QmlScriptEngine : public QScriptEngine + { + QmlScriptEngine(QmlEnginePrivate *priv) + : p(priv) {} + QmlEnginePrivate *p; + }; + QmlScriptEngine scriptEngine; QUrl baseUrl; @@ -188,6 +193,13 @@ public: bool resolveType(const Imports&, const QByteArray& type, QmlType** type_return, QUrl* url_return, ImportedNamespace** ns_return=0) const; void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, QmlType** type_return, QUrl* url_return ) const; + + static QScriptValue qmlScriptObject(QObject*, QmlEngine*); + static QScriptValue createComponent(QScriptContext*, QScriptEngine*); + static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*); + + static QScriptEngine *getScriptEngine(QmlEngine *e) { return &e->d_func()->scriptEngine; } + static QmlEnginePrivate *get(QmlEngine *e) { return e->d_func(); } }; class QmlScriptClass : public QScriptClass |