1 files changed, 26 insertions, 25 deletions

diff --git a/src/bluetooth/osx/osxbtdeviceinquiry.mm b/src/bluetooth/osx/osxbtdeviceinquiry.mm
index 6fb89e20..79a8a92c 100644
--- a/src/bluetooth/osx/osxbtdeviceinquiry.mm
+++ b/src/bluetooth/osx/osxbtdeviceinquiry.mm
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtBluetooth module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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 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.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -37,7 +43,6 @@
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
 
-
 QT_BEGIN_NAMESPACE
 
 namespace OSXBluetooth {
@@ -51,11 +56,7 @@ DeviceInquiryDelegate::~DeviceInquiryDelegate()
 
 QT_END_NAMESPACE
 
-
-#ifdef QT_NAMESPACE
-// We do not want to litter a code with QT_PREPEND_NAMESPACE, right?
-using namespace QT_NAMESPACE;
-#endif
+QT_USE_NAMESPACE
 
 
 @implementation QT_MANGLE_NAMESPACE(OSXBTDeviceInquiry)
@@ -72,8 +73,7 @@ using namespace QT_NAMESPACE;
             [m_inquiry setUpdateNewDeviceNames:NO];//Useless, disable!
             m_delegate = delegate;
         } else {
-            qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to create "
-                                     "a device inquiry";
+            qCCritical(QT_BT_OSX) << "failed to create a device inquiry";
         }
 
         m_active = false;
@@ -112,8 +112,7 @@ using namespace QT_NAMESPACE;
     if (result != kIOReturnSuccess) {
         // QtBluetooth will probably convert an error into UnknownError,
         // loosing the actual information.
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO <<"failed with "
-                                "IOKit error code: " << result;
+        qCWarning(QT_BT_OSX) << "failed with IOKit error code:" << result;
         m_active = false;
     }
 
@@ -129,6 +128,8 @@ using namespace QT_NAMESPACE;
         const IOReturn res = [m_inquiry stop];
         if (res != kIOReturnSuccess)
             m_active = true;
+        else
+            qCDebug(QT_BT_OSX) << "-stop, success (waiting for 'inquiryComplete')";
 
         return res;
     }
@@ -151,7 +152,7 @@ using namespace QT_NAMESPACE;
     if (error != kIOReturnSuccess) {
         // QtBluetooth has not too many error codes, 'UnknownError' is not really
         // useful, report the actual error code here:
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "IOKit error code: " << error;
+        qCWarning(QT_BT_OSX) << "IOKit error code: " << error;
         m_delegate->error(sender, error);
     } else {
         m_delegate->inquiryFinished(sender);