summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-30 19:17:01 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-01 14:48:57 +0200
commiteda28d82e239c57533e73be622b26a3985fb86ce (patch)
tree6f18228de6944f2eca7a4d1a1a1f200f68c97f34
parent00cc61aa4e9d624dc4894afe819f7413a9204a68 (diff)
Fix Qt6 buildwip/qt6
Prepend namespace to text stream operands and fix deprecated function and enum usage. Change-Id: Ib9c74f940173f678d7c5af143cd2fd4e8da982e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--src/bluetooth/android/devicediscoverybroadcastreceiver.cpp8
-rw-r--r--src/bluetooth/bluez/bluetoothmanagement.cpp2
-rw-r--r--src/bluetooth/bluez/hcimanager.cpp6
-rw-r--r--src/bluetooth/lecmaccalculator.cpp2
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp8
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp18
-rw-r--r--src/bluetooth/qlowenergycontroller_bluez.cpp48
-rw-r--r--src/nfc/targetemulator.cpp2
-rw-r--r--tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp6
10 files changed, 53 insertions, 49 deletions
diff --git a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
index f1f50516..19023efe 100644
--- a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
+++ b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
@@ -72,7 +72,7 @@ static QBitArray initializeMinorCaches()
case QBluetoothDeviceInfo::MiscellaneousDevice:
case QBluetoothDeviceInfo::ComputerDevice:
case QBluetoothDeviceInfo::PhoneDevice:
- case QBluetoothDeviceInfo::LANAccessDevice:
+ case QBluetoothDeviceInfo::NetworkDevice:
case QBluetoothDeviceInfo::AudioVideoDevice:
case QBluetoothDeviceInfo::PeripheralDevice:
case QBluetoothDeviceInfo::ImagingDevice:
@@ -114,7 +114,7 @@ static const MajorClassJavaToQtMapping majorMappings[] = {
{ "HEALTH", QBluetoothDeviceInfo::HealthDevice },
{ "IMAGING", QBluetoothDeviceInfo::ImagingDevice },
{ "MISC", QBluetoothDeviceInfo::MiscellaneousDevice },
- { "NETWORKING", QBluetoothDeviceInfo::LANAccessDevice },
+ { "NETWORKING", QBluetoothDeviceInfo::NetworkDevice },
{ "PERIPHERAL", QBluetoothDeviceInfo::PeripheralDevice },
{ "PHONE", QBluetoothDeviceInfo::PhoneDevice },
{ "TOY", QBluetoothDeviceInfo::ToyDevice },
@@ -130,7 +130,7 @@ static const int minorIndexSizes[] = {
61, // QBluetoothDevice::MiscellaneousDevice
18, // QBluetoothDevice::ComputerDevice
35, // QBluetoothDevice::PhoneDevice
- 62, // QBluetoothDevice::LANAccessDevice
+ 62, // QBluetoothDevice::NetworkDevice
0, // QBluetoothDevice::AudioVideoDevice
56, // QBluetoothDevice::PeripheralDevice
63, // QBluetoothDevice::ImagingDEvice
@@ -227,7 +227,7 @@ static const MinorClassJavaToQtMapping minorMappings[] = {
// QBluetoothDevice::Miscellaneous
{ nullptr, 0 }, // index 61 & separator
- // QBluetoothDevice::LANAccessDevice
+ // QBluetoothDevice::NetworkDevice
{ nullptr, 0 }, // index 62 & separator
// QBluetoothDevice::ImagingDevice
diff --git a/src/bluetooth/bluez/bluetoothmanagement.cpp b/src/bluetooth/bluez/bluetoothmanagement.cpp
index 31d3dc02..6a1e8864 100644
--- a/src/bluetooth/bluez/bluetoothmanagement.cpp
+++ b/src/bluetooth/bluez/bluetoothmanagement.cpp
@@ -254,7 +254,7 @@ void BluetoothManagement::_q_readNotifier()
}
default:
qCDebug(QT_BT_BLUEZ) << "BluetoothManagement: Ignored event:"
- << hex << qFromLittleEndian(hdr->cmdCode);
+ << Qt::hex << qFromLittleEndian(hdr->cmdCode);
break;
}
diff --git a/src/bluetooth/bluez/hcimanager.cpp b/src/bluetooth/bluez/hcimanager.cpp
index 2a7c9060..845dfec0 100644
--- a/src/bluetooth/bluez/hcimanager.cpp
+++ b/src/bluetooth/bluez/hcimanager.cpp
@@ -320,7 +320,7 @@ QVector<quint16> HciManager::activeLowEnergyConnections() const
activeLowEnergyHandles.append(info[i].handle);
break;
default:
- qCWarning(QT_BT_BLUEZ) << "Unknown active connection type:" << hex << info[i].type;
+ qCWarning(QT_BT_BLUEZ) << "Unknown active connection type:" << Qt::hex << info[i].type;
break;
}
}
@@ -467,7 +467,7 @@ void HciManager::handleHciEventPacket(const quint8 *data, int size)
return;
}
- qCDebug(QT_BT_BLUEZ) << "HCI event triggered, type:" << hex << header->evt;
+ qCDebug(QT_BT_BLUEZ) << "HCI event triggered, type:" << Qt::hex << header->evt;
switch (header->evt) {
case EVT_ENCRYPT_CHANGE:
@@ -475,7 +475,7 @@ void HciManager::handleHciEventPacket(const quint8 *data, int size)
const evt_encrypt_change *event = (evt_encrypt_change *) data;
qCDebug(QT_BT_BLUEZ) << "HCI Encrypt change, status:"
<< (event->status == 0 ? "Success" : "Failed")
- << "handle:" << hex << event->handle
+ << "handle:" << Qt::hex << event->handle
<< "encrypt:" << event->encrypt;
QBluetoothAddress remoteDevice = addressForConnectionHandle(event->handle);
diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp
index b150466e..475e46a8 100644
--- a/src/bluetooth/lecmaccalculator.cpp
+++ b/src/bluetooth/lecmaccalculator.cpp
@@ -169,7 +169,7 @@ bool LeCmacCalculator::verify(const QByteArray &message, const quint128 &csrk,
#ifdef CONFIG_LINUX_CRYPTO_API
const quint64 actualMac = calculateMac(message, csrk);
if (actualMac != expectedMac) {
- qCWarning(QT_BT_BLUEZ) << hex << "signature verification failed: calculated mac:"
+ qCWarning(QT_BT_BLUEZ) << Qt::hex << "signature verification failed: calculated mac:"
<< actualMac << "expected mac:" << expectedMac;
return false;
}
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
index 9d306053..043cc634 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
@@ -880,11 +880,15 @@ void QBluetoothDeviceDiscoveryAgentPrivate::registerDevice(const QBluetoothDevic
if (iter->address() == info.address()) {
qCDebug(QT_BT_WINRT) << "Updating device" << iter->name() << iter->address();
// merge service uuids
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ QVector<QBluetoothUuid> uuids = iter->serviceUuids();
+#else
QList<QBluetoothUuid> uuids = iter->serviceUuids();
+#endif
uuids.append(info.serviceUuids());
- const QSet<QBluetoothUuid> uuidSet = uuids.toSet();
+ const QSet<QBluetoothUuid> uuidSet = QSet<QBluetoothUuid>(uuids.begin(), uuids.end());
if (iter->serviceUuids().count() != uuidSet.count())
- iter->setServiceUuids(uuidSet.toList().toVector());
+ iter->setServiceUuids(uuidSet.values().toVector());
if (iter->coreConfigurations() != info.coreConfigurations())
iter->setCoreConfigurations(QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration);
return;
diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
index f02c6ab9..f48717a6 100644
--- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
@@ -1133,7 +1133,7 @@ void QBluetoothLocalDevicePrivate::createCache()
QList<QBluetoothAddress> QBluetoothLocalDevicePrivate::connectedDevices() const
{
- return connectedDevicesSet.toList();
+ return connectedDevicesSet.values();
}
void QBluetoothLocalDevice::pairingConfirmation(bool confirmation)
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp
index f1476758..69b6ac06 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_winrt.cpp
@@ -285,33 +285,33 @@ void QWinRTBluetoothServiceDiscoveryWorker::processServiceSearchResult(quint64 a
hr = dataReader->ReadByte(&value);
Q_ASSERT_SUCCEEDED(hr);
info.setAttribute(key, value);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "UINT8" << hex << value;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "UINT8" << Qt::hex << value;
} else if (type == TYPE_UINT16) {
quint16 value;
hr = dataReader->ReadUInt16(&value);
Q_ASSERT_SUCCEEDED(hr);
info.setAttribute(key, value);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "UINT16" << hex << value;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "UINT16" << Qt::hex << value;
} else if (type == TYPE_UINT32) {
quint32 value;
hr = dataReader->ReadUInt32(&value);
Q_ASSERT_SUCCEEDED(hr);
info.setAttribute(key, value);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "UINT32" << hex << value;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "UINT32" << Qt::hex << value;
} else if (type == TYPE_SHORT_UUID) {
quint16 value;
hr = dataReader->ReadUInt16(&value);
Q_ASSERT_SUCCEEDED(hr);
const QBluetoothUuid uuid(value);
info.setAttribute(key, uuid);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "UUID" << hex << uuid;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "UUID" << Qt::hex << uuid;
} else if (type == TYPE_LONG_UUID) {
GUID value;
hr = dataReader->ReadGuid(&value);
Q_ASSERT_SUCCEEDED(hr);
const QBluetoothUuid uuid(value);
info.setAttribute(key, uuid);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "UUID" << hex << uuid;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "UUID" << Qt::hex << uuid;
} else if (type == TYPE_STRING) {
BYTE length;
hr = dataReader->ReadByte(&length);
@@ -321,18 +321,18 @@ void QWinRTBluetoothServiceDiscoveryWorker::processServiceSearchResult(quint64 a
Q_ASSERT_SUCCEEDED(hr);
const QString str = QString::fromWCharArray(WindowsGetStringRawBuffer(value.Get(), nullptr));
info.setAttribute(key, str);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "STRING" << str;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "STRING" << str;
} else if (type == TYPE_SEQUENCE) {
bool ok;
QBluetoothServiceInfo::Sequence sequence = readSequence(dataReader, &ok, nullptr);
if (ok) {
info.setAttribute(key, sequence);
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "SEQUENCE" << sequence;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "SEQUENCE" << sequence;
} else {
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type << "SEQUENCE ERROR";
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type << "SEQUENCE ERROR";
}
} else {
- qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << hex << key << "TYPE" << dec << type;
+ qCDebug(QT_BT_WINRT) << "UUID" << uuid << "KEY" << Qt::hex << key << "TYPE" << Qt::dec << type;
}
hr = iterator->MoveNext(&current);
}
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index dfa21004..13d70ef3 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -236,7 +236,7 @@ static void dumpErrorInformation(const QByteArray &response)
}
qCDebug(QT_BT_BLUEZ) << "Error1:" << errorString
- << "last command:" << hex << lastCommand
+ << "last command:" << Qt::hex << lastCommand
<< "handle:" << handle;
}
@@ -351,7 +351,7 @@ void QLowEnergyControllerPrivateBluez::handleGattRequestTimeout()
const Request currentRequest = openRequests.dequeue();
requestPending = false; // reset pending flag
- qCWarning(QT_BT_BLUEZ).nospace() << "****** Request type 0x" << hex << currentRequest.command
+ qCWarning(QT_BT_BLUEZ).nospace() << "****** Request type 0x" << Qt::hex << currentRequest.command
<< " to server/peripheral timed out";
qCWarning(QT_BT_BLUEZ) << "****** Looks like the characteristic or descriptor does NOT act in"
<< "accordance to Bluetooth 4.x spec.";
@@ -408,7 +408,7 @@ void QLowEnergyControllerPrivateBluez::handleGattRequestTimeout()
default:
// not a command used by central role implementation
qCWarning(QT_BT_BLUEZ) << "Missing response for ATT peripheral command: "
- << hex << command;
+ << Qt::hex << command;
break;
}
@@ -983,7 +983,7 @@ void QLowEnergyControllerPrivateBluez::sendPacket(const QByteArray &packet)
// This packet is effectively discarded but the controller can still recover
if (result == -1) {
- qCDebug(QT_BT_BLUEZ) << "Cannot write L2CP packet:" << hex
+ qCDebug(QT_BT_BLUEZ) << "Cannot write L2CP packet:" << Qt::hex
<< packet.toHex()
<< l2cpSocket->errorString();
setError(QLowEnergyController::NetworkError);
@@ -1000,7 +1000,7 @@ void QLowEnergyControllerPrivateBluez::sendNextPendingRequest()
return;
const Request &request = openRequests.head();
-// qCDebug(QT_BT_BLUEZ) << "Sending request, type:" << hex << request.command
+// qCDebug(QT_BT_BLUEZ) << "Sending request, type:" << Qt::hex << request.command
// << request.payload.toHex();
requestPending = true;
@@ -1025,7 +1025,7 @@ QLowEnergyHandle parseReadByTypeCharDiscovery(
else
charData->uuid = convert_uuid128((quint128 *)&data[5]);
- qCDebug(QT_BT_BLUEZ) << "Found handle:" << hex << attributeHandle
+ qCDebug(QT_BT_BLUEZ) << "Found handle:" << Qt::hex << attributeHandle
<< "properties:" << charData->properties
<< "value handle:" << charData->valueHandle
<< "uuid:" << charData->uuid.toString();
@@ -1053,7 +1053,7 @@ QLowEnergyHandle parseReadByTypeIncludeDiscovery(
else
foundServices->append(convert_uuid128((quint128 *) &data[6]));
- qCDebug(QT_BT_BLUEZ) << "Found included service: " << hex
+ qCDebug(QT_BT_BLUEZ) << "Found included service: " << Qt::hex
<< attributeHandle << "uuid:" << *foundServices;
return attributeHandle;
@@ -1130,7 +1130,7 @@ void QLowEnergyControllerPrivateBluez::processReply(
offset += elementLength;
- qCDebug(QT_BT_BLUEZ) << "Found uuid:" << uuid << "start handle:" << hex
+ qCDebug(QT_BT_BLUEZ) << "Found uuid:" << uuid << "start handle:" << Qt::hex
<< start << "end handle:" << end;
QLowEnergyServicePrivate *priv = new QLowEnergyServicePrivate();
@@ -1437,13 +1437,13 @@ void QLowEnergyControllerPrivateBluez::processReply(
quint16 shortUuid = uuid.toUInt16(&ok);
if (ok && shortUuid >= QLowEnergyServicePrivate::PrimaryService
&& shortUuid <= QLowEnergyServicePrivate::Characteristic){
- qCDebug(QT_BT_BLUEZ) << "Suppressing primary/characteristic" << hex << shortUuid;
+ qCDebug(QT_BT_BLUEZ) << "Suppressing primary/characteristic" << Qt::hex << shortUuid;
continue;
}
// ignore value handle
if (descriptorHandle == p->characteristicList[charHandle].valueHandle) {
- qCDebug(QT_BT_BLUEZ) << "Suppressing char handle" << hex << descriptorHandle;
+ qCDebug(QT_BT_BLUEZ) << "Suppressing char handle" << Qt::hex << descriptorHandle;
continue;
}
@@ -1454,7 +1454,7 @@ void QLowEnergyControllerPrivateBluez::processReply(
qCDebug(QT_BT_BLUEZ) << "Descriptor found, uuid:"
<< uuid.toString()
- << "descriptor handle:" << hex << descriptorHandle;
+ << "descriptor handle:" << Qt::hex << descriptorHandle;
}
const QLowEnergyHandle nextPotentialHandle = descriptorHandle + 1;
@@ -1615,7 +1615,7 @@ void QLowEnergyControllerPrivateBluez::sendReadByGroupRequest(
QByteArray data(GRP_TYPE_REQ_HEADER_SIZE, Qt::Uninitialized);
memcpy(data.data(), packet, GRP_TYPE_REQ_HEADER_SIZE);
- qCDebug(QT_BT_BLUEZ) << "Sending read_by_group_type request, startHandle:" << hex
+ qCDebug(QT_BT_BLUEZ) << "Sending read_by_group_type request, startHandle:" << Qt::hex
<< start << "endHandle:" << end << type;
Request request;
@@ -1653,7 +1653,7 @@ void QLowEnergyControllerPrivateBluez::sendReadByTypeRequest(
QByteArray data(READ_BY_TYPE_REQ_HEADER_SIZE, Qt::Uninitialized);
memcpy(data.data(), packet, READ_BY_TYPE_REQ_HEADER_SIZE);
- qCDebug(QT_BT_BLUEZ) << "Sending read_by_type request, startHandle:" << hex
+ qCDebug(QT_BT_BLUEZ) << "Sending read_by_type request, startHandle:" << Qt::hex
<< nextHandle << "endHandle:" << serviceData->endHandle
<< "type:" << attributeType << "packet:" << data.toHex();
@@ -1783,7 +1783,7 @@ void QLowEnergyControllerPrivateBluez::readServiceValuesByOffset(
if (descriptorHandle) {
handleToRead = descriptorHandle;
qCDebug(QT_BT_BLUEZ) << "Reading descriptor via blob request"
- << hex << descriptorHandle;
+ << Qt::hex << descriptorHandle;
} else {
//charHandle is not the char's value handle
QSharedPointer<QLowEnergyServicePrivate> service =
@@ -1792,7 +1792,7 @@ void QLowEnergyControllerPrivateBluez::readServiceValuesByOffset(
&& service->characteristicList.contains(charHandle)) {
handleToRead = service->characteristicList[charHandle].valueHandle;
qCDebug(QT_BT_BLUEZ) << "Reading characteristic via blob request"
- << hex << handleToRead;
+ << Qt::hex << handleToRead;
} else {
Q_ASSERT(false);
}
@@ -1837,9 +1837,9 @@ void QLowEnergyControllerPrivateBluez::processUnsolicitedReply(const QByteArray
if (QT_BT_BLUEZ().isDebugEnabled()) {
if (isNotification)
- qCDebug(QT_BT_BLUEZ) << "Change notification for handle" << hex << changedHandle;
+ qCDebug(QT_BT_BLUEZ) << "Change notification for handle" << Qt::hex << changedHandle;
else
- qCDebug(QT_BT_BLUEZ) << "Change indication for handle" << hex << changedHandle;
+ qCDebug(QT_BT_BLUEZ) << "Change indication for handle" << Qt::hex << changedHandle;
}
const QLowEnergyCharacteristic ch = characteristicForHandle(changedHandle);
@@ -1966,7 +1966,7 @@ void QLowEnergyControllerPrivateBluez::discoverNextDescriptor(
Q_ASSERT(!pendingCharHandles.isEmpty());
Q_ASSERT(!serviceData.isNull());
- qCDebug(QT_BT_BLUEZ) << "Sending find_info request" << hex
+ qCDebug(QT_BT_BLUEZ) << "Sending find_info request" << Qt::hex
<< pendingCharHandles << startingHandle;
quint8 packet[FIND_INFO_REQUEST_HEADER_SIZE];
@@ -2019,7 +2019,7 @@ void QLowEnergyControllerPrivateBluez::sendNextPrepareWriteRequest(
putBtData(offset, &packet[3]); // offset into newValue
qCDebug(QT_BT_BLUEZ) << "Writing long characteristic (prepare):"
- << hex << handle;
+ << Qt::hex << handle;
const int maxAvailablePayload = mtuSize - PREPARE_WRITE_HEADER_SIZE;
@@ -2065,7 +2065,7 @@ void QLowEnergyControllerPrivateBluez::sendExecuteWriteRequest(
memcpy(data.data(), packet, EXECUTE_WRITE_HEADER_SIZE);
qCDebug(QT_BT_BLUEZ) << "Sending Execute Write Request for long characteristic value"
- << hex << attrHandle;
+ << Qt::hex << attrHandle;
Request request;
request.payload = data;
@@ -2143,7 +2143,7 @@ void QLowEnergyControllerPrivateBluez::readCharacteristic(
QByteArray data(READ_REQUEST_HEADER_SIZE, Qt::Uninitialized);
memcpy(data.data(), packet, READ_REQUEST_HEADER_SIZE);
- qCDebug(QT_BT_BLUEZ) << "Targeted reading characteristic" << hex << charHandle;
+ qCDebug(QT_BT_BLUEZ) << "Targeted reading characteristic" << Qt::hex << charHandle;
Request request;
request.payload = data;
@@ -2178,7 +2178,7 @@ void QLowEnergyControllerPrivateBluez::readDescriptor(
QByteArray data(READ_REQUEST_HEADER_SIZE, Qt::Uninitialized);
memcpy(data.data(), packet, READ_REQUEST_HEADER_SIZE);
- qCDebug(QT_BT_BLUEZ) << "Targeted reading descriptor" << hex << descriptorHandle;
+ qCDebug(QT_BT_BLUEZ) << "Targeted reading descriptor" << Qt::hex << descriptorHandle;
Request request;
request.payload = data;
@@ -2714,7 +2714,7 @@ void QLowEnergyControllerPrivateBluez::writeCharacteristicForCentral(const QShar
break;
}
- qCDebug(QT_BT_BLUEZ) << "Writing characteristic" << hex << charHandle
+ qCDebug(QT_BT_BLUEZ) << "Writing characteristic" << Qt::hex << charHandle
<< "(size:" << packet.count() << "with response:"
<< (mode == QLowEnergyService::WriteWithResponse)
<< "signed:" << (mode == QLowEnergyService::WriteSigned) << ")";
@@ -2774,7 +2774,7 @@ void QLowEnergyControllerPrivateBluez::writeDescriptorForCentral(
memcpy(data.data(), packet, WRITE_REQUEST_HEADER_SIZE);
memcpy(&(data.data()[WRITE_REQUEST_HEADER_SIZE]), newValue.constData(), newValue.size());
- qCDebug(QT_BT_BLUEZ) << "Writing descriptor" << hex << descriptorHandle
+ qCDebug(QT_BT_BLUEZ) << "Writing descriptor" << Qt::hex << descriptorHandle
<< "(size:" << size << ")";
Request request;
diff --git a/src/nfc/targetemulator.cpp b/src/nfc/targetemulator.cpp
index 80555593..4b347208 100644
--- a/src/nfc/targetemulator.cpp
+++ b/src/nfc/targetemulator.cpp
@@ -370,7 +370,7 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command)
return NACK;
default:
- qDebug() << "Unknown opcode for Tag Type 2" << hex << opcode;
+ qDebug() << "Unknown opcode for Tag Type 2" << Qt::hex << opcode;
qDebug() << "command:" << command.toHex();
return NACK;
diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
index d8c80291..068db93d 100644
--- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
+++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
@@ -152,21 +152,21 @@ void tst_QBluetoothDeviceInfo::tst_construction_data()
QTest::newRow("0x000300 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000300)
<< QBluetoothDeviceInfo::ServiceClasses(QBluetoothDeviceInfo::NoService)
- << QBluetoothDeviceInfo::LANAccessDevice
+ << QBluetoothDeviceInfo::NetworkDevice
<< quint8(QBluetoothDeviceInfo::NetworkFullService)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration
<< leDeviceUuid;
QTest::newRow("0x000320 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000320)
<< QBluetoothDeviceInfo::ServiceClasses(QBluetoothDeviceInfo::NoService)
- << QBluetoothDeviceInfo::LANAccessDevice
+ << QBluetoothDeviceInfo::NetworkDevice
<< quint8(QBluetoothDeviceInfo::NetworkLoadFactorOne)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration
<< leDeviceUuid;
QTest::newRow("0x0003E0 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x0003E0)
<< QBluetoothDeviceInfo::ServiceClasses(QBluetoothDeviceInfo::NoService)
- << QBluetoothDeviceInfo::LANAccessDevice
+ << QBluetoothDeviceInfo::NetworkDevice
<< quint8(QBluetoothDeviceInfo::NetworkNoService)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration
<< leDeviceUuid;