diff options
| -rw-r--r-- | examples/knx/router/main.cpp | 13 | ||||
| -rw-r--r-- | src/knx/netip/qknxnetipconnectionheader.cpp | 2 | ||||
| -rw-r--r-- | src/knx/ssl/qknxsecurekey.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/examples/knx/router/main.cpp b/examples/knx/router/main.cpp index f9ccc9a..5218661 100644 --- a/examples/knx/router/main.cpp +++ b/examples/knx/router/main.cpp @@ -238,14 +238,13 @@ int main(int argc, char *argv[]) QNetworkInterface iface { QNetworkInterface::interfaceFromName(cliParser.value("interface")) }; if (!iface.isValid()) { auto interfaces = iface.allInterfaces(); - QList<QNetworkInterface>::iterator found = ( std::find_if(interfaces.begin(), - interfaces.end(), - [](const QNetworkInterface &i){ - return i.type() == QNetworkInterface::Ethernet; - })); + QList<QNetworkInterface>::iterator found = std::find_if( + interfaces.begin(), interfaces.end(), [](const QNetworkInterface &i) { + return i.type() == QNetworkInterface::Ethernet; + } + ); if (found == iface.allInterfaces().end()) { - qInfo().noquote() << "No valid network interface given and no " - "Ethernet adapter found. "; + qInfo().noquote() << "No valid network interface given and no Ethernet adapter found."; cliParser.showHelp(); } iface = static_cast<QNetworkInterface>(*found); diff --git a/src/knx/netip/qknxnetipconnectionheader.cpp b/src/knx/netip/qknxnetipconnectionheader.cpp index 4bf2859..e571e43 100644 --- a/src/knx/netip/qknxnetipconnectionheader.cpp +++ b/src/knx/netip/qknxnetipconnectionheader.cpp @@ -237,7 +237,7 @@ QKnxNetIpConnectionHeader QKnxNetIpConnectionHeader::fromBytes(const QKnxByteArr if (availableSize < 4 && availableSize < totalSize) return {}; // header might be corrupted - QKnxNetIpConnectionHeader hdr{ bytes.at(index + 1), bytes.at(index + 2), bytes.at(index + 3) }; + QKnxNetIpConnectionHeader hdr { bytes.at(index + 1), bytes.at(index + 2), bytes.at(index + 3) }; if (totalSize > 4) hdr.setConnectionTypeSpecificHeaderItems(bytes.mid(index + 4, totalSize - 4)); return hdr; diff --git a/src/knx/ssl/qknxsecurekey.cpp b/src/knx/ssl/qknxsecurekey.cpp index 5aadbf9..8ca21ae 100644 --- a/src/knx/ssl/qknxsecurekey.cpp +++ b/src/knx/ssl/qknxsecurekey.cpp @@ -57,9 +57,9 @@ public: } #if QT_CONFIG(opensslv11) - EVP_PKEY *m_evpPKey{ nullptr }; + EVP_PKEY *m_evpPKey { nullptr }; #endif - QKnxSecureKey::Type m_type{ QKnxSecureKey::Type::Invalid }; + QKnxSecureKey::Type m_type { QKnxSecureKey::Type::Invalid }; }; /*! diff --git a/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp b/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp index c86c3af..2deae37 100644 --- a/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp +++ b/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp @@ -200,7 +200,7 @@ void tst_QKnxNetIpCri::testAdditionalData() .create(); frame2 = QKnxNetIpCriProxy::builder() .setConnectionType(QKnxNetIp::ConnectionType::Tunnel) - .setAdditionalData(QKnxByteArray{ quint8(QKnxNetIp::TunnelLayer::Link), 0x00 } + .setAdditionalData(QKnxByteArray { quint8(QKnxNetIp::TunnelLayer::Link), 0x00 } + address.bytes()) .create(); QCOMPARE(frame, frame2); diff --git a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp index 6a42544..af06c8f 100644 --- a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp +++ b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp @@ -300,7 +300,7 @@ void tst_QKnxLinkLayerFrameBuilder::testMemoryRead() .create(); QCOMPARE(extctr.destinationAddressType(), QKnxAddress::Type::Individual); auto byts = extctr.bytes(); - QCOMPARE(extctr.bytes(), QKnxByteArray{0x60}); + QCOMPARE(extctr.bytes(), QKnxByteArray { 0x60 }); auto frame = QKnxLinkLayerFrame::builder().setControlField(ctrl).setExtendedControlField(extctr) .setTpdu(tpdu).setDestinationAddress(destination).setSourceAddress(source) |