diff options
Diffstat (limited to 'src/bluetooth/osx/osxbtl2capchannel_p.h')
| -rw-r--r-- | src/bluetooth/osx/osxbtl2capchannel_p.h | 55 |
1 files changed, 23 insertions, 32 deletions
diff --git a/src/bluetooth/osx/osxbtl2capchannel_p.h b/src/bluetooth/osx/osxbtl2capchannel_p.h index 96ea985e..9736bd1d 100644 --- a/src/bluetooth/osx/osxbtl2capchannel_p.h +++ b/src/bluetooth/osx/osxbtl2capchannel_p.h @@ -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$ ** ****************************************************************************/ @@ -44,10 +36,9 @@ #include <QtCore/qglobal.h> -// Must be imported (Obj-C header, no inclusion guards). -#import <IOBluetooth/objc/IOBluetoothL2CAPChannel.h> - #include <Foundation/Foundation.h> +// Only after Foundation.h: +#include "corebluetoothwrapper_p.h" #include <cstddef> @@ -67,20 +58,20 @@ QT_END_NAMESPACE @interface QT_MANGLE_NAMESPACE(OSXBTL2CAPChannel) : NSObject<IOBluetoothL2CAPChannelDelegate> { - QT_PREPEND_NAMESPACE(OSXBluetooth::ChannelDelegate) *delegate; + QT_PREPEND_NAMESPACE(OSXBluetooth)::ChannelDelegate *delegate; IOBluetoothDevice *device; IOBluetoothL2CAPChannel *channel; bool connected; } -- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth::ChannelDelegate) *)aDelegate; -- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth::ChannelDelegate) *)aDelegate +- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth)::ChannelDelegate *)aDelegate; +- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth)::ChannelDelegate *)aDelegate channel:(IOBluetoothL2CAPChannel *)aChannel; - (void)dealloc; -// A single async connection (connect can be called only once). -- (IOReturn)connectAsyncToDevice:(const QBluetoothAddress &)address +// Async. connection (connect can be called only once). +- (IOReturn)connectAsyncToDevice:(const QT_PREPEND_NAMESPACE(QBluetoothAddress) &)address withPSM:(BluetoothL2CAPChannelID)psm; // IOBluetoothL2CAPChannelDelegate: @@ -102,12 +93,12 @@ QT_END_NAMESPACE // Writes the given data synchronously over the target L2CAP channel to the remote // device. -// The length of the data may not exceed the L2CAP channel's ougoing MTU. +// The length of the data may not exceed the L2CAP channel's outgoing MTU. // This method will block until the data has been successfully sent to the // hardware for transmission (or an error occurs). - (IOReturn) writeSync:(void*)data length:(UInt16)length; -// The length of the data may not exceed the L2CAP channel's ougoing MTU. +// The length of the data may not exceed the L2CAP channel's outgoing MTU. // When the data has been successfully passed to the hardware to be transmitted, // the delegate method -l2capChannelWriteComplete:refcon:status: will be called. // Returns kIOReturnSuccess if the data was buffered successfully. |