diff options
Diffstat (limited to 'src/plugins/sensors/android/main.cpp')
-rw-r--r-- | src/plugins/sensors/android/main.cpp | 58 |
1 files changed, 11 insertions, 47 deletions
diff --git a/src/plugins/sensors/android/main.cpp b/src/plugins/sensors/android/main.cpp index 85853cd2..8c2855cd 100644 --- a/src/plugins/sensors/android/main.cpp +++ b/src/plugins/sensors/android/main.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 BogDan Vatra <bogdan@kde.org> -** 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 BogDan Vatra <bogdan@kde.org> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qplugin.h> #include <qsensorplugin.h> @@ -77,7 +41,7 @@ public: switch (sensor) { case ASENSOR_TYPE_ACCELEROMETER: m_accelerationModes |= AndroidAccelerometer::Accelerometer; - QSensorManager::registerBackend(QAccelerometer::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QAccelerometer::sensorType, QByteArray::number(sensor), this); accelerometer = true; break; case ASENSOR_TYPE_GRAVITY: @@ -87,26 +51,26 @@ public: m_accelerationModes |= AndroidAccelerometer::LinearAcceleration; break; case ASENSOR_TYPE_AMBIENT_TEMPERATURE: - QSensorManager::registerBackend(QAmbientTemperatureSensor::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QAmbientTemperatureSensor::sensorType, QByteArray::number(sensor), this); break; case ASENSOR_TYPE_GYROSCOPE: - QSensorManager::registerBackend(QGyroscope::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QGyroscope::sensorType, QByteArray::number(sensor), this); break; case ASENSOR_TYPE_LIGHT: - QSensorManager::registerBackend(QLightSensor::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QLightSensor::sensorType, QByteArray::number(sensor), this); break; case ASENSOR_TYPE_MAGNETIC_FIELD: - QSensorManager::registerBackend(QMagnetometer::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QMagnetometer::sensorType, QByteArray::number(sensor), this); magnetometer = true; break; case ASENSOR_TYPE_PRESSURE: - QSensorManager::registerBackend(QPressureSensor::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QPressureSensor::sensorType, QByteArray::number(sensor), this); break; case ASENSOR_TYPE_PROXIMITY: - QSensorManager::registerBackend(QProximitySensor::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QProximitySensor::sensorType, QByteArray::number(sensor), this); break; case ASENSOR_TYPE_ROTATION_VECTOR: - QSensorManager::registerBackend(QRotationSensor::type, QByteArray::number(sensor), this); + QSensorManager::registerBackend(QRotationSensor::sensorType, QByteArray::number(sensor), this); break; case ASENSOR_TYPE_RELATIVE_HUMIDITY: @@ -128,7 +92,7 @@ public: } } if (accelerometer && magnetometer) - QSensorManager::registerBackend(QCompass::type, AndroidCompassId, this); + QSensorManager::registerBackend(QCompass::sensorType, AndroidCompassId, this); } QSensorBackend *createBackend(QSensor *sensor) override |