QSignalMapper: remove deprecated signals

Fixes: QTBUG-81774
Change-Id: I644e8b067e2d7698c297978199fa5655804b79c5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

2 files changed, 1 insertions, 68 deletions

diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp
index dc0dfe8f40..0dc9666df6 100644
--- a/src/corelib/kernel/qsignalmapper.cpp
+++ b/src/corelib/kernel/qsignalmapper.cpp
@@ -60,15 +60,8 @@ public:
         Q_Q(QSignalMapper);
 
         auto it = mappedValues.find(sender);
-        if (it != mappedValues.end()) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            Q_EMIT q->mapped(*it);
-QT_WARNING_POP
-#endif
+        if (it != mappedValues.end())
             Q_EMIT (q->*signal)(*it);
-        }
     }
 
     void emitMappedValues(QObject *sender)
@@ -288,56 +281,6 @@ void QSignalMapper::map(QObject *sender)
     d_func()->emitMappedValues(sender);
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \fn void QSignalMapper::mapped(int i)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has an integer mapping set. The object's mapped integer is passed
-    in \a i.
-
-    \sa setMapping()
-*/
-
-/*!
-    \fn void QSignalMapper::mapped(const QString &text)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has a string mapping set. The object's mapped string is passed in
-    \a text.
-
-    \sa setMapping()
-*/
-
-/*!
-    \fn void QSignalMapper::mapped(QWidget *widget)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has a widget mapping set. The object's mapped widget is passed in
-    \a widget.
-
-    \sa setMapping()
-*/
-
-/*!
-    \fn void QSignalMapper::mapped(QObject *object)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has an object mapping set. The object provided by the map is passed in
-    \a object.
-
-    \sa setMapping()
-*/
-#endif
-
 /*!
     \fn void QSignalMapper::mappedInt(int i)
     \since 5.15
diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h
index 592986e6a5..bd100a2467 100644
--- a/src/corelib/kernel/qsignalmapper.h
+++ b/src/corelib/kernel/qsignalmapper.h
@@ -66,16 +66,6 @@ public:
     QObject *mapping(QObject *object) const;
 
 Q_SIGNALS:
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedInt(int) instead")
-    void mapped(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedString(const QString&) instead")
-    void mapped(const QString &);
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedWidget(QWidget *) instead")
-    void mapped(QWidget *);
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedObject(QObject *) instead")
-    void mapped(QObject *);
-#endif
     void mappedInt(int);
     void mappedString(const QString &);
     void mappedWidget(QWidget *);