diff options
Diffstat (limited to 'src/sensorsquick/qmlsensorglobal.cpp')
-rw-r--r-- | src/sensorsquick/qmlsensorglobal.cpp | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/sensorsquick/qmlsensorglobal.cpp b/src/sensorsquick/qmlsensorglobal.cpp index 0bf67d4e..73f865c4 100644 --- a/src/sensorsquick/qmlsensorglobal.cpp +++ b/src/sensorsquick/qmlsensorglobal.cpp @@ -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 #include "qmlsensorglobal_p.h" #include <QtSensors/QSensor> @@ -44,7 +8,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype QmlSensors - \instantiates QmlSensorGlobal +//! \instantiates QmlSensorGlobal \inqmlmodule QtSensors \since QtSensors 5.0 \brief The QmlSensors singleton provides the module API. @@ -86,7 +50,7 @@ QStringList QmlSensorGlobal::sensorTypes() const { QStringList ret; const QList<QByteArray> sensorTypes = QSensor::sensorTypes(); - ret.reserve(sensorTypes.count()); + ret.reserve(sensorTypes.size()); for (const QByteArray &type : sensorTypes) ret << QString::fromLocal8Bit(type); return ret; @@ -102,7 +66,7 @@ QStringList QmlSensorGlobal::sensorsForType(const QString &type) const { QStringList ret; const QList<QByteArray> sensors = QSensor::sensorsForType(type.toLocal8Bit()); - ret.reserve(sensors.count()); + ret.reserve(sensors.size()); for (const QByteArray &identifier : sensors) ret << QString::fromLocal8Bit(identifier); return ret; |