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

Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()

Browse Source 
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-12-12 15:07:54 +01:00
parent e035ae6df1
commit 1adab4c4cc
24 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1077,7 +1077,7 @@ void CPPEditorWidget::updateOutlineNow()
return;
const Snapshot snapshot = m_modelManager->snapshot();
Document::Ptr document = snapshot.document(editorDocument()->filePath());
Document::Ptr document = snapshot.document(baseTextDocument()->filePath());
if (!document)
return;
@@ -1672,7 +1672,7 @@ void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)
// We can use the semanticInfo's snapshot (and avoid locking), but not its
// document, since it doesn't contain expanded macros.
LookupContext context(semanticInfo.snapshot.document(editorDocument()->filePath()),
LookupContext context(semanticInfo.snapshot.document(baseTextDocument()->filePath()),
semanticInfo.snapshot);
SemanticInfo::LocalUseIterator it(semanticInfo.localUses);
@@ -1841,7 +1841,7 @@ void CPPEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL
m_declDefLink = link;
Core::IDocument *targetDocument = Core::EditorManager::documentModel()->documentForFilePath(
m_declDefLink->targetFile->fileName());
if (editorDocument() != targetDocument) {
if (baseTextDocument() != targetDocument) {
if (TextEditor::BaseTextDocument *baseTextDocument = qobject_cast<TextEditor::BaseTextDocument *>(targetDocument))
connect(baseTextDocument->document(), SIGNAL(contentsChanged()),
this, SLOT(abortDeclDefLink()));
@@ -1876,7 +1876,7 @@ void CPPEditorWidget::abortDeclDefLink()
Core::IDocument *targetDocument = Core::EditorManager::documentModel()->documentForFilePath(
m_declDefLink->targetFile->fileName());
if (editorDocument() != targetDocument) {
if (baseTextDocument() != targetDocument) {
if (TextEditor::BaseTextDocument *baseTextDocument = qobject_cast<TextEditor::BaseTextDocument *>(targetDocument))
disconnect(baseTextDocument->document(), SIGNAL(contentsChanged()),
this, SLOT(abortDeclDefLink()));