diff options
Diffstat (limited to 'src/bluetooth/osx/osxbtsdpinquiry.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtsdpinquiry.mm | 71 |
1 files changed, 25 insertions, 46 deletions
diff --git a/src/bluetooth/osx/osxbtsdpinquiry.mm b/src/bluetooth/osx/osxbtsdpinquiry.mm index 9cafd572..004d9e61 100644 --- a/src/bluetooth/osx/osxbtsdpinquiry.mm +++ b/src/bluetooth/osx/osxbtsdpinquiry.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$ ** ****************************************************************************/ @@ -48,11 +40,7 @@ #include <QtCore/qvariant.h> #include <QtCore/qstring.h> -// We have to import - objc header files, no inclusion guards. -#import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h> -#import <IOBluetooth/objc/IOBluetoothSDPDataElement.h> -#import <IOBluetooth/objc/IOBluetoothSDPUUID.h> -#import <IOBluetooth/objc/IOBluetoothDevice.h> +#include "corebluetoothwrapper_p.h" QT_BEGIN_NAMESPACE @@ -64,7 +52,7 @@ SDPInquiryDelegate::~SDPInquiryDelegate() QVariant extract_attribute_value(IOBluetoothSDPDataElement *dataElement) { - Q_ASSERT_X(dataElement, "extractAttributeValue()", "invalid data element (nil)"); + Q_ASSERT_X(dataElement, Q_FUNC_INFO, "invalid data element (nil)"); // TODO: error handling and diagnostic messages. @@ -158,7 +146,7 @@ using namespace OSXBluetooth; - (id)initWithDelegate:(SDPInquiryDelegate *)aDelegate { - Q_ASSERT_X(aDelegate, "-initWithDelegate:", "invalid delegate (null)"); + Q_ASSERT_X(aDelegate, Q_FUNC_INFO, "invalid delegate (null)"); if (self = [super init]) { delegate = aDelegate; @@ -177,8 +165,7 @@ using namespace OSXBluetooth; - (IOReturn)performSDPQueryWithDevice:(const QBluetoothAddress &)address { - Q_ASSERT_X(!isActive, "-performSDPQueryWithDevice", - "SDP query in process"); + Q_ASSERT_X(!isActive, Q_FUNC_INFO, "SDP query in progress"); QList<QBluetoothUuid> emptyFilter; return [self performSDPQueryWithDevice:address filters:emptyFilter]; @@ -187,10 +174,8 @@ using namespace OSXBluetooth; - (IOReturn)performSDPQueryWithDevice:(const QBluetoothAddress &)address filters:(const QList<QBluetoothUuid> &)qtFilters { - Q_ASSERT_X(!isActive, "-performSDPQueryWithDevice:filters:", - "SDP query in progress"); - Q_ASSERT_X(!address.isNull(), "-performSDPQueryWithDevice:filters:", - "invalid target device address"); + Q_ASSERT_X(!isActive, Q_FUNC_INFO, "SDP query in progress"); + Q_ASSERT_X(!address.isNull(), Q_FUNC_INFO, "invalid target device address"); QT_BT_MAC_AUTORELEASEPOOL; @@ -199,8 +184,7 @@ using namespace OSXBluetooth; if (qtFilters.size()) { array.reset([[NSMutableArray alloc] init]); if (!array) { - qCCritical(QT_BT_OSX) << "-performSDPQueryWithDevices:filters:, " - "failed to allocate an uuid filter"; + qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to allocate an uuid filter"; return kIOReturnError; } @@ -211,8 +195,7 @@ using namespace OSXBluetooth; } if (int([array count]) != qtFilters.size()) { - qCCritical(QT_BT_OSX) << "-performSDPQueryWithDevices:filters:, " - << "failed to create an uuid filter"; + qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to create an uuid filter"; return kIOReturnError; } } @@ -220,8 +203,7 @@ using namespace OSXBluetooth; const BluetoothDeviceAddress iobtAddress(iobluetooth_address(address)); ObjCScopedPointer<IOBluetoothDevice> newDevice([[IOBluetoothDevice deviceWithAddress:&iobtAddress] retain]); if (!newDevice) { - qCCritical(QT_BT_OSX) << "-performSDPQueryWithDevices:filters:, " - << "failed to create an IOBluetoothDevice object"; + qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to create an IOBluetoothDevice object"; return kIOReturnError; } @@ -235,9 +217,7 @@ using namespace OSXBluetooth; result = [device performSDPQuery:self]; if (result != kIOReturnSuccess) { - qCCritical(QT_BT_OSX) << "-preformSDPQueryWithDevices:filters:, " - "failed to start an SDP query"; - + qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to start an SDP query"; device = oldDevice.take(); } else { isActive = true; @@ -265,8 +245,7 @@ using namespace OSXBluetooth; if (device != aDevice) return; - Q_ASSERT_X(delegate, "-sdpQueryComplete:status:", - "invalid delegate (null)"); + Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)"); isActive = false; |