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

C++ function link: Disable link if target editor changes.

Browse Source 
Change-Id: I7041f3c520e88b4376c5cbac08ed79aa44641f0f
Reviewed-on: http://codereview.qt.nokia.com/3088
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-17 12:21:04 +02:00
parent a59bca800f
commit 4e1d92fddc
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2302,6 +2302,14 @@ void CPPEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL
{
abortDeclDefLink();
m_declDefLink = link;
// disable the link if content of the target editor changes
TextEditor::BaseTextEditorWidget *targetEditor =
TextEditor::RefactoringChanges::editorForFile(link->targetFile->fileName());
if (targetEditor) {
connect(targetEditor, SIGNAL(textChanged()),
this, SLOT(abortDeclDefLink()));
}
}
void CPPEditorWidget::applyDeclDefLinkChanges(bool jumpToMatch)
@@ -2317,6 +2325,15 @@ void CPPEditorWidget::abortDeclDefLink()
{
if (!m_declDefLink)
return;
// undo connect from onFunctionDeclDefLinkFound
TextEditor::BaseTextEditorWidget *targetEditor =
TextEditor::RefactoringChanges::editorForFile(m_declDefLink->targetFile->fileName());
if (targetEditor) {
disconnect(targetEditor, SIGNAL(textChanged()),
this, SLOT(abortDeclDefLink()));
}
m_declDefLink->hideMarker(this);
m_declDefLink.clear();
}

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

@@ -269,7 +269,7 @@ private:
void abortRename();
void applyDeclDefLinkChanges(bool jumpToMatch);
void abortDeclDefLink();
Q_SLOT void abortDeclDefLink();
Link attemptFuncDeclDef(const QTextCursor &cursor,
const CPlusPlus::Document::Ptr &doc,

3
src/plugins/texteditor/refactoringchanges.h
View File

@@ -120,11 +120,10 @@ public:
*/
void activateEditor(const QString &fileName, int line, int column);
private:
static BaseTextEditorWidget *editorForFile(const QString &fileName,
bool openIfClosed = false);
private:
static QList<QTextCursor> rangesToSelections(QTextDocument *document, const QList<Range> &ranges);
virtual void indentSelection(const QTextCursor &selection,
const QString &fileName,