diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-16 14:12:04 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-31 11:31:09 +0000 |
commit | e061150cc54255726b8cda8cc928d3ed03ea8093 (patch) | |
tree | ea43c36b901831f3037b2fc5f9d141b868493ccd /src/qml/debugger/qqmldebugservice.cpp | |
parent | 0768d0dff9b2dc647da480bd73f5f25c84fdb427 (diff) |
Remove pimpl from all classes derived from QQmlDebugService
There is no point in using pimpl for purely internal classes,
especially when we move them to their own plugins.
Change-Id: I2ee8bf2ded2242d91bab89f589a131dc3bcc9a55
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugservice.cpp')
-rw-r--r-- | src/qml/debugger/qqmldebugservice.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp index edebf7a8cb..3a69799da8 100644 --- a/src/qml/debugger/qqmldebugservice.cpp +++ b/src/qml/debugger/qqmldebugservice.cpp @@ -32,7 +32,6 @@ ****************************************************************************/ #include "qqmldebugservice_p.h" -#include "qqmldebugservice_p_p.h" #include "qqmldebugconnector_p.h" #include <private/qqmldata_p.h> #include <private/qqmlcontext_p.h> @@ -43,6 +42,19 @@ QT_BEGIN_NAMESPACE +class QQmlDebugServer; + +class QQmlDebugServicePrivate : public QObjectPrivate +{ + Q_DECLARE_PUBLIC(QQmlDebugService) +public: + QQmlDebugServicePrivate(const QString &name, float version); + + const QString name; + const float version; + QQmlDebugService::State state; +}; + QQmlDebugServicePrivate::QQmlDebugServicePrivate(const QString &name, float version) : name(name), version(version), state(QQmlDebugService::NotConnected) { @@ -51,33 +63,17 @@ QQmlDebugServicePrivate::QQmlDebugServicePrivate(const QString &name, float vers QQmlDebugService::QQmlDebugService(const QString &name, float version, QObject *parent) : QObject(*(new QQmlDebugServicePrivate(name, version)), parent) { - registerService(); -} - -QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, QObject *parent) - : QObject(dd, parent) -{ - registerService(); -} - -/** - Registers the service. This should be called in the constructor of the inherited class. From - then on the service might get asynchronous calls to messageReceived(). - */ -QQmlDebugService::State QQmlDebugService::registerService() -{ Q_D(QQmlDebugService); QQmlDebugConnector *server = QQmlDebugConnector::instance(); if (!server) - return NotConnected; + return; if (server->service(d->name)) { qWarning() << "QQmlDebugService: Conflicting plugin name" << d->name; } else { server->addService(this); } - return state(); } QQmlDebugService::~QQmlDebugService() |