diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 12 | ||||
-rw-r--r-- | src/widgets/accessible/rangecontrols.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qspinbox.cpp | 34 | ||||
-rw-r--r-- | src/widgets/widgets/qspinbox.h | 8 |
4 files changed, 6 insertions, 50 deletions
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<int>::of(&QComboBox::currentIndexChanged), this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.pageWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.pageHeight, QOverload<double>::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<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::leftMarginChanged); - connect(m_ui.topMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::topMarginChanged); - connect(m_ui.rightMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::rightMarginChanged); - connect(m_ui.bottomMargin, QOverload<double>::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<QDoubleSpinBox *>(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) |