diff options
Diffstat (limited to 'src/dbus/qdbuspendingcall.cpp')
-rw-r--r-- | src/dbus/qdbuspendingcall.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 4d0131afff..8e604d5a77 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -47,6 +47,7 @@ #include "qcoreapplication.h" #include "qcoreevent.h" #include <private/qobject_p.h> +#include <private/qlocking_p.h> #ifndef QT_NO_DBUS @@ -221,8 +222,8 @@ void QDBusPendingCallPrivate::checkReceivedSignature() // can't use startsWith here because a null string doesn't start or end with an empty string if (replyMessage.signature().indexOf(expectedReplySignature) != 0) { - QString errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", " - "expected \"%2\""); + const auto errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", " + "expected \"%2\""); replyMessage = QDBusMessage::createError( QDBusError::InvalidSignature, errorMsg.arg(replyMessage.signature(), expectedReplySignature)); @@ -232,7 +233,7 @@ void QDBusPendingCallPrivate::checkReceivedSignature() void QDBusPendingCallPrivate::waitForFinished() { - QMutexLocker locker(&mutex); + const auto locker = qt_scoped_lock(mutex); if (replyMessage.type() != QDBusMessage::InvalidMessage) return; // already finished @@ -330,7 +331,7 @@ bool QDBusPendingCall::isFinished() const if (!d) return true; // considered finished - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage.type() != QDBusMessage::InvalidMessage; } @@ -352,7 +353,7 @@ bool QDBusPendingCall::isValid() const { if (!d) return false; - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage.type() == QDBusMessage::ReplyMessage; } @@ -369,7 +370,7 @@ bool QDBusPendingCall::isError() const { if (!d) return true; // considered finished and an error - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage.type() == QDBusMessage::ErrorMessage; } @@ -384,7 +385,7 @@ bool QDBusPendingCall::isError() const QDBusError QDBusPendingCall::error() const { if (d) { - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return QDBusError(d->replyMessage); } @@ -409,7 +410,7 @@ QDBusMessage QDBusPendingCall::reply() const { if (!d) return QDBusMessage::createError(error()); - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage; } @@ -473,7 +474,7 @@ QDBusPendingCall QDBusPendingCall::fromCompletedCall(const QDBusMessage &msg) msg.type() == QDBusMessage::ReplyMessage) { d = new QDBusPendingCallPrivate(QDBusMessage(), 0); d->replyMessage = msg; - d->ref.store(1); + d->ref.storeRelaxed(1); } return QDBusPendingCall(d); @@ -503,7 +504,7 @@ QDBusPendingCallWatcher::QDBusPendingCallWatcher(const QDBusPendingCall &call, Q : QObject(*new QDBusPendingCallWatcherPrivate, parent), QDBusPendingCall(call) { if (d) { // QDBusPendingCall::d - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); if (!d->watcherHelper) { d->watcherHelper = new QDBusPendingCallWatcherHelper; if (d->replyMessage.type() != QDBusMessage::InvalidMessage) { |