diff options
author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-20 02:30:02 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-22 22:10:02 +0100 |
commit | 7c247d3e70788fd601cdc4d45649d2c7ca1004f3 (patch) | |
tree | 77f54d9502f440704ea1ff51aab0ff031cb9e986 /src/widgets/dialogs | |
parent | 8ec2068f3d3e89d3b3c67ab65cf2b0ba694452a0 (diff) |
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 <jgastal@profusion.mobi>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qinputdialog.cpp | 25 | ||||
-rw-r--r-- | src/widgets/dialogs/qinputdialog.h | 11 |
2 files changed, 7 insertions, 29 deletions
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 @@ -1331,18 +1331,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, const QString &text = QString(), bool *ok = 0, @@ -1355,19 +1343,6 @@ int QInputDialog::getInteger(QWidget *parent, const QString &title, const QStrin */ /*! - \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, int decimals = 1, bool *ok = 0, 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! |