diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 1edb99f5f97e1c00f4a27fac8cfb3df9ef86d0b9..b50b43b17a8a6fac5c451eefe0056ec01dea015f 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -685,14 +685,14 @@ SemanticInfo QmlJSTextEditor::semanticInfo() const return m_semanticInfo; } -int QmlJSTextEditor::documentRevision() const +int QmlJSTextEditor::editorRevision() const { return document()->revision(); } bool QmlJSTextEditor::isOutdated() const { - if (m_semanticInfo.revision() != documentRevision()) + if (m_semanticInfo.revision() != editorRevision()) return true; return false; @@ -835,7 +835,7 @@ void QmlJSTextEditor::updateMethodBoxIndex() if (!m_semanticInfo.document) return; - if (m_semanticInfo.document->editorRevision() != documentRevision()) { + if (m_semanticInfo.document->editorRevision() != editorRevision()) { m_updateMethodBoxTimer->start(); return; } diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 4e3980b7c75d07ace4706734287f5281cb3ef694..763481a8f7d09fa8531aad6caf7e1276284df583 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -213,7 +213,7 @@ public: virtual void unCommentSelection(); SemanticInfo semanticInfo() const; - int documentRevision() const; + int editorRevision() const; bool isOutdated() const; QmlOutlineModel *outlineModel() const; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index c611c36aa4c6ba6b534d7d3eba839565f61ebde7..d55d5b31dcfa9f5b59c1edf0e404791f5756fac4 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -251,7 +251,7 @@ void QmlJSEditorPlugin::quickFixNow() if (QmlJSTextEditor *editor = qobject_cast<QmlJSTextEditor*>(m_currentTextEditable->widget())) { if (currentEditor == editor) { if (editor->isOutdated()) { - // qDebug() << "TODO: outdated document" << editor->documentRevision() << editor->semanticInfo().revision(); + // qDebug() << "TODO: outdated document" << editor->editorRevision() << editor->semanticInfo().revision(); // ### FIXME: m_quickFixTimer->start(QUICKFIX_INTERVAL); m_quickFixTimer->stop(); } else { diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 88d1326a59d8d504f5394b691c0844ac605dfebd..519eec219040f4638e29682b64d09a9e1d25215d 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -126,7 +126,7 @@ void HoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, int p const SemanticInfo semanticInfo = edit->semanticInfo(); - if (semanticInfo.revision() != edit->documentRevision()) + if (semanticInfo.revision() != edit->editorRevision()) return; const Snapshot snapshot = semanticInfo.snapshot;