From e9e111ffa851cc8ff6580c89000ddbc8de02d7e4 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 9 Sep 2014 11:09:07 +0200 Subject: [PATCH] CppEditor: Fix local renaming CppLocalRenaming was connected to the initial QPlainTextEdit::document() and not the "updated" QTextDocument set by BaseTextEditorWidgetPrivate::setupDocumentSignals(). Broken by commit c655d7e598931f78b105cef700b77cbed124a289 CppEditor: Convert to new construction scheme Change-Id: I2e785a9d62a3bd39d9e613776cfc8e35dd9ff5d4 Reviewed-by: Christian Stenger --- src/plugins/cppeditor/cppeditor.cpp | 2 ++ src/plugins/cppeditor/cpplocalrenaming.cpp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index a48a228ab2d..004a8ccfe0d 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -187,6 +187,8 @@ void CppEditorWidget::finalizeInitialization() d->m_lastSemanticInfo.localUses = localUses; }); + connect(document(), SIGNAL(contentsChange(int,int,int)), + &d->m_localRenaming, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int))); connect(&d->m_localRenaming, &CppLocalRenaming::finished, [this] { cppEditorDocument()->semanticRehighlight(); }); diff --git a/src/plugins/cppeditor/cpplocalrenaming.cpp b/src/plugins/cppeditor/cpplocalrenaming.cpp index e81b8e66aec..4eabf49f3d5 100644 --- a/src/plugins/cppeditor/cpplocalrenaming.cpp +++ b/src/plugins/cppeditor/cpplocalrenaming.cpp @@ -68,8 +68,6 @@ CppLocalRenaming::CppLocalRenaming(TextEditor::BaseTextEditorWidget *editorWidge , m_firstRenameChangeExpected(false) { forgetRenamingSelection(); - connect(m_editorWidget->document(), SIGNAL(contentsChange(int,int,int)), - this, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int))); } void CppLocalRenaming::updateSelectionsForVariableUnderCursor(