diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 17 | ||||
-rw-r--r-- | 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 @@ -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. 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); |