From e59094cb86b01396d7cfc2b337c58cfbef5b2455 Mon Sep 17 00:00:00 2001 From: Vitaly Fanaskov Date: Fri, 7 Feb 2020 09:36:54 +0100 Subject: QSpinBox: remove deprecated signal valueChanged(const QString &) Task-number: QTBUG-81845 Change-Id: I91148cac553f63b44968337ccc121e7376ee4465 Reviewed-by: Christian Ehrlicher --- examples/network/multicastsender/sender.cpp | 2 +- examples/opengl/qopenglwidget/mainwindow.cpp | 2 +- examples/widgets/animation/easing/window.cpp | 6 ++-- examples/widgets/desktop/screenshot/screenshot.cpp | 2 +- .../widgets/itemviews/pixelator/mainwindow.cpp | 4 +-- examples/widgets/painting/basicdrawing/window.cpp | 2 +- examples/widgets/painting/painterpaths/window.cpp | 4 +-- examples/widgets/richtext/calendar/mainwindow.cpp | 2 +- examples/widgets/tools/completer/mainwindow.cpp | 2 +- .../regularexpression/regularexpressiondialog.cpp | 2 +- examples/widgets/tools/undo/mainwindow.cpp | 2 +- examples/widgets/widgets/icons/mainwindow.cpp | 2 +- examples/widgets/widgets/movie/movieplayer.cpp | 2 +- examples/widgets/widgets/sliders/window.cpp | 10 +++---- examples/widgets/widgets/spinboxes/window.cpp | 2 +- .../widgets/widgets/validators/validatorwidget.cpp | 2 +- src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 12 ++++---- src/widgets/accessible/rangecontrols.cpp | 2 -- src/widgets/widgets/qspinbox.cpp | 34 ---------------------- src/widgets/widgets/qspinbox.h | 8 ----- .../widgets/qdoublespinbox/tst_qdoublespinbox.cpp | 4 +-- .../auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | 4 +-- 22 files changed, 34 insertions(+), 78 deletions(-) diff --git a/examples/network/multicastsender/sender.cpp b/examples/network/multicastsender/sender.cpp index a542a2528f..a995bd7331 100644 --- a/examples/network/multicastsender/sender.cpp +++ b/examples/network/multicastsender/sender.cpp @@ -81,7 +81,7 @@ Sender::Sender(QWidget *parent) buttonBox->addButton(startButton, QDialogButtonBox::ActionRole); buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole); - connect(ttlSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &Sender::ttlChanged); + connect(ttlSpinBox, &QSpinBox::valueChanged, this, &Sender::ttlChanged); connect(startButton, &QPushButton::clicked, this, &Sender::startSending); connect(quitButton, &QPushButton::clicked, this, &Sender::close); connect(&timer, &QTimer::timeout, this, &Sender::sendDatagram); diff --git a/examples/opengl/qopenglwidget/mainwindow.cpp b/examples/opengl/qopenglwidget/mainwindow.cpp index 6fab3df79e..eb34f87cb7 100644 --- a/examples/opengl/qopenglwidget/mainwindow.cpp +++ b/examples/opengl/qopenglwidget/mainwindow.cpp @@ -134,7 +134,7 @@ MainWindow::MainWindow() connect(slider, &QAbstractSlider::valueChanged, glwidget, &GLWidget::setScaling); connect(transparent, &QCheckBox::toggled, glwidget, &GLWidget::setTransparent); - connect(updateInterval, QOverload::of(&QSpinBox::valueChanged), + connect(updateInterval, &QSpinBox::valueChanged, this, &MainWindow::updateIntervalChanged); connect(timerBased, &QCheckBox::toggled, this, &MainWindow::timerUsageChanged); connect(timerBased, &QCheckBox::toggled, updateInterval, &QWidget::setEnabled); diff --git a/examples/widgets/animation/easing/window.cpp b/examples/widgets/animation/easing/window.cpp index 51d252e52b..7b4fe1d912 100644 --- a/examples/widgets/animation/easing/window.cpp +++ b/examples/widgets/animation/easing/window.cpp @@ -69,11 +69,11 @@ Window::Window(QWidget *parent) this, &Window::curveChanged); connect(m_ui.buttonGroup, &QButtonGroup::buttonClicked, this, &Window::pathChanged); - connect(m_ui.periodSpinBox, QOverload::of(&QDoubleSpinBox::valueChanged), + connect(m_ui.periodSpinBox, &QDoubleSpinBox::valueChanged, this, &Window::periodChanged); - connect(m_ui.amplitudeSpinBox, QOverload::of(&QDoubleSpinBox::valueChanged), + connect(m_ui.amplitudeSpinBox, &QDoubleSpinBox::valueChanged, this, &Window::amplitudeChanged); - connect(m_ui.overshootSpinBox, QOverload::of(&QDoubleSpinBox::valueChanged), + connect(m_ui.overshootSpinBox, &QDoubleSpinBox::valueChanged, this, &Window::overshootChanged); createCurveIcons(); diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp index ce5597bbdd..bcbf99dd41 100644 --- a/examples/widgets/desktop/screenshot/screenshot.cpp +++ b/examples/widgets/desktop/screenshot/screenshot.cpp @@ -70,7 +70,7 @@ Screenshot::Screenshot() delaySpinBox->setSuffix(tr(" s")); delaySpinBox->setMaximum(60); - connect(delaySpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(delaySpinBox, &QSpinBox::valueChanged, this, &Screenshot::updateCheckBox); hideThisWindowCheckBox = new QCheckBox(tr("Hide This Window"), optionsGroupBox); diff --git a/examples/widgets/itemviews/pixelator/mainwindow.cpp b/examples/widgets/itemviews/pixelator/mainwindow.cpp index f6b67e4dba..997f67e3c0 100644 --- a/examples/widgets/itemviews/pixelator/mainwindow.cpp +++ b/examples/widgets/itemviews/pixelator/mainwindow.cpp @@ -116,9 +116,9 @@ MainWindow::MainWindow() connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit); connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutBox); //! [4] - connect(pixelSizeSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(pixelSizeSpinBox, &QSpinBox::valueChanged, delegate, &PixelDelegate::setPixelSize); - connect(pixelSizeSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(pixelSizeSpinBox, &QSpinBox::valueChanged, this, &MainWindow::updateView); //! [4] diff --git a/examples/widgets/painting/basicdrawing/window.cpp b/examples/widgets/painting/basicdrawing/window.cpp index c3f05dd948..0a035cc299 100644 --- a/examples/widgets/painting/basicdrawing/window.cpp +++ b/examples/widgets/painting/basicdrawing/window.cpp @@ -159,7 +159,7 @@ Window::Window() //! [8] connect(shapeComboBox, &QComboBox::activated, this, &Window::shapeChanged); - connect(penWidthSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(penWidthSpinBox, &QSpinBox::valueChanged, this, &Window::penChanged); connect(penStyleComboBox, &QComboBox::activated, this, &Window::penChanged); diff --git a/examples/widgets/painting/painterpaths/window.cpp b/examples/widgets/painting/painterpaths/window.cpp index e43a0377af..07d3c5aaa8 100644 --- a/examples/widgets/painting/painterpaths/window.cpp +++ b/examples/widgets/painting/painterpaths/window.cpp @@ -204,9 +204,9 @@ Window::Window() this, &Window::penColorChanged); for (RenderArea *area : qAsConst(renderAreas)) { - connect(penWidthSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(penWidthSpinBox, &QSpinBox::valueChanged, area, &RenderArea::setPenWidth); - connect(rotationAngleSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(rotationAngleSpinBox, &QSpinBox::valueChanged, area, &RenderArea::setRotationAngle); } diff --git a/examples/widgets/richtext/calendar/mainwindow.cpp b/examples/widgets/richtext/calendar/mainwindow.cpp index 0842faeb16..8ac5a8cdce 100644 --- a/examples/widgets/richtext/calendar/mainwindow.cpp +++ b/examples/widgets/richtext/calendar/mainwindow.cpp @@ -90,7 +90,7 @@ MainWindow::MainWindow() this, &MainWindow::setMonth); connect(yearEdit, &QDateTimeEdit::dateChanged, this, &MainWindow::setYear); - connect(fontSizeSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(fontSizeSpinBox, &QSpinBox::valueChanged, this, &MainWindow::setFontSize); //! [3] diff --git a/examples/widgets/tools/completer/mainwindow.cpp b/examples/widgets/tools/completer/mainwindow.cpp index 14ad73847e..8e9c0e0615 100644 --- a/examples/widgets/tools/completer/mainwindow.cpp +++ b/examples/widgets/tools/completer/mainwindow.cpp @@ -123,7 +123,7 @@ MainWindow::MainWindow(QWidget *parent) this, &MainWindow::changeMode); connect(caseCombo, &QComboBox::activated, this, &MainWindow::changeCase); - connect(maxVisibleSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(maxVisibleSpinBox, &QSpinBox::valueChanged, this, &MainWindow::changeMaxVisible); //! [2] diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp index 6398098eee..2f2e2f6ea7 100644 --- a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp +++ b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp @@ -222,7 +222,7 @@ RegularExpressionDialog::RegularExpressionDialog(QWidget *parent) connect(optimizeOnFirstUsageOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); connect(dontAutomaticallyOptimizeOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); - connect(offsetSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(offsetSpinBox, &QSpinBox::valueChanged, this, &RegularExpressionDialog::refresh); connect(matchTypeComboBox, QOverload::of(&QComboBox::currentIndexChanged), diff --git a/examples/widgets/tools/undo/mainwindow.cpp b/examples/widgets/tools/undo/mainwindow.cpp index 9d83e3067a..5623a09ad2 100644 --- a/examples/widgets/tools/undo/mainwindow.cpp +++ b/examples/widgets/tools/undo/mainwindow.cpp @@ -86,7 +86,7 @@ MainWindow::MainWindow(QWidget *parent) connect(actionAbout, &QAction::triggered, this, &MainWindow::about); connect(actionAboutQt, &QAction::triggered, this, &MainWindow::aboutQt); - connect(undoLimit, QOverload::of(&QSpinBox::valueChanged), this, &MainWindow::updateActions); + connect(undoLimit, &QSpinBox::valueChanged, this, &MainWindow::updateActions); connect(documentTabs, &QTabWidget::currentChanged, this, &MainWindow::updateActions); actionOpen->setShortcut(QString("Ctrl+O")); diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index 928470b054..be92f83c75 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -401,7 +401,7 @@ QWidget *MainWindow::createIconSizeGroupBox() //! [26] //! [27] - connect(otherSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(otherSpinBox, &QSpinBox::valueChanged, this, &MainWindow::triggerChangeSize); QHBoxLayout *otherSizeLayout = new QHBoxLayout; diff --git a/examples/widgets/widgets/movie/movieplayer.cpp b/examples/widgets/widgets/movie/movieplayer.cpp index 41cd7923ee..76849268ab 100644 --- a/examples/widgets/widgets/movie/movieplayer.cpp +++ b/examples/widgets/widgets/movie/movieplayer.cpp @@ -81,7 +81,7 @@ MoviePlayer::MoviePlayer(QWidget *parent) connect(movie, &QMovie::stateChanged, this, &MoviePlayer::updateButtons); connect(fitCheckBox, &QCheckBox::clicked, this, &MoviePlayer::fitToWindow); connect(frameSlider, &QSlider::valueChanged, this, &MoviePlayer::goToFrame); - connect(speedSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(speedSpinBox, &QSpinBox::valueChanged, movie, &QMovie::setSpeed); mainLayout = new QVBoxLayout; diff --git a/examples/widgets/widgets/sliders/window.cpp b/examples/widgets/widgets/sliders/window.cpp index 948e545850..916f206379 100644 --- a/examples/widgets/widgets/sliders/window.cpp +++ b/examples/widgets/widgets/sliders/window.cpp @@ -78,7 +78,7 @@ Window::Window(QWidget *parent) verticalSliders, &SlidersGroup::setValue); connect(verticalSliders, &SlidersGroup::valueChanged, valueSpinBox, &QSpinBox::setValue); - connect(valueSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(valueSpinBox, &QSpinBox::valueChanged, horizontalSliders, &SlidersGroup::setValue); QHBoxLayout *layout = new QHBoxLayout; @@ -129,13 +129,13 @@ void Window::createControls(const QString &title) connect(orientationCombo, &QComboBox::activated, //! [7] //! [8] stackedWidget, &QStackedWidget::setCurrentIndex); - connect(minimumSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(minimumSpinBox, &QSpinBox::valueChanged, horizontalSliders, &SlidersGroup::setMinimum); - connect(minimumSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(minimumSpinBox, &QSpinBox::valueChanged, verticalSliders, &SlidersGroup::setMinimum); - connect(maximumSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(maximumSpinBox, &QSpinBox::valueChanged, horizontalSliders, &SlidersGroup::setMaximum); - connect(maximumSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(maximumSpinBox, &QSpinBox::valueChanged, verticalSliders, &SlidersGroup::setMaximum); connect(invertedAppearance, &QCheckBox::toggled, horizontalSliders, &SlidersGroup::invertAppearance); diff --git a/examples/widgets/widgets/spinboxes/window.cpp b/examples/widgets/widgets/spinboxes/window.cpp index 40c02aba70..6aeb5a8f69 100644 --- a/examples/widgets/widgets/spinboxes/window.cpp +++ b/examples/widgets/widgets/spinboxes/window.cpp @@ -262,7 +262,7 @@ void Window::createDoubleSpinBoxes() priceSpinBox->setPrefix("$"); priceSpinBox->setValue(99.99); - connect(precisionSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(precisionSpinBox, &QSpinBox::valueChanged, //! [17] this, &Window::changePrecision); diff --git a/examples/widgets/widgets/validators/validatorwidget.cpp b/examples/widgets/widgets/validators/validatorwidget.cpp index 625441d7c5..504eec4fe7 100644 --- a/examples/widgets/widgets/validators/validatorwidget.cpp +++ b/examples/widgets/widgets/validators/validatorwidget.cpp @@ -75,7 +75,7 @@ ValidatorWidget::ValidatorWidget(QWidget *parent) this, &ValidatorWidget::updateDoubleValidator); connect(doubleMinVal, &QDoubleSpinBox::editingFinished, this, &ValidatorWidget::updateDoubleValidator); - connect(doubleDecimals, QOverload::of(&QSpinBox::valueChanged), + connect(doubleDecimals, &QSpinBox::valueChanged, this, &ValidatorWidget::updateDoubleValidator); connect(doubleFormat, &QComboBox::activated, this, &ValidatorWidget::updateDoubleValidator); diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp index bd4aa962b7..185349af11 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp @@ -277,13 +277,13 @@ QPageSetupWidget::QPageSetupWidget(QWidget *parent) connect(m_ui.unitCombo, &QComboBox::activated, this, &QPageSetupWidget::unitChanged); connect(m_ui.pageSizeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.pageWidth, QOverload::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.pageHeight, QOverload::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged); + connect(m_ui.pageWidth, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::pageSizeChanged); + connect(m_ui.pageHeight, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.leftMargin, QOverload::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::leftMarginChanged); - connect(m_ui.topMargin, QOverload::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::topMarginChanged); - connect(m_ui.rightMargin, QOverload::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::rightMarginChanged); - connect(m_ui.bottomMargin, QOverload::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::bottomMarginChanged); + connect(m_ui.leftMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::leftMarginChanged); + connect(m_ui.topMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::topMarginChanged); + connect(m_ui.rightMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::rightMarginChanged); + connect(m_ui.bottomMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::bottomMarginChanged); connect(m_ui.portrait, &QRadioButton::clicked, this, &QPageSetupWidget::pageOrientationChanged); connect(m_ui.landscape, &QRadioButton::clicked, this, &QPageSetupWidget::pageOrientationChanged); diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index b5b8608418..6c12b553b4 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -254,7 +254,6 @@ QAccessibleSpinBox::QAccessibleSpinBox(QWidget *w) { Q_ASSERT(spinBox()); addControllingSignal(QLatin1String("valueChanged(int)")); - addControllingSignal(QLatin1String("valueChanged(QString)")); } /*! @@ -272,7 +271,6 @@ QAccessibleDoubleSpinBox::QAccessibleDoubleSpinBox(QWidget *widget) { Q_ASSERT(qobject_cast(widget)); addControllingSignal(QLatin1String("valueChanged(double)")); - addControllingSignal(QLatin1String("valueChanged(QString)")); } /*! diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp index cbd600ec6c..6ac2e1cec2 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -191,17 +191,6 @@ public: The new text is passed in \a text with prefix() and suffix(). */ -#if QT_DEPRECATED_SINCE(5, 14) -/*! - \fn void QSpinBox::valueChanged(const QString &text) - - \overload - \obsolete Use textChanged(QString) instead - - The new value is passed in \a text with prefix() and suffix(). -*/ -#endif - /*! Constructs a spin box with 0 as minimum value and 99 as maximum value, a step value of 1. The value is initially set to 0. It is parented to \a @@ -663,17 +652,6 @@ void QSpinBox::fixup(QString &input) const The new text is passed in \a text with prefix() and suffix(). */ -#if QT_DEPRECATED_SINCE(5, 14) -/*! - \fn void QDoubleSpinBox::valueChanged(const QString &text); - - \overload - \obsolete Use textChanged(QString) instead - - The new value is passed in \a text with prefix() and suffix(). -*/ -#endif - /*! Constructs a spin box with 0.0 as minimum value and 99.99 as maximum value, a step value of 1.0 and a precision of 2 decimal places. The value is @@ -1095,12 +1073,6 @@ void QSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old) if (ep != NeverEmit) { pendingEmit = false; if (ep == AlwaysEmit || value != old) { -#if QT_DEPRECATED_SINCE(5, 14) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit q->valueChanged(edit->displayText()); -QT_WARNING_POP -#endif emit q->textChanged(edit->displayText()); emit q->valueChanged(value.toInt()); } @@ -1252,12 +1224,6 @@ void QDoubleSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old) if (ep != NeverEmit) { pendingEmit = false; if (ep == AlwaysEmit || value != old) { -#if QT_DEPRECATED_SINCE(5, 14) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit q->valueChanged(edit->displayText()); -QT_WARNING_POP -#endif emit q->textChanged(edit->displayText()); emit q->valueChanged(value.toDouble()); } diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 762dd4a46a..be5357b028 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -107,10 +107,6 @@ public Q_SLOTS: Q_SIGNALS: void valueChanged(int); void textChanged(const QString &); -#if QT_DEPRECATED_SINCE(5, 14) - QT_DEPRECATED_X("Use textChanged(QString) instead") - void valueChanged(const QString &); -#endif private: Q_DISABLE_COPY(QSpinBox) @@ -173,10 +169,6 @@ public Q_SLOTS: Q_SIGNALS: void valueChanged(double); void textChanged(const QString &); -#if QT_DEPRECATED_SINCE(5, 14) - QT_DEPRECATED_X("Use textChanged(QString) instead") - void valueChanged(const QString &); -#endif private: Q_DISABLE_COPY(QDoubleSpinBox) diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index c6de750482..cec2da1d57 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -419,7 +419,7 @@ void tst_QDoubleSpinBox::setTracking() spin.setDecimals(decimals); spin.show(); - connect(&spin, SIGNAL(valueChanged(QString)), this, SLOT(valueChangedHelper(QString))); + connect(&spin, SIGNAL(textChanged(QString)), this, SLOT(valueChangedHelper(QString))); keys.simulate(&spin); QCOMPARE(actualTexts, texts); @@ -1774,7 +1774,7 @@ void tst_QDoubleSpinBox::stepModifierPressAndHold() stepModifierStyle->stepModifier = static_cast(stepModifier); spin.setStyle(stepModifierStyle.data()); - QSignalSpy spy(&spin, QOverload::of(&DoubleSpinBox::valueChanged)); + QSignalSpy spy(&spin, &DoubleSpinBox::valueChanged); spin.show(); QVERIFY(QTest::qWaitForWindowExposed(&spin)); diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 5b49e3484c..a8b47ffc46 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -1830,9 +1830,9 @@ void tst_QSpinBox::stepModifierPressAndHold() stepModifierStyle->stepModifier = static_cast(stepModifier); spin.setStyle(stepModifierStyle.data()); - QSignalSpy spy(&spin, QOverload::of(&SpinBox::valueChanged)); + QSignalSpy spy(&spin, &SpinBox::valueChanged); // TODO: remove debug output when QTBUG-69492 is fixed - connect(&spin, QOverload::of(&SpinBox::valueChanged), [=]() { + connect(&spin, &SpinBox::valueChanged, [=]() { qDebug() << QTime::currentTime() << "valueChanged emitted"; }); -- cgit v1.2.3