summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-09-01 18:07:31 +0200
committerhjk <hjk121@nokiamail.com>2014-09-02 08:20:10 +0200
commit2b44c977ba13427f686adfe7116988acc6705171 (patch)
tree94588e9fa44331395a5e098f241c67184db11bfa
parent0102455fd0532a189e561c9cfa8f8d01689a63cf (diff)
downloadqt-creator-2b44c977ba13427f686adfe7116988acc6705171.tar.gz
CppEditor: Replace two editor() self-checks with direct checks
Change-Id: Ice47cc3ad86bd8d1fe6eaa812bf6fbb096fdd56c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 4c92db00c1..c17dff66f1 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -693,7 +693,7 @@ void CppEditorWidget::updateFunctionDeclDefLink()
void CppEditorWidget::updateFunctionDeclDefLinkNow()
{
- if (Core::EditorManager::currentEditor() != editor())
+ if (Core::EditorManager::currentEditor()->widget() != this)
return;
const Snapshot semanticSnapshot = d->m_lastSemanticInfo.snapshot;
@@ -785,7 +785,7 @@ void CppEditorWidget::abortDeclDefLink()
void CppEditorWidget::showPreProcessorWidget()
{
- const QString &fileName = editor()->document()->filePath();
+ const QString &fileName = textDocument()->filePath();
// Check if this editor belongs to a project
QList<ProjectPart::Ptr> projectParts = d->m_modelManager->projectPart(fileName);