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>
This commit is contained in:
Christian Kamm
2011-08-08 12:47:49 +02:00
parent ff092f79b3
commit 0e54183d4d
42 changed files with 308 additions and 344 deletions

View File

@@ -51,13 +51,11 @@ class ITextEditor;
}
namespace QmlJS {
namespace Interpreter {
class ScopeChain;
class Context;
typedef QSharedPointer<const Context> ContextPtr;
class Value;
}
}
namespace QmlJSEditor {
class QmlJSTextEditorWidget;
@@ -78,19 +76,19 @@ private:
virtual void operateTooltip(TextEditor::ITextEditor *editor, const QPoint &point);
bool matchDiagnosticMessage(QmlJSEditor::QmlJSTextEditorWidget *qmlEditor, int pos);
bool matchColorItem(const QmlJS::Interpreter::ScopeChain &lookupContext,
bool matchColorItem(const QmlJS::ScopeChain &lookupContext,
const QmlJS::Document::Ptr &qmlDocument,
const QList<QmlJS::AST::Node *> &astPath,
unsigned pos);
void handleOrdinaryMatch(const QmlJS::Interpreter::ScopeChain &lookupContext,
void handleOrdinaryMatch(const QmlJS::ScopeChain &lookupContext,
QmlJS::AST::Node *node);
void handleImport(const QmlJS::Interpreter::ScopeChain &lookupContext,
void handleImport(const QmlJS::ScopeChain &lookupContext,
QmlJS::AST::UiImport *node);
void prettyPrintTooltip(const QmlJS::Interpreter::Value *value,
const QmlJS::Interpreter::ContextPtr &context);
void prettyPrintTooltip(const QmlJS::Value *value,
const QmlJS::ContextPtr &context);
TextEditor::HelpItem qmlHelpItem(const QmlJS::Interpreter::ScopeChain &lookupContext,
TextEditor::HelpItem qmlHelpItem(const QmlJS::ScopeChain &lookupContext,
QmlJS::AST::Node *node) const;
QmlJS::ModelManagerInterface *m_modelManager;