From af8b381f982abac984c38c47933bd104c12ba48d Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Mon, 14 Nov 2011 13:34:41 +0100 Subject: [PATCH] C++ editor: Unify rehighlight() and semanticRehighlight(). They did the same thing. Change-Id: Ic4d1a269417575110ea32ba5d583a01397c9d806 Reviewed-by: Leandro Melo --- src/plugins/cppeditor/cppeditor.cpp | 12 +++--------- src/plugins/cppeditor/cppeditor.h | 3 +-- src/plugins/cppeditor/cppplugin.cpp | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 0e8b6991e83..d1b665b8fec 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -635,12 +635,6 @@ void CPPEditorWidget::abortRename() setExtraSelections(CodeSemanticsSelection, m_renameSelections); } -void CPPEditorWidget::rehighlight(bool force) -{ - const SemanticHighlighter::Source source = currentSource(force); - m_semanticHighlighter->rehighlight(source); -} - void CPPEditorWidget::onDocumentUpdated(Document::Ptr doc) { if (doc->fileName() != file()->fileName()) @@ -655,7 +649,7 @@ void CPPEditorWidget::onDocumentUpdated(Document::Ptr doc) || !m_lastSemanticInfo.doc->translationUnit()->ast() || m_lastSemanticInfo.doc->fileName() != file()->fileName()))) { m_initialized = true; - rehighlight(/* force = */ true); + semanticRehighlight(/* force = */ true); } m_updateOutlineTimer->start(); @@ -1758,9 +1752,9 @@ bool CPPEditorWidget::openCppEditorAt(const Link &link) Constants::CPPEDITOR_ID); } -void CPPEditorWidget::semanticRehighlight() +void CPPEditorWidget::semanticRehighlight(bool force) { - m_semanticHighlighter->rehighlight(currentSource()); + m_semanticHighlighter->rehighlight(currentSource(force)); } void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo) diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 8c9c4dbc816..5308d796d15 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -211,7 +211,7 @@ public Q_SLOTS: void renameUsages(); void findUsages(); void renameUsagesNow(const QString &replacement = QString()); - void rehighlight(bool force = false); + void semanticRehighlight(bool force = false); protected: bool event(QEvent *e); @@ -240,7 +240,6 @@ private Q_SLOTS: void onDocumentUpdated(CPlusPlus::Document::Ptr doc); void onContentsChanged(int position, int charsRemoved, int charsAdded); - void semanticRehighlight(); void updateSemanticInfo(const CppEditor::Internal::SemanticInfo &semanticInfo); void highlightSymbolUsages(int from, int to); void finishHighlightSymbolUsages(); diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 9fc2fa81882..403679afcf6 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -406,7 +406,7 @@ void CppPlugin::currentEditorChanged(Core::IEditor *editor) return; else if (CPPEditorWidget *textEditor = qobject_cast(editor->widget())) { - textEditor->rehighlight(/*force = */ true); + textEditor->semanticRehighlight(/*force = */ true); } }