Simplify object/id lookup in QQmlDebugService

By tracking object destruction we can avoid looping over all cached
objects to find out which ones are still OK and we don't have to
manually clear the cache anymore. Looking up objects by source location
is specific to the engine debug service and should be done there.

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

1 files changed, 3 insertions, 5 deletions

diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index a84237c109..af58168fff 100644
--- a/src/qml/debugger/qqmldebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -36,6 +36,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qdatastream.h>
+#include <QtCore/qhash.h>
 
 #include <private/qtqmlglobal_p.h>
 
@@ -73,12 +74,9 @@ public:
     void sendMessage(const QByteArray &);
     void sendMessages(const QList<QByteArray> &);
 
+    static const QHash<int, QObject *> &objectsForIds();
     static int idForObject(QObject *);
-    static QObject *objectForId(int);
-    static QList<QObject*> objectForLocationInfo(const QString &filename,
-                                          int lineNumber, int columnNumber);
-    static void removeInvalidObjectsFromHash();
-    static void clearObjectsFromHash();
+    static QObject *objectForId(int id) { return objectsForIds().value(id); }
 
     static QString objectToString(QObject *obj);