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

QmlJS: Allow lookups on const Contexts. Pass const Contexts where ok.

Browse Source 
In preparation for caching Contexts.

Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-08-25 11:51:34 +02:00
parent 44f4db7a39
commit 898098c1f2
15 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljseditor/qmljscodecompletion.cpp
View File

@@ -168,11 +168,11 @@ class EnumerateProperties: private Interpreter::MemberProcessor
QHash<QString, const Interpreter::Value *> _properties;
bool _globalCompletion;
bool _enumerateGeneratedSlots;
Interpreter::Context *_context;
const Interpreter::Context *_context;
const Interpreter::ObjectValue *_currentObject;
public:
EnumerateProperties(Interpreter::Context *context)
EnumerateProperties(const Interpreter::Context *context)
: _globalCompletion(false),
_enumerateGeneratedSlots(false),
_context(context),
@@ -692,7 +692,7 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
const QList<AST::Node *> path = semanticInfo.astPath(editor->position());
LookupContext::Ptr lookupContext = LookupContext::create(document, snapshot, path);
Interpreter::Context *context = lookupContext->context();
const Interpreter::Context *context = lookupContext->context();
// Search for the operator that triggered the completion.
QChar completionOperator;

2
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -251,7 +251,7 @@ void HoverHandler::operateTooltip(TextEditor::ITextEditor *editor, const QPoint
}
QString HoverHandler::prettyPrint(const QmlJS::Interpreter::Value *value,
QmlJS::Interpreter::Context *context)
const QmlJS::Interpreter::Context *context)
{
if (! value)
return QString();

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

@@ -75,7 +75,7 @@ private:
QmlJS::AST::Node *node);
QString prettyPrint(const QmlJS::Interpreter::Value *value,
QmlJS::Interpreter::Context *context);
const QmlJS::Interpreter::Context *context);
QmlJS::ModelManagerInterface *m_modelManager;
QColor m_colorTip;

2
src/plugins/qmljseditor/qmloutlinemodel.cpp
View File

@@ -108,7 +108,7 @@ QmlOutlineItem &QmlOutlineItem::copyValues(const QmlOutlineItem &other)
return *this;
}
QString QmlOutlineItem::prettyPrint(const QmlJS::Interpreter::Value *value, QmlJS::Interpreter::Context *context) const
QString QmlOutlineItem::prettyPrint(const QmlJS::Interpreter::Value *value, const QmlJS::Interpreter::Context *context) const
{
if (! value)
return QString();

2
src/plugins/qmljseditor/qmloutlinemodel.h
View File

@@ -46,7 +46,7 @@ public:
QmlOutlineItem &copyValues(const QmlOutlineItem &other); // so that we can assign all values at onc
private:
QString prettyPrint(const QmlJS::Interpreter::Value *value, QmlJS::Interpreter::Context *context) const;
QString prettyPrint(const QmlJS::Interpreter::Value *value, const QmlJS::Interpreter::Context *context) const;
QmlOutlineModel *m_outlineModel;
QmlJS::AST::Node *m_node;