From 21e2a227b9f01585ac858549ebdd597a779917bc Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Wed, 7 Mar 2012 09:34:12 +0100 Subject: QmlDebugging: Revert the names of services Revert the names of the services changed in b855240b782395f94315f43ea3e7e182299fac48 to maintain BC. Change-Id: I79826d92fd09c41e0020541b0c7bb77b5b2ecb1f Reviewed-by: Kai Koehne --- src/qml/debugger/qqmldebugclient.cpp | 4 ++-- src/qml/debugger/qqmldebugserver.cpp | 12 ++++++------ src/qml/debugger/qqmldebugservice.cpp | 2 +- src/qml/debugger/qqmlenginedebug.cpp | 2 +- src/qml/debugger/qqmlenginedebugservice.cpp | 4 ++-- src/qml/debugger/qqmlinspectorservice.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/qml/debugger/qqmldebugclient.cpp b/src/qml/debugger/qqmldebugclient.cpp index 12276b48fa..fcb0861c21 100644 --- a/src/qml/debugger/qqmldebugclient.cpp +++ b/src/qml/debugger/qqmldebugclient.cpp @@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE const int protocolVersion = 1; -const QString serverId = QLatin1String("QQmlDebugServer"); -const QString clientId = QLatin1String("QQmlDebugClient"); +const QString serverId = QLatin1String("QDeclarativeDebugServer"); +const QString clientId = QLatin1String("QDeclarativeDebugClient"); class QQmlDebugClientPrivate : public QObjectPrivate { diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index 8d5c597a78..f27123a4d2 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE handshake: 1. Client sends - "QQmlDebugServer" 0 version pluginNames + "QDeclarativeDebugServer" 0 version pluginNames version: an int representing the highest protocol version the client knows pluginNames: plugins available on client side 2. Server sends @@ -69,12 +69,12 @@ QT_BEGIN_NAMESPACE pluginNames: plugins available on server side. plugins both in the client and server message are enabled. client plugin advertisement 1. Client sends - "QQmlDebugServer" 1 pluginNames + "QDeclarativeDebugServer" 1 pluginNames server plugin advertisement 1. Server sends "QQmlDebugClient" 1 pluginNames pluginVersions plugin communication: - Everything send with a header different to "QQmlDebugServer" is sent to the appropriate plugin. + Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin. */ const int protocolVersion = 1; @@ -155,7 +155,7 @@ void QQmlDebugServerPrivate::advertisePlugins() pluginNames << service->name(); pluginVersions << service->version(); } - out << QString(QLatin1String("QQmlDebugClient")) << 1 << pluginNames << pluginVersions; + out << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << pluginNames << pluginVersions; } QMetaObject::invokeMethod(q, "_q_sendMessages", Qt::QueuedConnection, Q_ARG(QList, QList() << message)); @@ -354,7 +354,7 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message) QString name; in >> name; - if (name == QLatin1String("QQmlDebugServer")) { + if (name == QLatin1String("QDeclarativeDebugServer")) { int op = -1; in >> op; if (op == 0) { @@ -373,7 +373,7 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message) pluginVersions << service->version(); } - out << QString(QLatin1String("QQmlDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions; + out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions; } d->connection->send(QList() << helloAnswer); diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp index 9eb9489566..a1cc4fe0a3 100644 --- a/src/qml/debugger/qqmldebugservice.cpp +++ b/src/qml/debugger/qqmldebugservice.cpp @@ -140,7 +140,7 @@ struct ObjectReferenceHash }; } -Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash); +Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash) /*! diff --git a/src/qml/debugger/qqmlenginedebug.cpp b/src/qml/debugger/qqmlenginedebug.cpp index 597e7aeb04..65af181f1b 100644 --- a/src/qml/debugger/qqmlenginedebug.cpp +++ b/src/qml/debugger/qqmlenginedebug.cpp @@ -96,7 +96,7 @@ public: QQmlEngineDebugClient::QQmlEngineDebugClient(QQmlDebugConnection *client, QQmlEngineDebugPrivate *p) - : QQmlDebugClient(QLatin1String("QQmlEngine"), client), priv(p) + : QQmlDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p) { } diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index be2e826bdf..114d7ef63f 100644 --- a/src/qml/debugger/qqmlenginedebugservice.cpp +++ b/src/qml/debugger/qqmlenginedebugservice.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QQmlEngineDebugService, qmlEngineDebugService); +Q_GLOBAL_STATIC(QQmlEngineDebugService, qmlEngineDebugService) QQmlEngineDebugService *QQmlEngineDebugService::instance() { @@ -67,7 +67,7 @@ QQmlEngineDebugService *QQmlEngineDebugService::instance() } QQmlEngineDebugService::QQmlEngineDebugService(QObject *parent) - : QQmlDebugService(QLatin1String("QQmlEngine"), 1, parent), + : QQmlDebugService(QLatin1String("QDeclarativeEngine"), 1, parent), m_watch(new QQmlWatcher(this)), m_statesDelegate(0) { diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp index 508d12eefa..c494045bff 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/qml/debugger/qqmlinspectorservice.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QQmlInspectorService, serviceInstance) QQmlInspectorService::QQmlInspectorService() - : QQmlDebugService(QLatin1String("QQmlObserverMode"), 1) + : QQmlDebugService(QLatin1String("QDeclarativeObserverMode"), 1) , m_currentInspectorPlugin(0) { registerService(); -- cgit v1.2.3