diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-09-13 08:45:17 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-17 05:37:59 +0000 |
commit | ee54c027176403fa943ca7f5c787f7d5e65967ea (patch) | |
tree | a0d7060f1b71d6434c726a8c0b629ffd266d51e4 /src | |
parent | e05deb028aa600781d8ef695a734ad6898948ef7 (diff) |
More consistent logging category use in bluetooth implementations
There were few plain qDebugs and qWarnings in the bluetooth code
which content-wise seem indistinguishable from categorized logging
in the same code.
Change-Id: I0a1a5c7fb14bd5d8b767a5f982ed5c2b3768f265
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit a82c068a8ce41f92816c015e9dc5957f7c3ec654)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/bluetooth/bluez/remotedevicemanager.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller_android.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller_bluez.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller_winrt.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontrollerbase.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/bluetooth/bluez/remotedevicemanager.cpp b/src/bluetooth/bluez/remotedevicemanager.cpp index cf3a27d0..5ac2d0c0 100644 --- a/src/bluetooth/bluez/remotedevicemanager.cpp +++ b/src/bluetooth/bluez/remotedevicemanager.cpp @@ -104,7 +104,7 @@ void RemoteDeviceManager::prepareNextJob() jobQueue.pop_front(); jobInProgress = false; - qDebug(QT_BT_BLUEZ) << "RemoteDeviceManager job queue status:" << jobQueue.empty(); + qCDebug(QT_BT_BLUEZ) << "RemoteDeviceManager job queue status:" << jobQueue.empty(); if (jobQueue.empty()) emit finished(); else @@ -163,7 +163,7 @@ void RemoteDeviceManager::disconnectDevice(const QBluetoothAddress &remote) } if (!jobStarted) { - qDebug(QT_BT_BLUEZ) << "RemoteDeviceManager JobDisconnectDevice failed"; + qCDebug(QT_BT_BLUEZ) << "RemoteDeviceManager JobDisconnectDevice failed"; QTimer::singleShot(0, this, [this](){ prepareNextJob(); }); } } diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp index d3dbc50e..00aa5dc7 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp @@ -214,7 +214,7 @@ void QWinRTBluetoothServiceDiscoveryWorker::processServiceSearchResult(quint64 a hr = service->GetSdpRawAttributesAsync(op.GetAddressOf()); if (FAILED(hr)) { emit errorOccured(); - qDebug() << "Check manifest capabilities"; + qCDebug(QT_BT_WINDOWS) << "Check manifest capabilities"; continue; } ComPtr<IMapView<UINT32, IBuffer *>> mapView; diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp index cce26d21..8a24c5ac 100644 --- a/src/bluetooth/qlowenergycontroller_android.cpp +++ b/src/bluetooth/qlowenergycontroller_android.cpp @@ -154,7 +154,7 @@ void QLowEnergyControllerPrivateAndroid::connectToDevice() // required to pass unit test on default backend if (remoteDevice.isNull()) { - qWarning() << "Invalid/null remote device address"; + qCWarning(QT_BT_ANDROID) << "Invalid/null remote device address"; setError(QLowEnergyController::UnknownRemoteDeviceError); return; } diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp index 5600be4b..5c2b30ec 100644 --- a/src/bluetooth/qlowenergycontroller_bluez.cpp +++ b/src/bluetooth/qlowenergycontroller_bluez.cpp @@ -1843,7 +1843,7 @@ int QLowEnergyControllerPrivateBluez::securityLevel() const if (optval & L2CAP_LM_SECURE) level = BT_SECURITY_HIGH; - qDebug() << "Current l2cp sec level (old):" << level; + qCDebug(QT_BT_BLUEZ) << "Current l2cp sec level (old):" << level; return level; } @@ -1890,7 +1890,7 @@ bool QLowEnergyControllerPrivateBluez::setSecurityLevel(int level) } if (setsockopt(socket, SOL_L2CAP, L2CAP_LM, &optval, sizeof(optval)) == 0) { - qDebug(QT_BT_BLUEZ) << "Old l2cp sec level:" << optval; + qCDebug(QT_BT_BLUEZ) << "Old l2cp sec level:" << optval; return true; } diff --git a/src/bluetooth/qlowenergycontroller_winrt.cpp b/src/bluetooth/qlowenergycontroller_winrt.cpp index 2112d8bf..b7038210 100644 --- a/src/bluetooth/qlowenergycontroller_winrt.cpp +++ b/src/bluetooth/qlowenergycontroller_winrt.cpp @@ -464,7 +464,7 @@ void QLowEnergyControllerPrivateWinRT::connectToDevice() mAbortPending = false; Q_Q(QLowEnergyController); if (remoteDevice.isNull()) { - qWarning() << "Invalid/null remote device address"; + qCWarning(QT_BT_WINDOWS) << "Invalid/null remote device address"; setError(QLowEnergyController::UnknownRemoteDeviceError); return; } diff --git a/src/bluetooth/qlowenergycontrollerbase.cpp b/src/bluetooth/qlowenergycontrollerbase.cpp index dbca072d..5fde2be5 100644 --- a/src/bluetooth/qlowenergycontrollerbase.cpp +++ b/src/bluetooth/qlowenergycontrollerbase.cpp @@ -319,7 +319,7 @@ QLowEnergyService *QLowEnergyControllerPrivate::addServiceHelper( } if (localServices.contains(servicePrivate->uuid)) { - qWarning() << "Overriding existing local service with uuid" + qCWarning(QT_BT) << "Overriding existing local service with uuid" << servicePrivate->uuid; } this->localServices.insert(servicePrivate->uuid, servicePrivate); |