feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Remove LookupContext.

Browse Source 
Use Context or ScopeChain instead.

Change-Id: I2489477eac08774ba41710ee81876aab11b5af24
Reviewed-on: http://codereview.qt.nokia.com/1699
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-08 12:26:22 +02:00
parent 76be300202
commit ff092f79b3
22 changed files with 155 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmljseditor/qmljshoverhandler.h
View File

@@ -34,7 +34,6 @@
#define QMLJSHOVERHANDLER_H
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/qmljslookupcontext.h>
#include <texteditor/basehoverhandler.h>
#include <QtGui/QColor>
@@ -51,6 +50,15 @@ namespace TextEditor {
class ITextEditor;
}
namespace QmlJS {
namespace Interpreter {
class ScopeChain;
class Context;
typedef QSharedPointer<const Context> ContextPtr;
class Value;
}
}
namespace QmlJSEditor {
class QmlJSTextEditorWidget;
@@ -70,19 +78,19 @@ private:
virtual void operateTooltip(TextEditor::ITextEditor *editor, const QPoint &point);
bool matchDiagnosticMessage(QmlJSEditor::QmlJSTextEditorWidget *qmlEditor, int pos);
bool matchColorItem(const QmlJS::LookupContext::Ptr &lookupContext,
bool matchColorItem(const QmlJS::Interpreter::ScopeChain &lookupContext,
const QmlJS::Document::Ptr &qmlDocument,
const QList<QmlJS::AST::Node *> &astPath,
unsigned pos);
void handleOrdinaryMatch(const QmlJS::LookupContext::Ptr &lookupContext,
void handleOrdinaryMatch(const QmlJS::Interpreter::ScopeChain &lookupContext,
QmlJS::AST::Node *node);
void handleImport(const QmlJS::LookupContext::Ptr &lookupContext,
void handleImport(const QmlJS::Interpreter::ScopeChain &lookupContext,
QmlJS::AST::UiImport *node);
void prettyPrintTooltip(const QmlJS::Interpreter::Value *value,
const QmlJS::Interpreter::ContextPtr &context);
TextEditor::HelpItem qmlHelpItem(const QmlJS::LookupContext::Ptr &lookupContext,
TextEditor::HelpItem qmlHelpItem(const QmlJS::Interpreter::ScopeChain &lookupContext,
QmlJS::AST::Node *node) const;
QmlJS::ModelManagerInterface *m_modelManager;