From b8b2b00e4f8b6d3834d1f35b48f2c1c25bbbdf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 13 Oct 2020 12:17:39 +0200 Subject: [PATCH] Replace Qt::endl for backwards compatibility --- .../deconz/zigbeebridgecontrollerdeconz.cpp | 28 ++++----- .../nxp/zigbeebridgecontrollernxp.cpp | 2 +- libnymea-zigbee/zdo/zigbeedeviceprofile.cpp | 62 +++++++++---------- libnymea-zigbee/zigbeenetwork.cpp | 20 +++--- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp b/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp index b162636..70749af 100644 --- a/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp +++ b/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp @@ -1045,19 +1045,19 @@ QDebug operator<<(QDebug debug, const DeconzDeviceState &deviceState) QDebug operator<<(QDebug debug, const DeconzNetworkConfiguration &configuration) { - debug.nospace() << "Network configuration:" << Qt::endl; - debug.nospace() << " - Node type:" << configuration.nodeType << Qt::endl; - debug.nospace() << " - IEEE address:" << configuration.ieeeAddress.toString() << Qt::endl; - debug.nospace() << " - NWK address:" << ZigbeeUtils::convertUint16ToHexString(configuration.shortAddress) << Qt::endl; - debug.nospace() << " - PAN ID:" << ZigbeeUtils::convertUint16ToHexString(configuration.panId) << Qt::endl; - debug.nospace() << " - Extended PAN ID:" << ZigbeeUtils::convertUint64ToHexString(configuration.extendedPanId) << Qt::endl; - debug.nospace() << " - APS Extended PAN ID:" << ZigbeeUtils::convertUint64ToHexString(configuration.apsExtendedPanId) << Qt::endl; - debug.nospace() << " - Trust center IEEE address:" << configuration.trustCenterAddress.toString() << Qt::endl; - debug.nospace() << " - Channel mask:" << ZigbeeChannelMask(configuration.channelMask) << Qt::endl; - debug.nospace() << " - Channel:" << configuration.currentChannel << Qt::endl; - debug.nospace() << " - Security mode:" << configuration.securityMode << Qt::endl; - debug.nospace() << " - Protocol version:" << ZigbeeUtils::convertUint16ToHexString(configuration.protocolVersion) << Qt::endl; - debug.nospace() << " - Network update ID:" << ZigbeeUtils::convertByteToHexString(configuration.networkUpdateId) << Qt::endl; - debug.nospace() << " - Watchdog TTL:" << configuration.watchdogTimeout << Qt::endl; + debug.nospace() << "Network configuration:" << "\n"; + debug.nospace() << " - Node type:" << configuration.nodeType << "\n"; + debug.nospace() << " - IEEE address:" << configuration.ieeeAddress.toString() << "\n"; + debug.nospace() << " - NWK address:" << ZigbeeUtils::convertUint16ToHexString(configuration.shortAddress) << "\n"; + debug.nospace() << " - PAN ID:" << ZigbeeUtils::convertUint16ToHexString(configuration.panId) << "\n"; + debug.nospace() << " - Extended PAN ID:" << ZigbeeUtils::convertUint64ToHexString(configuration.extendedPanId) << "\n"; + debug.nospace() << " - APS Extended PAN ID:" << ZigbeeUtils::convertUint64ToHexString(configuration.apsExtendedPanId) << "\n"; + debug.nospace() << " - Trust center IEEE address:" << configuration.trustCenterAddress.toString() << "\n"; + debug.nospace() << " - Channel mask:" << ZigbeeChannelMask(configuration.channelMask) << "\n"; + debug.nospace() << " - Channel:" << configuration.currentChannel << "\n"; + debug.nospace() << " - Security mode:" << configuration.securityMode << "\n"; + debug.nospace() << " - Protocol version:" << ZigbeeUtils::convertUint16ToHexString(configuration.protocolVersion) << "\n"; + debug.nospace() << " - Network update ID:" << ZigbeeUtils::convertByteToHexString(configuration.networkUpdateId) << "\n"; + debug.nospace() << " - Watchdog TTL:" << configuration.watchdogTimeout << "\n"; return debug.space(); } diff --git a/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp b/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp index 34e23c0..7279ca8 100644 --- a/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp +++ b/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp @@ -197,7 +197,7 @@ void ZigbeeBridgeControllerNxp::onInterfacePackageReceived(const QByteArray &pac qCWarning(dcZigbeeController()) << "Received empty debug log notification"; return; } - qCDebug(dcZigbeeController()) << "*****DEBUG*****" << static_cast(data.at(0)) << Qt::endl << qUtf8Printable(data.right(data.length() - 1)); + qCDebug(dcZigbeeController()) << "*****DEBUG*****" << static_cast(data.at(0)) << "\n" << qUtf8Printable(data.right(data.length() - 1)); break; case Nxp::NotificationDeviceStatusChanged: m_controllerState = static_cast(data.at(0)); diff --git a/libnymea-zigbee/zdo/zigbeedeviceprofile.cpp b/libnymea-zigbee/zdo/zigbeedeviceprofile.cpp index d2e9483..5e71f38 100644 --- a/libnymea-zigbee/zdo/zigbeedeviceprofile.cpp +++ b/libnymea-zigbee/zdo/zigbeedeviceprofile.cpp @@ -206,15 +206,15 @@ QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::Adpu &deviceAdpu) QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::NodeDescriptor &nodeDescriptor) { - debug.nospace() << "NodeDescriptor(" << nodeDescriptor.nodeType << ")" << Qt::endl; - debug.nospace() << " Complex descriptor available: " << nodeDescriptor.complexDescriptorAvailable << Qt::endl; - debug.nospace() << " User descriptor available: " << nodeDescriptor.userDescriptorAvailable << Qt::endl; - debug.nospace() << " " << nodeDescriptor.frequencyBand << Qt::endl; + debug.nospace() << "NodeDescriptor(" << nodeDescriptor.nodeType << ")" << "\n"; + debug.nospace() << " Complex descriptor available: " << nodeDescriptor.complexDescriptorAvailable << "\n"; + debug.nospace() << " User descriptor available: " << nodeDescriptor.userDescriptorAvailable << "\n"; + debug.nospace() << " " << nodeDescriptor.frequencyBand << "\n"; debug.nospace() << " " << nodeDescriptor.macCapabilities; - debug.nospace() << " Manufacturer code: " << ZigbeeUtils::convertUint16ToHexString(nodeDescriptor.manufacturerCode) << "(" << nodeDescriptor.manufacturerCode << ")" << Qt::endl; - debug.nospace() << " Maximum buffer size: " << nodeDescriptor.maximumBufferSize << Qt::endl; - debug.nospace() << " Maximum RX size: " << nodeDescriptor.maximumRxSize << Qt::endl; - debug.nospace() << " Maximum TX size: " << nodeDescriptor.maximumTxSize << Qt::endl; + debug.nospace() << " Manufacturer code: " << ZigbeeUtils::convertUint16ToHexString(nodeDescriptor.manufacturerCode) << "(" << nodeDescriptor.manufacturerCode << ")" << "\n"; + debug.nospace() << " Maximum buffer size: " << nodeDescriptor.maximumBufferSize << "\n"; + debug.nospace() << " Maximum RX size: " << nodeDescriptor.maximumRxSize << "\n"; + debug.nospace() << " Maximum TX size: " << nodeDescriptor.maximumTxSize << "\n"; debug.nospace() << " " << nodeDescriptor.serverMask; debug.nospace() << " " << nodeDescriptor.descriptorCapabilities; return debug; @@ -222,43 +222,43 @@ QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::NodeDescriptor &nodeD QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::MacCapabilities &macCapabilities) { - debug.nospace() << "MacCapabilities(" << ZigbeeUtils::convertByteToHexString(macCapabilities.flag) << ")" << Qt::endl; - debug.nospace() << " Alternate PAN Coordinator: " << macCapabilities.alternatePanCoordinator << Qt::endl; - debug.nospace() << " " << macCapabilities.deviceType << Qt::endl; - debug.nospace() << " Power source main power: " << macCapabilities.powerSourceFlagMainPower << Qt::endl; - debug.nospace() << " Receiver on when idle: " << macCapabilities.receiverOnWhenIdle << Qt::endl; - debug.nospace() << " Security capability: " << macCapabilities.securityCapability << Qt::endl; - debug.nospace() << " Allocate address: " << macCapabilities.allocateAddress << Qt::endl; + debug.nospace() << "MacCapabilities(" << ZigbeeUtils::convertByteToHexString(macCapabilities.flag) << ")" << "\n"; + debug.nospace() << " Alternate PAN Coordinator: " << macCapabilities.alternatePanCoordinator << "\n"; + debug.nospace() << " " << macCapabilities.deviceType << "\n"; + debug.nospace() << " Power source main power: " << macCapabilities.powerSourceFlagMainPower << "\n"; + debug.nospace() << " Receiver on when idle: " << macCapabilities.receiverOnWhenIdle << "\n"; + debug.nospace() << " Security capability: " << macCapabilities.securityCapability << "\n"; + debug.nospace() << " Allocate address: " << macCapabilities.allocateAddress << "\n"; return debug; } QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::ServerMask &serverMask) { - debug.nospace() << "ServerMask(" << ZigbeeUtils::convertUint16ToHexString(serverMask.serverMaskFlag) << ")" << Qt::endl; - debug.nospace() << " Primary trust center: " << serverMask.primaryTrustCenter << Qt::endl; - debug.nospace() << " Backup trust center: " << serverMask.backupTrustCenter << Qt::endl; - debug.nospace() << " Primary binding cache: " << serverMask.primaryBindingCache << Qt::endl; - debug.nospace() << " Backup binding cache: " << serverMask.backupBindingCache << Qt::endl; - debug.nospace() << " Primary discovery cache: " << serverMask.primaryDiscoveryCache << Qt::endl; - debug.nospace() << " Backup discovery cache: " << serverMask.backupDiscoveryCache << Qt::endl; - debug.nospace() << " Network manager: " << serverMask.networkManager << Qt::endl; + debug.nospace() << "ServerMask(" << ZigbeeUtils::convertUint16ToHexString(serverMask.serverMaskFlag) << ")" << "\n"; + debug.nospace() << " Primary trust center: " << serverMask.primaryTrustCenter << "\n"; + debug.nospace() << " Backup trust center: " << serverMask.backupTrustCenter << "\n"; + debug.nospace() << " Primary binding cache: " << serverMask.primaryBindingCache << "\n"; + debug.nospace() << " Backup binding cache: " << serverMask.backupBindingCache << "\n"; + debug.nospace() << " Primary discovery cache: " << serverMask.primaryDiscoveryCache << "\n"; + debug.nospace() << " Backup discovery cache: " << serverMask.backupDiscoveryCache << "\n"; + debug.nospace() << " Network manager: " << serverMask.networkManager << "\n"; return debug; } QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::DescriptorCapabilities &descriptorCapabilities) { - debug.nospace() << "DescriptorCapabilities(" << ZigbeeUtils::convertByteToHexString(descriptorCapabilities.descriptorCapabilitiesFlag) << ")" << Qt::endl; - debug.nospace() << " Extended active endpoint list available: " << descriptorCapabilities.extendedActiveEndpointListAvailable << Qt::endl; - debug.nospace() << " Extended simple descriptor list available: " << descriptorCapabilities.extendedSimpleDescriptorListAvailable << Qt::endl; + debug.nospace() << "DescriptorCapabilities(" << ZigbeeUtils::convertByteToHexString(descriptorCapabilities.descriptorCapabilitiesFlag) << ")" << "\n"; + debug.nospace() << " Extended active endpoint list available: " << descriptorCapabilities.extendedActiveEndpointListAvailable << "\n"; + debug.nospace() << " Extended simple descriptor list available: " << descriptorCapabilities.extendedSimpleDescriptorListAvailable << "\n"; return debug; } QDebug operator<<(QDebug debug, const ZigbeeDeviceProfile::PowerDescriptor &powerDescriptor) { - debug.nospace() << "PowerDescriptor(" << ZigbeeUtils::convertByteToHexString(powerDescriptor.powerDescriptoFlag) << ")" << Qt::endl; - debug.nospace() << " Power mode: " << powerDescriptor.powerMode << Qt::endl; - debug.nospace() << " Available power sources: " << powerDescriptor.availablePowerSources << Qt::endl; - debug.nospace() << " Power source: " << powerDescriptor.powerSource << Qt::endl; - debug.nospace() << " Power level: " << powerDescriptor.powerLevel << Qt::endl; + debug.nospace() << "PowerDescriptor(" << ZigbeeUtils::convertByteToHexString(powerDescriptor.powerDescriptoFlag) << ")" << "\n"; + debug.nospace() << " Power mode: " << powerDescriptor.powerMode << "\n"; + debug.nospace() << " Available power sources: " << powerDescriptor.availablePowerSources << "\n"; + debug.nospace() << " Power source: " << powerDescriptor.powerSource << "\n"; + debug.nospace() << " Power level: " << powerDescriptor.powerLevel << "\n"; return debug; } diff --git a/libnymea-zigbee/zigbeenetwork.cpp b/libnymea-zigbee/zigbeenetwork.cpp index cb45ad4..1d98193 100644 --- a/libnymea-zigbee/zigbeenetwork.cpp +++ b/libnymea-zigbee/zigbeenetwork.cpp @@ -542,26 +542,26 @@ QDebug operator<<(QDebug debug, ZigbeeNetwork *network) { debug.nospace().noquote() << "ZigbeeNetwork (" << ZigbeeUtils::convertUint16ToHexString(network->panId()) << ", Channel " << network->channel() - << ")" << Qt::endl; + << ")" << "\n"; foreach (ZigbeeNode *node, network->nodes()) { - debug.nospace().noquote() << " ---> " << node << Qt::endl; + debug.nospace().noquote() << " ---> " << node << "\n"; debug.nospace().noquote() << " " << node->nodeDescriptor(); debug.nospace().noquote() << " " << node->powerDescriptor(); - debug.nospace().noquote() << " Endpoints: " << node->endpoints().count() << Qt::endl; + debug.nospace().noquote() << " Endpoints: " << node->endpoints().count() << "\n"; foreach (ZigbeeNodeEndpoint *endpoint, node->endpoints()) { - debug.nospace().noquote() << " - " << endpoint << Qt::endl; - debug.nospace().noquote() << " Input clusters:" << Qt::endl; + debug.nospace().noquote() << " - " << endpoint << "\n"; + debug.nospace().noquote() << " Input clusters:" << "\n"; foreach (ZigbeeCluster *cluster, endpoint->inputClusters()) { - debug.nospace().noquote() << " - " << cluster << Qt::endl; + debug.nospace().noquote() << " - " << cluster << "\n"; foreach (const ZigbeeClusterAttribute &attribute, cluster->attributes()) { - debug.nospace().noquote() << " - " << attribute << Qt::endl; + debug.nospace().noquote() << " - " << attribute << "\n"; } } - debug.nospace().noquote() << " Output clusters:" << Qt::endl; + debug.nospace().noquote() << " Output clusters:" << "\n"; foreach (ZigbeeCluster *cluster, endpoint->outputClusters()) { - debug.nospace().noquote() << " - " << cluster << Qt::endl; + debug.nospace().noquote() << " - " << cluster << "\n"; foreach (const ZigbeeClusterAttribute &attribute, cluster->attributes()) { - debug.nospace().noquote() << " - " << attribute << Qt::endl; + debug.nospace().noquote() << " - " << attribute << "\n"; } } }