summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2023-01-11 17:33:21 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-16 09:13:31 +0000
commit2effd0fb85b7bf21acd5352d75b5536e234afca2 (patch)
treea8708f0f362344db54cbb02815d073a1f170e722
parent7f610be0e41b6d22c06bc6baa0620c591f68bbb9 (diff)
Use QSysInfo::Endian instead of introducing a new enum
As pointed out during Qt 6.5 API review. Change-Id: I4b521140184877d5a5b133b5e10f476684b9837a Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 2bce1825e7ef31f7c1989b0af1432b4831bb186e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/serialbus/qcancommondefinitions.cpp23
-rw-r--r--src/serialbus/qcancommondefinitions.h7
-rw-r--r--src/serialbus/qcandbcfileparser.cpp4
-rw-r--r--src/serialbus/qcanframeprocessor.cpp15
-rw-r--r--src/serialbus/qcansignaldescription.cpp18
-rw-r--r--src/serialbus/qcansignaldescription.h4
-rw-r--r--src/serialbus/qcansignaldescription_p.h2
-rw-r--r--src/serialbus/qcanuniqueiddescription.cpp10
-rw-r--r--src/serialbus/qcanuniqueiddescription.h4
-rw-r--r--src/serialbus/qcanuniqueiddescription_p.h2
-rw-r--r--tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp36
-rw-r--r--tests/auto/qcanframeprocessor/tst_qcanframeprocessor.cpp200
-rw-r--r--tests/auto/qcansignaldescription/tst_qcansignaldescription.cpp4
-rw-r--r--tests/auto/qcanuniqueiddescription/tst_qcanuniqueiddescription.cpp6
14 files changed, 153 insertions, 182 deletions
diff --git a/src/serialbus/qcancommondefinitions.cpp b/src/serialbus/qcancommondefinitions.cpp
index 8c49de1..cb33e82 100644
--- a/src/serialbus/qcancommondefinitions.cpp
+++ b/src/serialbus/qcancommondefinitions.cpp
@@ -41,15 +41,6 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \enum QtCanBus::DataEndian
-
- This enum represents the byte order of the data.
-
- \value LittleEndian The data is little endian.
- \value BigEndian The data is big endian.
-*/
-
-/*!
\enum QtCanBus::MultiplexState
This enum represents the possible multiplex states of a signal.
@@ -109,20 +100,6 @@ QDebug operator<<(QDebug dbg, QtCanBus::DataFormat format)
return dbg;
}
-QDebug operator<<(QDebug dbg, QtCanBus::DataEndian endian)
-{
- QDebugStateSaver saver(dbg);
- switch (endian) {
- case QtCanBus::DataEndian::LittleEndian:
- dbg << "LittleEndian";
- break;
- case QtCanBus::DataEndian::BigEndian:
- dbg << "BigEndian";
- break;
- }
- return dbg;
-}
-
QDebug operator<<(QDebug dbg, QtCanBus::MultiplexState state)
{
QDebugStateSaver saver(dbg);
diff --git a/src/serialbus/qcancommondefinitions.h b/src/serialbus/qcancommondefinitions.h
index c094538..f3e4b1a 100644
--- a/src/serialbus/qcancommondefinitions.h
+++ b/src/serialbus/qcancommondefinitions.h
@@ -4,6 +4,7 @@
#ifndef QCANCOMMONDEFINITIONS_H
#define QCANCOMMONDEFINITIONS_H
+#include <QtCore/qsysinfo.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtypes.h>
@@ -26,11 +27,6 @@ enum class DataFormat : quint8 {
Ascii
};
-enum class DataEndian : quint8 {
- LittleEndian = 0,
- BigEndian
-};
-
enum class MultiplexState : quint8 {
None = 0x00,
MultiplexorSwitch = 0x01,
@@ -48,7 +44,6 @@ class QDebug;
Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::DataSource source);
Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::DataFormat format);
-Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::DataEndian endian);
Q_SERIALBUS_EXPORT QDebug operator<<(QDebug dbg, QtCanBus::MultiplexState state);
#endif // QT_NO_DEBUG_STREAM
diff --git a/src/serialbus/qcandbcfileparser.cpp b/src/serialbus/qcandbcfileparser.cpp
index 0037e84..0cdd989 100644
--- a/src/serialbus/qcandbcfileparser.cpp
+++ b/src/serialbus/qcandbcfileparser.cpp
@@ -275,7 +275,7 @@ QCanUniqueIdDescription QCanDbcFileParser::uniqueIdDescription()
{
QCanUniqueIdDescription desc;
desc.setSource(QtCanBus::DataSource::FrameId);
- desc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ desc.setEndian(QSysInfo::Endian::LittleEndian);
desc.setStartBit(0);
desc.setBitLength(29); // for both extended and normal frame id
return desc;
@@ -590,7 +590,7 @@ QCanSignalDescription QCanDbcFileParserPrivate::extractSignal(const QRegularExpr
// 0 = BE; 1 = LE
const auto endian = match.capturedView(u"byteOrder"_s) == u"0"_s
- ? QtCanBus::DataEndian::BigEndian : QtCanBus::DataEndian::LittleEndian;
+ ? QSysInfo::Endian::BigEndian : QSysInfo::Endian::LittleEndian;
desc.setDataEndian(endian);
// + = unsigned; - = signed
diff --git a/src/serialbus/qcanframeprocessor.cpp b/src/serialbus/qcanframeprocessor.cpp
index 189daec..7939d9a 100644
--- a/src/serialbus/qcanframeprocessor.cpp
+++ b/src/serialbus/qcanframeprocessor.cpp
@@ -27,10 +27,10 @@ QT_BEGIN_NAMESPACE
// Helper method to extract the max bit number of the signal.
// Note that for BE it's not the last bit of the signal.
-static quint16 extractMaxBitNum(quint16 startBit, quint16 bitLength, QtCanBus::DataEndian endian)
+static quint16 extractMaxBitNum(quint16 startBit, quint16 bitLength, QSysInfo::Endian endian)
{
#ifdef USE_DBC_COMPATIBLE_BE_HANDLING
- if (endian == QtCanBus::DataEndian::LittleEndian) {
+ if (endian == QSysInfo::Endian::LittleEndian) {
return startBit + bitLength - 1;
} else {
const auto startByteNum = startBit / 8;
@@ -703,7 +703,7 @@ static QVariant extractValue(const unsigned char *data, const QCanSignalDescript
const auto maxBytesToRead = (length % 8 == 0) ? length / 8 : length / 8 + 1;
const auto start = signalDesc.startBit();
T value = {};
- const bool isBigEndian = signalDesc.dataEndian() == QtCanBus::DataEndian::BigEndian;
+ const bool isBigEndian = signalDesc.dataEndian() == QSysInfo::Endian::BigEndian;
if (isBigEndian) {
// Big Endian - start bit is MSB
if (start % 8 == 7 && length % 8 == 0) {
@@ -832,7 +832,7 @@ static QVariant extractValue(const unsigned char *data, const QCanSignalDescript
quint16 valueIdx = 0;
quint16 startIdx = start;
quint16 numToRead = length;
- if (signalDesc.dataEndian() == QtCanBus::DataEndian::BigEndian) {
+ if (signalDesc.dataEndian() == QSysInfo::Endian::BigEndian) {
const auto readInFirstByte = length % 8;
// else we have round number of bytes and all these tricks are not needed
if (readInFirstByte) {
@@ -865,7 +865,7 @@ static QVariant extractValue(const unsigned char *data, const QCanSignalDescript
}
// check and convert endian
T convertedValue = {};
- if (signalDesc.dataEndian() == QtCanBus::DataEndian::LittleEndian)
+ if (signalDesc.dataEndian() == QSysInfo::Endian::LittleEndian)
convertedValue = qFromLittleEndian(value);
else
convertedValue = qFromBigEndian(value);
@@ -970,8 +970,7 @@ static void encodeValue(unsigned char *data, const QVariant &valueVar,
else
value = valueVar.value<T>();
- const bool dataLittleEndian =
- signalDesc.dataEndian() == QtCanBus::DataEndian::LittleEndian;
+ const bool dataLittleEndian = signalDesc.dataEndian() == QSysInfo::Endian::LittleEndian;
const auto maxBytesToWrite = (length % 8 == 0) ? length / 8 : length / 8 + 1;
@@ -1080,7 +1079,7 @@ static void encodeValue(unsigned char *data, const QVariant &valueVar,
// We also need to consider that we operate on q{u}int64 values for
// {un}signed integers, so we need to chop the unneeded bytes first.
const bool dataLittleEndian =
- signalDesc.dataEndian() == QtCanBus::DataEndian::LittleEndian;
+ signalDesc.dataEndian() == QSysInfo::Endian::LittleEndian;
T valueToWrite = value;
quint16 writeOffset = 0;
diff --git a/src/serialbus/qcansignaldescription.cpp b/src/serialbus/qcansignaldescription.cpp
index a8e5b81..5dca66c 100644
--- a/src/serialbus/qcansignaldescription.cpp
+++ b/src/serialbus/qcansignaldescription.cpp
@@ -76,13 +76,13 @@ QT_BEGIN_NAMESPACE
\code
QCanSignalDescription signal1;
- signal1.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signal1.setDataEndian(QSysInfo::Endian::LittleEndian);
signal1.setStartBit(0);
signal1.setBitLength(12);
// other parameters for signal1
QCanSignalDescription signal2;
- signal2.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signal2.setDataEndian(QSysInfo::Endian::LittleEndian);
signal2.setStartBit(12);
signal2.setBitLength(12);
// other parameters for signal2
@@ -99,13 +99,13 @@ QT_BEGIN_NAMESPACE
\code
QCanSignalDescription signal1;
- signal1.setDataEndian(QtCanBus::DataEndian::BigEndian);
+ signal1.setDataEndian(QSysInfo::Endian::BigEndian);
signal1.setStartBit(7);
signal1.setBitLength(12);
// other parameters for signal1
QCanSignalDescription signal2;
- signal2.setDataEndian(QtCanBus::DataEndian::BigEndian);
+ signal2.setDataEndian(QSysInfo::Endian::BigEndian);
signal2.setStartBit(11);
signal2.setBitLength(12);
// other parameters for signal2
@@ -392,14 +392,14 @@ void QCanSignalDescription::setDataSource(QtCanBus::DataSource source)
/*!
Returns the data endian of the signal's value.
- By default, \l {QtCanBus::DataEndian::}{BigEndian} is used.
+ By default, \l {QSysInfo::}{BigEndian} is used.
\note The data endian is ignored if the \l dataFormat() is set to
\l {QtCanBus::DataFormat::}{Ascii}.
- \sa setDataEndian(), QtCanBus::DataEndian
+ \sa setDataEndian(), QSysInfo::Endian
*/
-QtCanBus::DataEndian QCanSignalDescription::dataEndian() const
+QSysInfo::Endian QCanSignalDescription::dataEndian() const
{
return d->endian;
}
@@ -407,9 +407,9 @@ QtCanBus::DataEndian QCanSignalDescription::dataEndian() const
/*!
Sets the data endian of the signal's value to \a endian.
- \sa dataEndian(), QtCanBus::DataEndian
+ \sa dataEndian(), QSysInfo::Endian
*/
-void QCanSignalDescription::setDataEndian(QtCanBus::DataEndian endian)
+void QCanSignalDescription::setDataEndian(QSysInfo::Endian endian)
{
d.detach();
d->endian = endian;
diff --git a/src/serialbus/qcansignaldescription.h b/src/serialbus/qcansignaldescription.h
index a044bf6..4c41d06 100644
--- a/src/serialbus/qcansignaldescription.h
+++ b/src/serialbus/qcansignaldescription.h
@@ -58,8 +58,8 @@ public:
QtCanBus::DataSource dataSource() const;
void setDataSource(QtCanBus::DataSource source);
- QtCanBus::DataEndian dataEndian() const;
- void setDataEndian(QtCanBus::DataEndian endian);
+ QSysInfo::Endian dataEndian() const;
+ void setDataEndian(QSysInfo::Endian endian);
QtCanBus::DataFormat dataFormat() const;
void setDataFormat(QtCanBus::DataFormat format);
diff --git a/src/serialbus/qcansignaldescription_p.h b/src/serialbus/qcansignaldescription_p.h
index 3321943..d43b564 100644
--- a/src/serialbus/qcansignaldescription_p.h
+++ b/src/serialbus/qcansignaldescription_p.h
@@ -32,7 +32,7 @@ public:
QString receiver;
QString comment;
QtCanBus::DataSource source = QtCanBus::DataSource::Payload;
- QtCanBus::DataEndian endian = QtCanBus::DataEndian::BigEndian;
+ QSysInfo::Endian endian = QSysInfo::Endian::BigEndian;
QtCanBus::DataFormat format = QtCanBus::DataFormat::SignedInteger;
quint16 startBit = 0;
quint16 dataLength = 0;
diff --git a/src/serialbus/qcanuniqueiddescription.cpp b/src/serialbus/qcanuniqueiddescription.cpp
index 31db282..2947fd4 100644
--- a/src/serialbus/qcanuniqueiddescription.cpp
+++ b/src/serialbus/qcanuniqueiddescription.cpp
@@ -194,11 +194,11 @@ void QCanUniqueIdDescription::setBitLength(quint8 length)
/*!
Returns the data endian of the unique identifier.
- By default, \l {QtCanBus::}{LittleEndian} is used.
+ By default, \l {QSysInfo::}{LittleEndian} is used.
- \sa setEndian(), QtCanBus::DataEndian
+ \sa setEndian(), QSysInfo::Endian
*/
-QtCanBus::DataEndian QCanUniqueIdDescription::endian() const
+QSysInfo::Endian QCanUniqueIdDescription::endian() const
{
return d->endian;
}
@@ -206,9 +206,9 @@ QtCanBus::DataEndian QCanUniqueIdDescription::endian() const
/*!
Sets the data endian of the unique identifier to \a endian.
- \sa endian(), QtCanBus::DataEndian
+ \sa endian(), QSysInfo::Endian
*/
-void QCanUniqueIdDescription::setEndian(QtCanBus::DataEndian endian)
+void QCanUniqueIdDescription::setEndian(QSysInfo::Endian endian)
{
d.detach();
d->endian = endian;
diff --git a/src/serialbus/qcanuniqueiddescription.h b/src/serialbus/qcanuniqueiddescription.h
index e6b3ef4..6591672 100644
--- a/src/serialbus/qcanuniqueiddescription.h
+++ b/src/serialbus/qcanuniqueiddescription.h
@@ -47,8 +47,8 @@ public:
quint8 bitLength() const;
void setBitLength(quint8 length);
- QtCanBus::DataEndian endian() const;
- void setEndian(QtCanBus::DataEndian endian);
+ QSysInfo::Endian endian() const;
+ void setEndian(QSysInfo::Endian endian);
private:
QExplicitlySharedDataPointer<QCanUniqueIdDescriptionPrivate> d;
diff --git a/src/serialbus/qcanuniqueiddescription_p.h b/src/serialbus/qcanuniqueiddescription_p.h
index d23ca5b..70ea367 100644
--- a/src/serialbus/qcanuniqueiddescription_p.h
+++ b/src/serialbus/qcanuniqueiddescription_p.h
@@ -24,7 +24,7 @@ class Q_SERIALBUS_PRIVATE_EXPORT QCanUniqueIdDescriptionPrivate : public QShared
{
public:
QtCanBus::DataSource source = QtCanBus::DataSource::FrameId;
- QtCanBus::DataEndian endian = QtCanBus::DataEndian::LittleEndian;
+ QSysInfo::Endian endian = QSysInfo::Endian::LittleEndian;
quint16 startBit = 0;
quint8 bitLength = 0;
diff --git a/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp b/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp
index d4f1748..e2a8e61 100644
--- a/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp
+++ b/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp
@@ -47,7 +47,7 @@ void tst_QCanDbcFileParser::uinqueId()
{
QCanUniqueIdDescription expectedDesc;
expectedDesc.setSource(QtCanBus::DataSource::FrameId);
- expectedDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ expectedDesc.setEndian(QSysInfo::Endian::LittleEndian);
expectedDesc.setStartBit(0);
expectedDesc.setBitLength(29);
@@ -138,7 +138,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("Signal0"); // correct
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -181,7 +181,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -211,7 +211,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -224,7 +224,7 @@ void tst_QCanDbcFileParser::parseFile_data()
messageDesc.addSignalDescription(signalDesc);
signalDesc.setName("s1");
- signalDesc.setDataEndian(QtCanBus::DataEndian::BigEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::BigEndian);
signalDesc.setBitLength(8);
signalDesc.setStartBit(23);
signalDesc.setPhysicalUnit("");
@@ -244,7 +244,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -293,7 +293,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -349,7 +349,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -405,7 +405,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -446,7 +446,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -495,7 +495,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -538,7 +538,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::SignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -564,7 +564,7 @@ void tst_QCanDbcFileParser::parseFile_data()
otherDesc.setComment("comment for Test1.");
signalDesc.setName("s2");
- signalDesc.setDataEndian(QtCanBus::DataEndian::BigEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::BigEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setStartBit(7);
signalDesc.setBitLength(8);
@@ -587,7 +587,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setMultiplexState(QtCanBus::MultiplexState::MultiplexorSwitch);
@@ -644,7 +644,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setMultiplexState(QtCanBus::MultiplexState::MultiplexorSwitch);
@@ -735,7 +735,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -792,7 +792,7 @@ void tst_QCanDbcFileParser::parseFile_data()
QCanSignalDescription signalDesc;
signalDesc.setName("Signal0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::Float);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setStartBit(0);
@@ -811,7 +811,7 @@ void tst_QCanDbcFileParser::parseFile_data()
otherDesc.setTransmitter("Vector__XXX");
signalDesc.setName("s0");
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
signalDesc.setMultiplexState(QtCanBus::MultiplexState::MultiplexorSwitch);
diff --git a/tests/auto/qcanframeprocessor/tst_qcanframeprocessor.cpp b/tests/auto/qcanframeprocessor/tst_qcanframeprocessor.cpp
index a7697ac..e26e626 100644
--- a/tests/auto/qcanframeprocessor/tst_qcanframeprocessor.cpp
+++ b/tests/auto/qcanframeprocessor/tst_qcanframeprocessor.cpp
@@ -275,7 +275,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
QTest::addColumn<quint16>("startBit");
QTest::addColumn<quint16>("bitLength");
QTest::addColumn<QtCanBus::DataFormat>("format");
- QTest::addColumn<QtCanBus::DataEndian>("endian");
+ QTest::addColumn<QSysInfo::Endian>("endian");
QTest::addColumn<QVariant>("expectedValue");
struct SourceDesc {
@@ -294,21 +294,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x1234FFEC) << quint16(0) << quint16(16)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(65516);
QTest::addRow("%s, signed neg, 16bit, start 0, le", s.name)
<< s.source
<< quint64(0x1234FFEC) << quint16(0) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-20);
QTest::addRow("%s, signed pos, 16bit, start 0, le", s.name)
<< s.source
<< quint64(0x12340FEC) << quint16(0) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(4076);
// LE, 16 bit, start 5
@@ -317,7 +317,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< quint64(0x1234FFECULL << 5)
<< quint16(5) << quint16(16)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(65516);
QTest::addRow("%s, signed neg, 16bit, start 5, le", s.name)
@@ -325,7 +325,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< quint64((0x1234FFECULL << 5) & 0x1FFFFFFFU)
<< quint16(5) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-20);
QTest::addRow("%s, signed pos, 16bit, start 5, le", s.name)
@@ -333,7 +333,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< quint64(0x12340FECULL << 5)
<< quint16(5) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(4076);
// LE, 19 bit, start 0
@@ -341,21 +341,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x1234FFEC) << quint16(0) << quint16(19)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(327660);
QTest::addRow("%s, signed neg, 19bit, start 0, le", s.name)
<< s.source
<< quint64(0x123D800A) << quint16(0) << quint16(19)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-163830);
QTest::addRow("%s, signed pos, 19bit, start 0, le", s.name)
<< s.source
<< quint64(0x1231800A) << quint16(0) << quint16(19)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(98314);
// LE, 19 bit, start 3
@@ -364,7 +364,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< quint64(0x1234FFECULL << 3)
<< quint16(3) << quint16(19)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(327660);
QTest::addRow("%s, signed neg, 19bit, start 3, le", s.name)
@@ -372,7 +372,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< quint64(0x123D800AULL << 3)
<< quint16(3) << quint16(19)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-163830);
QTest::addRow("%s, signed pos, 19bit, start 3, le", s.name)
@@ -380,7 +380,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< quint64(0x1231800AULL << 3)
<< quint16(3) << quint16(19)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(98314);
// BE, 16 bit, start 7
@@ -388,21 +388,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x1234ECFF) << quint16(7) << quint16(16)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(65516);
QTest::addRow("%s, signed neg, 16bit, start 7, be", s.name)
<< s.source
<< quint64(0x1234ECFF) << quint16(7) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-20);
QTest::addRow("%s, signed pos, 16bit, start 7, be", s.name)
<< s.source
<< quint64(0x1234EC0F) << quint16(7) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(4076);
// BE, 16 bit, start 5
@@ -410,21 +410,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x1234FB3F) << quint16(5) << quint16(16)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(65516);
QTest::addRow("%s, signed neg, 16bit, start 5, be", s.name)
<< s.source
<< quint64(0x1234FB3F) << quint16(5) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-20);
QTest::addRow("%s, signed pos, 16bit, start 5, be", s.name)
<< s.source
<< quint64(0x1234FB03) << quint16(5) << quint16(16)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(4076);
// BE, 21 bit, start 7
@@ -432,21 +432,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x1264FFA7) << quint16(7) << quint16(21)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(1376236);
QTest::addRow("%s, signed neg, 21bit, start 7, be", s.name)
<< s.source
<< quint64(0x1264FFA7) << quint16(7) << quint16(21)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-720916);
QTest::addRow("%s, signed pos, 21bit, start 7, be", s.name)
<< s.source
<< quint64(0x1264FF27) << quint16(7) << quint16(21)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(327660);
// BE, 21 bit, start 4
@@ -454,21 +454,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x12ECFF14) << quint16(4) << quint16(21)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(1376236);
QTest::addRow("%s, signed neg, 21bit, start 4, be", s.name)
<< s.source
<< quint64(0x12ECFF14) << quint16(4) << quint16(21)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-720916);
QTest::addRow("%s, signed pos, 21bit, start 4, be", s.name)
<< s.source
<< quint64(0x12ECFF04) << quint16(4) << quint16(21)
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(327660);
// Some LE tests for values less than 8 bit
@@ -476,21 +476,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x12345678) << quint16(0) << quint16(4)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(8);
QTest::addRow("%s, unsinged, 4bit, start 3, le", s.name)
<< s.source
<< quint64(0x12345678) << quint16(3) << quint16(4)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(15);
QTest::addRow("%s, unsinged, 4bit, start 7, le", s.name)
<< s.source
<< quint64(0x12345678) << quint16(7) << quint16(4)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(12);
// Some BE tests for values less than 8 bit
@@ -498,21 +498,21 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< quint64(0x12345678) << quint16(7) << quint16(4)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(7);
QTest::addRow("%s, unsinged, 4bit, start 5, be", s.name)
<< s.source
<< quint64(0x12345678) << quint16(5) << quint16(4)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(14);
QTest::addRow("%s, unsinged, 4bit, start 0, be", s.name)
<< s.source
<< quint64(0x12345678) << quint16(0) << quint16(4)
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(2);
}
@@ -528,7 +528,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< QtCanBus::DataSource::Payload
<< value << i << quint16(32)
<< QtCanBus::DataFormat::Float
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(floatVal);
// to get the proper BE value with an offset, we need to take an LE
@@ -543,7 +543,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< QtCanBus::DataSource::Payload
<< value << quint16(23 - i) << quint16(32)
<< QtCanBus::DataFormat::Float
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(floatVal);
}
}
@@ -558,7 +558,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< QtCanBus::DataSource::Payload
<< value << quint16(0) << quint16(64)
<< QtCanBus::DataFormat::Double
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(doubleVal);
const double beDoubleVal = qToBigEndian(doubleVal);
@@ -567,7 +567,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< QtCanBus::DataSource::Payload
<< value << quint16(7) << quint16(64)
<< QtCanBus::DataFormat::Double
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(doubleVal);
}
@@ -584,7 +584,7 @@ void tst_QCanFrameProcessor::parseSignal_data()
<< s.source
<< value << quint16(offset + i) << quint16(expectedData.size() * 8)
<< QtCanBus::DataFormat::Ascii
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(expectedData);
}
}
@@ -597,7 +597,7 @@ void tst_QCanFrameProcessor::parseSignal()
QFETCH(quint16, startBit);
QFETCH(quint16, bitLength);
QFETCH(QtCanBus::DataFormat, format);
- QFETCH(QtCanBus::DataEndian, endian);
+ QFETCH(QSysInfo::Endian, endian);
QFETCH(QVariant, expectedValue);
QCanSignalDescription sig;
@@ -861,14 +861,14 @@ void tst_QCanFrameProcessor::parseExtendedMultiplexedSignals()
QCanSignalDescription s0; // multiplexor 1
s0.setName("s0");
- s0.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s0.setDataEndian(QSysInfo::Endian::LittleEndian);
s0.setStartBit(0);
s0.setBitLength(4);
s0.setMultiplexState(QtCanBus::MultiplexState::MultiplexorSwitch);
QCanSignalDescription s1; // multiplexor 2, also depends on the value of s0
s1.setName("s1");
- s1.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s1.setDataEndian(QSysInfo::Endian::LittleEndian);
s1.setStartBit(4);
s1.setBitLength(4);
s1.setMultiplexState(QtCanBus::MultiplexState::SwitchAndSignal);
@@ -876,7 +876,7 @@ void tst_QCanFrameProcessor::parseExtendedMultiplexedSignals()
QCanSignalDescription s2; // depends on mux1 only, contains 12 bits of data
s2.setName("s2");
- s2.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s2.setDataEndian(QSysInfo::Endian::LittleEndian);
s2.setStartBit(4);
s2.setBitLength(12);
s2.setMultiplexState(QtCanBus::MultiplexState::MultiplexedSignal);
@@ -885,7 +885,7 @@ void tst_QCanFrameProcessor::parseExtendedMultiplexedSignals()
QCanSignalDescription s3; // depends on mux2 (so indirectly on mux1)
s3.setName("s3");
- s3.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s3.setDataEndian(QSysInfo::Endian::LittleEndian);
s3.setStartBit(8);
s3.setBitLength(8);
s3.setMultiplexState(QtCanBus::MultiplexState::MultiplexedSignal);
@@ -893,7 +893,7 @@ void tst_QCanFrameProcessor::parseExtendedMultiplexedSignals()
QCanSignalDescription s4; // depends on mux2 (so indirectly on mux1)
s4.setName("s4");
- s4.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s4.setDataEndian(QSysInfo::Endian::LittleEndian);
s4.setStartBit(8);
s4.setBitLength(8);
s4.setMultiplexState(QtCanBus::MultiplexState::MultiplexedSignal);
@@ -1106,7 +1106,7 @@ void tst_QCanFrameProcessor::extractUniqueId_data()
const QtCanBus::UniqueId uniqueId = 0x0965;
for (quint16 startBit = 0; startBit < 8; ++startBit) {
uidDesc.setStartBit(startBit);
- uidDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ uidDesc.setEndian(QSysInfo::Endian::LittleEndian);
const QCanBusFrame::FrameId frameIdLe = qToLittleEndian(uniqueId) << startBit;
QTest::addRow("frameId, LE, start %d", startBit)
<< uidDesc
@@ -1122,7 +1122,7 @@ void tst_QCanFrameProcessor::extractUniqueId_data()
const auto val = (qToLittleEndian(uniqueId) << 16) >> idx;
const auto startBit = startBitsFrame[idx];
const QCanBusFrame::FrameId frameIdBe = qToBigEndian(val);
- uidDesc.setEndian(QtCanBus::DataEndian::BigEndian);
+ uidDesc.setEndian(QSysInfo::Endian::BigEndian);
uidDesc.setStartBit(startBit);
QTest::addRow("frameId, BE, start %d", startBit)
<< uidDesc
@@ -1135,7 +1135,7 @@ void tst_QCanFrameProcessor::extractUniqueId_data()
uidDesc.setSource(QtCanBus::DataSource::Payload);
for (quint16 startBit = 8; startBit < 16; ++startBit) {
uidDesc.setStartBit(startBit);
- uidDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ uidDesc.setEndian(QSysInfo::Endian::LittleEndian);
const quint32 payload = 0x01 | (qToLittleEndian(uniqueId) << startBit);
const QByteArray payloadData(reinterpret_cast<const char *>(&payload), sizeof(payload));
QTest::addRow("payload, LE, offset %d", startBit)
@@ -1153,7 +1153,7 @@ void tst_QCanFrameProcessor::extractUniqueId_data()
const auto val = (qToLittleEndian(uniqueId) << 8) >> idx;
quint32 payload = 0x01 | qToBigEndian(val);
const QByteArray payloadData(reinterpret_cast<const char *>(&payload), sizeof(payload));
- uidDesc.setEndian(QtCanBus::DataEndian::BigEndian);
+ uidDesc.setEndian(QSysInfo::Endian::BigEndian);
uidDesc.setStartBit(startBit);
QTest::addRow("payload, BE, offset %d", startBit)
<< uidDesc
@@ -1193,7 +1193,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addColumn<quint16>("bitLength");
QTest::addColumn<QtCanBus::DataSource>("source");
QTest::addColumn<QtCanBus::DataFormat>("format");
- QTest::addColumn<QtCanBus::DataEndian>("endian");
+ QTest::addColumn<QSysInfo::Endian>("endian");
QTest::addColumn<QVariant>("signalValue");
QTest::addColumn<quint64>("expectedData");
@@ -1212,21 +1212,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 16bit, start 0, le", s.name)
<< quint16(0) << quint16(16) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(65516)
<< quint64(0xFFEC);
QTest::addRow("%s, signed neg, 16bit, start 0, le", s.name)
<< quint16(0) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-20)
<< quint64(0xFFEC);
QTest::addRow("%s, signed pos, 16bit, start 0, le", s.name)
<< quint16(0) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(32748)
<< quint64(0x7FEC);
@@ -1234,21 +1234,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 16bit, start 5, le", s.name)
<< quint16(5) << quint16(16) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(65516)
<< quint64(0xFFECULL << 5);
QTest::addRow("%s, signed neg, 16bit, start 5, le", s.name)
<< quint16(5) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-20)
<< quint64(0xFFECULL << 5);
QTest::addRow("%s, signed pos, 16bit, start 5, le", s.name)
<< quint16(5) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(32748)
<< quint64(0x7FECULL << 5);
@@ -1256,21 +1256,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 19bit, start 0, le", s.name)
<< quint16(0) << quint16(19) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(327660)
<< quint64(0x4FFEC);
QTest::addRow("%s, signed neg, 19bit, start 0, le", s.name)
<< quint16(0) << quint16(19) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-196628)
<< quint64(0x4FFEC);
QTest::addRow("%s, signed pos, 19bit, start 0, le", s.name)
<< quint16(0) << quint16(19) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(196588)
<< quint64(0x2FFEC);
@@ -1278,21 +1278,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 19bit, start 3, le", s.name)
<< quint16(3) << quint16(19) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(327660)
<< quint64(0x4FFECULL << 3);
QTest::addRow("%s, signed neg, 19bit, start 3, le", s.name)
<< quint16(3) << quint16(19) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(-196628)
<< quint64(0x4FFECULL << 3);
QTest::addRow("%s, signed pos, 19bit, start 3, le", s.name)
<< quint16(3) << quint16(19) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(196588)
<< quint64(0x2FFECULL << 3);
@@ -1300,21 +1300,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 16bit, start 7, be", s.name)
<< quint16(7) << quint16(16) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(65516)
<< quint64(0xECFF);
QTest::addRow("%s, signed neg, 16bit, start 7, be", s.name)
<< quint16(7) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-20)
<< quint64(0xECFF);
QTest::addRow("%s, signed pos, 16bit, start 7, be", s.name)
<< quint16(7) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(32748)
<< quint64(0xEC7F);
@@ -1322,21 +1322,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 16bit, start 5, be", s.name)
<< quint16(5) << quint16(16) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(65516)
<< quint64(0x00FB3F);
QTest::addRow("%s, signed neg, 16bit, start 5, be", s.name)
<< quint16(5) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-20)
<< quint64(0x00FB3F);
QTest::addRow("%s, signed pos, 16bit, start 5, be", s.name)
<< quint16(5) << quint16(16) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(32748)
<< quint64(0x00FB1F);
@@ -1344,21 +1344,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 21bit, start 7, be", s.name)
<< quint16(7) << quint16(21) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(1834988) /* 0x1BFFEC */
<< quint64(0x60FFDF);
QTest::addRow("%s, signed neg, 21bit, start 7, be", s.name)
<< quint16(7) << quint16(21) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-262164)
<< quint64(0x60FFDF);
QTest::addRow("%s, signed pos, 21bit, start 7, be", s.name)
<< quint16(7) << quint16(21) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(786412)
<< quint64(0x60FF5F);
@@ -1366,21 +1366,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsigned, 21bit, start 4, be", s.name)
<< quint16(4) << quint16(21) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(1834988) /* 0x1BFFEC */
<< quint64(0xECFF1B);
QTest::addRow("%s, signed neg, 21bit, start 4, be", s.name)
<< quint16(4) << quint16(21) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(-262164)
<< quint64(0xECFF1B);
QTest::addRow("%s, signed pos, 21bit, start 4, be", s.name)
<< quint16(4) << quint16(21) << s.source
<< QtCanBus::DataFormat::SignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(786412)
<< quint64(0xECFF0B);
@@ -1388,21 +1388,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsinged, 4bit, start 0, le", s.name)
<< quint16(0) << quint16(4) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(8)
<< quint64(0x08);
QTest::addRow("%s, unsinged, 4bit, start 3, le", s.name)
<< quint16(3) << quint16(4) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(15)
<< quint64(0x78);
QTest::addRow("%s, unsinged, 4bit, start 7, le", s.name)
<< quint16(7) << quint16(4) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(12)
<< quint64(0x0600);
@@ -1410,21 +1410,21 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, unsinged, 4bit, start 7, be", s.name)
<< quint16(7) << quint16(4) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(8)
<< quint64(0x80);
QTest::addRow("%s, unsinged, 4bit, start 5, be", s.name)
<< quint16(5) << quint16(4) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(14)
<< quint64(0x38);
QTest::addRow("%s, unsinged, 4bit, start 0, be", s.name)
<< quint16(0) << quint16(4) << s.source
<< QtCanBus::DataFormat::UnsignedInteger
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(3)
<< quint64(0x6000);
}
@@ -1441,7 +1441,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
<< quint16(i) << quint16(32)
<< QtCanBus::DataSource::Payload
<< QtCanBus::DataFormat::Float
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(floatVal)
<< value;
@@ -1457,7 +1457,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
<< quint16(23 - i) << quint16(32)
<< QtCanBus::DataSource::Payload
<< QtCanBus::DataFormat::Float
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(floatVal)
<< value;
}
@@ -1473,7 +1473,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
<< quint16(0) << quint16(64)
<< QtCanBus::DataSource::Payload
<< QtCanBus::DataFormat::Double
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(doubleVal)
<< value;
@@ -1484,7 +1484,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
<< quint16(7) << quint16(64)
<< QtCanBus::DataSource::Payload
<< QtCanBus::DataFormat::Double
- << QtCanBus::DataEndian::BigEndian
+ << QSysInfo::Endian::BigEndian
<< QVariant(doubleVal)
<< value;
}
@@ -1501,7 +1501,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
QTest::addRow("%s, ascii, start %d", s.name, offset + i)
<< quint16(offset + i) << quint16(asciiData.size() * 8) << s.source
<< QtCanBus::DataFormat::Ascii
- << QtCanBus::DataEndian::LittleEndian /* does not matter */
+ << QSysInfo::Endian::LittleEndian /* does not matter */
<< QVariant(asciiData)
<< value;
}
@@ -1519,7 +1519,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
<< quint16(0) << quint16(expectedData.size() * 8)
<< QtCanBus::DataSource::Payload
<< QtCanBus::DataFormat::Ascii
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(data)
<< value;
}
@@ -1535,7 +1535,7 @@ void tst_QCanFrameProcessor::prepareFrame_data()
<< quint16(0) << quint16(expectedData.size() * 8)
<< QtCanBus::DataSource::Payload
<< QtCanBus::DataFormat::Ascii
- << QtCanBus::DataEndian::LittleEndian
+ << QSysInfo::Endian::LittleEndian
<< QVariant(data)
<< value;
}
@@ -1547,7 +1547,7 @@ void tst_QCanFrameProcessor::prepareFrame()
QFETCH(quint16, bitLength);
QFETCH(QtCanBus::DataSource, source);
QFETCH(QtCanBus::DataFormat, format);
- QFETCH(QtCanBus::DataEndian, endian);
+ QFETCH(QSysInfo::Endian, endian);
QFETCH(QVariant, signalValue);
QFETCH(quint64, expectedData);
@@ -1570,7 +1570,7 @@ void tst_QCanFrameProcessor::prepareFrame()
static constexpr QtCanBus::UniqueId uniqueId = 123;
QCanUniqueIdDescription uidDesc;
- uidDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ uidDesc.setEndian(QSysInfo::Endian::LittleEndian);
uidDesc.setSource(uidSource);
uidDesc.setStartBit(0);
uidDesc.setBitLength(uidLength);
@@ -1706,14 +1706,14 @@ void tst_QCanFrameProcessor::prepareMultiplexedPayload()
QCanSignalDescription s0; // multiplexor 1
s0.setName("s0");
- s0.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s0.setDataEndian(QSysInfo::Endian::LittleEndian);
s0.setStartBit(0);
s0.setBitLength(4);
s0.setMultiplexState(QtCanBus::MultiplexState::MultiplexorSwitch);
QCanSignalDescription s1; // multiplexor 2, also depends on the value of s0
s1.setName("s1");
- s1.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s1.setDataEndian(QSysInfo::Endian::LittleEndian);
s1.setStartBit(4);
s1.setBitLength(4);
s1.setMultiplexState(QtCanBus::MultiplexState::SwitchAndSignal);
@@ -1721,7 +1721,7 @@ void tst_QCanFrameProcessor::prepareMultiplexedPayload()
QCanSignalDescription s2; // depends on mux1 only, contains 12 bits of data
s2.setName("s2");
- s2.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s2.setDataEndian(QSysInfo::Endian::LittleEndian);
s2.setStartBit(4);
s2.setBitLength(12);
s2.setMultiplexState(QtCanBus::MultiplexState::MultiplexedSignal);
@@ -1730,7 +1730,7 @@ void tst_QCanFrameProcessor::prepareMultiplexedPayload()
QCanSignalDescription s3; // depends on mux2 (so indirectly on mux1)
s3.setName("s3");
- s3.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s3.setDataEndian(QSysInfo::Endian::LittleEndian);
s3.setStartBit(8);
s3.setBitLength(8);
s3.setMultiplexState(QtCanBus::MultiplexState::MultiplexedSignal);
@@ -1738,7 +1738,7 @@ void tst_QCanFrameProcessor::prepareMultiplexedPayload()
QCanSignalDescription s4; // depends on mux2 (so indirectly on mux1)
s4.setName("s4");
- s4.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ s4.setDataEndian(QSysInfo::Endian::LittleEndian);
s4.setStartBit(8);
s4.setBitLength(8);
s4.setMultiplexState(QtCanBus::MultiplexState::MultiplexedSignal);
@@ -1969,7 +1969,7 @@ void tst_QCanFrameProcessor::prepareUniqueId_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::UnsignedInteger);
signalDesc.setStartBit(0);
signalDesc.setBitLength(8);
@@ -1988,7 +1988,7 @@ void tst_QCanFrameProcessor::prepareUniqueId_data()
uidDesc.setBitLength(12);
for (quint8 startBit = 0; startBit < 8; ++startBit) {
uidDesc.setStartBit(startBit);
- uidDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ uidDesc.setEndian(QSysInfo::Endian::LittleEndian);
const QCanBusFrame::FrameId frameId = qFromLittleEndian(uniqueId) << startBit;
QTest::addRow("frameId, LE, start %d", startBit)
<< uidDesc << messageDesc << uniqueId << signalValues
@@ -2003,7 +2003,7 @@ void tst_QCanFrameProcessor::prepareUniqueId_data()
const auto val = (qToLittleEndian(uniqueId) << 16) >> idx;
const QCanBusFrame::FrameId frameId = qToBigEndian(val);
const auto startBit = startBitsFrame[idx];
- uidDesc.setEndian(QtCanBus::DataEndian::BigEndian);
+ uidDesc.setEndian(QSysInfo::Endian::BigEndian);
uidDesc.setStartBit(startBit);
QTest::addRow("frameId, BE, offser %d", startBit)
<< uidDesc << messageDesc << uniqueId << signalValues
@@ -2017,7 +2017,7 @@ void tst_QCanFrameProcessor::prepareUniqueId_data()
for (quint8 startBit = 8; startBit < 16; ++startBit) {
uidDesc.setStartBit(startBit);
- uidDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ uidDesc.setEndian(QSysInfo::Endian::LittleEndian);
const quint32 payload = 0x01 | qFromLittleEndian(uniqueId) << startBit;
const QByteArray payloadData(reinterpret_cast<const char *>(&payload), sizeof(payload));
QTest::addRow("payload, LE, offser %d", startBit)
@@ -2034,7 +2034,7 @@ void tst_QCanFrameProcessor::prepareUniqueId_data()
const auto startBit = startBitsPayload[idx];
quint32 payload = 0x01 | qToBigEndian(val);
const QByteArray payloadData(reinterpret_cast<const char *>(&payload), sizeof(payload));
- uidDesc.setEndian(QtCanBus::DataEndian::BigEndian);
+ uidDesc.setEndian(QSysInfo::Endian::BigEndian);
uidDesc.setStartBit(startBit);
QTest::addRow("payload, BE, start %d", startBit)
<< uidDesc << messageDesc << uniqueId << signalValues
@@ -2071,7 +2071,7 @@ void tst_QCanFrameProcessor::roundtrip_data()
{
QCanUniqueIdDescription uidDesc;
uidDesc.setSource(QtCanBus::DataSource::FrameId);
- uidDesc.setEndian(QtCanBus::DataEndian::LittleEndian);
+ uidDesc.setEndian(QSysInfo::Endian::LittleEndian);
uidDesc.setStartBit(0);
uidDesc.setBitLength(11);
@@ -2086,7 +2086,7 @@ void tst_QCanFrameProcessor::roundtrip_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
- signalDesc.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::LittleEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::SignedInteger);
signalDesc.setStartBit(0);
signalDesc.setBitLength(4);
@@ -2134,7 +2134,7 @@ void tst_QCanFrameProcessor::roundtrip_data()
{
QCanUniqueIdDescription uidDesc;
uidDesc.setSource(QtCanBus::DataSource::FrameId);
- uidDesc.setEndian(QtCanBus::DataEndian::BigEndian);
+ uidDesc.setEndian(QSysInfo::Endian::BigEndian);
uidDesc.setStartBit(7);
uidDesc.setBitLength(11);
@@ -2149,7 +2149,7 @@ void tst_QCanFrameProcessor::roundtrip_data()
QCanSignalDescription signalDesc;
signalDesc.setName("s0");
signalDesc.setDataSource(QtCanBus::DataSource::Payload);
- signalDesc.setDataEndian(QtCanBus::DataEndian::BigEndian);
+ signalDesc.setDataEndian(QSysInfo::Endian::BigEndian);
signalDesc.setDataFormat(QtCanBus::DataFormat::SignedInteger);
signalDesc.setStartBit(7);
signalDesc.setBitLength(4);
diff --git a/tests/auto/qcansignaldescription/tst_qcansignaldescription.cpp b/tests/auto/qcansignaldescription/tst_qcansignaldescription.cpp
index 0897bfd..4a29797 100644
--- a/tests/auto/qcansignaldescription/tst_qcansignaldescription.cpp
+++ b/tests/auto/qcansignaldescription/tst_qcansignaldescription.cpp
@@ -30,7 +30,7 @@ void tst_QCanSignalDescription::construct()
QCOMPARE(d.receiver(), QString());
QCOMPARE(d.comment(), QString());
QCOMPARE(d.dataSource(), QtCanBus::DataSource::Payload);
- QCOMPARE(d.dataEndian(), QtCanBus::DataEndian::BigEndian);
+ QCOMPARE(d.dataEndian(), QSysInfo::Endian::BigEndian);
QCOMPARE(d.dataFormat(), QtCanBus::DataFormat::SignedInteger);
QCOMPARE(d.startBit(), 0);
QCOMPARE(d.bitLength(), 0);
@@ -147,7 +147,7 @@ void tst_QCanSignalDescription::comparison()
}
{
QCanSignalDescription d1 = d;
- d1.setDataEndian(QtCanBus::DataEndian::LittleEndian);
+ d1.setDataEndian(QSysInfo::Endian::LittleEndian);
QCOMPARE_NE(d1, d);
QVERIFY(!QCanSignalDescriptionPrivate::get(d1)->isShared());
}
diff --git a/tests/auto/qcanuniqueiddescription/tst_qcanuniqueiddescription.cpp b/tests/auto/qcanuniqueiddescription/tst_qcanuniqueiddescription.cpp
index 195a567..04e78fd 100644
--- a/tests/auto/qcanuniqueiddescription/tst_qcanuniqueiddescription.cpp
+++ b/tests/auto/qcanuniqueiddescription/tst_qcanuniqueiddescription.cpp
@@ -31,7 +31,7 @@ void tst_QCanUniqueIdDescription::init()
d.setSource(QtCanBus::DataSource::FrameId);
d.setStartBit(0);
d.setBitLength(29);
- d.setEndian(QtCanBus::DataEndian::LittleEndian);
+ d.setEndian(QSysInfo::Endian::LittleEndian);
}
void tst_QCanUniqueIdDescription::construct()
@@ -39,7 +39,7 @@ void tst_QCanUniqueIdDescription::construct()
QCanUniqueIdDescription desc;
QVERIFY(!desc.isValid());
QCOMPARE(desc.source(), QtCanBus::DataSource::FrameId);
- QCOMPARE(desc.endian(), QtCanBus::DataEndian::LittleEndian);
+ QCOMPARE(desc.endian(), QSysInfo::Endian::LittleEndian);
QCOMPARE(desc.startBit(), 0);
QCOMPARE(desc.bitLength(), 0);
}
@@ -106,7 +106,7 @@ void tst_QCanUniqueIdDescription::comparison()
}
{
QCanUniqueIdDescription d1 = d;
- d1.setEndian(QtCanBus::DataEndian::BigEndian);
+ d1.setEndian(QSysInfo::Endian::BigEndian);
QCOMPARE_NE(d1, d);
QVERIFY(!QCanUniqueIdDescriptionPrivate::get(d)->isShared());
QVERIFY(!QCanUniqueIdDescriptionPrivate::get(d1)->isShared());