diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:01:08 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-09-17 13:50:40 +0200 |
| commit | be2f664d9e7b181909d45cb0531def9da5017e5a (patch) | |
| tree | 394bfb63fb136a869a0430f1a379eff2e49e76fb /src/knx/core/qknxbytearray.cpp | |
| parent | df0ba9b97c26901f52769381df3c4cbf1fae9ca6 (diff) | |
| parent | 8b0120194e5ab01aa8344d781782dd818a262f02 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/knx/core/qknxbytearray.h
Change-Id: Ieb8bfa6f4adc4f566ae80874df522ab555c4d943
Diffstat (limited to 'src/knx/core/qknxbytearray.cpp')
| -rw-r--r-- | src/knx/core/qknxbytearray.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/knx/core/qknxbytearray.cpp b/src/knx/core/qknxbytearray.cpp index 53ed547..bfec17d 100644 --- a/src/knx/core/qknxbytearray.cpp +++ b/src/knx/core/qknxbytearray.cpp @@ -262,18 +262,18 @@ void QKnxByteArray::resize(int size) */ /*! - \fn void QKnxByteArray::set(int i, quint8 value) + \fn void QKnxByteArray::set(int i, quint8 val) - Sets the character at the index position \a i in the byte array to \a value. + Sets the character at the index position \a i in the byte array to \a val. \a i must be a valid index position in the byte array (that is, between 0 and the value returned by size()). */ /*! - \fn void QKnxByteArray::setValue(int i, quint8 value) + \fn void QKnxByteArray::setValue(int i, quint8 val) - Sets the value at the index position \a i in the byte array to \a value. + Sets the value at the index position \a i in the byte array to \a val. If the index \a i is out of bounds, the function does nothing. If you are certain that \a i is within bounds, you can use set() instead, which |