From 9cc8949cc63e47da3db333a699ff55ffa811783b Mon Sep 17 00:00:00 2001 From: Vitaly Fanaskov Date: Tue, 4 Feb 2020 15:31:25 +0100 Subject: QComboBox: remove deprecated signals The following signals have been removed: - void activated(const QString &); - void highlighted(const QString &); Task-number: QTBUG-81845 Change-Id: I61b552d9258987d4252202953aaf4909f9bd718e Reviewed-by: Qt CI Bot Reviewed-by: Christian Ehrlicher --- .../widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp | 2 +- examples/widgets/painting/basicdrawing/window.cpp | 10 +++++----- examples/widgets/painting/imagecomposition/imagecomposer.cpp | 2 +- examples/widgets/painting/painterpaths/window.cpp | 8 ++++---- examples/widgets/painting/transformations/window.cpp | 4 ++-- examples/widgets/richtext/calendar/mainwindow.cpp | 2 +- examples/widgets/richtext/textedit/textedit.cpp | 2 +- examples/widgets/tools/codecs/previewform.cpp | 2 +- examples/widgets/tools/completer/mainwindow.cpp | 6 +++--- examples/widgets/tools/settingseditor/locationdialog.cpp | 6 +++--- examples/widgets/tools/treemodelcompleter/mainwindow.cpp | 4 ++-- examples/widgets/widgets/icons/imagedelegate.cpp | 2 +- examples/widgets/widgets/lineedits/window.cpp | 10 +++++----- examples/widgets/widgets/sliders/window.cpp | 2 +- examples/widgets/widgets/validators/validatorwidget.cpp | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp index 9fa24fcd17..2f1d9a330c 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp @@ -67,7 +67,7 @@ EmbeddedDialog::EmbeddedDialog(QWidget *parent) ui->style->setCurrentIndex(ui->style->count() - 1); } - connect(ui->layoutDirection, QOverload::of(&QComboBox::activated), + connect(ui->layoutDirection, &QComboBox::activated, this, &EmbeddedDialog::layoutDirectionChanged); connect(ui->spacing, &QSlider::valueChanged, this, &EmbeddedDialog::spacingChanged); diff --git a/examples/widgets/painting/basicdrawing/window.cpp b/examples/widgets/painting/basicdrawing/window.cpp index 65f6971d13..c3f05dd948 100644 --- a/examples/widgets/painting/basicdrawing/window.cpp +++ b/examples/widgets/painting/basicdrawing/window.cpp @@ -157,17 +157,17 @@ Window::Window() //! [7] //! [8] - connect(shapeComboBox, QOverload::of(&QComboBox::activated), + connect(shapeComboBox, &QComboBox::activated, this, &Window::shapeChanged); connect(penWidthSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &Window::penChanged); - connect(penStyleComboBox, QOverload::of(&QComboBox::activated), + connect(penStyleComboBox, &QComboBox::activated, this, &Window::penChanged); - connect(penCapComboBox, QOverload::of(&QComboBox::activated), + connect(penCapComboBox, &QComboBox::activated, this, &Window::penChanged); - connect(penJoinComboBox, QOverload::of(&QComboBox::activated), + connect(penJoinComboBox, &QComboBox::activated, this, &Window::penChanged); - connect(brushStyleComboBox, QOverload::of(&QComboBox::activated), + connect(brushStyleComboBox, &QComboBox::activated, this, &Window::brushChanged); connect(antialiasingCheckBox, &QAbstractButton::toggled, renderArea, &RenderArea::setAntialiased); diff --git a/examples/widgets/painting/imagecomposition/imagecomposer.cpp b/examples/widgets/painting/imagecomposition/imagecomposer.cpp index ffdc8f433c..f0935147cf 100644 --- a/examples/widgets/painting/imagecomposition/imagecomposer.cpp +++ b/examples/widgets/painting/imagecomposition/imagecomposer.cpp @@ -102,7 +102,7 @@ ImageComposer::ImageComposer() //! [3] connect(sourceButton, &QAbstractButton::clicked, this, &ImageComposer::chooseSource); - connect(operatorComboBox, QOverload::of(&QComboBox::activated), + connect(operatorComboBox, &QComboBox::activated, this, &ImageComposer::recalculateResult); connect(destinationButton, &QAbstractButton::clicked, this, &ImageComposer::chooseDestination); diff --git a/examples/widgets/painting/painterpaths/window.cpp b/examples/widgets/painting/painterpaths/window.cpp index 6fb3218313..e43a0377af 100644 --- a/examples/widgets/painting/painterpaths/window.cpp +++ b/examples/widgets/painting/painterpaths/window.cpp @@ -194,13 +194,13 @@ Window::Window() //! [12] //! [16] - connect(fillRuleComboBox, QOverload::of(&QComboBox::activated), + connect(fillRuleComboBox, &QComboBox::activated, this, &Window::fillRuleChanged); - connect(fillColor1ComboBox, QOverload::of(&QComboBox::activated), + connect(fillColor1ComboBox, &QComboBox::activated, this, &Window::fillGradientChanged); - connect(fillColor2ComboBox, QOverload::of(&QComboBox::activated), + connect(fillColor2ComboBox, &QComboBox::activated, this, &Window::fillGradientChanged); - connect(penColorComboBox, QOverload::of(&QComboBox::activated), + connect(penColorComboBox, &QComboBox::activated, this, &Window::penColorChanged); for (RenderArea *area : qAsConst(renderAreas)) { diff --git a/examples/widgets/painting/transformations/window.cpp b/examples/widgets/painting/transformations/window.cpp index 8261c4e12e..a07e4dd5d1 100644 --- a/examples/widgets/painting/transformations/window.cpp +++ b/examples/widgets/painting/transformations/window.cpp @@ -79,7 +79,7 @@ Window::Window() operationComboBoxes[i]->addItem(tr("Scale to 75%")); operationComboBoxes[i]->addItem(tr("Translate by (50, 50)")); - connect(operationComboBoxes[i], QOverload::of(&QComboBox::activated), + connect(operationComboBoxes[i], &QComboBox::activated, this, &Window::operationChanged); layout->addWidget(transformedRenderAreas[i], 0, i + 1); @@ -159,7 +159,7 @@ void Window::setupShapes() shapes.append(text); shapes.append(truck); - connect(shapeComboBox, QOverload::of(&QComboBox::activated), + connect(shapeComboBox, &QComboBox::activated, this, &Window::shapeSelected); } //! [7] diff --git a/examples/widgets/richtext/calendar/mainwindow.cpp b/examples/widgets/richtext/calendar/mainwindow.cpp index 3ddb1cf7ad..0842faeb16 100644 --- a/examples/widgets/richtext/calendar/mainwindow.cpp +++ b/examples/widgets/richtext/calendar/mainwindow.cpp @@ -86,7 +86,7 @@ MainWindow::MainWindow() //! [2] //! [3] - connect(monthCombo, QOverload::of(&QComboBox::activated), + connect(monthCombo, &QComboBox::activated, this, &MainWindow::setMonth); connect(yearEdit, &QDateTimeEdit::dateChanged, this, &MainWindow::setYear); diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 85fb83ab89..efeaf75cc5 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -389,7 +389,7 @@ void TextEdit::setupTextActions() comboStyle->addItem("Heading 5"); comboStyle->addItem("Heading 6"); - connect(comboStyle, QOverload::of(&QComboBox::activated), this, &TextEdit::textStyle); + connect(comboStyle, &QComboBox::activated, this, &TextEdit::textStyle); comboFont = new QFontComboBox(tb); tb->addWidget(comboFont); diff --git a/examples/widgets/tools/codecs/previewform.cpp b/examples/widgets/tools/codecs/previewform.cpp index f48651335a..80a99bf271 100644 --- a/examples/widgets/tools/codecs/previewform.cpp +++ b/examples/widgets/tools/codecs/previewform.cpp @@ -167,7 +167,7 @@ PreviewForm::PreviewForm(QWidget *parent) new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); okButton = buttonBox->button(QDialogButtonBox::Ok); - connect(encodingComboBox, QOverload::of(&QComboBox::activated), + connect(encodingComboBox, &QComboBox::activated, this, &PreviewForm::updateTextEdit); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); diff --git a/examples/widgets/tools/completer/mainwindow.cpp b/examples/widgets/tools/completer/mainwindow.cpp index b50e0a5456..14ad73847e 100644 --- a/examples/widgets/tools/completer/mainwindow.cpp +++ b/examples/widgets/tools/completer/mainwindow.cpp @@ -117,11 +117,11 @@ MainWindow::MainWindow(QWidget *parent) contentsLabel = new QLabel; contentsLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - connect(modelCombo, QOverload::of(&QComboBox::activated), + connect(modelCombo, &QComboBox::activated, this, &MainWindow::changeModel); - connect(modeCombo, QOverload::of(&QComboBox::activated), + connect(modeCombo, &QComboBox::activated, this, &MainWindow::changeMode); - connect(caseCombo, QOverload::of(&QComboBox::activated), + connect(caseCombo, &QComboBox::activated, this, &MainWindow::changeCase); connect(maxVisibleSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &MainWindow::changeMaxVisible); diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp index 99c9834a63..86119a1afd 100644 --- a/examples/widgets/tools/settingseditor/locationdialog.cpp +++ b/examples/widgets/tools/settingseditor/locationdialog.cpp @@ -115,9 +115,9 @@ LocationDialog::LocationDialog(QWidget *parent) buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - connect(formatComboBox, QOverload::of(&QComboBox::activated), + connect(formatComboBox, &QComboBox::activated, this, &LocationDialog::updateLocationsTable); - connect(scopeComboBox, QOverload::of(&QComboBox::activated), + connect(scopeComboBox, &QComboBox::activated, this, &LocationDialog::updateLocationsTable); connect(organizationComboBox->lineEdit(), &QLineEdit::editingFinished, @@ -125,7 +125,7 @@ LocationDialog::LocationDialog(QWidget *parent) connect(applicationComboBox->lineEdit(), &QLineEdit::editingFinished, this, &LocationDialog::updateLocationsTable); - connect(applicationComboBox, QOverload::of(&QComboBox::activated), + connect(applicationComboBox, &QComboBox::activated, this, &LocationDialog::updateLocationsTable); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); diff --git a/examples/widgets/tools/treemodelcompleter/mainwindow.cpp b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp index 302ccc436c..3305ac9032 100644 --- a/examples/widgets/tools/treemodelcompleter/mainwindow.cpp +++ b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp @@ -126,9 +126,9 @@ MainWindow::MainWindow(QWidget *parent) //! [1] //! [2] - connect(modeCombo, QOverload::of(&QComboBox::activated), + connect(modeCombo, &QComboBox::activated, this, &MainWindow::changeMode); - connect(caseCombo, QOverload::of(&QComboBox::activated), + connect(caseCombo, &QComboBox::activated, this, &MainWindow::changeMode); lineEdit = new QLineEdit; diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp index 4fd251aa1b..9f1e19c9eb 100644 --- a/examples/widgets/widgets/icons/imagedelegate.cpp +++ b/examples/widgets/widgets/icons/imagedelegate.cpp @@ -70,7 +70,7 @@ QWidget *ImageDelegate::createEditor(QWidget *parent, else if (index.column() == 2) comboBox->addItems(IconPreviewArea::iconStateNames()); - connect(comboBox, QOverload::of(&QComboBox::activated), + connect(comboBox, &QComboBox::activated, this, &ImageDelegate::emitCommitData); return comboBox; diff --git a/examples/widgets/widgets/lineedits/window.cpp b/examples/widgets/widgets/lineedits/window.cpp index bb9396411a..765f867deb 100644 --- a/examples/widgets/widgets/lineedits/window.cpp +++ b/examples/widgets/widgets/lineedits/window.cpp @@ -127,15 +127,15 @@ Window::Window(QWidget *parent) //! [4] //! [5] - connect(echoComboBox, QOverload::of(&QComboBox::activated), + connect(echoComboBox, &QComboBox::activated, this, &Window::echoChanged); - connect(validatorComboBox, QOverload::of(&QComboBox::activated), + connect(validatorComboBox, &QComboBox::activated, this, &Window::validatorChanged); - connect(alignmentComboBox, QOverload::of(&QComboBox::activated), + connect(alignmentComboBox, &QComboBox::activated, this, &Window::alignmentChanged); - connect(inputMaskComboBox, QOverload::of(&QComboBox::activated), + connect(inputMaskComboBox, &QComboBox::activated, this, &Window::inputMaskChanged); - connect(accessComboBox, QOverload::of(&QComboBox::activated), + connect(accessComboBox, &QComboBox::activated, this, &Window::accessChanged); //! [5] diff --git a/examples/widgets/widgets/sliders/window.cpp b/examples/widgets/widgets/sliders/window.cpp index 4a28a61f3d..948e545850 100644 --- a/examples/widgets/widgets/sliders/window.cpp +++ b/examples/widgets/widgets/sliders/window.cpp @@ -126,7 +126,7 @@ void Window::createControls(const QString &title) orientationCombo->addItem(tr("Vertical slider-like widgets")); //! [6] //! [7] - connect(orientationCombo, QOverload::of(&QComboBox::activated), + connect(orientationCombo, &QComboBox::activated, //! [7] //! [8] stackedWidget, &QStackedWidget::setCurrentIndex); connect(minimumSpinBox, QOverload::of(&QSpinBox::valueChanged), diff --git a/examples/widgets/widgets/validators/validatorwidget.cpp b/examples/widgets/widgets/validators/validatorwidget.cpp index 9ddd640924..625441d7c5 100644 --- a/examples/widgets/widgets/validators/validatorwidget.cpp +++ b/examples/widgets/widgets/validators/validatorwidget.cpp @@ -77,7 +77,7 @@ ValidatorWidget::ValidatorWidget(QWidget *parent) this, &ValidatorWidget::updateDoubleValidator); connect(doubleDecimals, QOverload::of(&QSpinBox::valueChanged), this, &ValidatorWidget::updateDoubleValidator); - connect(doubleFormat, QOverload::of(&QComboBox::activated), + connect(doubleFormat, &QComboBox::activated, this, &ValidatorWidget::updateDoubleValidator); connect(doubleEditor, &QLineEdit::editingFinished, doubleLedWidget, &LEDWidget::flash); -- cgit v1.2.3