diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-12-17 09:46:39 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-12-18 10:55:09 +0100 |
| commit | a007a6c6b40f14b4ad41130abbb445e45e919759 (patch) | |
| tree | 81c6c77dc524a08c8fb2ba743d437953b864b2b1 /src/bluetooth/osx/osxbtledeviceinquiry_p.h | |
| parent | 6102f74e45ce4cd8792f323a06bdbab5f27fd106 (diff) | |
QBluetoothDeviceDiscoveryAgent - cleanup (OS X/iOS)
Replace handwritten 'signatures' with Q_FUNC_INFO, remove spurious
debug messages. Get rid of 'transient delegate' trick.
Change-Id: I2c490271baba7247af11df128964b61d0255ef95
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/osx/osxbtledeviceinquiry_p.h')
| -rw-r--r-- | src/bluetooth/osx/osxbtledeviceinquiry_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry_p.h b/src/bluetooth/osx/osxbtledeviceinquiry_p.h index 20004d30..c8b6133e 100644 --- a/src/bluetooth/osx/osxbtledeviceinquiry_p.h +++ b/src/bluetooth/osx/osxbtledeviceinquiry_p.h @@ -47,9 +47,6 @@ #include <QtCore/qglobal.h> #include <QtCore/qlist.h> -// The Foundation header must be included before -// corebluetoothwrapper_p.h - a workaround for a broken -// 10.9 SDK. #include <Foundation/Foundation.h> @class QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry); @@ -88,7 +85,7 @@ QT_END_NAMESPACE @interface QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry) : NSObject {// Protocols are adopted in the mm file. - QT_PREPEND_NAMESPACE(OSXBluetooth::LEDeviceInquiryDelegate) *delegate; + QT_PREPEND_NAMESPACE(OSXBluetooth)::LEDeviceInquiryDelegate *delegate; // TODO: scoped pointers/shared pointers? NSMutableDictionary *peripherals; // Found devices. @@ -101,7 +98,7 @@ QT_END_NAMESPACE bool isActive; } -- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth::LEDeviceInquiryDelegate) *)aDelegate; +- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth)::LEDeviceInquiryDelegate *)aDelegate; - (void)dealloc; // Actual scan can be delayed - we have to wait for a status update first. |