diff options
Diffstat (limited to 'src/widgets/kernel/qapplication.h')
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 396d0c9474..7a5d7ba1a9 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -110,11 +110,11 @@ public: using QGuiApplication::palette; static QPalette palette(const QWidget *); static QPalette palette(const char *className); - static void setPalette(const QPalette &, const char* className = Q_NULLPTR); + static void setPalette(const QPalette &, const char* className = nullptr); static QFont font(); static QFont font(const QWidget*); static QFont font(const char *className); - static void setFont(const QFont &, const char* className = Q_NULLPTR); + static void setFont(const QFont &, const char* className = nullptr); static QFontMetrics fontMetrics(); #if QT_VERSION < 0x060000 // remove these forwarders in Qt 6 @@ -177,7 +177,7 @@ public: #endif static int exec(); - bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool notify(QObject *, QEvent *) override; #ifdef QT_KEYPAD_NAVIGATION static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); @@ -201,8 +201,8 @@ public Q_SLOTS: static void aboutQt(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override; private: Q_DISABLE_COPY(QApplication) |