feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Use QComboBox::currentTextChanged instead of currentIndexChanged"

Browse Source 
This reverts commit 25f9d9c434.

The deprecation was reverted in qtbase 298f750cdba2bd15e735a47ba8d3b9c093367ba3.

Change-Id: I8a05f038be4b7fc89e05830435e08c3212e4f116
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2019-07-16 13:03:51 +00:00
parent 700c88418c
commit 90c6bc578f
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmleditorwidgets/contextpanetextwidget.cpp
View File

@@ -103,7 +103,7 @@ ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
connect(ui->bottomAlignmentButton, &QToolButton::toggled, connect(ui->bottomAlignmentButton, &QToolButton::toggled,
this, &ContextPaneTextWidget::onVerticalAlignmentChanged); this, &ContextPaneTextWidget::onVerticalAlignmentChanged);
connect(ui->styleComboBox, &QComboBox::currentTextChanged, connect(ui->styleComboBox, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
this, &ContextPaneTextWidget::onStyleComboBoxChanged); this, &ContextPaneTextWidget::onStyleComboBoxChanged);
} }

3
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -230,7 +230,8 @@ NewDialog::NewDialog(QWidget *parent) :
connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &NewDialog::accept); connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &NewDialog::accept);
connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &NewDialog::reject); connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &NewDialog::reject);
connect(m_ui->comboBox, &QComboBox::currentTextChanged, connect(m_ui->comboBox,
QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
this, &NewDialog::setSelectedPlatform); this, &NewDialog::setSelectedPlatform);
} }

2
src/plugins/scxmleditor/common/colorsettings.cpp
View File

@@ -39,7 +39,7 @@ ColorSettings::ColorSettings(QWidget *parent)
m_ui.setupUi(this); m_ui.setupUi(this);
m_ui.m_colorThemeView->setEnabled(false); m_ui.m_colorThemeView->setEnabled(false);
connect(m_ui.m_comboColorThemes, &QComboBox::currentTextChanged, connect(m_ui.m_comboColorThemes, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
this, &ColorSettings::selectTheme); this, &ColorSettings::selectTheme);
connect(m_ui.m_colorThemeView, &ColorThemeView::colorChanged, this, &ColorSettings::updateCurrentColors); connect(m_ui.m_colorThemeView, &ColorThemeView::colorChanged, this, &ColorSettings::updateCurrentColors);
connect(m_ui.m_addColorTheme, &QToolButton::clicked, this, &ColorSettings::createTheme); connect(m_ui.m_addColorTheme, &QToolButton::clicked, this, &ColorSettings::createTheme);

3
src/plugins/texteditor/fontsettingspage.cpp
View File

@@ -364,7 +364,8 @@ QWidget *FontSettingsPage::widget()
connect(d_ptr->m_ui->fontComboBox, &QFontComboBox::currentFontChanged, connect(d_ptr->m_ui->fontComboBox, &QFontComboBox::currentFontChanged,
this, &FontSettingsPage::fontSelected); this, &FontSettingsPage::fontSelected);
connect(d_ptr->m_ui->sizeComboBox, &QComboBox::currentTextChanged, connect(d_ptr->m_ui->sizeComboBox,
QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
this, &FontSettingsPage::fontSizeSelected); this, &FontSettingsPage::fontSizeSelected);
connect(d_ptr->m_ui->zoomSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), connect(d_ptr->m_ui->zoomSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
this, &FontSettingsPage::fontZoomChanged); this, &FontSettingsPage::fontZoomChanged);

3
src/shared/help/bookmarkmanager.cpp
View File

@@ -95,7 +95,8 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
&QStandardItemModel::itemChanged, &QStandardItemModel::itemChanged,
this, &BookmarkDialog::itemChanged); this, &BookmarkDialog::itemChanged);
connect(ui.bookmarkFolders, &QComboBox::currentTextChanged, connect(ui.bookmarkFolders,
QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
this, &BookmarkDialog::selectBookmarkFolder); this, &BookmarkDialog::selectBookmarkFolder);
connect(ui.treeView, &TreeView::customContextMenuRequested, connect(ui.treeView, &TreeView::customContextMenuRequested,