summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <dangelog@gmail.com>2012-03-24 18:23:49 +0000
committerQt by Nokia <qt-info@nokia.com>2012-04-07 22:20:19 +0200
commitc3b9a67cf054c71d7dd57d91220cded62256019d (patch)
tree85ae902d80cead2abb88dd8c7ba827f193ef63b9 /src
parente6e4456de0506aa9896b687dc858eb9ae03d8917 (diff)
More qHash(T, uint) overloads for Qt types
The more we get in 5.0, the better. Change-Id: If00084477709db4fc3f6b2e15024d046491be2ae Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qregexp.cpp4
-rw-r--r--src/dbus/qdbusextratypes.h8
-rw-r--r--src/network/kernel/qhostaddress.cpp4
-rw-r--r--src/network/kernel/qhostaddress.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 6462b3df92..1db0fcf44c 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -3815,9 +3815,9 @@ struct QRegExpPrivate
};
#if !defined(QT_NO_REGEXP_OPTIM)
-uint qHash(const QRegExpEngineKey &key)
+uint qHash(const QRegExpEngineKey &key, uint seed)
{
- return qHash(key.pattern);
+ return qHash(key.pattern, seed);
}
typedef QCache<QRegExpEngineKey, QRegExpEngine> EngineCache;
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index d8bdf7424c..c1b8cffc79 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -99,8 +99,8 @@ inline bool operator!=(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs)
inline bool operator<(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs)
{ return lhs.path() < rhs.path(); }
-inline uint qHash(const QDBusObjectPath &objectPath)
-{ return qHash(objectPath.path()); }
+inline uint qHash(const QDBusObjectPath &objectPath, uint seed)
+{ return qHash(objectPath.path(), seed); }
class Q_DBUS_EXPORT QDBusSignature
@@ -146,8 +146,8 @@ inline bool operator!=(const QDBusSignature &lhs, const QDBusSignature &rhs)
inline bool operator<(const QDBusSignature &lhs, const QDBusSignature &rhs)
{ return lhs.signature() < rhs.signature(); }
-inline uint qHash(const QDBusSignature &signature)
-{ return qHash(signature.signature()); }
+inline uint qHash(const QDBusSignature &signature, uint seed)
+{ return qHash(signature.signature(), seed); }
class QDBusVariant
{
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 009c8f2a6a..2adf19ead4 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -1027,9 +1027,9 @@ QDebug operator<<(QDebug d, const QHostAddress &address)
}
#endif
-uint qHash(const QHostAddress &key)
+uint qHash(const QHostAddress &key, uint seed)
{
- return qHash(key.toString());
+ return qHash(key.toString(), seed);
}
#ifndef QT_NO_DATASTREAM
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index fdf09ecc82..b298e3f479 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -135,7 +135,7 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QHostAddress &);
#endif
-Q_NETWORK_EXPORT uint qHash(const QHostAddress &key);
+Q_NETWORK_EXPORT uint qHash(const QHostAddress &key, uint seed = 0);
#ifndef QT_NO_DATASTREAM
Q_NETWORK_EXPORT QDataStream &operator<<(QDataStream &, const QHostAddress &);