From 2bafdb71a23507c2f4f731a45ef7f18a1925d6c4 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 13 Jul 2010 10:45:20 +0200
Subject: [PATCH] QmlJSEditor: Rename documentRevision() to editorRevision()
In line with QmlJS::Document::editorRevision() and
CPPEditor::editorRevision()
Reviewed-by: Roberto Raggi
---
src/plugins/qmljseditor/qmljseditor.cpp | 6 +++---
src/plugins/qmljseditor/qmljseditor.h | 2 +-
src/plugins/qmljseditor/qmljseditorplugin.cpp | 2 +-
src/plugins/qmljseditor/qmljshoverhandler.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 1edb99f5f97..b50b43b17a8 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 4e3980b7c75..763481a8f7d 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 c611c36aa4c..d55d5b31dcf 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 88d1326a59d..519eec21904 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;
--
GitLab