diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-14 12:27:40 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-29 14:35:56 +0000 |
| commit | c866ba8e3a4489881bf328da16673b8acc1eeca8 (patch) | |
| tree | 2cd3e468ef0e995a788abc364a96fce7deb0f1da /src/qml/debugger | |
| parent | db90054b186317da4e363c64207c0156d9d73da5 (diff) | |
Remove some methods from QQmlDebugServer
They were only used internally or for redundant checks in the tests.
Change-Id: Iaa7d52be030adaa52a07b28fba53bdef9fada879
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 24 | ||||
| -rw-r--r-- | src/qml/debugger/qqmldebugserver_p.h | 3 |
2 files changed, 2 insertions, 25 deletions
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index 44cd767914..607b03916e 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -347,26 +347,6 @@ void QQmlDebugServerThread::run() eventLoop.processEvents(QEventLoop::AllEvents); } -bool QQmlDebugServer::hasDebuggingClient() const -{ - Q_D(const QQmlDebugServer); - return d->connection - && d->connection->isConnected() - && d->gotHello; -} - -bool QQmlDebugServer::hasThread() const -{ - Q_D(const QQmlDebugServer); - return d->thread != 0; -} - -bool QQmlDebugServer::hasConnection() const -{ - Q_D(const QQmlDebugServer); - return d->connection != 0; -} - bool QQmlDebugServer::blockingMode() const { Q_D(const QQmlDebugServer); @@ -819,8 +799,8 @@ bool QQmlDebugServerPrivate::enable(Action action) return false; if (!action(d)) return false; - while (!wrapper->m_instance.hasConnection()) { - if (!wrapper->m_instance.hasThread()) + while (!d->connection) { + if (!d->thread) return false; } return true; diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h index 4183370c46..fdac9e1abf 100644 --- a/src/qml/debugger/qqmldebugserver_p.h +++ b/src/qml/debugger/qqmldebugserver_p.h @@ -62,9 +62,6 @@ public: static QQmlDebugServer *instance(); - bool hasThread() const; - bool hasConnection() const; - bool hasDebuggingClient() const; bool blockingMode() const; QList<QQmlDebugService*> services() const; |