1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Examples: replace deprecated QComboBox functions

Browse Source 
Replace the deprecated currentIndexChanged(QString) and
activated(QString) with the new currentTextChanged() and textActivated()
functions

Change-Id: I8616354fa06cc63dce6f5cfef0902f4b55981043
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-03-03 19:31:26 +01:00
parent 332f295743
commit d8ac4b40b5
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/graphicsview/diagramscene/mainwindow.cpp
View File

@ -473,7 +473,7 @@ void MainWindow::createToolbars()
fontSizeCombo->addItem(QString().setNum(i)); fontSizeCombo->addItem(QString().setNum(i));
QIntValidator *validator = new QIntValidator(2, 64, this); QIntValidator *validator = new QIntValidator(2, 64, this);
fontSizeCombo->setValidator(validator); fontSizeCombo->setValidator(validator);
connect(fontSizeCombo, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), connect(fontSizeCombo, &QComboBox::currentTextChanged,
this, &MainWindow::fontSizeChanged); this, &MainWindow::fontSizeChanged);
fontColorToolButton = new QToolButton; fontColorToolButton = new QToolButton;
@ -536,7 +536,7 @@ void MainWindow::createToolbars()
scales << tr("50%") << tr("75%") << tr("100%") << tr("125%") << tr("150%"); scales << tr("50%") << tr("75%") << tr("100%") << tr("125%") << tr("150%");
sceneScaleCombo->addItems(scales); sceneScaleCombo->addItems(scales);
sceneScaleCombo->setCurrentIndex(2); sceneScaleCombo->setCurrentIndex(2);
connect(sceneScaleCombo, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), connect(sceneScaleCombo, &QComboBox::currentTextChanged,
this, &MainWindow::sceneScaleChanged); this, &MainWindow::sceneScaleChanged);
pointerToolbar = addToolBar(tr("Pointer type")); pointerToolbar = addToolBar(tr("Pointer type"));

2
examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
View File

@ -73,7 +73,7 @@ EmbeddedDialog::EmbeddedDialog(QWidget *parent)
this, &EmbeddedDialog::spacingChanged); this, &EmbeddedDialog::spacingChanged);
connect(ui->fontComboBox, &QFontComboBox::currentFontChanged, connect(ui->fontComboBox, &QFontComboBox::currentFontChanged,
this, &EmbeddedDialog::fontChanged); this, &EmbeddedDialog::fontChanged);
connect(ui->style, QOverload<const QString &>::of(&QComboBox::activated), connect(ui->style, &QComboBox::textActivated,
this, &EmbeddedDialog::styleChanged); this, &EmbeddedDialog::styleChanged);
} }

4
examples/widgets/richtext/textedit/textedit.cpp
View File

@ -369,7 +369,7 @@ void TextEdit::setupTextActions()
comboFont = new QFontComboBox(tb); comboFont = new QFontComboBox(tb);
tb->addWidget(comboFont); tb->addWidget(comboFont);
connect(comboFont, QOverload<const QString &>::of(&QComboBox::activated), this, &TextEdit::textFamily); connect(comboFont, &QComboBox::textActivated, this, &TextEdit::textFamily);
comboSize = new QComboBox(tb); comboSize = new QComboBox(tb);
comboSize->setObjectName("comboSize"); comboSize->setObjectName("comboSize");
@ -381,7 +381,7 @@ void TextEdit::setupTextActions()
comboSize->addItem(QString::number(size)); comboSize->addItem(QString::number(size));
comboSize->setCurrentIndex(standardSizes.indexOf(QApplication::font().pointSize())); comboSize->setCurrentIndex(standardSizes.indexOf(QApplication::font().pointSize()));
connect(comboSize, QOverload<const QString &>::of(&QComboBox::activated), this, &TextEdit::textSize); connect(comboSize, &QComboBox::textActivated, this, &TextEdit::textSize);
} }
bool TextEdit::load(const QString &f) bool TextEdit::load(const QString &f)

4
examples/widgets/widgets/charactermap/mainwindow.cpp
View File

@ -114,9 +114,9 @@ MainWindow::MainWindow(QWidget *parent)
this, &MainWindow::findSizes); this, &MainWindow::findSizes);
connect(fontCombo, &QFontComboBox::currentFontChanged, connect(fontCombo, &QFontComboBox::currentFontChanged,
characterWidget, &CharacterWidget::updateFont); characterWidget, &CharacterWidget::updateFont);
connect(sizeCombo, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), connect(sizeCombo, &QComboBox::currentTextChanged,
characterWidget, &CharacterWidget::updateSize); characterWidget, &CharacterWidget::updateSize);
connect(styleCombo, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), connect(styleCombo, &QComboBox::currentTextChanged,
characterWidget, &CharacterWidget::updateStyle); characterWidget, &CharacterWidget::updateStyle);
//! [4] //! [5] //! [4] //! [5]
connect(characterWidget, &CharacterWidget::characterSelected, connect(characterWidget, &CharacterWidget::characterSelected,

2
examples/widgets/widgets/spinboxes/window.cpp
View File

@ -176,7 +176,7 @@ void Window::createDateTimeEdits()
formatComboBox->addItem("hh:mm ap"); formatComboBox->addItem("hh:mm ap");
//! [9] //! [10] //! [9] //! [10]
connect(formatComboBox, QOverload<const QString &>::of(&QComboBox::activated), connect(formatComboBox, &QComboBox::textActivated,
this, &Window::setFormatString); this, &Window::setFormatString);
//! [10] //! [10]

2
examples/widgets/widgets/styles/widgetgallery.cpp
View File

@ -79,7 +79,7 @@ WidgetGallery::WidgetGallery(QWidget *parent)
//! [0] //! [0]
//! [1] //! [1]
connect(styleComboBox, QOverload<const QString &>::of(&QComboBox::activated), connect(styleComboBox, &QComboBox::textActivated,
//! [1] //! [2] //! [1] //! [2]
this, &WidgetGallery::changeStyle); this, &WidgetGallery::changeStyle);
connect(useStylePaletteCheckBox, &QCheckBox::toggled, connect(useStylePaletteCheckBox, &QCheckBox::toggled,