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
{
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
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;
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<QByteArray>, QList<QByteArray>() << message));
QString name;
in >> name;
- if (name == QLatin1String("QQmlDebugServer")) {
+ if (name == QLatin1String("QDeclarativeDebugServer")) {
int op = -1;
in >> op;
if (op == 0) {
pluginVersions << service->version();
}
- out << QString(QLatin1String("QQmlDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions;
+ out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions;
}
d->connection->send(QList<QByteArray>() << helloAnswer);
};
}
-Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash);
+Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash)
/*!
QQmlEngineDebugClient::QQmlEngineDebugClient(QQmlDebugConnection *client,
QQmlEngineDebugPrivate *p)
- : QQmlDebugClient(QLatin1String("QQmlEngine"), client), priv(p)
+ : QQmlDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
{
}
QT_BEGIN_NAMESPACE
-Q_GLOBAL_STATIC(QQmlEngineDebugService, qmlEngineDebugService);
+Q_GLOBAL_STATIC(QQmlEngineDebugService, qmlEngineDebugService)
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)
{
Q_GLOBAL_STATIC(QQmlInspectorService, serviceInstance)
QQmlInspectorService::QQmlInspectorService()
- : QQmlDebugService(QLatin1String("QQmlObserverMode"), 1)
+ : QQmlDebugService(QLatin1String("QDeclarativeObserverMode"), 1)
, m_currentInspectorPlugin(0)
{
registerService();
public:
QQmlInspectorClient(QQmlDebugConnection *connection)
- : QQmlDebugClient(QLatin1String("QQmlObserverMode"), connection)
+ : QQmlDebugClient(QLatin1String("QDeclarativeObserverMode"), connection)
, m_showAppOnTop(false)
{
}