RIP QBasicMutexLocker

This was used as a work-around for Q5MutexLocker's UB downcasting
QBasicMutex to QMutex, and for some unspecified performance
improvements.

Now that Q6MutexLocker is a template, the two are almost
token-by-token identical, so we can remove this work-around and use
QMutexLocker directly.

Partially reverts aea500d5d76864bb1a3918e338ca6806e1766e41.

Pick-to: 6.6 6.5 6.2
Change-Id: I57ef5c53999869aa3454fbbaad884c1d18591b2a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 873d3daeca..b7b0ec390e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -234,7 +234,7 @@ bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const
     ConnectionData *cd = connections.loadRelaxed();
     if (signal_index < 0 || !cd)
         return false;
-    QBasicMutexLocker locker(signalSlotLock(q));
+    QMutexLocker locker(signalSlotLock(q));
     if (signal_index < cd->signalVectorCount()) {
         const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
 
@@ -274,7 +274,7 @@ QObjectList QObjectPrivate::senderList() const
     QObjectList returnValue;
     ConnectionData *cd = connections.loadRelaxed();
     if (cd) {
-        QBasicMutexLocker locker(signalSlotLock(q_func()));
+        QMutexLocker locker(signalSlotLock(q_func()));
         for (Connection *c = cd->senders; c; c = c->next)
             returnValue << c->sender;
     }
@@ -1025,7 +1025,7 @@ QObject::~QObject()
         }
 
         QBasicMutex *signalSlotMutex = signalSlotLock(this);
-        QBasicMutexLocker locker(signalSlotMutex);
+        QMutexLocker locker(signalSlotMutex);
 
         // disconnect all receivers
         int receiverCount = cd->signalVectorCount();
@@ -1383,7 +1383,7 @@ bool QObject::event(QEvent *e)
             QAbstractMetaCallEvent *mce = static_cast<QAbstractMetaCallEvent*>(e);
 
             if (!d_func()->connections.loadRelaxed()) {
-                QBasicMutexLocker locker(signalSlotLock(this));
+                QMutexLocker locker(signalSlotLock(this));
                 d_func()->ensureConnectionData();
             }
             QObjectPrivate::Sender sender(this, const_cast<QObject*>(mce->sender()), mce->signalId());
@@ -2523,7 +2523,7 @@ QObject *QObject::sender() const
 {
     Q_D(const QObject);
 
-    QBasicMutexLocker locker(signalSlotLock(this));
+    QMutexLocker locker(signalSlotLock(this));
     QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
     if (!cd || !cd->currentSender)
         return nullptr;
@@ -2565,7 +2565,7 @@ int QObject::senderSignalIndex() const
 {
     Q_D(const QObject);
 
-    QBasicMutexLocker locker(signalSlotLock(this));
+    QMutexLocker locker(signalSlotLock(this));
     QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
     if (!cd || !cd->currentSender)
         return -1;
@@ -2630,7 +2630,7 @@ int QObject::receivers(const char *signal) const
         }
 
         QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
-        QBasicMutexLocker locker(signalSlotLock(this));
+        QMutexLocker locker(signalSlotLock(this));
         if (cd && signal_index < cd->signalVectorCount()) {
             const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
             while (c) {
@@ -2677,7 +2677,7 @@ bool QObject::isSignalConnected(const QMetaMethod &signal) const
 
     signalIndex += QMetaObjectPrivate::signalOffset(signal.mobj);
 
-    QBasicMutexLocker locker(signalSlotLock(this));
+    QMutexLocker locker(signalSlotLock(this));
     return d->isSignalConnected(signalIndex, true);
 }
 
@@ -3583,7 +3583,7 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender,
     QObject *s = const_cast<QObject *>(sender);
 
     QBasicMutex *senderMutex = signalSlotLock(sender);
-    QBasicMutexLocker locker(senderMutex);
+    QMutexLocker locker(senderMutex);
 
     QObjectPrivate::ConnectionData *scd = QObjectPrivate::get(s)->connections.loadRelaxed();
     if (!scd)
@@ -3810,7 +3810,7 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect
     while (argumentTypes[nargs - 1])
         ++nargs;
 
-    QBasicMutexLocker locker(signalSlotLock(c->receiver.loadRelaxed()));
+    QMutexLocker locker(signalSlotLock(c->receiver.loadRelaxed()));
     QObject *receiver = c->receiver.loadRelaxed();
     if (!receiver) {
         // the connection has been disconnected before we got the lock
@@ -3951,7 +3951,7 @@ void doActivate(QObject *sender, int signal_index, void **argv)
 
                 QSemaphore semaphore;
                 {
-                    QBasicMutexLocker locker(signalSlotLock(receiver));
+                    QMutexLocker locker(signalSlotLock(receiver));
                     if (!c->isSingleShot && !c->receiver.loadAcquire())
                         continue;
                     QMetaCallEvent *ev = c->isSlotObject ?
@@ -4272,7 +4272,7 @@ void QObject::dumpObjectInfo() const
            objectName().isEmpty() ? "unnamed" : objectName().toLocal8Bit().data());
 
     Q_D(const QObject);
-    QBasicMutexLocker locker(signalSlotLock(this));
+    QMutexLocker locker(signalSlotLock(this));
 
     // first, look for connections where this object is the sender
     qDebug("  SIGNALS OUT");