feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Fix local renaming

Browse Source 
CppLocalRenaming was connected to the initial QPlainTextEdit::document()
and not the "updated" QTextDocument set by
BaseTextEditorWidgetPrivate::setupDocumentSignals().

Broken by

    commit c655d7e598
    CppEditor: Convert to new construction scheme

Change-Id: I2e785a9d62a3bd39d9e613776cfc8e35dd9ff5d4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-09-09 11:09:07 +02:00
parent 36d8ad4c39
commit e9e111ffa8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -187,6 +187,8 @@ void CppEditorWidget::finalizeInitialization()
d->m_lastSemanticInfo.localUses = localUses; 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] { connect(&d->m_localRenaming, &CppLocalRenaming::finished, [this] {
cppEditorDocument()->semanticRehighlight(); cppEditorDocument()->semanticRehighlight();
}); });

2
src/plugins/cppeditor/cpplocalrenaming.cpp
View File

@@ -68,8 +68,6 @@ CppLocalRenaming::CppLocalRenaming(TextEditor::BaseTextEditorWidget *editorWidge
, m_firstRenameChangeExpected(false) , m_firstRenameChangeExpected(false)
{ {
forgetRenamingSelection(); forgetRenamingSelection();
connect(m_editorWidget->document(), SIGNAL(contentsChange(int,int,int)),
this, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int)));
} }
void CppLocalRenaming::updateSelectionsForVariableUnderCursor( void CppLocalRenaming::updateSelectionsForVariableUnderCursor(