From 681f93c74d7d60dc1998d3124e1f59ddc0f476ee Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Wed, 20 Sep 2017 20:57:39 +0200 Subject: Replace Q_DECL_OVERRIDE with override Change-Id: I176f91a8c51e81a2df3fe91733118261491223ee Reviewed-by: Lars Knoll --- src/quickwidgets/qquickwidget.cpp | 2 +- src/quickwidgets/qquickwidget_p.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quickwidgets') diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 6784155d25..1fea73818c 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -80,7 +80,7 @@ class QQuickWidgetRenderControl : public QQuickRenderControl { public: QQuickWidgetRenderControl(QQuickWidget *quickwidget) : m_quickWidget(quickwidget) {} - QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE { + QWindow *renderWindow(QPoint *offset) override { if (offset) *offset = m_quickWidget->mapTo(m_quickWidget->window(), QPoint()); return m_quickWidget->window()->windowHandle(); diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 6892e6e0b4..a92fb9f6bd 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -87,7 +87,7 @@ public: ~QQuickWidgetPrivate(); void execute(); - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry) override; void initResize(); void updateSize(); void updatePosition(); @@ -100,8 +100,8 @@ public: void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs); #if QT_CONFIG(opengl) - GLuint textureId() const Q_DECL_OVERRIDE; - QImage grabFramebuffer() Q_DECL_OVERRIDE; + GLuint textureId() const override; + QImage grabFramebuffer() override; #else QImage grabFramebuffer(); #endif -- cgit v1.2.3