diff options
Diffstat (limited to 'src/sensors/qirproximitysensor.cpp')
| -rw-r--r-- | src/sensors/qirproximitysensor.cpp | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/src/sensors/qirproximitysensor.cpp b/src/sensors/qirproximitysensor.cpp index 2be5a43a..4d205d05 100644 --- a/src/sensors/qirproximitysensor.cpp +++ b/src/sensors/qirproximitysensor.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 <qirproximitysensor.h> #include "qirproximitysensor_p.h" @@ -49,6 +13,7 @@ IMPLEMENT_READING(QIRProximityReading) \ingroup sensors_reading \inmodule QtSensors \since 5.1 + \internal \brief The QIRProximityReading class holds readings from the IR proximity sensor. @@ -101,6 +66,7 @@ void QIRProximityReading::setReflectance(qreal reflectance) \ingroup sensors_filter \inmodule QtSensors \since 5.1 + \internal \brief The QIRProximityFilter class is a convenience wrapper around QSensorFilter. @@ -121,13 +87,14 @@ bool QIRProximityFilter::filter(QSensorReading *reading) return filter(static_cast<QIRProximityReading*>(reading)); } -char const * const QIRProximitySensor::type("QIRProximitySensor"); +char const * const QIRProximitySensor::sensorType("QIRProximitySensor"); /*! \class QIRProximitySensor \ingroup sensors_type \inmodule QtSensors \since 5.1 + \internal \brief The QIRProximitySensor class is a convenience wrapper around QSensor. @@ -144,7 +111,7 @@ char const * const QIRProximitySensor::type("QIRProximitySensor"); Construct the sensor as a child of \a parent. */ QIRProximitySensor::QIRProximitySensor(QObject *parent) - : QSensor(QIRProximitySensor::type, parent) + : QSensor(QIRProximitySensor::sensorType, parent) { } |