diff options
Diffstat (limited to 'src/bluetooth/osx/osxbtdevicepair.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtdevicepair.mm | 71 |
1 files changed, 30 insertions, 41 deletions
diff --git a/src/bluetooth/osx/osxbtdevicepair.mm b/src/bluetooth/osx/osxbtdevicepair.mm index c9d6de32..41c20b8b 100644 --- a/src/bluetooth/osx/osxbtdevicepair.mm +++ b/src/bluetooth/osx/osxbtdevicepair.mm @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtBluetooth module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** 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. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -43,11 +35,9 @@ #include "osxbtutility_p.h" #include <QtCore/qloggingcategory.h> +#include <QtCore/qsysinfo.h> #include <QtCore/qdebug.h> -// Import to avoid problems with multiple inclusion (objc headers are not guarded against). -#import <IOBluetooth/objc/IOBluetoothDevice.h> - QT_BEGIN_NAMESPACE namespace OSXBluetooth { @@ -82,10 +72,8 @@ using namespace QT_NAMESPACE; delegate:(OSXBluetooth::PairingDelegate *)object { if (self = [super init]) { - Q_ASSERT_X(!address.isNull(), "-initWithTarget:delegate", - "invalid target address"); - Q_ASSERT_X(object, "-initWithTarget:delegate:", - "invalid delegate (null)"); + Q_ASSERT_X(!address.isNull(), Q_FUNC_INFO, "invalid target address"); + Q_ASSERT_X(object, Q_FUNC_INFO, "invalid delegate (null)"); m_targetAddress = address; m_object = object; @@ -97,10 +85,13 @@ using namespace QT_NAMESPACE; - (void)dealloc { -#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9, __IPHONE_NA) +#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9) // Stop also sets a delegate to nil (Apple's docs). // 10.9 only. - [m_pairing stop]; + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_9) + [m_pairing stop]; + else + [m_pairing setDelegate:nil]; #else [m_pairing setDelegate:nil]; #endif @@ -114,7 +105,7 @@ using namespace QT_NAMESPACE; if (m_active) return kIOReturnBusy; - Q_ASSERT_X(!m_targetAddress.isNull(), "-start", "invalid target address"); + Q_ASSERT_X(!m_targetAddress.isNull(), Q_FUNC_INFO, "invalid target address"); QT_BT_MAC_AUTORELEASEPOOL; @@ -122,15 +113,15 @@ using namespace QT_NAMESPACE; // Device is autoreleased. IOBluetoothDevice *const device = [IOBluetoothDevice deviceWithAddress:&iobtAddress]; if (!device) { - qCCritical(QT_BT_OSX) << "-start:, failed to create a device " + qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to create a device " "to pair with"; - return kIOReturnInternalError; // TODO: Find something more appropriate. + return kIOReturnError; } m_pairing = [[IOBluetoothDevicePair pairWithDevice:device] retain]; if (!m_pairing) { - qCCritical(QT_BT_OSX) << "-start, failed to create pair"; - return kIOReturnInternalError; + qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to create pair"; + return kIOReturnError; } [m_pairing setDelegate:self]; @@ -169,7 +160,7 @@ using namespace QT_NAMESPACE; - (IOBluetoothDevice *)targetDevice { - return [m_pairing device];//It's retained/autoreleased by pair (?). + return [m_pairing device];//It's retained/autoreleased by pair. } // IOBluetoothDevicePairDelegate: @@ -195,8 +186,7 @@ using namespace QT_NAMESPACE; if (sender != m_pairing) // Can never happen. return; - Q_ASSERT_X(m_object, "-devicePairingUserConfirmationRequest:numericValue:", - "invalid delegate (null)"); + Q_ASSERT_X(m_object, Q_FUNC_INFO, "invalid delegate (null)"); m_object->requestUserConfirmation(self, numericValue); } @@ -210,8 +200,7 @@ using namespace QT_NAMESPACE; - (void)devicePairingFinished:(id)sender error:(IOReturn)error { - Q_ASSERT_X(m_object, "-devicePairingFinished:", - "invalid delegate (null)"); + Q_ASSERT_X(m_object, Q_FUNC_INFO, "invalid delegate (null)"); if (sender != m_pairing) // Can never happen though. return; |