From 299a9ac49cfe0f363ee8da690c7e35d677a01153 Mon Sep 17 00:00:00 2001
From: Juha Vuolle <juha.vuolle@qt.io>
Date: Tue, 16 Apr 2024 09:26:59 +0300
Subject: [PATCH] QSignalMapper: change to use QObject::connect PMF syntax
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-122619
Change-Id: I148e4ec77d16f62015c19c641b181e653219d132
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/kernel/qsignalmapper.cpp | 11 +++--------
 src/corelib/kernel/qsignalmapper.h   |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp
index 2a3b8149d1..65d766db4a 100644
--- a/src/corelib/kernel/qsignalmapper.cpp
+++ b/src/corelib/kernel/qsignalmapper.cpp
@@ -13,11 +13,6 @@ class QSignalMapperPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QSignalMapper)
 public:
-    void _q_senderDestroyed()
-    {
-        Q_Q(QSignalMapper);
-        q->removeMappings(q->sender());
-    }
 
     template <class Signal, class Container>
     void emitMappedValue(QObject *sender, Signal signal, const Container &mappedValues)
@@ -129,7 +124,7 @@ void QSignalMapper::setMapping(QObject *sender, int id)
 {
     Q_D(QSignalMapper);
     d->intHash.insert(sender, id);
-    connect(sender, SIGNAL(destroyed()), this, SLOT(_q_senderDestroyed()));
+    connect(sender, &QObject::destroyed, this, &QSignalMapper::removeMappings);
 }
 
 /*!
@@ -142,7 +137,7 @@ void QSignalMapper::setMapping(QObject *sender, const QString &text)
 {
     Q_D(QSignalMapper);
     d->stringHash.insert(sender, text);
-    connect(sender, SIGNAL(destroyed()), this, SLOT(_q_senderDestroyed()));
+    connect(sender, &QObject::destroyed, this, &QSignalMapper::removeMappings);
 }
 
 /*!
@@ -155,7 +150,7 @@ void QSignalMapper::setMapping(QObject *sender, QObject *object)
 {
     Q_D(QSignalMapper);
     d->objectHash.insert(sender, object);
-    connect(sender, SIGNAL(destroyed()), this, SLOT(_q_senderDestroyed()));
+    connect(sender, &QObject::destroyed, this, &QSignalMapper::removeMappings);
 }
 
 /*!
diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h
index 3c3005dabd..af0be52ee5 100644
--- a/src/corelib/kernel/qsignalmapper.h
+++ b/src/corelib/kernel/qsignalmapper.h
@@ -38,7 +38,6 @@ public Q_SLOTS:
 
 private:
     Q_DISABLE_COPY(QSignalMapper)
-    Q_PRIVATE_SLOT(d_func(), void _q_senderDestroyed())
 };
 
 QT_END_NAMESPACE