diff options
-rw-r--r-- | src/qml/debugger/qdebugmessageservice.cpp | 8 | ||||
-rw-r--r-- | src/qml/debugger/qqmlconfigurabledebugservice.cpp | 5 | ||||
-rw-r--r-- | src/qml/debugger/qqmlconfigurabledebugservice_p.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmlconfigurabledebugservice_p_p.h | 3 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugservice.cpp | 17 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugservice_p.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugservice_p_p.h | 7 | ||||
-rw-r--r-- | src/qml/debugger/qv4debugservice.cpp | 11 |
8 files changed, 21 insertions, 34 deletions
diff --git a/src/qml/debugger/qdebugmessageservice.cpp b/src/qml/debugger/qdebugmessageservice.cpp index deaa472ce0..9d5d5d0d9c 100644 --- a/src/qml/debugger/qdebugmessageservice.cpp +++ b/src/qml/debugger/qdebugmessageservice.cpp @@ -50,9 +50,8 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, class QDebugMessageServicePrivate : public QQmlDebugServicePrivate { public: - QDebugMessageServicePrivate() - : oldMsgHandler(0) - , prevState(QQmlDebugService::NotConnected) + QDebugMessageServicePrivate() : QQmlDebugServicePrivate(QStringLiteral("DebugMessages"), 2), + oldMsgHandler(0), prevState(QQmlDebugService::NotConnected) { } @@ -62,8 +61,7 @@ public: }; QDebugMessageService::QDebugMessageService(QObject *parent) : - QQmlDebugService(*(new QDebugMessageServicePrivate()), - QStringLiteral("DebugMessages"), 2, parent) + QQmlDebugService(*(new QDebugMessageServicePrivate), parent) { Q_D(QDebugMessageService); diff --git a/src/qml/debugger/qqmlconfigurabledebugservice.cpp b/src/qml/debugger/qqmlconfigurabledebugservice.cpp index e3693e00a4..c63910efc5 100644 --- a/src/qml/debugger/qqmlconfigurabledebugservice.cpp +++ b/src/qml/debugger/qqmlconfigurabledebugservice.cpp @@ -38,12 +38,11 @@ QT_BEGIN_NAMESPACE QQmlConfigurableDebugService::QQmlConfigurableDebugService(const QString &name, float version, QObject *parent) : - QQmlDebugService((*new QQmlConfigurableDebugServicePrivate), name, version, parent) { init(); } + QQmlDebugService((*new QQmlConfigurableDebugServicePrivate(name, version)), parent) { init(); } QQmlConfigurableDebugService::QQmlConfigurableDebugService(QQmlDebugServicePrivate &dd, - const QString &name, float version, QObject *parent) : - QQmlDebugService(dd, name, version, parent) { init(); } + QQmlDebugService(dd, parent) { init(); } QMutex *QQmlConfigurableDebugService::configMutex() { diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p.h index cf69c3a1f6..c7afcb94dd 100644 --- a/src/qml/debugger/qqmlconfigurabledebugservice_p.h +++ b/src/qml/debugger/qqmlconfigurabledebugservice_p.h @@ -59,7 +59,7 @@ public: QQmlConfigurableDebugService(const QString &name, float version, QObject *parent = 0); protected: - QQmlConfigurableDebugService(QQmlDebugServicePrivate &dd, const QString &name, float version, QObject *parent = 0); + QQmlConfigurableDebugService(QQmlDebugServicePrivate &dd, QObject *parent = 0); QMutex *configMutex(); void stopWaiting(); diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p_p.h index 6d693b6352..fcdefe3954 100644 --- a/src/qml/debugger/qqmlconfigurabledebugservice_p_p.h +++ b/src/qml/debugger/qqmlconfigurabledebugservice_p_p.h @@ -58,7 +58,8 @@ class QQmlConfigurableDebugServicePrivate : public QQmlDebugServicePrivate { Q_DECLARE_PUBLIC(QQmlConfigurableDebugService) public: - QQmlConfigurableDebugServicePrivate() : configMutex(QMutex::Recursive) {} + QQmlConfigurableDebugServicePrivate(const QString &name, float version) : + QQmlDebugServicePrivate(name, version), configMutex(QMutex::Recursive) {} QMutex configMutex; QList<QQmlEngine *> waitingEngines; diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp index a171c26ea7..dda7fbe435 100644 --- a/src/qml/debugger/qqmldebugservice.cpp +++ b/src/qml/debugger/qqmldebugservice.cpp @@ -43,29 +43,20 @@ QT_BEGIN_NAMESPACE -QQmlDebugServicePrivate::QQmlDebugServicePrivate() +QQmlDebugServicePrivate::QQmlDebugServicePrivate(const QString &name, float version) : + name(name), version(version), state(QQmlDebugService::NotConnected) { } QQmlDebugService::QQmlDebugService(const QString &name, float version, QObject *parent) - : QObject(*(new QQmlDebugServicePrivate), parent) + : QObject(*(new QQmlDebugServicePrivate(name, version)), parent) { QQmlDebugServer::instance(); // create it when it isn't there yet. - - Q_D(QQmlDebugService); - d->name = name; - d->version = version; - d->state = QQmlDebugService::NotConnected; } -QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, - const QString &name, float version, QObject *parent) +QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, QObject *parent) : QObject(dd, parent) { - Q_D(QQmlDebugService); - d->name = name; - d->version = version; - d->state = QQmlDebugService::NotConnected; } /** diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index c21aaf2240..a84237c109 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -88,7 +88,7 @@ public: protected: explicit QQmlDebugService(const QString &, float version, QObject *parent = 0); - QQmlDebugService(QQmlDebugServicePrivate &dd, const QString &name, float version, QObject *parent = 0); + QQmlDebugService(QQmlDebugServicePrivate &dd, QObject *parent = 0); State registerService(); diff --git a/src/qml/debugger/qqmldebugservice_p_p.h b/src/qml/debugger/qqmldebugservice_p_p.h index 7d60739f3a..e1e93e5e0c 100644 --- a/src/qml/debugger/qqmldebugservice_p_p.h +++ b/src/qml/debugger/qqmldebugservice_p_p.h @@ -45,6 +45,7 @@ // We mean it. // +#include "qqmldebugservice_p.h" #include <QtCore/qglobal.h> #include <private/qobject_p.h> @@ -57,10 +58,10 @@ class QQmlDebugServicePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQmlDebugService) public: - QQmlDebugServicePrivate(); + QQmlDebugServicePrivate(const QString &name, float version); - QString name; - float version; + const QString name; + const float version; QQmlDebugService::State state; }; diff --git a/src/qml/debugger/qv4debugservice.cpp b/src/qml/debugger/qv4debugservice.cpp index 0fe6f06761..ef78b379a1 100644 --- a/src/qml/debugger/qv4debugservice.cpp +++ b/src/qml/debugger/qv4debugservice.cpp @@ -1012,11 +1012,9 @@ public: }; } // anonymous namespace -QV4DebugServicePrivate::QV4DebugServicePrivate() - : debuggerAgent(this) - , version(1) - , theSelectedFrame(0) - , unknownV8CommandHandler(new UnknownV8CommandHandler) +QV4DebugServicePrivate::QV4DebugServicePrivate() : + QQmlConfigurableDebugServicePrivate(QStringLiteral("V8Debugger"), 1), debuggerAgent(this), + version(1), theSelectedFrame(0), unknownV8CommandHandler(new UnknownV8CommandHandler) { addHandler(new V8VersionRequest); addHandler(new V8SetBreakPointRequest); @@ -1047,8 +1045,7 @@ V8CommandHandler *QV4DebugServicePrivate::v8CommandHandler(const QString &comman } QV4DebugService::QV4DebugService(QObject *parent) - : QQmlConfigurableDebugService(*(new QV4DebugServicePrivate()), - QStringLiteral("V8Debugger"), 1, parent) + : QQmlConfigurableDebugService(*(new QV4DebugServicePrivate()), parent) {} QV4DebugService::~QV4DebugService() |