diff options
Diffstat (limited to 'src/sensors/qhumiditysensor.cpp')
| -rw-r--r-- | src/sensors/qhumiditysensor.cpp | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/src/sensors/qhumiditysensor.cpp b/src/sensors/qhumiditysensor.cpp index aaf60b65..9c0db944 100644 --- a/src/sensors/qhumiditysensor.cpp +++ b/src/sensors/qhumiditysensor.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Canonical 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 Canonical Ltd +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qhumiditysensor.h> #include "qhumiditysensor_p.h" @@ -129,7 +93,7 @@ bool QHumidityFilter::filter(QSensorReading *reading) return filter(static_cast<QHumidityReading*>(reading)); } -char const * const QHumiditySensor::type("QHumiditySensor"); +char const * const QHumiditySensor::sensorType("QHumiditySensor"); /*! @@ -153,7 +117,7 @@ char const * const QHumiditySensor::type("QHumiditySensor"); Construct the sensor as a child of \a parent. */ QHumiditySensor::QHumiditySensor(QObject *parent) - : QSensor(QHumiditySensor::type, parent) + : QSensor(QHumiditySensor::sensorType, parent) { } @@ -177,5 +141,6 @@ QHumidityReading *QHumiditySensor::reading() const return static_cast<QHumidityReading*>(QSensor::reading()); } -#include "moc_qhumiditysensor.cpp" QT_END_NAMESPACE + +#include "moc_qhumiditysensor.cpp" |