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

This reverts commit abf5e3ddc3.

src/plugins/debugger/gdb/gdbengine.h

@@ -34,7 +34,6 @@
 #include "gdbmi.h"
 #include "outputcollector.h"
 #include "watchutils.h"
-#include "asyncwatchmodel.h"
 
 #include <consoleprocess.h>
 
@@ -123,8 +122,6 @@ private:
     void loadAllSymbols();
     virtual QList<Symbol> moduleSymbols(const QString &moduleName);
 
-    WatchModel *watchModel(int type) const { return m_models.model(type); }
-
     Q_SLOT void setDebugDebuggingHelpers(const QVariant &on);
     Q_SLOT void setUseDebuggingHelpers(const QVariant &on);
 
@@ -200,7 +197,6 @@ private slots:
     void stubStarted();
     void stubError(const QString &msg);
     void uploadProcError(QProcess::ProcessError error);
-    void updateWatchData(const WatchData &data);
 
 private:
     int terminationIndex(const QByteArray &buffer, int &length);
@@ -328,6 +324,7 @@ private:
     // FIXME: BaseClass. called to improve situation for a watch item
     void updateSubItem(const WatchData &data);
 
+    void updateWatchData(const WatchData &data);
     void rebuildModel();
 
     void insertData(const WatchData &data);
@@ -387,7 +384,6 @@ private:
 
     DebuggerManager * const q;
     IDebuggerManagerAccessForEngines * const qq;
-    AsyncWatchModelMixin m_models;
     // make sure to re-initialize new members in initializeVariables();
 };