diff options
Diffstat (limited to 'src/widgets/dialogs/qfontdialog.h')
-rw-r--r-- | src/widgets/dialogs/qfontdialog.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index 455b5d3f3e..a065f8bebf 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -79,16 +79,10 @@ public: void setOptions(FontDialogOptions options); FontDialogOptions options() const; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); - void setVisible(bool visible); + void setVisible(bool visible) Q_DECL_OVERRIDE; static QFont getFont(bool *ok, QWidget *parent = 0); static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = 0, const QString &title = QString(), @@ -99,9 +93,9 @@ Q_SIGNALS: void fontSelected(const QFont &font); protected: - void changeEvent(QEvent *event); - void done(int result); - bool eventFilter(QObject *object, QEvent *event); + void changeEvent(QEvent *event) Q_DECL_OVERRIDE; + void done(int result) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QFontDialog) |