1 files changed, 14 insertions, 39 deletions

diff --git a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
index 1d46886d1c..f173c9a8df 100644
--- a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
+++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
@@ -1,33 +1,8 @@
-/****************************************************************************
-**
-** 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 <QStyleOption>
 
 
@@ -45,16 +20,16 @@ struct StyleOptionPointerBase
 {
     QStyleOption *pointer;
 
-    StyleOptionPointerBase(QStyleOption *p = 0) : pointer(p) { }
+    StyleOptionPointerBase(QStyleOption *p = nullptr) : pointer(p) { }
 
-    virtual ~StyleOptionPointerBase() { pointer = 0; }
+    virtual ~StyleOptionPointerBase() { pointer = nullptr; }
 };
 
 template <typename T>
 struct StyleOptionPointer: public StyleOptionPointerBase
 {
-    StyleOptionPointer(T *p = 0): StyleOptionPointerBase(p) {}
-    ~StyleOptionPointer() { delete static_cast<T *>(pointer); pointer = 0; }
+    StyleOptionPointer(T *p = nullptr): StyleOptionPointerBase(p) {}
+    ~StyleOptionPointer() { delete static_cast<T *>(pointer); pointer = nullptr; }
 };
 
 Q_DECLARE_METATYPE(StyleOptionPointerBase*)
@@ -94,25 +69,25 @@ void tst_QStyleOption::qstyleoptioncast()
     QFETCH(bool, canCastToComplex);
     QFETCH(int, type);
 
-    QVERIFY(testOption->pointer != 0);
+    QVERIFY(testOption->pointer != nullptr);
 
     QCOMPARE(testOption->pointer->type, type);
 
     // Cast to common base class
     QStyleOption *castOption = qstyleoption_cast<QStyleOption*>(testOption->pointer);
-    QVERIFY(castOption != 0);
+    QVERIFY(castOption != nullptr);
 
     // Cast to complex base class
     castOption = qstyleoption_cast<QStyleOptionComplex*>(testOption->pointer);
-    QCOMPARE(canCastToComplex, (castOption != 0));
+    QCOMPARE(canCastToComplex, (castOption != nullptr));
 
     // Cast to combo box
     castOption = qstyleoption_cast<QStyleOptionComboBox*>(testOption->pointer);
-    QCOMPARE((castOption != 0),(testOption->pointer->type == QStyleOption::SO_ComboBox));
+    QCOMPARE((castOption != nullptr),(testOption->pointer->type == QStyleOption::SO_ComboBox));
 
     // Cast to button
     castOption = qstyleoption_cast<QStyleOptionButton*>(testOption->pointer);
-    QCOMPARE((castOption != 0),(testOption->pointer->type == QStyleOption::SO_Button));
+    QCOMPARE((castOption != nullptr),(testOption->pointer->type == QStyleOption::SO_Button));
 
     // Cast to lower version
     testOption->pointer->version += 1;