summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-06-19 14:37:26 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-06-22 07:20:21 +0000
commit5e035bd7400245684e3d2139813e7b9a774a880a (patch)
treebcef310109e8a8219a2ae3cd4b7554815c00d09e
parent7e08cca3117a1e12383b968b1a4d7224df623967 (diff)
downloadqt-creator-5e035bd7400245684e3d2139813e7b9a774a880a.tar.gz
C++: Rename semanticRehighlight to recalculateSemanticInfoDetached
semanticRehighlight() does a bit more than only rehighlighting and we want to trigger (only) rehighlighting in a follow-up change. Change-Id: Ic8da9ec8643f0f82f7c99ef9a8180b2868194254 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r--src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp4
-rw-r--r--src/plugins/clangcodemodel/clangeditordocumentprocessor.h2
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp2
-rw-r--r--src/plugins/cppeditor/cppeditordocument.cpp4
-rw-r--r--src/plugins/cppeditor/cppeditordocument.h2
-rw-r--r--src/plugins/cpptools/baseeditordocumentprocessor.h2
-rw-r--r--src/plugins/cpptools/builtineditordocumentprocessor.cpp2
-rw-r--r--src/plugins/cpptools/builtineditordocumentprocessor.h2
8 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index bae1ac3e2f..368236c766 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -162,9 +162,9 @@ void ClangEditorDocumentProcessor::run()
m_builtinProcessor.run();
}
-void ClangEditorDocumentProcessor::semanticRehighlight(bool force)
+void ClangEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
{
- m_builtinProcessor.semanticRehighlight(force);
+ m_builtinProcessor.recalculateSemanticInfoDetached(force);
}
CppTools::SemanticInfo ClangEditorDocumentProcessor::recalculateSemanticInfo()
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index e21f5f93bc..508c235d1f 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -56,7 +56,7 @@ public:
// BaseEditorDocumentProcessor interface
void run() override;
- void semanticRehighlight(bool force) override;
+ void recalculateSemanticInfoDetached(bool force) override;
CppTools::SemanticInfo recalculateSemanticInfo() override;
CppTools::BaseEditorDocumentParser *parser() override;
CPlusPlus::Snapshot snapshot() override;
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 97bbfd5a78..cf309c2969 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -182,7 +182,7 @@ void CppEditorWidget::finalizeInitialization()
connect(document(), SIGNAL(contentsChange(int,int,int)),
&d->m_localRenaming, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int)));
connect(&d->m_localRenaming, &CppLocalRenaming::finished, [this] {
- cppEditorDocument()->semanticRehighlight();
+ cppEditorDocument()->recalculateSemanticInfoDetached();
});
connect(&d->m_localRenaming, &CppLocalRenaming::processKeyPressNormally,
this, &CppEditorWidget::processKeyNormally);
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index 9ee0aa5226..dec8995138 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -130,11 +130,11 @@ TextEditor::CompletionAssistProvider *CppEditorDocument::completionAssistProvide
return m_completionAssistProvider;
}
-void CppEditorDocument::semanticRehighlight()
+void CppEditorDocument::recalculateSemanticInfoDetached()
{
CppTools::BaseEditorDocumentProcessor *p = processor();
QTC_ASSERT(p, return);
- p->semanticRehighlight(true);
+ p->recalculateSemanticInfoDetached(true);
}
CppTools::SemanticInfo CppEditorDocument::recalculateSemanticInfo()
diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h
index e7aef03152..18ba8104e5 100644
--- a/src/plugins/cppeditor/cppeditordocument.h
+++ b/src/plugins/cppeditor/cppeditordocument.h
@@ -57,7 +57,7 @@ public:
bool isObjCEnabled() const;
TextEditor::CompletionAssistProvider *completionAssistProvider() const override;
- void semanticRehighlight();
+ void recalculateSemanticInfoDetached();
CppTools::SemanticInfo recalculateSemanticInfo(); // TODO: Remove me
void setPreprocessorSettings(const CppTools::ProjectPart::Ptr &projectPart,
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h
index e3c8dcc679..908cd9782a 100644
--- a/src/plugins/cpptools/baseeditordocumentprocessor.h
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.h
@@ -60,7 +60,7 @@ public:
// Function interface to implement
virtual void run() = 0;
- virtual void semanticRehighlight(bool force) = 0;
+ virtual void recalculateSemanticInfoDetached(bool force) = 0;
virtual CppTools::SemanticInfo recalculateSemanticInfo() = 0;
virtual CPlusPlus::Snapshot snapshot() = 0;
virtual BaseEditorDocumentParser *parser() = 0;
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
index 59f0ff7c17..af0efebc8f 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
@@ -176,7 +176,7 @@ CPlusPlus::Snapshot BuiltinEditorDocumentProcessor::snapshot()
return m_parser.snapshot();
}
-void BuiltinEditorDocumentProcessor::semanticRehighlight(bool force)
+void BuiltinEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
{
const auto source = createSemanticInfoSource(force);
m_semanticInfoUpdater.updateDetached(source);
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.h b/src/plugins/cpptools/builtineditordocumentprocessor.h
index 0b80f94c29..9e18020975 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.h
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.h
@@ -51,7 +51,7 @@ public:
// BaseEditorDocumentProcessor interface
void run() override;
- void semanticRehighlight(bool force) override;
+ void recalculateSemanticInfoDetached(bool force) override;
CppTools::SemanticInfo recalculateSemanticInfo() override;
BaseEditorDocumentParser *parser() override;
CPlusPlus::Snapshot snapshot() override;