From 90c6bc578fb0e81ebbbfcebddc7e4191ae22d94b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 16 Jul 2019 13:03:51 +0000 Subject: [PATCH] Revert "Use QComboBox::currentTextChanged instead of currentIndexChanged" This reverts commit 25f9d9c43481b0a02d632bf609417c4302fe1fe1. The deprecation was reverted in qtbase 298f750cdba2bd15e735a47ba8d3b9c093367ba3. Change-Id: I8a05f038be4b7fc89e05830435e08c3212e4f116 Reviewed-by: hjk --- src/libs/qmleditorwidgets/contextpanetextwidget.cpp | 2 +- src/plugins/coreplugin/dialogs/newdialog.cpp | 3 ++- src/plugins/scxmleditor/common/colorsettings.cpp | 2 +- src/plugins/texteditor/fontsettingspage.cpp | 3 ++- src/shared/help/bookmarkmanager.cpp | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp index 6a37637a6a0..70b6c700db4 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp @@ -103,7 +103,7 @@ ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) : connect(ui->bottomAlignmentButton, &QToolButton::toggled, this, &ContextPaneTextWidget::onVerticalAlignmentChanged); - connect(ui->styleComboBox, &QComboBox::currentTextChanged, + connect(ui->styleComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &ContextPaneTextWidget::onStyleComboBoxChanged); } diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index b4713e6a73b..e691d826ed7 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -230,7 +230,8 @@ NewDialog::NewDialog(QWidget *parent) : connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &NewDialog::accept); connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &NewDialog::reject); - connect(m_ui->comboBox, &QComboBox::currentTextChanged, + connect(m_ui->comboBox, + QOverload::of(&QComboBox::currentIndexChanged), this, &NewDialog::setSelectedPlatform); } diff --git a/src/plugins/scxmleditor/common/colorsettings.cpp b/src/plugins/scxmleditor/common/colorsettings.cpp index 4049db0646b..8b952c253b5 100644 --- a/src/plugins/scxmleditor/common/colorsettings.cpp +++ b/src/plugins/scxmleditor/common/colorsettings.cpp @@ -39,7 +39,7 @@ ColorSettings::ColorSettings(QWidget *parent) m_ui.setupUi(this); m_ui.m_colorThemeView->setEnabled(false); - connect(m_ui.m_comboColorThemes, &QComboBox::currentTextChanged, + connect(m_ui.m_comboColorThemes, QOverload::of(&QComboBox::currentIndexChanged), this, &ColorSettings::selectTheme); connect(m_ui.m_colorThemeView, &ColorThemeView::colorChanged, this, &ColorSettings::updateCurrentColors); connect(m_ui.m_addColorTheme, &QToolButton::clicked, this, &ColorSettings::createTheme); diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 26b7a707816..6911c844a84 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -364,7 +364,8 @@ QWidget *FontSettingsPage::widget() connect(d_ptr->m_ui->fontComboBox, &QFontComboBox::currentFontChanged, this, &FontSettingsPage::fontSelected); - connect(d_ptr->m_ui->sizeComboBox, &QComboBox::currentTextChanged, + connect(d_ptr->m_ui->sizeComboBox, + QOverload::of(&QComboBox::currentIndexChanged), this, &FontSettingsPage::fontSizeSelected); connect(d_ptr->m_ui->zoomSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &FontSettingsPage::fontZoomChanged); diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 996d2bb02b9..dc19b8e92ad 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -95,7 +95,8 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title, &QStandardItemModel::itemChanged, this, &BookmarkDialog::itemChanged); - connect(ui.bookmarkFolders, &QComboBox::currentTextChanged, + connect(ui.bookmarkFolders, + QOverload::of(&QComboBox::currentIndexChanged), this, &BookmarkDialog::selectBookmarkFolder); connect(ui.treeView, &TreeView::customContextMenuRequested,