diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-21 19:37:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-21 19:17:03 +0100 |
| commit | 10a034f0271b712a4eadcea9b17db407e032d860 (patch) | |
| tree | de0862d152c784d49829a504839351dcab8a8a60 /src/widgets/dialogs/qinputdialog.cpp | |
| parent | 75292d0442735337492eedec1019841e052e71ad (diff) | |
Merge overloads of QInputDialog::getText() and QInputDialog::getItem()
Change-Id: Ifaefaa5c3faa698c8570da4ef00e130c211b2609
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/widgets/dialogs/qinputdialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qinputdialog.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index dc7e30368b..903d50edab 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -1173,17 +1173,6 @@ QString QInputDialog::getText(QWidget *parent, const QString &title, const QStri } /*! - \internal -*/ -// ### Qt 5: Use only the version above. -QString QInputDialog::getText(QWidget *parent, const QString &title, const QString &label, - QLineEdit::EchoMode mode, const QString &text, bool *ok, - Qt::WindowFlags flags) -{ - return getText(parent, title, label, mode, text, ok, flags, Qt::ImhNone); -} - -/*! \since 4.5 Static convenience function to get an integer input from the user. @@ -1342,17 +1331,6 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri } /*! - \internal -*/ -// ### Qt 5: Use only the version above. -QString QInputDialog::getItem(QWidget *parent, const QString &title, const QString &label, - const QStringList &items, int current, bool editable, bool *ok, - Qt::WindowFlags flags) -{ - return getItem(parent, title, label, items, current, editable, ok, flags, Qt::ImhNone); -} - -/*! \obsolete Use getInt() instead. |