From ded7536c90023fdf5f643a180ced405643ba7ab5 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 2 Apr 2019 11:42:23 +0200 Subject: Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345 Reviewed-by: Jüri Valdmann --- tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/qwebengineview') diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 17177c7fb..16a3d32b6 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -588,8 +588,8 @@ class KeyEventRecordingWidget : public QWidget { public: QList pressEvents; QList releaseEvents; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE { pressEvents << *e; } - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE { releaseEvents << *e; } + void keyPressEvent(QKeyEvent *e) override { pressEvents << *e; } + void keyReleaseEvent(QKeyEvent *e) override { releaseEvents << *e; } }; void tst_QWebEngineView::unhandledKeyEventPropagation() @@ -879,7 +879,7 @@ public: explicit KeyboardAndMouseEventRecordingWidget(QWidget *parent = 0) : QWidget(parent), m_eventCounter(0) {} - bool event(QEvent *event) Q_DECL_OVERRIDE + bool event(QEvent *event) override { QString eventString; switch (event->type()) { -- cgit v1.2.3