From fe4a5a27e09b8109381e52aa1b71135a916dff1a Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 15 Apr 2020 16:55:41 +0200 Subject: Remove deprecated members from dialog classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And a few cleanups of out-dated comments and dead code. Change-Id: I59c6b9129a21b8953626cb63c3ebbf9b6c49a657 Reviewed-by: Tor Arne Vestbø --- src/widgets/dialogs/qinputdialog.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/widgets/dialogs/qinputdialog.h') diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index a8696cb562..d3c95ccd23 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -56,7 +56,6 @@ class Q_WIDGETS_EXPORT QInputDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QInputDialog) -// Q_ENUMS(InputMode InputDialogOption) QDOC_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode) QDOC_PROPERTY(QString labelText READ labelText WRITE setLabelText) QDOC_PROPERTY(InputDialogOptions options READ options WRITE setOptions) @@ -177,35 +176,15 @@ public: int minValue = -2147483647, int maxValue = 2147483647, int step = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); -#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 = 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) - QT_DEPRECATED static inline int getInteger(QWidget *parent, const QString &title, const QString &label, int value = 0, - int minValue = -2147483647, int maxValue = 2147483647, - int step = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()) - { - return getInt(parent, title, label, value, minValue, maxValue, step, ok, flags); - } -#endif void setDoubleStep(double step); double doubleStep() const; Q_SIGNALS: - // ### emit signals! void textValueChanged(const QString &text); void textValueSelected(const QString &text); void intValueChanged(int value); -- cgit v1.2.3