Debugger: Remove some deprecated methods

Change-Id: I67254bb6d3d23e9fa9e121df0b3b923330cfe84a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

5 files changed, 11 insertions, 40 deletions

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 04607474a0..b606546cd6 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -446,31 +446,6 @@ QAbstractItemModel *DebuggerEngine::threadsModel() const
     return model;
 }
 
-QAbstractItemModel *DebuggerEngine::localsModel() const
-{
-    return watchHandler()->model();
-}
-
-QAbstractItemModel *DebuggerEngine::watchersModel() const
-{
-    return watchHandler()->model();
-}
-
-QAbstractItemModel *DebuggerEngine::returnModel() const
-{
-    return watchHandler()->model();
-}
-
-QAbstractItemModel *DebuggerEngine::inspectorModel() const
-{
-    return watchHandler()->model();
-}
-
-QAbstractItemModel *DebuggerEngine::toolTipsModel() const
-{
-    return watchHandler()->model();
-}
-
 QAbstractItemModel *DebuggerEngine::watchModel() const
 {
     return watchHandler()->model();
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 74626857f7..d6ca432a63 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -223,11 +223,6 @@ public:
     virtual QAbstractItemModel *registerModel() const;
     virtual QAbstractItemModel *stackModel() const;
     virtual QAbstractItemModel *threadsModel() const;
-    virtual QAbstractItemModel *localsModel() const; // Deprecated, FIXME: use watchModel
-    virtual QAbstractItemModel *watchersModel() const; // Deprecated, FIXME: use watchModel
-    virtual QAbstractItemModel *returnModel() const; // Deprecated, FIXME: use watchModel
-    virtual QAbstractItemModel *inspectorModel() const; // Deprecated, FIXME: use watchModel
-    virtual QAbstractItemModel *toolTipsModel() const; // Deprecated, FIXME: use watchModel
     virtual QAbstractItemModel *watchModel() const;
     virtual QAbstractItemModel *sourceFilesModel() const;
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a92fae8d8c..11828e58b2 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2074,15 +2074,15 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
         m_currentEngine->resetLocation();
     m_currentEngine = engine;
 
-    m_localsWindow->setModel(engine->localsModel());
+    m_localsWindow->setModel(engine->watchModel());
     m_modulesWindow->setModel(engine->modulesModel());
     m_registerWindow->setModel(engine->registerModel());
-    m_returnWindow->setModel(engine->returnModel());
+    m_returnWindow->setModel(engine->watchModel());
     m_sourceFilesWindow->setModel(engine->sourceFilesModel());
     m_stackWindow->setModel(engine->stackModel());
     m_threadsWindow->setModel(engine->threadsModel());
-    m_watchersWindow->setModel(engine->watchersModel());
-    m_inspectorWindow->setModel(engine->inspectorModel());
+    m_watchersWindow->setModel(engine->watchModel());
+    m_inspectorWindow->setModel(engine->watchModel());
 
     engine->watchHandler()->rebuildModel();
 
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 70567f34e2..08d93457eb 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -372,7 +372,7 @@ void QmlEngine::connectionEstablished()
 
     if (!watchHandler()->watcherNames().isEmpty())
         synchronizeWatchers();
-    connect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
+    connect(watchModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
 
     if (state() == EngineRunRequested)
         notifyEngineRunAndInferiorRunOk();
@@ -560,7 +560,7 @@ void QmlEngine::gotoLocation(const Location &location)
 
 void QmlEngine::closeConnection()
 {
-    disconnect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
+    disconnect(watchModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
     m_adapter.closeConnection();
 }
 
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index 1d51afb31f..52f1ce3a2c 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -254,13 +254,14 @@ void QmlV8DebuggerClientPrivate::evaluate(const QString expr, bool global,
         args.setProperty(_(DISABLE_BREAK), QScriptValue(disableBreak));
 
     if (addContext) {
-        QAbstractItemModel *localsModel = engine->localsModel();
-        int rowCount = localsModel->rowCount();
+        WatchHandler *watchHandler = engine->watchHandler();
+        QAbstractItemModel *watchModel = watchHandler->model();
+        int rowCount = watchModel->rowCount();
 
         QScriptValue ctxtList = parser.call(QScriptValue(), QScriptValueList() << _(ARRAY  ));
         while (rowCount) {
-            QModelIndex index = localsModel->index(--rowCount, 0);
-            const WatchData *data = engine->watchHandler()->watchData(index);
+            QModelIndex index = watchModel->index(--rowCount, 0);
+            const WatchData *data = watchHandler->watchData(index);
             QScriptValue ctxt = parser.call(QScriptValue(), QScriptValueList() << QScriptValue(_(OBJECT)));
             ctxt.setProperty(_(NAME), QScriptValue(data->name));
             ctxt.setProperty(_(HANDLE), QScriptValue(int(data->id)));