From 40a91b315b3fa795a36cfd1dc528d02d3f9b7451 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 20 Jan 2009 17:57:07 +0100
Subject: [PATCH] fix access to uninitialized m_core member that should have
 not been there anymore

---
 src/plugins/cppeditor/cppeditor.cpp | 6 +++---
 src/plugins/cppeditor/cppeditor.h   | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 093c39611bb..0a9cf3958b2 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -334,10 +334,10 @@ void CPPEditor::jumpToMethod(int)
     if (! symbol)
         return;
 
-    m_core->editorManager()->addCurrentPositionToNavigationHistory(true);
+    Core::ICore::instance()->editorManager()->addCurrentPositionToNavigationHistory(true);
     int line = symbol->line();
     gotoLine(line);
-    m_core->editorManager()->addCurrentPositionToNavigationHistory();
+    Core::ICore::instance()->editorManager()->addCurrentPositionToNavigationHistory();
     setFocus();
 }
 
@@ -655,7 +655,7 @@ void CPPEditor::contextMenuEvent(QContextMenuEvent *e)
         menu->removeAction(lastAction);
 
     Core::ActionContainer *mcontext =
-        m_core->actionManager()->actionContainer(CppEditor::Constants::M_CONTEXT);
+        Core::ICore::instance()->actionManager()->actionContainer(CppEditor::Constants::M_CONTEXT);
     QMenu *contextMenu = mcontext->menu();
 
     foreach (QAction *action, contextMenu->actions())
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 6773a5308ae..4f324b68340 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -35,20 +35,14 @@
 #define CPPEDITOR_H
 
 #include "cppeditorenums.h"
+
 #include <cplusplus/CppDocument.h>
 #include <texteditor/basetexteditor.h>
-#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
-class QAction;
 class QComboBox;
-class QStringListModel;
 QT_END_NAMESPACE
 
-namespace Core {
-class ICore;
-}
-
 namespace CPlusPlus {
 class OverviewModel;
 class Symbol;
@@ -136,7 +130,6 @@ private:
 
     bool openEditorAt(CPlusPlus::Symbol *symbol);
 
-    Core::ICore *m_core;
     CppTools::CppModelManagerInterface *m_modelManager;
 
     QList<int> m_contexts;