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/netip/qknxnetipstructheader.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/netip/qknxnetipstructheader.cpp')
| -rw-r--r-- | src/knx/netip/qknxnetipstructheader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/knx/netip/qknxnetipstructheader.cpp b/src/knx/netip/qknxnetipstructheader.cpp index 3d977f5..34f7fc2 100644 --- a/src/knx/netip/qknxnetipstructheader.cpp +++ b/src/knx/netip/qknxnetipstructheader.cpp @@ -64,19 +64,19 @@ QT_BEGIN_NAMESPACE */ /*! - \fn template <typename CodeType> QKnxNetIpStructHeader<CodeType>::QKnxNetIpStructHeader(CodeType code) + \fn template <typename CodeType> QKnxNetIpStructHeader<CodeType>::QKnxNetIpStructHeader(CodeType codeType) Constructs a valid header object and sets the KNXnet/IP structure identifier - to \a code. + to \a codeType. \sa isValid(), code(), setCode() */ /*! - \fn template <typename CodeType> QKnxNetIpStructHeader<CodeType>::QKnxNetIpStructHeader(CodeType code, quint16 dataSize) + \fn template <typename CodeType> QKnxNetIpStructHeader<CodeType>::QKnxNetIpStructHeader(CodeType codeType, quint16 dataFieldSize) Constructs a valid header object and sets the KNXnet/IP structure identifier - to \a code and the data size to \a dataSize and updates the header size and + to \a codeType and the data size to \a dataFieldSize and updates the header size and total size accordingly. \sa isValid(), code(), setCode(), dataSize(), setDataSize() @@ -143,9 +143,9 @@ QT_BEGIN_NAMESPACE */ /*! - \fn template <typename CodeType> void QKnxNetIpStructHeader<CodeType>::setDataSize(quint16 dataSize) + \fn template <typename CodeType> void QKnxNetIpStructHeader<CodeType>::setDataSize(quint16 dataFieldSize) - Sets the KNXnet/IP structure data size to \a dataSize and updates the + Sets the KNXnet/IP structure data size to \a dataFieldSize and updates the header and total size accordingly. */ @@ -156,9 +156,9 @@ QT_BEGIN_NAMESPACE */ /*! - \fn template <typename CodeType> void QKnxNetIpStructHeader<CodeType>::setCode(CodeType code) + \fn template <typename CodeType> void QKnxNetIpStructHeader<CodeType>::setCode(CodeType codeType) - Sets the KNXnet/IP structure's code identifier to \a code. + Sets the KNXnet/IP structure's code identifier to \a codeType. */ /*! |