From 32dfbd6dbf8393dcd4e4eaa557902108a2714326 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 25 Sep 2014 16:01:09 +0200
Subject: Add qHash(QSslError) overload

qsslsocket_winrt.cpp defined it locally, which runs the risk of
clashes with a potential user-defined qHash(QSslError), so
make it public.

Also included both .error() and .certificate() in the hash, as
both of these are used to determine equality (the WinRT version
only used .error()).

[ChangeLog][QtNetwork][QSslError] Can now be used in QSet/QHash.

Change-Id: Ieb7995bed491ff011d4be9dad544248b56fd4f73
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
---
 src/network/ssl/qsslerror.cpp        | 13 +++++++++++++
 src/network/ssl/qsslerror.h          |  2 ++
 src/network/ssl/qsslsocket_winrt.cpp |  5 -----
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/network')

diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index ff30098347..5004e561a8 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -305,6 +305,19 @@ QSslCertificate QSslError::certificate() const
     return d->certificate;
 }
 
+/*!
+    Returns the hash value for the \a key, using \a seed to seed the calculation.
+    \since 5.4
+    \relates QHash
+*/
+uint qHash(const QSslError &key, uint seed) Q_DECL_NOTHROW
+{
+    // 2x boost::hash_combine inlined:
+    seed ^= qHash(key.error())       + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+    seed ^= qHash(key.certificate()) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+    return seed;
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 //class QDebug;
 QDebug operator<<(QDebug debug, const QSslError &error)
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index d25546b68b..c00532e294 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -102,6 +102,8 @@ private:
 };
 Q_DECLARE_SHARED(QSslError)
 
+Q_NETWORK_EXPORT uint qHash(const QSslError &key, uint seed = 0) Q_DECL_NOTHROW;
+
 #ifndef QT_NO_DEBUG_STREAM
 class QDebug;
 Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslError &error);
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index 69f8b6d68a..da4c72be01 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -65,11 +65,6 @@ using namespace ABI::Windows::Storage::Streams;
 
 QT_BEGIN_NAMESPACE
 
-// For QSet<QSslError>
-inline uint qHash(const QSslError &error, uint seed)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(error)))
-{ return (qHash(error.error()) ^ seed); }
-
 bool QSslSocketPrivate::s_libraryLoaded = true;
 bool QSslSocketPrivate::s_loadRootCertsOnDemand = true;
 bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
-- 
cgit v1.2.3