diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index fad4dc632e1..eb743965b41 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -964,7 +964,7 @@ void CPPEditorWidget::renameSymbolUnderCursor() return; CppEditorSupport *edSup = m_modelManager->cppEditorSupport(editor()); - updateSemanticInfo(edSup->recalculateSemanticInfo(/* emitSignalWhenFinished = */ false)); + updateSemanticInfo(edSup->recalculateSemanticInfo()); abortRename(); QTextCursor c = textCursor(); diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 5af358eadf7..451ff8eb8da 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -220,12 +220,12 @@ bool CppEditorSupport::initialized() return m_initialized; } -SemanticInfo CppEditorSupport::recalculateSemanticInfo(bool emitSignalWhenFinished) +SemanticInfo CppEditorSupport::recalculateSemanticInfo() { m_futureSemanticInfo.cancel(); SemanticInfo::Source source = currentSource(false); - recalculateSemanticInfoNow(source, emitSignalWhenFinished); + recalculateSemanticInfoNow(source, /*emitSignalWhenFinished=*/ false); return m_lastSemanticInfo; } diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index f9ba8762561..278c3a78f43 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -110,8 +110,8 @@ public: bool initialized(); /// Retrieve the semantic info, which will get recalculated on the current - /// thread if it is outdate. - SemanticInfo recalculateSemanticInfo(bool emitSignalWhenFinished = true); + /// thread if it is outdate. Will not emit the semanticInfoUpdated() signal. + SemanticInfo recalculateSemanticInfo(); CPlusPlus::Document::Ptr lastSemanticInfoDocument() const;