From 3703a28511bed9daea2af57409db150cb3ed1a23 Mon Sep 17 00:00:00 2001
From: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
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 <shawn.rutledge@qt.io>
---
 src/widgets/dialogs/qinputdialog.cpp  |  2 +-
 src/widgets/widgets/qcombobox.cpp     | 30 ------------------------------
 src/widgets/widgets/qcombobox.h       |  6 ------
 src/widgets/widgets/qfontcombobox.cpp |  2 +-
 4 files changed, 2 insertions(+), 38 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index eeb0613d79..479e45ff56 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -300,7 +300,7 @@ void QInputDialogPrivate::ensureComboBox()
         comboBox->hide();
         QObject::connect(comboBox, SIGNAL(editTextChanged(QString)),
                          q, SLOT(_q_textChanged(QString)));
-        QObject::connect(comboBox, SIGNAL(currentIndexChanged(QString)),
+        QObject::connect(comboBox, SIGNAL(currentTextChanged(QString)),
                          q, SLOT(_q_textChanged(QString)));
     }
 }
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)
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 56386a4b8c..444c834e88 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -230,12 +230,6 @@ Q_SIGNALS:
     void textActivated(const QString &);
     void highlighted(int index);
     void textHighlighted(const QString &);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use currentIndexChanged(int, const QString &) instead")
-    void currentIndexChanged(int index);
-    QT_DEPRECATED_VERSION_X_5_15("Use currentIndexChanged(int, const QString &) instead")
-    void currentIndexChanged(const QString &);
-#endif
     void currentIndexChanged(int index, const QString &text);
     void currentTextChanged(const QString &);
 
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
index 4a99b0f962..cb665de889 100644
--- a/src/widgets/widgets/qfontcombobox.cpp
+++ b/src/widgets/widgets/qfontcombobox.cpp
@@ -427,7 +427,7 @@ QFontComboBox::QFontComboBox(QWidget *parent)
         lview->setUniformItemSizes(true);
     setWritingSystem(QFontDatabase::Any);
 
-    connect(this, SIGNAL(currentIndexChanged(QString)),
+    connect(this, SIGNAL(currentTextChanged(QString)),
             this, SLOT(_q_currentChanged(QString)));
 
     connect(qApp, SIGNAL(fontDatabaseChanged()),
-- 
cgit v1.2.3