diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2017-05-12 13:37:50 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2017-05-12 16:47:32 +0200 |
commit | 690f2ffdcfccf982c99c54fddb5757c8980d348b (patch) | |
tree | aeffc6859f40102199d03e5a22a3568ee19b628a /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
parent | 6176a2d40b81be68520a3aafb5b4adc709829a69 (diff) | |
parent | 6b3640d28f2ef47c47ada0f8d44117a1b7a28098 (diff) |
Merge remote-tracking branch 'gerrit/5.9' into wip/win
Change-Id: Ia247c260a9fa27df79d18e5397eba5918d626684
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 62 |
1 files changed, 43 insertions, 19 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 16ebe63c..4d0e24eb 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -1,32 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2014 Denis Shienkov <denis.shienkov@gmail.com> -** Contact: http://www.qt.io/licensing/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtBluetooth module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** 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. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** 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$ ** @@ -58,7 +64,7 @@ #include <QtBluetooth/QBluetoothAddress> #include <QtBluetooth/QBluetoothLocalDevice> -#ifdef QT_BLUEZ_BLUETOOTH +#if QT_CONFIG(bluez) #include "bluez/bluez5_helper_p.h" class OrgBluezManagerInterface; @@ -77,10 +83,14 @@ QT_END_NAMESPACE #include <QtConcurrent> #endif +#ifdef QT_WINRT_BLUETOOTH +class QWinRTBluetoothDeviceDiscoveryWorker; +#endif + QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgentPrivate -#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WIN_BLUETOOTH) +#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH) || defined(QT_WIN_BLUETOOTH) : public QObject { Q_OBJECT @@ -94,11 +104,11 @@ public: QBluetoothDeviceDiscoveryAgent *parent); ~QBluetoothDeviceDiscoveryAgentPrivate(); - void start(); + void start(QBluetoothDeviceDiscoveryAgent::DiscoveryMethods methods); void stop(); bool isActive() const; -#ifdef QT_BLUEZ_BLUETOOTH +#if QT_CONFIG(bluez) void _q_deviceFound(const QString &address, const QVariantMap &dict); void _q_propertyChanged(const QString &name, const QDBusVariant &value); void _q_InterfacesAdded(const QDBusObjectPath &object_path, @@ -136,7 +146,7 @@ private: QTimer *leScanTimeout; bool pendingCancel, pendingStart; -#elif defined(QT_BLUEZ_BLUETOOTH) +#elif QT_CONFIG(bluez) QBluetoothAddress m_adapterAddress; bool pendingCancel; bool pendingStart; @@ -173,6 +183,20 @@ private: Qt::HANDLE hSearch; #endif +#ifdef QT_WINRT_BLUETOOTH +private slots: + void registerDevice(const QBluetoothDeviceInfo &info); + void onScanFinished(); + void onScanCanceled(); + +private: + void disconnectAndClearWorker(); + QPointer<QWinRTBluetoothDeviceDiscoveryWorker> worker; + QTimer *leScanTimer; +#endif + + int lowEnergySearchTimeout; + QBluetoothDeviceDiscoveryAgent::DiscoveryMethods requestedMethods; QBluetoothDeviceDiscoveryAgent *q_ptr; }; |