From 3703a28511bed9daea2af57409db150cb3ed1a23 Mon Sep 17 00:00:00 2001 From: Vitaly Fanaskov Date: Wed, 5 Feb 2020 16:09:21 +0100 Subject: QComboBox: remove currentIndexChanged(const QString&) Fixes: QTBUG-81913 Task-number: QTBUG-81845 Change-Id: I8f24b858ce4e35b495440001d7734cc8f169cd5f Reviewed-by: Shawn Rutledge --- src/widgets/widgets/qcombobox.cpp | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'src/widgets/widgets/qcombobox.cpp') diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 3cfa213245..9c1bd1e79a 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -932,29 +932,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const highlighted by the user. The item's \a text is passed. */ -/*! - \fn void QComboBox::currentIndexChanged(int index) - \since 4.1 - - This signal is sent whenever the currentIndex in the combobox - changes either through user interaction or programmatically. The - item's \a index is passed or -1 if the combobox becomes empty or the - currentIndex was reset. - - \obsolete Use currentIndexChanged(int index, const QString &text) instead -*/ - -/*! - \fn void QComboBox::currentIndexChanged(const QString &text) - \since 4.1 - - This signal is sent whenever the currentIndex in the combobox - changes either through user interaction or programmatically. The - item's \a text is passed. - - \obsolete Use currentIndexChanged(int index, const QString &text) instead -*/ - /*! \fn void QComboBox::currentIndexChanged(int index, const QString &text) \since 5.15 @@ -1435,13 +1412,6 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index) { Q_Q(QComboBox); const QString text = itemText(index); -#if QT_DEPRECATED_SINCE(5, 15) - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED - emit q->currentIndexChanged(index.row()); - emit q->currentIndexChanged(text); - QT_WARNING_POP -#endif emit q->currentIndexChanged(index.row(), text); // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here if (!lineEdit) -- cgit v1.2.3