From e6b302dd6cb5dbc67c7647f7d90a4a7099faa487 Mon Sep 17 00:00:00 2001
From: Ale Martinez <amtriathlon@gmail.com>
Date: Sun, 7 Mar 2021 10:48:07 -0300
Subject: [PATCH] Revert "Add getFingerprint method to detect all changes in
 UserMetricSettings"

This reverts commit c726325af6e366f19592a34890025be576b4affa.
---
 src/Metrics/RideMetric.cpp       |  6 +++---
 src/Metrics/UserMetricSettings.h | 31 ++++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/Metrics/RideMetric.cpp b/src/Metrics/RideMetric.cpp
index 4b174f6e3..3dd654f87 100644
--- a/src/Metrics/RideMetric.cpp
+++ b/src/Metrics/RideMetric.cpp
@@ -179,11 +179,11 @@ quint16
 RideMetric::userMetricFingerprint(QList<UserMetricSettings> these)
 {
     // run through loaded metrics and compute a fingerprint CRC
-    quint16 fingerprint = 0;
+    QByteArray fingers;
     foreach(UserMetricSettings x, these)
-        fingerprint += x.getFingerprint();
+        fingers += x.fingerprint.toLocal8Bit();
 
-    return fingerprint;
+    return qChecksum(fingers.constData(), fingers.size());
 }
 
 QHash<QString,RideMetricPtr>
diff --git a/src/Metrics/UserMetricSettings.h b/src/Metrics/UserMetricSettings.h
index c5f6f4343..92143c5f0 100644
--- a/src/Metrics/UserMetricSettings.h
+++ b/src/Metrics/UserMetricSettings.h
@@ -45,23 +45,24 @@ class UserMetricSettings {
 
     public:
 
-        qint16 getFingerprint() const {
+        bool operator!= (UserMetricSettings right) const {
 
             // mostly used to see if it changed when editing
-            QByteArray ba = QString(this->symbol +
-                                    this->name +
-                                    this->description +
-                                    this->unitsMetric +
-                                    this->unitsImperial +
-                                    this->type +
-                                    this->precision +
-                                    this->aggzero +
-                                    this->istime +
-                                    this->conversion +
-                                    this->conversionSum +
-                                    this->program).toUtf8();
-
-            return qChecksum(ba, ba.length());
+            if (this->symbol != right.symbol ||
+                this->name != right.name ||
+                this->description != right.description ||
+                this->unitsMetric != right.unitsMetric ||
+                this->unitsImperial != right.unitsImperial ||
+                this->conversion != right.conversion ||
+                this->conversionSum != right.conversionSum ||
+                this->program != right.program ||
+                this->precision != right.precision ||
+                this->istime != right.istime ||
+                this->aggzero != right.aggzero ||
+                this->fingerprint != right.fingerprint)
+                return true;
+            else
+                return false;
         }
 
         QString symbol,