diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-08-08 12:47:49 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-08-08 13:21:28 +0200 |
| commit | 0e54183d4d31dc34fc742503c6e0956dd1737133 (patch) | |
| tree | 5afeed4c2c52fa17314369e59cdcf034139c43a7 /src/plugins/qmldesigner/designercore/model/texttomodelmerger.h | |
| parent | ff092f79b33e48847c7a475eb7362ffb9649aa49 (diff) | |
| download | qt-creator-0e54183d4d31dc34fc742503c6e0956dd1737133.tar.gz | |
QmlJS: Remove Interpreter namespace.
The distinction between QmlJS and QmlJS::Interpreter has always been
weak and the extra namespace just added an unnecessary complication.
Change-Id: I4db8ef4bd91b5f6bf610a9d23fdbf55bd60250fc
Reviewed-on: http://codereview.qt.nokia.com/2743
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/texttomodelmerger.h')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 939825fb60..92b298dfd5 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -68,7 +68,7 @@ public: RewriterView *view() const { return m_rewriterView; } - const QmlJS::Interpreter::ScopeChain &scopeChain() const + const QmlJS::ScopeChain &scopeChain() const { return *m_scopeChain; } QmlJS::Document *document() const @@ -140,7 +140,7 @@ private: private: RewriterView *m_rewriterView; bool m_isActive; - QSharedPointer<const QmlJS::Interpreter::ScopeChain> m_scopeChain; + QSharedPointer<const QmlJS::ScopeChain> m_scopeChain; QmlJS::Document::Ptr m_document; QTimer m_setupTimer; QSet<ModelNode> m_setupComponentList; |