From 75292d0442735337492eedec1019841e052e71ad Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Fri, 20 Jan 2012 02:23:16 +0200 Subject: 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 --- src/widgets/dialogs/qfontdialog.cpp | 17 ----------------- src/widgets/dialogs/qfontdialog.h | 8 ++------ 2 files changed, 2 insertions(+), 23 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 @@ -383,23 +383,6 @@ QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget *parent, cons return QFontDialogPrivate::getFont(ok, initial, parent, title, options); } -/*! - \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 diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index bda23def26..3d8566d6d8 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -97,13 +97,9 @@ public: void setVisible(bool visible); - // ### Qt 5: merge overloads - static QFont getFont(bool *ok, const QFont &initial, QWidget *parent, const QString &title, - FontDialogOptions options); - static QFont getFont(bool *ok, const QFont &initial, QWidget *parent, const QString &title); - static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = 0); static QFont getFont(bool *ok, QWidget *parent = 0); - + static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = 0, const QString &title = QString(), + FontDialogOptions options = 0); Q_SIGNALS: void currentFontChanged(const QFont &font); -- cgit v1.2.3