From 0193d164e79845f7a2b5a388ed2818854c77399f Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Fri, 21 May 2021 10:01:56 +0300 Subject: 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 --- src/imports/sensors/qmltapsensor.cpp | 179 ----------------------------------- 1 file changed, 179 deletions(-) delete mode 100644 src/imports/sensors/qmltapsensor.cpp (limited to 'src/imports/sensors/qmltapsensor.cpp') diff --git a/src/imports/sensors/qmltapsensor.cpp b/src/imports/sensors/qmltapsensor.cpp deleted file mode 100644 index 76f34c2e..00000000 --- a/src/imports/sensors/qmltapsensor.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#include "qmltapsensor.h" -#include - -/*! - \qmltype TapSensor - \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. - - The TapSensor element reports tap and double tap events - along the X, Y and Z axes. - - This element wraps the QTapSensor class. Please see the documentation for - QTapSensor for details. - - \sa TapReading -*/ - -QmlTapSensor::QmlTapSensor(QObject *parent) - : QmlSensor(parent) - , m_sensor(new QTapSensor(this)) -{ - connect(m_sensor, SIGNAL(returnDoubleTapEventsChanged(bool)), - this, SIGNAL(returnDoubleTapEventsChanged(bool))); -} - -QmlTapSensor::~QmlTapSensor() -{ -} - -QmlSensorReading *QmlTapSensor::createReading() const -{ - return new QmlTapSensorReading(m_sensor); -} - -QSensor *QmlTapSensor::sensor() const -{ - return m_sensor; -} - -/*! - \qmlproperty bool TapSensor::returnDoubleTapEvents - This property holds a value indicating if double tap events should be reported. - - Please see QTapSensor::returnDoubleTapEvents for information about this property. -*/ - -bool QmlTapSensor::returnDoubleTapEvents() const -{ - return m_sensor->returnDoubleTapEvents(); -} - -void QmlTapSensor::setReturnDoubleTapEvents(bool ret) -{ - m_sensor->setReturnDoubleTapEvents(ret); -} - -/*! - \qmltype TapReading - \instantiates QmlTapSensorReading - \ingroup qml-sensors_reading - \inqmlmodule QtSensors - \since QtSensors 5.0 - \inherits SensorReading - \brief The TapReading element holds the most recent TapSensor reading. - - The TapReading element holds the most recent TapSensor reading. - - This element wraps the QTapReading class. Please see the documentation for - QTapReading for details. - - This element cannot be directly created. -*/ - -QmlTapSensorReading::QmlTapSensorReading(QTapSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) -{ -} - -QmlTapSensorReading::~QmlTapSensorReading() -{ -} - -/*! - \qmlproperty TapDirection TapReading::tapDirection - This property holds the direction of the tap. - - Please see QTapReading::tapDirection for information about this property. - - Note that TapDirection constants are exposed through the TapReading class. - \code - TapSensor { - onReadingChanged: { - if ((reading.tapDirection & TapReading.X_Both)) - // do something - } - } - \endcode -*/ - -QTapReading::TapDirection QmlTapSensorReading::tapDirection() const -{ - return m_tapDirection; -} - -/*! - \qmlproperty bool TapReading::doubleTap - This property holds a value indicating if there was a single or double tap. - - Please see QTapReading::doubleTap for information about this property. -*/ - -bool QmlTapSensorReading::isDoubleTap() const -{ - return m_isDoubleTap; -} - -QSensorReading *QmlTapSensorReading::reading() const -{ - return const_cast(m_sensor)->reading(); -} - -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(); - } -} -- cgit v1.2.3