diff options
Diffstat (limited to 'src/sensors/qaccelerometer.cpp')
-rw-r--r-- | src/sensors/qaccelerometer.cpp | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/sensors/qaccelerometer.cpp b/src/sensors/qaccelerometer.cpp index bb65d80b..685b3e16 100644 --- a/src/sensors/qaccelerometer.cpp +++ b/src/sensors/qaccelerometer.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 "qaccelerometer.h" #include "qaccelerometer_p.h" @@ -155,7 +119,7 @@ bool QAccelerometerFilter::filter(QSensorReading *reading) return filter(static_cast<QAccelerometerReading*>(reading)); } -char const * const QAccelerometer::type("QAccelerometer"); +char const * const QAccelerometer::sensorType("QAccelerometer"); /*! \enum QAccelerometer::AccelerationMode @@ -205,7 +169,7 @@ char const * const QAccelerometer::type("QAccelerometer"); Construct the sensor as a child of \a parent. */ QAccelerometer::QAccelerometer(QObject *parent) - : QSensor(QAccelerometer::type, *new QAccelerometerPrivate, parent) + : QSensor(QAccelerometer::sensorType, *new QAccelerometerPrivate, parent) { } @@ -276,6 +240,6 @@ QAccelerometerReading *QAccelerometer::reading() const \since 5.1 */ -#include "moc_qaccelerometer.cpp" QT_END_NAMESPACE +#include "moc_qaccelerometer.cpp" |