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>

10 files changed, 30 insertions, 59 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;