diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:24 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:29 +0200 |
commit | 8b0120194e5ab01aa8344d781782dd818a262f02 (patch) | |
tree | 034e6be56a535ae922f475afdc2819a43e294e31 /src/knx/core/qknxbytearray.h | |
parent | 05f708f025018a96d3fa6c49ea0dc94f5131af23 (diff) | |
parent | 2d67519c9d0a67ea5526a481e30ec2cf5b464694 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/knx/core/qknxbytearray.h')
-rw-r--r-- | src/knx/core/qknxbytearray.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/knx/core/qknxbytearray.h b/src/knx/core/qknxbytearray.h index 4f1fdb1..f6feba5 100644 --- a/src/knx/core/qknxbytearray.h +++ b/src/knx/core/qknxbytearray.h @@ -92,11 +92,11 @@ public: void resize(int size); inline quint8 at(int i) const { return m_bytes.at(i); } - inline void set(int i, quint8 value) { m_bytes[i] = value; } + inline void set(int i, quint8 val) { m_bytes[i] = val; } - inline void setValue(int i, quint8 value) + inline void setValue(int i, quint8 val) { - if (i >= 0 && i < m_bytes.size()) m_bytes[i] = value; + if (i >= 0 && i < m_bytes.size()) m_bytes[i] = val; } inline quint8 value(int i, quint8 defaultValue = {}) const { |