Don't exposes QQmlDebugServer's list of services.

The only thing we ever want to do is look up a service by name.

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

diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index 7d0ed00..7cd9382 100644 (file)
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -644,18 +644,11 @@ void QQmlDebugServerPrivate::_q_removeThread()
     q_func()->moveToThread(parentThread);
 }
 
-QList<QQmlDebugService*> QQmlDebugServer::services() const
+QQmlDebugService *QQmlDebugServer::service(const QString &name) const
 {
     Q_D(const QQmlDebugServer);
     QReadLocker lock(&d->pluginsLock);
-    return d->plugins.values();
-}
-
-QStringList QQmlDebugServer::serviceNames() const
-{
-    Q_D(const QQmlDebugServer);
-    QReadLocker lock(&d->pluginsLock);
-    return d->plugins.keys();
+    return d->plugins.value(name);
 }
 
 void QQmlDebugServer::addEngine(QQmlEngine *engine)

diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h
index fdac9e1..617f589 100644 (file)
--- a/src/qml/debugger/qqmldebugserver_p.h
+++ b/src/qml/debugger/qqmldebugserver_p.h
@@ -64,8 +64,7 @@ public:
 
     bool blockingMode() const;
 
-    QList<QQmlDebugService*> services() const;
-    QStringList serviceNames() const;
+    QQmlDebugService *service(const QString &name) const;
 
     void addEngine(QQmlEngine *engine);
     void removeEngine(QQmlEngine *engine);

diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp
index 59ff1db..0b5dddd 100644 (file)
--- a/src/qml/debugger/qqmldebugservice.cpp
+++ b/src/qml/debugger/qqmldebugservice.cpp
@@ -71,7 +71,7 @@ QQmlDebugService::State QQmlDebugService::registerService()
     if (!server)
         return NotConnected;
 
-    if (server->serviceNames().contains(d->name)) {
+    if (server->service(d->name)) {
         qWarning() << "QQmlDebugService: Conflicting plugin name" << d->name;
     } else {
         server->addService(this);