1 files changed, 14 insertions, 37 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index eaad5e478d..28c439dbcd 100644
--- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -1,32 +1,7 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QTest>
 #include <QtWidgets/qgraphicseffect.h>
 #include <QtWidgets/qgraphicsview.h>
 #include <QtWidgets/qgraphicsscene.h>
@@ -43,7 +18,7 @@ public:
           m_painter(0)
     {}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         m_painter = painter;
         ++numRepaints;
@@ -70,7 +45,7 @@ public:
           m_painter(0), m_source(0)
     {}
 
-    QRectF boundingRectFor(const QRectF &rect) const
+    QRectF boundingRectFor(const QRectF &rect) const override
     { return rect.adjusted(-m_margin, -m_margin, m_margin, m_margin); }
 
     void reset()
@@ -94,7 +69,7 @@ public:
     int margin() const
     { return m_margin; }
 
-    void draw(QPainter *painter)
+    void draw(QPainter *painter) override
     {
         ++numRepaints;
         if (storeDeviceDependentStuff) {
@@ -109,7 +84,7 @@ public:
         source()->draw(painter);
     }
 
-    void sourceChanged(ChangeFlags)
+    void sourceChanged(ChangeFlags) override
     { m_sourceChanged = true; }
 
     void sourceBoundingRectChanged()
@@ -179,11 +154,11 @@ void tst_QGraphicsEffectSource::init()
     QVERIFY(effect);
     QVERIFY(item);
     QVERIFY(effect->source());
-    effect->reset();
     effect->storeDeviceDependentStuff = false;
     effect->doNothingInDraw = false;
-    item->reset();
     QCoreApplication::processEvents(); // Process all queued paint events
+    effect->reset();
+    item->reset();
 }
 
 void tst_QGraphicsEffectSource::graphicsItem()
@@ -310,11 +285,13 @@ public:
     {
     }
 
-    QRectF boundingRectFor(const QRectF &src) const {
+    QRectF boundingRectFor(const QRectF &src) const override
+    {
         return src.adjusted(-10, -10, 10, 10);
     }
 
-    void draw(QPainter *) {
+    void draw(QPainter *) override
+    {
         pix = source()->pixmap(coordinateMode, &offset, padMode);
     }