diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-20 02:23:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-21 19:17:03 +0100 |
| commit | 75292d0442735337492eedec1019841e052e71ad (patch) | |
| tree | 9308cb057f45d4bfb5a05c73ee61dd460565b94a /src/widgets/dialogs/qfontdialog.cpp | |
| parent | 02ad2c18295fa9c48b436740b2065a9d626c89af (diff) | |
Merge overloads of QFontDialog::getFont().
Per Qt 5 comment. Note that this leaves one overload of getFont() intact, as
removing it would be a source-incompatible change.
Change-Id: Ieb6ddfef9aa86750c14928ab2e0a9bfb84d322ab
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qfontdialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index c8fb36d9d6..cbe16702e4 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -385,23 +385,6 @@ QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget *parent, cons /*! \overload - \since 4.5 -*/ -QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget *parent, const QString &title) -{ - return QFontDialogPrivate::getFont(ok, initial, parent, title, 0); -} - -/*! - \overload -*/ -QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget *parent) -{ - return QFontDialogPrivate::getFont(ok, initial, parent, QString(), 0); -} - -/*! - \overload Executes a modal font dialog and returns a font. |