diff options
Diffstat (limited to 'src/sensorsquick/qmltapsensor.cpp')
| -rw-r--r-- | src/sensorsquick/qmltapsensor.cpp | 72 |
1 files changed, 20 insertions, 52 deletions
diff --git a/src/sensorsquick/qmltapsensor.cpp b/src/sensorsquick/qmltapsensor.cpp index faeba623..2fa75f00 100644 --- a/src/sensorsquick/qmltapsensor.cpp +++ b/src/sensorsquick/qmltapsensor.cpp @@ -1,54 +1,19 @@ -/**************************************************************************** -** -** 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 "qmltapsensor_p.h" #include <QtSensors/QTapSensor> /*! \qmltype TapSensor - \instantiates QmlTapSensor +//! \instantiates QmlTapSensor \ingroup qml-sensors_type \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The TapSensor element reports tap and double tap events along the X, Y and Z axes. + \internal The TapSensor element reports tap and double tap events along the X, Y and Z axes. @@ -100,12 +65,13 @@ void QmlTapSensor::setReturnDoubleTapEvents(bool ret) /*! \qmltype TapReading - \instantiates QmlTapSensorReading +//! \instantiates QmlTapSensorReading \ingroup qml-sensors_reading \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The TapReading element holds the most recent TapSensor reading. + \internal The TapReading element holds the most recent TapSensor reading. @@ -116,8 +82,7 @@ void QmlTapSensor::setReturnDoubleTapEvents(bool ret) */ QmlTapSensorReading::QmlTapSensorReading(QTapSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } @@ -147,6 +112,12 @@ QTapReading::TapDirection QmlTapSensorReading::tapDirection() const return m_tapDirection; } +QBindable<QTapReading::TapDirection> QmlTapSensorReading::bindableTapDirection() const +{ + return &m_tapDirection; +} + + /*! \qmlproperty bool TapReading::doubleTap This property holds a value indicating if there was a single or double tap. @@ -159,6 +130,11 @@ bool QmlTapSensorReading::isDoubleTap() const return m_isDoubleTap; } +QBindable<bool> QmlTapSensorReading::bindableDoubleTap() const +{ + return &m_isDoubleTap; +} + QSensorReading *QmlTapSensorReading::reading() const { return const_cast<QTapSensor*>(m_sensor)->reading(); @@ -166,14 +142,6 @@ QSensorReading *QmlTapSensorReading::reading() const void QmlTapSensorReading::readingUpdate() { - QTapReading::TapDirection td = m_sensor->reading()->tapDirection(); - if (m_tapDirection != td) { - m_tapDirection = td; - Q_EMIT tapDirectionChanged(); - } - bool dTap = m_sensor->reading()->isDoubleTap(); - if (m_isDoubleTap != dTap) { - m_isDoubleTap = dTap; - Q_EMIT isDoubleTapChanged(); - } + m_tapDirection = m_sensor->reading()->tapDirection(); + m_isDoubleTap = m_sensor->reading()->isDoubleTap(); } |