Remove unused debuggerMap and debuggerIndex from QV4DebugService

Change-Id: Ibd8cf48b90f98bf6ec1411e669c5824cd10293d2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

2 files changed, 3 insertions, 18 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
index 89820c9f56..b4957513ba 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
@@ -62,7 +62,6 @@ QT_BEGIN_NAMESPACE
 class V8CommandHandler;
 class UnknownV8CommandHandler;
 
-int QV4DebugServiceImpl::debuggerIndex = 0;
 int QV4DebugServiceImpl::sequence = 0;
 
 class V8CommandHandler
@@ -622,9 +621,7 @@ void QV4DebugServiceImpl::engineAboutToBeAdded(QQmlEngine *engine)
         if (QQmlDebugConnector *server = QQmlDebugConnector::instance()) {
             if (ee) {
                 ee->enableDebugger();
-                QV4::Debugging::Debugger *debugger = ee->debugger;
-                debuggerMap.insert(debuggerIndex++, debugger);
-                debuggerAgent.addDebugger(debugger);
+                debuggerAgent.addDebugger(ee->debugger);
                 debuggerAgent.moveToThread(server->thread());
             }
         }
@@ -637,18 +634,8 @@ void QV4DebugServiceImpl::engineAboutToBeRemoved(QQmlEngine *engine)
     QMutexLocker lock(&m_configMutex);
     if (engine){
         const QV4::ExecutionEngine *ee = QV8Engine::getV4(engine->handle());
-        if (ee) {
-            QV4::Debugging::Debugger *debugger = ee->debugger;
-            typedef QMap<int, QV4::Debugging::Debugger *>::const_iterator DebuggerMapIterator;
-            const DebuggerMapIterator end = debuggerMap.constEnd();
-            for (DebuggerMapIterator i = debuggerMap.constBegin(); i != end; ++i) {
-                if (i.value() == debugger) {
-                    debuggerMap.remove(i.key());
-                    break;
-                }
-            }
-            debuggerAgent.removeDebugger(debugger);
-        }
+        if (ee)
+            debuggerAgent.removeDebugger(ee->debugger);
     }
     QQmlConfigurableDebugService<QV4DebugService>::engineAboutToBeRemoved(engine);
 }
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
index 6c2950de8c..fc3a20973e 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
@@ -107,8 +107,6 @@ private:
     int encodeScopeType(QV4::Heap::ExecutionContext::ContextType scopeType);
 
     QStringList breakOnSignals;
-    QMap<int, QV4::Debugging::Debugger *> debuggerMap;
-    static int debuggerIndex;
     static int sequence;
     const int version;
     QV4DataCollector::Refs collectedRefs;