summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2018-05-31 13:38:20 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2018-05-31 12:55:02 +0000
commite1e3241fbb5ee1cb31651f118d5a2a1c1c1a06b8 (patch)
tree10dcc47a3520f71796d4d06a6d9548b865e2a69d
parentc2a6cf5b464291fbecf89f851e7e6c365dc5a62d (diff)
Add Q_FALLTHROUGH to fix spurious warnings
Change-Id: Ide40b647eefb7028bb81e5eddcee390b0f9dffe0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/knx/qknxtpdu.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/knx/qknxtpdu.cpp b/src/knx/qknxtpdu.cpp
index d85c707..d056f3b 100644
--- a/src/knx/qknxtpdu.cpp
+++ b/src/knx/qknxtpdu.cpp
@@ -546,7 +546,7 @@ QKnxByteArray QKnxTpdu::data() const
case ApplicationControlField::GroupValueWrite:
if (size() > 2)
break;
-
+ Q_FALLTHROUGH();
case ApplicationControlField::AdcRead:
case ApplicationControlField::AdcResponse:
case ApplicationControlField::MemoryRead:
@@ -556,6 +556,7 @@ QKnxByteArray QKnxTpdu::data() const
case ApplicationControlField::DeviceDescriptorResponse:
case ApplicationControlField::Restart: // 6 bits from an optimized TPDU
dataApci = QKnxUtils::QUint8::bytes(quint8(d_ptr->byte(1) & 0x3f));
+ Q_FALLTHROUGH();
default:
break;
}
@@ -599,7 +600,7 @@ void QKnxTpdu::setData(const QKnxByteArray &data)
case ApplicationControlField::GroupValueWrite:
if (data.size() > 1 || quint8(data.at(0)) > 0x3f)
break;
-
+ Q_FALLTHROUGH();
case ApplicationControlField::AdcRead:
case ApplicationControlField::AdcResponse:
case ApplicationControlField::MemoryRead:
@@ -609,8 +610,8 @@ void QKnxTpdu::setData(const QKnxByteArray &data)
case ApplicationControlField::DeviceDescriptorResponse:
case ApplicationControlField::Restart:
d_ptr->setByte(1, apciBytes.at(1) | quint8(data.at(0)));
- remainingData = data.mid(1); Q_FALLTHROUGH();
-
+ remainingData = data.mid(1);
+ Q_FALLTHROUGH();
default:
break;
}