diff options
Diffstat (limited to 'src/bluetooth/osx/osxbtsocketlistener.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtsocketlistener.mm | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/bluetooth/osx/osxbtsocketlistener.mm b/src/bluetooth/osx/osxbtsocketlistener.mm index 125f910a..e3124dd1 100644 --- a/src/bluetooth/osx/osxbtsocketlistener.mm +++ b/src/bluetooth/osx/osxbtsocketlistener.mm @@ -1,7 +1,7 @@ /**************************************************************************** ** -** 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. ** @@ -10,9 +10,9 @@ ** 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 @@ -23,8 +23,8 @@ ** 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. ** ** $QT_END_LICENSE$ @@ -34,13 +34,9 @@ #include "osxbtsocketlistener_p.h" #include "osxbtutility_p.h" -#include <QtCore/qloggingcategory.h> #include <QtCore/qdebug.h> -// Imports, since these are Objective-C headers and -// they do not have inclusion guards. -#import <IOBluetooth/objc/IOBluetoothRFCOMMChannel.h> -#import <IOBluetooth/objc/IOBluetoothL2CAPChannel.h> +#include "corebluetoothwrapper_p.h" QT_BEGIN_NAMESPACE @@ -64,7 +60,7 @@ using namespace QT_NAMESPACE; - (id)initWithListener:(OSXBluetooth::SocketListener *)aDelegate { - Q_ASSERT_X(aDelegate, "-initWithListener:", "invalid delegate (null)"); + Q_ASSERT_X(aDelegate, Q_FUNC_INFO, "invalid delegate (null)"); if (self = [super init]) { connectionNotification = nil; delegate = aDelegate; @@ -84,8 +80,7 @@ using namespace QT_NAMESPACE; - (bool)listenRFCOMMConnectionsWithChannelID:(BluetoothRFCOMMChannelID)channelID { - Q_ASSERT_X(!connectionNotification, "-listenRFCOMMConnectionsWithChannelID", - "already listening"); + Q_ASSERT_X(!connectionNotification, Q_FUNC_INFO, "already listening"); connectionNotification = [IOBluetoothRFCOMMChannel registerForChannelOpenNotifications:self selector:@selector(rfcommOpenNotification:channel:) @@ -100,8 +95,7 @@ using namespace QT_NAMESPACE; - (bool)listenL2CAPConnectionsWithPSM:(BluetoothL2CAPPSM)psm { - Q_ASSERT_X(!connectionNotification, "-listenL2CAPConnectionsWithPSM:", - "already listening"); + Q_ASSERT_X(!connectionNotification, Q_FUNC_INFO, "already listening"); connectionNotification = [IOBluetoothL2CAPChannel registerForChannelOpenNotifications:self selector:@selector(l2capOpenNotification:channel:) @@ -119,8 +113,7 @@ using namespace QT_NAMESPACE; { Q_UNUSED(notification) - Q_ASSERT_X(delegate, "-rfcommOpenNotification:channel:", - "invalid delegate (null)"); + Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)"); delegate->openNotify(newChannel); } @@ -129,8 +122,7 @@ using namespace QT_NAMESPACE; { Q_UNUSED(notification) - Q_ASSERT_X(delegate, "-l2capOpenNotification:channel:", - "invalid delegate (null)"); + Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)"); delegate->openNotify(newChannel); } |