diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-14 16:36:32 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-30 09:08:49 +0000 |
commit | 7d8e29534d2bf86cdad8a7a7c4c8b84c60daa42c (patch) | |
tree | b70aaf67905d8e562519006dee1bc23f6e1bddce /src/qml/debugger/qqmldebugservice.cpp | |
parent | 6a00b4d4ead8efa75c312acaff897d96fe79a6d9 (diff) |
Extract minimal interface from QQmlDebugServer and use it.
This will allow us to move QQmlDebugServer into a plugin. The new QQmlDebugServer
is the interface exposed to connection plugins. The interface exposed to services
is renamed to QQmlDebugConnector, as technically it doesn't have to be a
"server".
Change-Id: Id508b8c0a6960228e889f45a437b73060392db39
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugservice.cpp')
-rw-r--r-- | src/qml/debugger/qqmldebugservice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp index 00f543927a..a406d99fff 100644 --- a/src/qml/debugger/qqmldebugservice.cpp +++ b/src/qml/debugger/qqmldebugservice.cpp @@ -33,7 +33,7 @@ #include "qqmldebugservice_p.h" #include "qqmldebugservice_p_p.h" -#include "qqmldebugserver_p.h" +#include "qqmldebugconnector_p.h" #include <private/qqmldata_p.h> #include <private/qqmlcontext_p.h> @@ -51,7 +51,7 @@ QQmlDebugServicePrivate::QQmlDebugServicePrivate(const QString &name, float vers QQmlDebugService::QQmlDebugService(const QString &name, float version, QObject *parent) : QObject(*(new QQmlDebugServicePrivate(name, version)), parent) { - QQmlDebugServer::instance(); // create it when it isn't there yet. + QQmlDebugConnector::instance(); // create it when it isn't there yet. } QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, QObject *parent) @@ -66,7 +66,7 @@ QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, QObject *parent) QQmlDebugService::State QQmlDebugService::registerService() { Q_D(QQmlDebugService); - QQmlDebugServer *server = QQmlDebugServer::instance(); + QQmlDebugConnector *server = QQmlDebugConnector::instance(); if (!server) return NotConnected; @@ -81,7 +81,7 @@ QQmlDebugService::State QQmlDebugService::registerService() QQmlDebugService::~QQmlDebugService() { - if (QQmlDebugServer *inst = QQmlDebugServer::instance()) + if (QQmlDebugConnector *inst = QQmlDebugConnector::instance()) inst->removeService(this); } @@ -175,7 +175,7 @@ void QQmlDebugService::sendMessages(const QList<QByteArray> &messages) if (state() != Enabled) return; - if (QQmlDebugServer *inst = QQmlDebugServer::instance()) + if (QQmlDebugConnector *inst = QQmlDebugConnector::instance()) inst->sendMessages(this, messages); } |