From 9deb4731a4b6af4c87846b7890e7501f624259d3 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 15 Dec 2015 15:30:41 +0100 Subject: Make QQmlDebugConnector::hasEngine() const Change-Id: I7441c24e3c2ae00ac274aa053d2e03d8f61ac830 Reviewed-by: Simon Hausmann --- src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp | 2 +- src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h | 2 +- src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp index 58eadbcf7e..fe94610496 100644 --- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp +++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp @@ -255,7 +255,7 @@ void QQmlNativeDebugConnector::removeEngine(QJSEngine *engine) m_engines.removeOne(engine); } -bool QQmlNativeDebugConnector::hasEngine(QJSEngine *engine) +bool QQmlNativeDebugConnector::hasEngine(QJSEngine *engine) const { return m_engines.contains(engine); } diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h index 5b1bc90478..c2eba9dfc4 100644 --- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h +++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h @@ -51,7 +51,7 @@ public: QQmlDebugService *service(const QString &name) const Q_DECL_OVERRIDE; void addEngine(QJSEngine *engine) Q_DECL_OVERRIDE; void removeEngine(QJSEngine *engine) Q_DECL_OVERRIDE; - bool hasEngine(QJSEngine *engine) Q_DECL_OVERRIDE; + bool hasEngine(QJSEngine *engine) const Q_DECL_OVERRIDE; bool addService(const QString &name, QQmlDebugService *service) Q_DECL_OVERRIDE; bool removeService(const QString &name) Q_DECL_OVERRIDE; bool open(const QVariantHash &configuration) Q_DECL_OVERRIDE; diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp index f6e805ca19..a2182c2baf 100644 --- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp +++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp @@ -132,7 +132,7 @@ public: void addEngine(QJSEngine *engine) Q_DECL_OVERRIDE; void removeEngine(QJSEngine *engine) Q_DECL_OVERRIDE; - bool hasEngine(QJSEngine *engine) Q_DECL_OVERRIDE; + bool hasEngine(QJSEngine *engine) const Q_DECL_OVERRIDE; bool addService(const QString &name, QQmlDebugService *service) Q_DECL_OVERRIDE; bool removeService(const QString &name) Q_DECL_OVERRIDE; @@ -183,7 +183,7 @@ private: QHash m_engineConditions; - QMutex m_helloMutex; + mutable QMutex m_helloMutex; QWaitCondition m_helloCondition; QQmlDebugServerThread m_thread; QPacketProtocol *m_protocol; @@ -597,7 +597,7 @@ void QQmlDebugServerImpl::removeEngine(QJSEngine *engine) m_engineConditions.remove(engine); } -bool QQmlDebugServerImpl::hasEngine(QJSEngine *engine) +bool QQmlDebugServerImpl::hasEngine(QJSEngine *engine) const { QMutexLocker locker(&m_helloMutex); QHash::ConstIterator i = m_engineConditions.constFind(engine); -- cgit v1.2.3