whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Robin Burchell 2012-01-20 02:23:16 +02:00 committed by Qt by Nokia
parent 02ad2c1829
commit 75292d0442
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/dialogs/qfontdialog.cpp
View File

@ -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

8
src/widgets/dialogs/qfontdialog.h
View File

@ -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);