1 files changed, 5 insertions, 42 deletions

diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h
index 89823ca2..b9436822 100644
--- a/src/sensors/qorientationsensor.h
+++ b/src/sensors/qorientationsensor.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QORIENTATIONSENSOR_H
 #define QORIENTATIONSENSOR_H
@@ -49,7 +13,6 @@ class QOrientationReadingPrivate;
 class Q_SENSORS_EXPORT QOrientationReading : public QSensorReading
 {
     Q_OBJECT
-    Q_ENUMS(Orientation)
     Q_PROPERTY(Orientation orientation READ orientation)
     DECLARE_READING(QOrientationReading)
 public:
@@ -62,6 +25,7 @@ public:
         FaceUp,
         FaceDown
     };
+    Q_ENUM(Orientation)
 
     Orientation orientation() const;
     void setOrientation(Orientation orientation);
@@ -79,10 +43,10 @@ class Q_SENSORS_EXPORT QOrientationSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QOrientationSensor(QObject *parent = Q_NULLPTR);
+    explicit QOrientationSensor(QObject *parent = nullptr);
     virtual ~QOrientationSensor();
     QOrientationReading *reading() const;
-    static char const * const type;
+    static char const * const sensorType;
 
 private:
     Q_DISABLE_COPY(QOrientationSensor)
@@ -91,4 +55,3 @@ private:
 QT_END_NAMESPACE
 
 #endif
-