diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-21 10:01:56 +0300 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-26 09:48:04 +0300 |
commit | 0193d164e79845f7a2b5a388ed2818854c77399f (patch) | |
tree | 68d05a426a53d39c0bce34705dd91fbbbc9c24e5 /src/imports/sensors/qmlambienttemperaturesensor.cpp | |
parent | cf21f9074be72e9d5a1c45638bf6762edad7a73f (diff) |
Split the Sensors QML plugin into a library and a plugin
The main changes:
- Introduction of new SensorsQuick library with private exports
- The original QML plugin loads this new library and does little else
- Renamed original 'sensors' plugin as 'declarative_sensors' to provide
an idea what it relates to
- Renamed library headers as private "_p.h" and added "We mean it"
- Changed qmlRegister* calls to QML_ELEMENT macros
- Removed files that are generated in Qt6 (qmldir, plugins.qmltypes)
Task-number: QTBUG-92530
Change-Id: I18f849adabcc79ac47e67305f78aefeee82801bc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports/sensors/qmlambienttemperaturesensor.cpp')
-rw-r--r-- | src/imports/sensors/qmlambienttemperaturesensor.cpp | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/src/imports/sensors/qmlambienttemperaturesensor.cpp b/src/imports/sensors/qmlambienttemperaturesensor.cpp deleted file mode 100644 index 1958f6d8..00000000 --- a/src/imports/sensors/qmlambienttemperaturesensor.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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$ -** -****************************************************************************/ -#include "qmlambienttemperaturesensor.h" -#include <QtSensors/QAmbientTemperatureSensor> - -/*! - \qmltype AmbientTemperatureSensor - \instantiates QmlAmbientTemperatureSensor - \ingroup qml-sensors_type - \inqmlmodule QtSensors - \since QtSensors 5.1 - \inherits Sensor - \brief The AmbientTemperatureSensor element reports on the ambient temperature. - - The AmbientTemperatureSensor element reports on the ambient temperature. - - This element wraps the QAmbientTemperatureSensor class. Please see the documentation for - QAmbientTemperatureSensor for details. - - \sa AmbientTemperatureReading -*/ - -QmlAmbientTemperatureSensor::QmlAmbientTemperatureSensor(QObject *parent) - : QmlSensor(parent) - , m_sensor(new QAmbientTemperatureSensor(this)) -{ -} - -QmlAmbientTemperatureSensor::~QmlAmbientTemperatureSensor() -{ -} - -QmlSensorReading *QmlAmbientTemperatureSensor::createReading() const -{ - return new QmlAmbientTemperatureReading(m_sensor); -} - -QSensor *QmlAmbientTemperatureSensor::sensor() const -{ - return m_sensor; -} - -/*! - \qmltype AmbientTemperatureReading - \instantiates QmlAmbientTemperatureReading - \ingroup qml-sensors_reading - \inqmlmodule QtSensors - \since QtSensors 5.1 - \inherits SensorReading - \brief The AmbientTemperatureReading element holds the most recent temperature reading. - - The AmbientTemperatureReading element holds the most recent temperature reading. - - This element wraps the QAmbientTemperatureReading class. Please see the documentation for - QAmbientTemperatureReading for details. - - This element cannot be directly created. -*/ - -QmlAmbientTemperatureReading::QmlAmbientTemperatureReading(QAmbientTemperatureSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) - , m_temperature(0) -{ -} - -QmlAmbientTemperatureReading::~QmlAmbientTemperatureReading() -{ -} - -/*! - \qmlproperty qreal AmbientTemperatureReading::temperature - This property holds the ambient temperature in degree Celsius. - - Please see QAmbientTemperatureReading::temperature for information about this property. -*/ - -qreal QmlAmbientTemperatureReading::temperature() const -{ - return m_temperature; -} - -QSensorReading *QmlAmbientTemperatureReading::reading() const -{ - return m_sensor->reading(); -} - -void QmlAmbientTemperatureReading::readingUpdate() -{ - const qreal temperature = m_sensor->reading()->temperature(); - if (m_temperature != temperature) { - m_temperature = temperature; - Q_EMIT temperatureChanged(); - } -} |