Use QLoggingCategory in Bluetooth QML import plugin.

Add some minor include cleanups as well.

Task-number: QTBUG-32253
Change-Id: I2ccb813a9dd85ca16c1ed8aab962418df8157890
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index 67b71902..6689d663 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -44,7 +44,8 @@
 
 #include <QPixmap>
 
-#include <qbluetoothdeviceinfo.h>
+#include <QtCore/QLoggingCategory>
+#include <QtBluetooth/QBluetoothDeviceInfo>
 #include <QtBluetooth/QBluetoothAddress>
 
 #include "qdeclarativebluetoothservice_p.h"
@@ -91,6 +92,8 @@
     \sa QBluetoothServiceDiscoveryAgent
 */
 
+Q_DECLARE_LOGGING_CATEGORY(QT_BT_QML)
+
 class QDeclarativeBluetoothDiscoveryModelPrivate
 {
 public:
@@ -214,7 +217,7 @@ QVariant QDeclarativeBluetoothDiscoveryModel::data(const QModelIndex &index, int
 
     if (discoveryMode() != DeviceDiscovery) {
         if (index.row() >= d->m_services.count()){
-            qWarning() << "index out of bounds";
+            qCWarning(QT_BT_QML) << "index out of bounds";
             return QVariant();
         }
 
@@ -239,7 +242,7 @@ QVariant QDeclarativeBluetoothDiscoveryModel::data(const QModelIndex &index, int
         }
     } else {
         if (index.row() >= d->m_devices.count()) {
-            qWarning() << "index out of bounds";
+            qCWarning(QT_BT_QML) << "index out of bounds";
             return QVariant();
         }
 
@@ -432,7 +435,7 @@ void QDeclarativeBluetoothDiscoveryModel::setUuidFilter(QString uuid)
 
     QBluetoothUuid qbuuid(uuid);
     if (qbuuid.isNull()) {
-        qWarning() << "Invalid UUID providded " << uuid;
+        qCWarning(QT_BT_QML) << "Invalid UUID providded " << uuid;
         return;
     }
     d->m_uuid = uuid;