diff options
Diffstat (limited to 'src/gui/kernel/qwindow.h')
-rw-r--r-- | src/gui/kernel/qwindow.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 44ff054fa3..ac5543f884 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -141,12 +141,12 @@ public: }; Q_ENUM(AncestorMode) - explicit QWindow(QScreen *screen = Q_NULLPTR); + explicit QWindow(QScreen *screen = nullptr); explicit QWindow(QWindow *parent); virtual ~QWindow(); void setSurfaceType(SurfaceType surfaceType); - SurfaceType surfaceType() const Q_DECL_OVERRIDE; + SurfaceType surfaceType() const override; bool isVisible() const; @@ -168,7 +168,7 @@ public: void setModality(Qt::WindowModality modality); void setFormat(const QSurfaceFormat &format); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; QSurfaceFormat requestedFormat() const; void setFlags(Qt::WindowFlags flags); @@ -231,7 +231,7 @@ public: inline int x() const { return geometry().x(); } inline int y() const { return geometry().y(); } - QSize size() const Q_DECL_OVERRIDE { return geometry().size(); } + QSize size() const override { return geometry().size(); } inline QPoint position() const { return geometry().topLeft(); } void setPosition(const QPoint &pt); @@ -347,7 +347,7 @@ protected: virtual void hideEvent(QHideEvent *); // TODO Qt 6 - add closeEvent virtual handler - virtual bool event(QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *) override; virtual void keyPressEvent(QKeyEvent *); virtual void keyReleaseEvent(QKeyEvent *); virtual void mousePressEvent(QMouseEvent *); @@ -367,7 +367,7 @@ protected: private: Q_PRIVATE_SLOT(d_func(), void _q_clearAlert()) - QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE; + QPlatformSurface *surfaceHandle() const override; Q_DISABLE_COPY(QWindow) @@ -380,12 +380,12 @@ private: #ifndef Q_QDOC template <> inline QWindow *qobject_cast<QWindow*>(QObject *o) { - if (!o || !o->isWindowType()) return Q_NULLPTR; + if (!o || !o->isWindowType()) return nullptr; return static_cast<QWindow*>(o); } template <> inline const QWindow *qobject_cast<const QWindow*>(const QObject *o) { - if (!o || !o->isWindowType()) return Q_NULLPTR; + if (!o || !o->isWindowType()) return nullptr; return static_cast<const QWindow*>(o); } #endif // !Q_QDOC |