From 7c247d3e70788fd601cdc4d45649d2c7ca1004f3 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Fri, 20 Jan 2012 02:30:02 +0200 Subject: Obsolete QInputDialog::getInteger() 'officially'. It has long since been obsolete in code and removed from the documentation, but was never marked QT_DEPRECATED. Do so, and inline the implementation. Change-Id: Ic7bfdaf76269b7f9addeba83e64bc9525c581dda Reviewed-by: Jonas Gastal Reviewed-by: Lars Knoll --- src/widgets/dialogs/qinputdialog.cpp | 25 ------------------------- src/widgets/dialogs/qinputdialog.h | 11 +++++++---- 2 files changed, 7 insertions(+), 29 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 903d50edab..b9fde611d6 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -1330,18 +1330,6 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri } } -/*! - \obsolete - - Use getInt() instead. -*/ -int QInputDialog::getInteger(QWidget *parent, const QString &title, const QString &label, - int value, int min, int max, int step, bool *ok, - Qt::WindowFlags flags) -{ - return getInt(parent, title, label, value, min, max, step, ok, flags); -} - /*! \fn QString QInputDialog::getText(const QString &title, const QString &label, QLineEdit::EchoMode echo = QLineEdit::Normal, @@ -1354,19 +1342,6 @@ int QInputDialog::getInteger(QWidget *parent, const QString &title, const QStrin The \a name parameter is ignored. */ -/*! - \fn int QInputDialog::getInteger(const QString &title, const QString &label, int value = 0, - int min = -2147483647, int max = 2147483647, - int step = 1, bool *ok = 0, - QWidget *parent = 0, const char *name = 0, Qt::WindowFlags flags = 0) - - - Call getInteger(\a parent, \a title, \a label, \a value, \a - min, \a max, \a step, \a ok, \a flags) instead. - - The \a name parameter is ignored. -*/ - /*! \fn double QInputDialog::getDouble(const QString &title, const QString &label, double value = 0, double min = -2147483647, double max = 2147483647, diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 31ba6a3966..0db83ba5c8 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -183,11 +183,14 @@ public: double minValue = -2147483647, double maxValue = 2147483647, int decimals = 1, bool *ok = 0, Qt::WindowFlags flags = 0); - // obsolete - static int getInteger(QWidget *parent, const QString &title, const QString &label, int value = 0, +#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 = 0, Qt::WindowFlags flags = 0); - + int step = 1, bool *ok = 0, Qt::WindowFlags flags = 0) + { + return getInt(parent, title, label, value, minValue, maxValue, step, ok, flags); + } +#endif Q_SIGNALS: // ### emit signals! -- cgit v1.2.3