Do not provide {in}equality opeartors for CAN parser value classes

These operators are only needed for tests.
Provide helper headers with proper implementations to avoid code
duplication, because each pair of operators is used in more than one
test.

Noticed during Qt 6.5 API review.

Change-Id: Icf36ad7a7fb3e9230154933593470a6c84c16901
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 8db3c1142248e4564e8b90db61ad1bdf13164453)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 0 insertions, 133 deletions

diff --git a/src/serialbus/qcanmessagedescription.cpp b/src/serialbus/qcanmessagedescription.cpp
index d1b0f7c..bbb5d85 100644
--- a/src/serialbus/qcanmessagedescription.cpp
+++ b/src/serialbus/qcanmessagedescription.cpp
@@ -100,20 +100,6 @@ QCanMessageDescription &QCanMessageDescription::operator=(const QCanMessageDescr
 */
 
 /*!
-    \fn bool QCanMessageDescription::operator==(const QCanMessageDescription &lhs, const QCanMessageDescription &rhs)
-
-    Returns \c true if all of the \a lhs object's values are the same as those
-    of \a rhs. Otherwise returns \c false.
-*/
-
-/*!
-    \fn bool QCanMessageDescription::operator!=(const QCanMessageDescription &lhs, const QCanMessageDescription &rhs)
-
-    Returns \c true if any of the \a lhs object's values are not the same as
-    those of \a rhs. Otherwise returns \c false.
-*/
-
-/*!
     Returns \c true when the message description is valid and \c false
     otherwise.
 
@@ -334,16 +320,6 @@ void QCanMessageDescription::setSignalDescriptions(const QList<QCanSignalDescrip
         d->messageSignals.insert(desc.name(), desc);
 }
 
-bool QCanMessageDescription::equals(const QCanMessageDescription &lhs, const QCanMessageDescription &rhs)
-{
-    return lhs.d->name == rhs.d->name
-            && lhs.d->transmitter == rhs.d->transmitter
-            && lhs.d->comment == rhs.d->comment
-            && lhs.d->id == rhs.d->id
-            && lhs.d->size == rhs.d->size
-            && lhs.d->messageSignals == rhs.d->messageSignals;
-}
-
 #ifndef QT_NO_DEBUG_STREAM
 QDebug QCanMessageDescription::debugStreaming(QDebug dbg, const QCanMessageDescription &msg)
 {
diff --git a/src/serialbus/qcanmessagedescription.h b/src/serialbus/qcanmessagedescription.h
index 27687ea..1cf7b55 100644
--- a/src/serialbus/qcanmessagedescription.h
+++ b/src/serialbus/qcanmessagedescription.h
@@ -28,15 +28,6 @@ public:
     Q_SERIALBUS_EXPORT QCanMessageDescription &operator=(const QCanMessageDescription &other);
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QCanMessageDescription)
 
-    friend bool operator==(const QCanMessageDescription &lhs, const QCanMessageDescription &rhs)
-    {
-        return equals(lhs, rhs);
-    }
-    friend bool operator!=(const QCanMessageDescription &lhs, const QCanMessageDescription &rhs)
-    {
-        return !equals(lhs, rhs);
-    }
-
     void swap(QCanMessageDescription &other) noexcept { d.swap(other.d); }
 
     Q_SERIALBUS_EXPORT bool isValid() const;
@@ -67,8 +58,6 @@ private:
     QExplicitlySharedDataPointer<QCanMessageDescriptionPrivate> d;
     friend class QCanMessageDescriptionPrivate;
 
-    static bool equals(const QCanMessageDescription &lhs, const QCanMessageDescription &rhs);
-
     friend void qHash(const QCanMessageDescription &desc, size_t seed) noexcept = delete;
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/serialbus/qcansignaldescription.cpp b/src/serialbus/qcansignaldescription.cpp
index 113e736..0df6a4a 100644
--- a/src/serialbus/qcansignaldescription.cpp
+++ b/src/serialbus/qcansignaldescription.cpp
@@ -247,20 +247,6 @@ QCanSignalDescription &QCanSignalDescription::operator=(const QCanSignalDescript
 */
 
 /*!
-    \fn bool QCanSignalDescription::operator==(const QCanSignalDescription &lhs, const QCanSignalDescription &rhs)
-
-    Returns \c true if all of the \a lhs object's values are the same as those
-    of \a rhs. Otherwise returns \c false.
-*/
-
-/*!
-    \fn bool QCanSignalDescription::operator!=(const QCanSignalDescription &lhs, const QCanSignalDescription &rhs)
-
-    Returns \c true if any of the \a lhs object's values are not the same as
-    those of \a rhs. Otherwise returns \c false.
-*/
-
-/*!
     Returns \c true when the signal description is valid and \c false otherwise.
 
     A valid signal description \e must fulfill the following conditions:
@@ -776,46 +762,6 @@ void QCanSignalDescription::addMultiplexSignal(const QString &name, const QVaria
     d->muxSignals.insert(name, { {value, value} });
 }
 
-// copied from qtbase/src/testlib/qtestcase.cpp
-template <typename T>
-static bool floatingCompare(const T &actual, const T &expected)
-{
-    switch (qFpClassify(expected))
-    {
-    case FP_INFINITE:
-        return (expected < 0) == (actual < 0) && qFpClassify(actual) == FP_INFINITE;
-    case FP_NAN:
-        return qFpClassify(actual) == FP_NAN;
-    default:
-        if (!qFuzzyIsNull(expected))
-            return qFuzzyCompare(actual, expected);
-        Q_FALLTHROUGH();
-    case FP_SUBNORMAL: // subnormal is always fuzzily null
-    case FP_ZERO:
-        return qFuzzyIsNull(actual);
-    }
-}
-
-bool QCanSignalDescription::equals(const QCanSignalDescription &lhs, const QCanSignalDescription &rhs)
-{
-    return lhs.d->name == rhs.d->name
-            && lhs.d->unit == rhs.d->unit
-            && lhs.d->receiver == rhs.d->receiver
-            && lhs.d->comment == rhs.d->comment
-            && lhs.d->source == rhs.d->source
-            && lhs.d->endian == rhs.d->endian
-            && lhs.d->format == rhs.d->format
-            && lhs.d->startBit == rhs.d->startBit
-            && lhs.d->dataLength == rhs.d->dataLength
-            && lhs.d->muxState == rhs.d->muxState
-            && lhs.d->muxSignals == rhs.d->muxSignals
-            && floatingCompare(lhs.d->factor, rhs.d->factor)
-            && floatingCompare(lhs.d->offset, rhs.d->offset)
-            && floatingCompare(lhs.d->scaling, rhs.d->scaling)
-            && floatingCompare(lhs.d->minimum, rhs.d->minimum)
-            && floatingCompare(lhs.d->maximum, rhs.d->maximum);
-}
-
 #ifndef QT_NO_DEBUG_STREAM
 QDebug QCanSignalDescription::debugStreaming(QDebug dbg, const QCanSignalDescription &sig)
 {
diff --git a/src/serialbus/qcansignaldescription.h b/src/serialbus/qcansignaldescription.h
index 4633170..89e48c8 100644
--- a/src/serialbus/qcansignaldescription.h
+++ b/src/serialbus/qcansignaldescription.h
@@ -55,15 +55,6 @@ public:
     Q_SERIALBUS_EXPORT QCanSignalDescription &operator=(const QCanSignalDescription &other);
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QCanSignalDescription)
 
-    friend bool operator==(const QCanSignalDescription &lhs, const QCanSignalDescription &rhs)
-    {
-        return equals(lhs, rhs);
-    }
-    friend bool operator!=(const QCanSignalDescription &lhs, const QCanSignalDescription &rhs)
-    {
-        return !equals(lhs, rhs);
-    }
-
     void swap(QCanSignalDescription &other) noexcept { d.swap(other.d); }
 
     Q_SERIALBUS_EXPORT bool isValid() const;
@@ -122,8 +113,6 @@ private:
     QExplicitlySharedDataPointer<QCanSignalDescriptionPrivate> d;
     friend class QCanSignalDescriptionPrivate;
 
-    static bool equals(const QCanSignalDescription &lhs, const QCanSignalDescription &rhs);
-
     friend void qHash(const QCanSignalDescription &desc, size_t seed) noexcept = delete;
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/serialbus/qcanuniqueiddescription.cpp b/src/serialbus/qcanuniqueiddescription.cpp
index 3096b05..3ec45b4 100644
--- a/src/serialbus/qcanuniqueiddescription.cpp
+++ b/src/serialbus/qcanuniqueiddescription.cpp
@@ -99,20 +99,6 @@ QCanUniqueIdDescription &QCanUniqueIdDescription::operator=(const QCanUniqueIdDe
 */
 
 /*!
-    \fn bool QCanUniqueIdDescription::operator==(const QCanUniqueIdDescription &lhs, const QCanUniqueIdDescription &rhs)
-
-    Returns \c true if all of the \a lhs object's values are the same as those
-    of \a rhs. Otherwise returns \c false.
-*/
-
-/*!
-    \fn bool QCanUniqueIdDescription::operator!=(const QCanUniqueIdDescription &lhs, const QCanUniqueIdDescription &rhs)
-
-    Returns \c true if any of the \a lhs object's values are not the same as
-    those of \a rhs. Otherwise returns \c false.
-*/
-
-/*!
     Returns \c true when this unique identifier description is valid and
     \c false otherwise.
 
@@ -216,14 +202,6 @@ void QCanUniqueIdDescription::setEndian(QSysInfo::Endian endian)
     d->endian = endian;
 }
 
-bool QCanUniqueIdDescription::equals(const QCanUniqueIdDescription &lhs, const QCanUniqueIdDescription &rhs)
-{
-    return lhs.d->source == rhs.d->source
-            && lhs.d->endian == rhs.d->endian
-            && lhs.d->startBit == rhs.d->startBit
-            && lhs.d->bitLength == rhs.d->bitLength;
-}
-
 QCanUniqueIdDescriptionPrivate *QCanUniqueIdDescriptionPrivate::get(const QCanUniqueIdDescription &desc)
 {
     return desc.d.data();
diff --git a/src/serialbus/qcanuniqueiddescription.h b/src/serialbus/qcanuniqueiddescription.h
index bd29d52..06b89a2 100644
--- a/src/serialbus/qcanuniqueiddescription.h
+++ b/src/serialbus/qcanuniqueiddescription.h
@@ -25,15 +25,6 @@ public:
     Q_SERIALBUS_EXPORT QCanUniqueIdDescription &operator=(const QCanUniqueIdDescription &other);
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QCanUniqueIdDescription)
 
-    friend bool operator==(const QCanUniqueIdDescription &lhs, const QCanUniqueIdDescription &rhs)
-    {
-        return equals(lhs, rhs);
-    }
-    friend bool operator!=(const QCanUniqueIdDescription &lhs, const QCanUniqueIdDescription &rhs)
-    {
-        return !equals(lhs, rhs);
-    }
-
     void swap(QCanUniqueIdDescription &other) noexcept { d.swap(other.d); }
 
     Q_SERIALBUS_EXPORT bool isValid() const;
@@ -54,8 +45,6 @@ private:
     QExplicitlySharedDataPointer<QCanUniqueIdDescriptionPrivate> d;
     friend class QCanUniqueIdDescriptionPrivate;
 
-    static bool equals(const QCanUniqueIdDescription &lhs, const QCanUniqueIdDescription &rhs);
-
     friend void qHash(const QCanUniqueIdDescription &desc, size_t seed) noexcept = delete;
 };