diff options
| -rw-r--r-- | src/serialbus/qcanbusframe.cpp | 4 | ||||
| -rw-r--r-- | src/serialbus/qcanbusframe.h | 4 | ||||
| -rw-r--r-- | tests/auto/qcanbusframe/tst_qcanbusframe.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/serialbus/qcanbusframe.cpp b/src/serialbus/qcanbusframe.cpp index b511c51..e85b0d1 100644 --- a/src/serialbus/qcanbusframe.cpp +++ b/src/serialbus/qcanbusframe.cpp @@ -54,13 +54,15 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QCanBusFrame::QCanBusFrame(QCanBusFrame::FrameType type) + \fn QCanBusFrame::QCanBusFrame(QCanBusFrame::FrameType type = DataFrame) + \since 5.8 Constructs a CAN frame of the specified \a type. */ /*! \fn QCanBusFrame::QCanBusFrame(quint32 identifier, const QByteArray &data) + \since 5.8 Constructs a CAN frame using \a identifier as the frame identifier and \a data as the payload. */ diff --git a/src/serialbus/qcanbusframe.h b/src/serialbus/qcanbusframe.h index 6c83e85..b295373 100644 --- a/src/serialbus/qcanbusframe.h +++ b/src/serialbus/qcanbusframe.h @@ -72,7 +72,7 @@ public: InvalidFrame = 0x4 }; - explicit QCanBusFrame(QCanBusFrame::FrameType type) : + explicit QCanBusFrame(QCanBusFrame::FrameType type = DataFrame) : canId(0x0), isExtendedFrame(0x0), version(0x0) @@ -98,7 +98,7 @@ public: Q_DECLARE_FLAGS(FrameErrors, FrameError) Q_FLAGS(FrameErrors) - explicit QCanBusFrame(quint32 identifier = 0, const QByteArray &data = QByteArray()) : + explicit QCanBusFrame(quint32 identifier, const QByteArray &data) : canId(identifier & 0x1FFFFFFFU), format(DataFrame), isExtendedFrame((identifier & 0x1FFFF800U) ? 0x1 : 0x0), diff --git a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp index b2778ee..3a199ec 100644 --- a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp +++ b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp @@ -366,7 +366,7 @@ void tst_QCanBusFrame::streaming() void tst_QCanBusFrame::tst_error() { - QCanBusFrame frame(1); + QCanBusFrame frame(1, QByteArray()); QCOMPARE(frame.frameType(), QCanBusFrame::DataFrame); QCOMPARE(frame.frameId(), 1u); QCOMPARE(frame.error(), QCanBusFrame::NoError); |