Revert "Enabled the use of Debugger-specific watch/locals models."

This reverts commit abf5e3ddc3.

src/plugins/debugger/cdb/cdbdebugengine_p.h

@@ -39,7 +39,6 @@
 
 #include <utils/consoleprocess.h>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QPointer>
 #include <QtCore/QMap>
 
 namespace Debugger {
@@ -50,8 +49,6 @@ class IDebuggerManagerAccessForEngines;
 class WatchHandler;
 class CdbStackFrameContext;
 class CdbStackTraceContext;
-class CdbLocalsModel;
-class CdbWatchModel;
 
 // Thin wrapper around the 'DBEng' debugger engine shared library
 // which is loaded at runtime.
@@ -118,7 +115,7 @@ struct CdbDebugEnginePrivate
 
     bool isDebuggeeRunning() const { return m_watchTimer != -1; }
     void handleDebugEvent();
-    void updateThreadList();
+    void updateThreadList();    
     void updateStackTrace();
     void updateModules();
 
@@ -126,6 +123,7 @@ struct CdbDebugEnginePrivate
     void cleanStackTrace();
     void clearForRun();
     void handleModuleLoad(const QString &);
+    CdbStackFrameContext *getStackFrameContext(int frameIndex, QString *errorMessage) const;
     void clearDisplay();
 
     bool interruptInterferiorProcess(QString *errorMessage);
@@ -139,8 +137,6 @@ struct CdbDebugEnginePrivate
     enum EndDebuggingMode { EndDebuggingDetach, EndDebuggingTerminate, EndDebuggingAuto };
     void endDebugging(EndDebuggingMode em = EndDebuggingAuto);
 
-    void saveLocalsViewState();
-
     static bool executeDebuggerCommand(CIDebugControl *ctrl, const QString &command, QString *errorMessage);
     static bool evaluateExpression(CIDebugControl *ctrl, const QString &expression, DEBUG_VALUE *v, QString *errorMessage);
 
@@ -159,7 +155,7 @@ struct CdbDebugEnginePrivate
     int                     m_watchTimer;
     CdbComInterfaces        m_cif;
     CdbDebugEventCallback   m_debugEventCallBack;
-    CdbDebugOutput          m_debugOutputCallBack;
+    CdbDebugOutput          m_debugOutputCallBack;    
     QSharedPointer<CdbDumperHelper> m_dumper;
 
     CdbDebugEngine* m_engine;
@@ -172,9 +168,6 @@ struct CdbDebugEnginePrivate
 
     DebuggerStartMode m_mode;
     Core::Utils::ConsoleProcess m_consoleStubProc;
-
-    QPointer<CdbLocalsModel> m_localsModel;
-    QPointer<CdbWatchModel> m_watchModel;
 };
 
 // helper functions