Merge branch 'master' into forget-rooms-really

1 files changed, 1 insertions, 19 deletions

diff --git a/lib/user.cpp b/lib/user.cpp
index 7f3f11f6..7b695618 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -33,9 +33,6 @@
 #include <QtCore/QStringBuilder>
 #include <QtCore/QElapsedTimer>
 
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QtEndian>
-
 #include <functional>
 
 using namespace QMatrixClient;
@@ -50,23 +47,8 @@ class User::Private
             return Avatar(move(url));
         }
 
-        qreal makeHueF()
-        {
-            Q_ASSERT(!userId.isEmpty());
-            QByteArray hash = QCryptographicHash::hash(userId.toUtf8(),
-                                                       QCryptographicHash::Sha1);
-            QDataStream dataStream(qToLittleEndian(hash).left(2));
-            dataStream.setByteOrder(QDataStream::LittleEndian);
-            quint16 hashValue;
-            dataStream >> hashValue;
-            const auto hueF =
-                    qreal(hashValue)/std::numeric_limits<quint16>::max();
-            Q_ASSERT((0 <= hueF) && (hueF <= 1));
-            return hueF;
-        }
-
         Private(QString userId, Connection* connection)
-            : userId(move(userId)), connection(connection), hueF(makeHueF())
+            : userId(move(userId)), connection(connection), hueF(stringToHueF(this->userId))
         { }
 
         QString userId;