whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSignalMapper: change to use QObject::connect PMF syntax 

Task-number: QTBUG-122619
Change-Id: I148e4ec77d16f62015c19c641b181e653219d132
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Juha Vuolle 2024-04-16 09:26:59 +03:00
parent db818849c1
commit 299a9ac49c
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/kernel/qsignalmapper.cpp
View File

@ -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);
}
/*!

1
src/corelib/kernel/qsignalmapper.h
View File

@ -38,7 +38,6 @@ public Q_SLOTS:
private:
Q_DISABLE_COPY(QSignalMapper)
Q_PRIVATE_SLOT(d_func(), void _q_senderDestroyed())
};
QT_END_NAMESPACE