summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qfontdialog.h
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2012-01-20 02:23:16 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-21 19:17:03 +0100
commit75292d0442735337492eedec1019841e052e71ad (patch)
tree9308cb057f45d4bfb5a05c73ee61dd460565b94a /src/widgets/dialogs/qfontdialog.h
parent02ad2c18295fa9c48b436740b2065a9d626c89af (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.h')
-rw-r--r--src/widgets/dialogs/qfontdialog.h8
1 files changed, 2 insertions, 6 deletions
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);