diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-26 17:08:01 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eb@emlix.com> | 2020-01-23 16:12:40 +0100 |
| commit | 4c8f2e881efd1ba742da6d4a7df52445d99cd948 (patch) | |
| tree | d19a540ed3902abbcb0bf9c6d0640645c14ebdd9 /src | |
| parent | 303e9168eb912ef3c1f5e504b5aa45a3eed5d757 (diff) | |
Un-deprecate QSignalMapper
From the comments on QTBUG-73407 and the last comments on
29bcbeab90210da80234529905d17280374f9684, it seems like there are still
use-cases when QSignalMapper is useful.
Change-Id: I8402286cb8a395a4601cda8a4cdda51f19aef073
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit b6688a4d4939b15713ffd8702253433032879fcb)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qsignalmapper.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qsignalmapper.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp index 02a1281f92..fc761ff039 100644 --- a/src/corelib/kernel/qsignalmapper.cpp +++ b/src/corelib/kernel/qsignalmapper.cpp @@ -61,7 +61,6 @@ public: /*! \class QSignalMapper \inmodule QtCore - \obsolete The recommended solution is connecting the signal to a lambda. \brief The QSignalMapper class bundles signals from identifiable senders. \ingroup objectmodel @@ -69,7 +68,9 @@ public: This class collects a set of parameterless signals, and re-emits them with integer, string or widget parameters corresponding to - the object that sent the signal. + the object that sent the signal. Note that in most cases you can + use lambdas for passing custom parameters to slots. This is less + costly and will simplify the code. The class supports the mapping of particular strings or integers with particular objects using setMapping(). The objects' signals @@ -311,4 +312,3 @@ void QSignalMapper::map(QObject *sender) QT_END_NAMESPACE #include "moc_qsignalmapper.cpp" - diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index 6c4cfa9627..0da1e8f87d 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -42,8 +42,6 @@ #include <QtCore/qobject.h> -#if QT_DEPRECATED_SINCE(5, 10) - QT_BEGIN_NAMESPACE class QSignalMapperPrivate; @@ -53,7 +51,7 @@ class Q_CORE_EXPORT QSignalMapper : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QSignalMapper) public: - QT_DEPRECATED explicit QSignalMapper(QObject *parent = nullptr); + explicit QSignalMapper(QObject *parent = nullptr); ~QSignalMapper(); void setMapping(QObject *sender, int id); @@ -84,6 +82,4 @@ private: QT_END_NAMESPACE -#endif - #endif // QSIGNALMAPPER_H |