diff options
author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-02-04 15:31:25 +0100 |
---|---|---|
committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-02-10 18:28:45 +0100 |
commit | 9cc8949cc63e47da3db333a699ff55ffa811783b (patch) | |
tree | f21de429bd5a1abcac784fb9e0e3c34f1e8e2fa0 /src/widgets/widgets/qcombobox.cpp | |
parent | f19fbbdb2f5a3dbf3bac7cdbb4f7e8efe34f1e0d (diff) |
QComboBox: remove deprecated signals
The following signals have been removed:
- void activated(const QString &);
- void highlighted(const QString &);
Task-number: QTBUG-81845
Change-Id: I61b552d9258987d4252202953aaf4909f9bd718e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 9789004473..b249608ccc 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -905,20 +905,9 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const The item's \a index is passed. Note that this signal is sent even when the choice is not changed. If you need to know when the choice actually changes, use signal currentIndexChanged(). - */ /*! - \fn void QComboBox::activated(const QString &text) - - This signal is sent when the user chooses an item in the combobox. - The item's \a text is passed. Note that this signal is sent even - when the choice is not changed. If you need to know when the - choice actually changes, use signal currentIndexChanged(). - - \obsolete Use QComboBox::textActivated() instead -*/ -/*! \fn void QComboBox::textActivated(const QString &text) \since 5.14 @@ -936,14 +925,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const */ /*! - \fn void QComboBox::highlighted(const QString &text) - - This signal is sent when an item in the combobox popup list is - highlighted by the user. The item's \a text is passed. - - \obsolete Use textHighlighted() instead -*/ -/*! \fn void QComboBox::textHighlighted(const QString &text) \since 5.14 @@ -1424,12 +1405,6 @@ void QComboBoxPrivate::emitActivated(const QModelIndex &index) QString text(itemText(index)); emit q->activated(index.row()); emit q->textActivated(text); -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit q->activated(text); -QT_WARNING_POP -#endif } void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index) @@ -1440,12 +1415,6 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index) QString text(itemText(index)); emit q->highlighted(index.row()); emit q->textHighlighted(text); -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit q->highlighted(text); -QT_WARNING_POP -#endif } void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index) |