1 files changed, 5 insertions, 42 deletions

diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
index 27a07ad6..9736857b 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
@@ -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
 
 #include "sensorfwsensorbase.h"
 
@@ -92,7 +56,7 @@ void SensorfwSensorBase::start()
     if (m_sensorInterface) {
         // dataRate
         QByteArray type = sensor()->type();
-        if (type != QTapSensor::type && type != QProximitySensor::type) {
+        if (type != QTapSensor::sensorType && type != QProximitySensor::sensorType) {
             int dataRate = sensor()->dataRate();
             int interval = dataRate > 0 ? 1000 / dataRate : 0;
             // for testing maximum speed
@@ -291,8 +255,8 @@ bool SensorfwSensorBase::initSensorInterface(QString const &name)
     // TODO deztructor: Leaking abstraction detected. Just copied code
     // from initSensor<>() here, need to
     QByteArray type = sensor()->type();
-    if ((type == QAmbientLightSensor::type) // SensorFW returns lux values, plugin enumerated values
-        || (type == QIRProximitySensor::type) // SensorFW returns raw reflectance values, plugin % of max reflectance
+    if ((type == QAmbientLightSensor::sensorType) // SensorFW returns lux values, plugin enumerated values
+        || (type == QIRProximitySensor::sensorType) // SensorFW returns raw reflectance values, plugin % of max reflectance
         || (name == "accelerometersensor") // SensorFW returns milliGs, plugin m/s^2
         || (name == "magnetometersensor") // SensorFW returns nanoTeslas, plugin Teslas
         || (name == "gyroscopesensor")) // SensorFW returns DSPs, plugin milliDSPs
@@ -330,4 +294,3 @@ bool SensorfwSensorBase::isFeatureSupported(QSensor::Feature feature) const
 
     return false;
 }
-