From b3b51a7665dae78db352ccdeb5f25f0e5df43c09 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 25 Mar 2020 10:57:14 +0100 Subject: Fix deprecation warnings for QInputDialog::getDouble() The way this was done didn't really make sense. The change added an overload with one additional argument. The deprecation warning would have now forced everybody to explicitly specify all arguments to avoid the warning. Instead, keep both overloads in 5.15, but document them as one method. Remove the old version in Qt6 and move the default arguments to the new version. Change-Id: I738d4d1b99cdf30db53acf14382a00cac74aa10a Reviewed-by: Kai Koehne --- src/widgets/dialogs/qinputdialog.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/widgets/dialogs/qinputdialog.h') diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 6e2d6eebf30..a8696cb5625 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -177,21 +177,19 @@ public: int minValue = -2147483647, int maxValue = 2147483647, int step = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("This overload is deprecated. Use the overload that takes step as a final argument") - static double getDouble(QWidget *parent, const QString &title, const QString &label, double value = 0, - double minValue = -2147483647, double maxValue = 2147483647, - int decimals = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); -#endif -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) || defined(Q_QDOC) static double getDouble(QWidget *parent, const QString &title, const QString &label, double value = 0, double minValue = -2147483647, double maxValue = 2147483647, int decimals = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(), double step = 1); #else - static double getDouble(QWidget *parent, const QString &title, const QString &label, double value, - double minValue, double maxValue, int decimals, bool *ok, Qt::WindowFlags flags, - double step); + static double getDouble(QWidget *parent, const QString &title, const QString &label, + double value = 0, double minValue = -2147483647, + double maxValue = 2147483647, int decimals = 1, bool *ok = nullptr, + Qt::WindowFlags flags = Qt::WindowFlags()); + static double getDouble(QWidget *parent, const QString &title, const QString &label, + double value, double minValue, double maxValue, int decimals, bool *ok, + Qt::WindowFlags flags, double step); #endif #if QT_DEPRECATED_SINCE(5, 0) -- cgit v1.2.3