Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR

Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 6efbf53ed..b0165cfbc 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -134,7 +134,7 @@ void tst_Accessibility::hierarchy()
     QVERIFY(windowRect.contains(inputRect));
     QPoint inputCenter = inputRect.center();
     QAccessibleInterface *hitTest = view;
-    QAccessibleInterface *child = Q_NULLPTR;
+    QAccessibleInterface *child = nullptr;
     while (hitTest) {
         child = hitTest;
         hitTest = hitTest->childAt(inputCenter.x(), inputCenter.y());
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 3792b5522..f73469d83 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1550,7 +1550,7 @@ public:
     JavaScriptCallback() { }
     JavaScriptCallback(const QVariant& _expected) : expected(_expected) { }
 
-    void check(const QVariant& result) Q_DECL_OVERRIDE
+    void check(const QVariant& result) override
     {
         QVERIFY(result.isValid());
         QCOMPARE(result, expected);
@@ -1563,7 +1563,7 @@ private:
 class JavaScriptCallbackNull : public JavaScriptCallbackBase
 {
 public:
-    void check(const QVariant& result) Q_DECL_OVERRIDE
+    void check(const QVariant& result) override
     {
         QVERIFY(result.isNull());
 // FIXME: Returned null values are currently invalid QVariants.
@@ -1574,7 +1574,7 @@ public:
 class JavaScriptCallbackUndefined : public JavaScriptCallbackBase
 {
 public:
-    void check(const QVariant& result) Q_DECL_OVERRIDE
+    void check(const QVariant& result) override
     {
         QVERIFY(result.isNull());
         QVERIFY(!result.isValid());
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 8bd68bb97..ebd25e892 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -374,17 +374,17 @@ public:
     {
     }
 
-    qint64 readData(char *, qint64) Q_DECL_OVERRIDE
+    qint64 readData(char *, qint64) override
     {
         m_job->fail(QWebEngineUrlRequestJob::RequestFailed);
         return -1;
     }
-    qint64 writeData(const char *, qint64) Q_DECL_OVERRIDE
+    qint64 writeData(const char *, qint64) override
     {
         m_job->fail(QWebEngineUrlRequestJob::RequestFailed);
         return -1;
     }
-    void close() Q_DECL_OVERRIDE
+    void close() override
     {
         QIODevice::close();
         deleteLater();
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<QKeyEvent> pressEvents;
     QList<QKeyEvent> 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()) {