diff options
Diffstat (limited to 'src/sensorsquick/qmlrotationsensor_p.h')
| -rw-r--r-- | src/sensorsquick/qmlrotationsensor_p.h | 65 |
1 files changed, 17 insertions, 48 deletions
diff --git a/src/sensorsquick/qmlrotationsensor_p.h b/src/sensorsquick/qmlrotationsensor_p.h index f14ad791..1ef008b8 100644 --- a/src/sensorsquick/qmlrotationsensor_p.h +++ b/src/sensorsquick/qmlrotationsensor_p.h @@ -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 #ifndef QMLROTATIONSENSOR_P_H #define QMLROTATIONSENSOR_P_H @@ -57,7 +21,7 @@ QT_BEGIN_NAMESPACE class QRotationSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlRotationSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged) @@ -68,23 +32,22 @@ public: ~QmlRotationSensor(); bool hasZ() const; + QSensor *sensor() const override; Q_SIGNALS: void hasZChanged(bool hasZ); private: - QSensor *sensor() const override; - void _update() override; QRotationSensor *m_sensor; QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlRotationSensorReading : public QmlSensorReading { Q_OBJECT - Q_PROPERTY(qreal x READ x NOTIFY xChanged) - Q_PROPERTY(qreal y READ y NOTIFY yChanged) - Q_PROPERTY(qreal z READ z NOTIFY zChanged) + Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) + Q_PROPERTY(qreal y READ y NOTIFY yChanged BINDABLE bindableY) + Q_PROPERTY(qreal z READ z NOTIFY zChanged BINDABLE bindableZ) QML_NAMED_ELEMENT(RotationReading) QML_UNCREATABLE("Cannot create RotationReading") QML_ADDED_IN_VERSION(5,0) @@ -93,8 +56,11 @@ public: ~QmlRotationSensorReading(); qreal x() const; + QBindable<qreal> bindableX() const; qreal y() const; + QBindable<qreal> bindableY() const; qreal z() const; + QBindable<qreal> bindableZ() const; Q_SIGNALS: void xChanged(); @@ -105,9 +71,12 @@ private: QSensorReading *reading() const override; void readingUpdate() override; QRotationSensor *m_sensor; - qreal m_x; - qreal m_y; - qreal m_z; + Q_OBJECT_BINDABLE_PROPERTY(QmlRotationSensorReading, qreal, + m_x, &QmlRotationSensorReading::xChanged) + Q_OBJECT_BINDABLE_PROPERTY(QmlRotationSensorReading, qreal, + m_y, &QmlRotationSensorReading::yChanged) + Q_OBJECT_BINDABLE_PROPERTY(QmlRotationSensorReading, qreal, + m_z, &QmlRotationSensorReading::zChanged) }; QT_END_NAMESPACE |