Make keys of all debug services public

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

8 files changed, 61 insertions, 39 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp
index 6bccec08b1..ee1047d2b0 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp
@@ -38,16 +38,14 @@
 
 QT_BEGIN_NAMESPACE
 
-const QString QDebugMessageService::s_key = QStringLiteral("DebugMessages");
-
 void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt,
                          const QString &buf)
 {
-    QQmlDebugConnector::service<QDebugMessageService>()->sendDebugMessage(type, ctxt, buf);
+    QQmlDebugConnector::service<QDebugMessageServiceImpl>()->sendDebugMessage(type, ctxt, buf);
 }
 
-QDebugMessageService::QDebugMessageService(QObject *parent) :
-    QQmlDebugService(s_key, 2, parent), oldMsgHandler(0),
+QDebugMessageServiceImpl::QDebugMessageServiceImpl(QObject *parent) :
+    QDebugMessageService(2, parent), oldMsgHandler(0),
     prevState(QQmlDebugService::NotConnected)
 {
     // don't execute stateChanged() in parallel
@@ -58,7 +56,7 @@ QDebugMessageService::QDebugMessageService(QObject *parent) :
     }
 }
 
-void QDebugMessageService::sendDebugMessage(QtMsgType type,
+void QDebugMessageServiceImpl::sendDebugMessage(QtMsgType type,
                                             const QMessageLogContext &ctxt,
                                             const QString &buf)
 {
@@ -76,7 +74,7 @@ void QDebugMessageService::sendDebugMessage(QtMsgType type,
         (*oldMsgHandler)(type, ctxt, buf);
 }
 
-void QDebugMessageService::stateChanged(State state)
+void QDebugMessageServiceImpl::stateChanged(State state)
 {
     QMutexLocker lock(&initMutex);
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h b/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h
index c0dc41bcd0..04f5966dd7 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <private/qqmldebugservice_p.h>
+#include <private/qqmldebugserviceinterfaces_p.h>
 
 #include <QtCore/qlogging.h>
 #include <QtCore/qmutex.h>
@@ -54,22 +54,19 @@ QT_BEGIN_NAMESPACE
 
 class QDebugMessageServicePrivate;
 
-class QDebugMessageService : public QQmlDebugService
+class QDebugMessageServiceImpl : public QDebugMessageService
 {
     Q_OBJECT
 public:
-    QDebugMessageService(QObject *parent = 0);
+    QDebugMessageServiceImpl(QObject *parent = 0);
 
     void sendDebugMessage(QtMsgType type, const QMessageLogContext &ctxt,
                           const QString &buf);
 
 protected:
-    static const QString s_key;
-
     void stateChanged(State);
 
 private:
-    friend class QQmlDebugConnector;
     friend class QQmlDebuggerServiceFactory;
 
     QtMessageHandler oldMsgHandler;
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp
index 7ba2aeecb0..ac3b435350 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp
@@ -41,8 +41,8 @@ QT_BEGIN_NAMESPACE
 
 QQmlDebugService *QQmlDebuggerServiceFactory::create(const QString &key)
 {
-    if (key == QDebugMessageService::s_key)
-        return new QDebugMessageService(this);
+    if (key == QDebugMessageServiceImpl::s_key)
+        return new QDebugMessageServiceImpl(this);
 
     if (key == QQmlEngineDebugServiceImpl::s_key)
         return new QQmlEngineDebugServiceImpl(this);
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
index 4f131ac481..8f697f1571 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
@@ -36,14 +36,12 @@
 
 QT_BEGIN_NAMESPACE
 
-const QString QQmlEngineControlService::s_key = QStringLiteral("EngineControl");
-
-QQmlEngineControlService::QQmlEngineControlService(QObject *parent) :
-    QQmlDebugService(s_key, 1, parent)
+QQmlEngineControlServiceImpl::QQmlEngineControlServiceImpl(QObject *parent) :
+    QQmlEngineControlService(1, parent)
 {
 }
 
-void QQmlEngineControlService::messageReceived(const QByteArray &message)
+void QQmlEngineControlServiceImpl::messageReceived(const QByteArray &message)
 {
     QMutexLocker lock(&dataMutex);
     QQmlDebugStream d(message);
@@ -60,7 +58,7 @@ void QQmlEngineControlService::messageReceived(const QByteArray &message)
     }
 }
 
-void QQmlEngineControlService::engineAboutToBeAdded(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineAboutToBeAdded(QQmlEngine *engine)
 {
     QMutexLocker lock(&dataMutex);
     if (state() == Enabled) {
@@ -73,7 +71,7 @@ void QQmlEngineControlService::engineAboutToBeAdded(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::engineAboutToBeRemoved(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineAboutToBeRemoved(QQmlEngine *engine)
 {
     QMutexLocker lock(&dataMutex);
     if (state() == Enabled) {
@@ -86,7 +84,7 @@ void QQmlEngineControlService::engineAboutToBeRemoved(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::engineAdded(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineAdded(QQmlEngine *engine)
 {
     if (state() == Enabled) {
         QMutexLocker lock(&dataMutex);
@@ -96,7 +94,7 @@ void QQmlEngineControlService::engineAdded(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::engineRemoved(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineRemoved(QQmlEngine *engine)
 {
     if (state() == Enabled) {
         QMutexLocker lock(&dataMutex);
@@ -106,7 +104,7 @@ void QQmlEngineControlService::engineRemoved(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::sendMessage(QQmlEngineControlService::MessageType type, QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::sendMessage(QQmlEngineControlServiceImpl::MessageType type, QQmlEngine *engine)
 {
     QByteArray message;
     QQmlDebugStream d(&message, QIODevice::WriteOnly);
@@ -114,7 +112,7 @@ void QQmlEngineControlService::sendMessage(QQmlEngineControlService::MessageType
     emit messageToClient(name(), message);
 }
 
-void QQmlEngineControlService::stateChanged(State)
+void QQmlEngineControlServiceImpl::stateChanged(State)
 {
     // We flush everything for any kind of state change, to avoid complicated timing issues.
     QMutexLocker lock(&dataMutex);
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h
index e2a93e562a..8dbc922a6f 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h
@@ -35,7 +35,7 @@
 #define QQMLENGINECONTROLSERVICE_H
 
 #include <QMutex>
-#include <private/qqmldebugservice_p.h>
+#include <private/qqmldebugserviceinterfaces_p.h>
 
 //
 //  W A R N I N G
@@ -50,11 +50,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlEngineControlService : public QQmlDebugService
+class QQmlEngineControlServiceImpl : public QQmlEngineControlService
 {
 public:
-    static const QString s_key;
-
     enum MessageType {
         EngineAboutToBeAdded,
         EngineAdded,
@@ -67,9 +65,11 @@ public:
         StopWaitingEngine
     };
 
-    QQmlEngineControlService(QObject *parent = 0);
+    QQmlEngineControlServiceImpl(QObject *parent = 0);
 
 protected:
+    friend class QQmlProfilerServiceFactory;
+
     QMutex dataMutex;
     QList<QQmlEngine *> startingEngines;
     QList<QQmlEngine *> stoppingEngines;
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservicefactory.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservicefactory.cpp
index 83c2075246..c1b8e6a817 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservicefactory.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservicefactory.cpp
@@ -42,8 +42,8 @@ QQmlDebugService *QQmlProfilerServiceFactory::create(const QString &key)
     if (key == QQmlProfilerServiceImpl::s_key)
         return new QQmlProfilerServiceImpl(this);
 
-    if (key == QQmlEngineControlService::s_key)
-        return new QQmlEngineControlService(this);
+    if (key == QQmlEngineControlServiceImpl::s_key)
+        return new QQmlEngineControlServiceImpl(this);
 
     return 0;
 }
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces.cpp b/src/qml/debugger/qqmldebugserviceinterfaces.cpp
index 2bf9f2785c..992b007e86 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces.cpp
+++ b/src/qml/debugger/qqmldebugserviceinterfaces.cpp
@@ -39,5 +39,7 @@ const QString QV4DebugService::s_key = QStringLiteral("V8Debugger");
 const QString QQmlEngineDebugService::s_key = QStringLiteral("QmlDebugger");
 const QString QQmlInspectorService::s_key = QStringLiteral("QmlInspector");
 const QString QQmlProfilerService::s_key = QStringLiteral("CanvasFrameRate");
+const QString QDebugMessageService::s_key = QStringLiteral("DebugMessages");
+const QString QQmlEngineControlService::s_key = QStringLiteral("EngineControl");
 
 QT_END_NAMESPACE
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
index a2ba670608..54f9114159 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h
+++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
@@ -60,6 +60,8 @@ class Q_QML_PRIVATE_EXPORT QV4DebugService : protected QQmlDebugService
 {
     Q_OBJECT
 public:
+    static const QString s_key;
+
     virtual void signalEmitted(const QString &signal) = 0;
 
 protected:
@@ -67,14 +69,14 @@ protected:
 
     QV4DebugService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}
-
-    static const QString s_key;
 };
 
 class Q_QML_PRIVATE_EXPORT QQmlProfilerService : protected QQmlDebugService
 {
     Q_OBJECT
 public:
+    static const QString s_key;
+
     virtual void addGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) = 0;
     virtual void removeGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) = 0;
 
@@ -89,14 +91,14 @@ protected:
 
     QQmlProfilerService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}
-
-    static const QString s_key;
 };
 
 class Q_QML_PRIVATE_EXPORT QQmlEngineDebugService : protected QQmlDebugService
 {
     Q_OBJECT
 public:
+    static const QString s_key;
+
     virtual void objectCreated(QQmlEngine *engine, QObject *object) = 0;
     virtual void setStatesDelegate(QQmlDebugStatesDelegate *) = 0;
 
@@ -107,14 +109,14 @@ protected:
         QQmlDebugService(s_key, version, parent) {}
 
     QQmlBoundSignal *nextSignal(QQmlBoundSignal *prev) { return prev->m_nextSignal; }
-
-    static const QString s_key;
 };
 
 class Q_QML_PRIVATE_EXPORT QQmlInspectorService : protected QQmlDebugService
 {
     Q_OBJECT
 public:
+    static const QString s_key;
+
     virtual void addView(QObject *) = 0;
     virtual void removeView(QObject *) = 0;
 
@@ -123,8 +125,33 @@ protected:
 
     QQmlInspectorService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}
+};
 
+class Q_QML_PRIVATE_EXPORT QDebugMessageService : protected QQmlDebugService
+{
+    Q_OBJECT
+public:
     static const QString s_key;
+
+protected:
+    friend class QQmlDebugConnector;
+
+    QDebugMessageService(float version, QObject *parent = 0) :
+        QQmlDebugService(s_key, version, parent) {}
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlEngineControlService : protected QQmlDebugService
+{
+    Q_OBJECT
+public:
+    static const QString s_key;
+
+protected:
+    friend class QQmlDebugConnector;
+
+    QQmlEngineControlService(float version, QObject *parent = 0) :
+        QQmlDebugService(s_key, version, parent) {}
+
 };
 
 QT_END_NAMESPACE