C++ function link: Unbreak same-file links.

Change-Id: Icfb71278c796dfb8668de423a691c7dc90e9531f
Reviewed-on: http://codereview.qt.nokia.com/3170
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 8998fa3..c32b232 100644 (file)
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -2306,7 +2306,7 @@ void CPPEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL
     // disable the link if content of the target editor changes
     TextEditor::BaseTextEditorWidget *targetEditor =
             TextEditor::RefactoringChanges::editorForFile(link->targetFile->fileName());
-    if (targetEditor) {
+    if (targetEditor && targetEditor != this) {
         connect(targetEditor, SIGNAL(textChanged()),
                 this, SLOT(abortDeclDefLink()));
     }
@@ -2329,7 +2329,7 @@ void CPPEditorWidget::abortDeclDefLink()
     // undo connect from onFunctionDeclDefLinkFound
     TextEditor::BaseTextEditorWidget *targetEditor =
             TextEditor::RefactoringChanges::editorForFile(m_declDefLink->targetFile->fileName());
-    if (targetEditor) {
+    if (targetEditor && targetEditor != this) {
         disconnect(targetEditor, SIGNAL(textChanged()),
                    this, SLOT(abortDeclDefLink()));
     }