diff options
Diffstat (limited to 'src/sensorsquick/qmlhumiditysensor_p.h')
| -rw-r--r-- | src/sensorsquick/qmlhumiditysensor_p.h | 61 |
1 files changed, 16 insertions, 45 deletions
diff --git a/src/sensorsquick/qmlhumiditysensor_p.h b/src/sensorsquick/qmlhumiditysensor_p.h index 40c49339..e01b0dc3 100644 --- a/src/sensorsquick/qmlhumiditysensor_p.h +++ b/src/sensorsquick/qmlhumiditysensor_p.h @@ -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 #ifndef QMLHUMIDITYSENSOR_P_H #define QMLHUMIDITYSENSOR_P_H @@ -57,7 +21,7 @@ QT_BEGIN_NAMESPACE class QHumiditySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumiditySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlHumiditySensor : public QmlSensor { Q_OBJECT @@ -67,18 +31,21 @@ public: explicit QmlHumiditySensor(QObject *parent = nullptr); ~QmlHumiditySensor(); -private: QSensor *sensor() const override; + +private: QmlSensorReading *createReading() const override; QHumiditySensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumidityReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlHumidityReading : public QmlSensorReading { Q_OBJECT - Q_PROPERTY(qreal relativeHumidity READ relativeHumidity NOTIFY relativeHumidityChanged) - Q_PROPERTY(qreal absoluteHumidity READ absoluteHumidity NOTIFY absoluteHumidityChanged) + Q_PROPERTY(qreal relativeHumidity READ relativeHumidity + NOTIFY relativeHumidityChanged BINDABLE bindableRelativeHumidity) + Q_PROPERTY(qreal absoluteHumidity READ absoluteHumidity + NOTIFY absoluteHumidityChanged BINDABLE bindableAbsoluteHumidity) QML_NAMED_ELEMENT(HumidityReading) QML_UNCREATABLE("Cannot create HumidityReading") QML_ADDED_IN_VERSION(5,9) @@ -87,7 +54,9 @@ public: ~QmlHumidityReading(); qreal relativeHumidity() const; + QBindable<qreal> bindableRelativeHumidity() const; qreal absoluteHumidity() const; + QBindable<qreal> bindableAbsoluteHumidity() const; Q_SIGNALS: void relativeHumidityChanged(); @@ -98,8 +67,10 @@ private: void readingUpdate() override; QHumiditySensor *m_sensor; - qreal m_relativeHumidity; - qreal m_absoluteHumidity; + Q_OBJECT_BINDABLE_PROPERTY(QmlHumidityReading, qreal, + m_relativeHumidity, &QmlHumidityReading::relativeHumidityChanged) + Q_OBJECT_BINDABLE_PROPERTY(QmlHumidityReading, qreal, + m_absoluteHumidity, &QmlHumidityReading::absoluteHumidityChanged) }; QT_END_NAMESPACE |