diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-02-14 16:16:56 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-12 01:51:20 +0200 |
| commit | 707129fd5a7c6390fbdf4270119226df2a427fcd (patch) | |
| tree | 3394b456eae374078330684d0523b7874ac630de /src/corelib/text/qregexp.cpp | |
| parent | 2844631aa977fb1619ec3910090d1bdd4c7459c2 (diff) | |
Long live qHashMulti(Commutative)
Add a helper function so that we have a shortcut.
Instead of writing:
QHashCombine hash;
seed = hash(seed, fieldA);
seed = hash(seed, fieldB);
// etc.
return seed;
one can now simply write:
return qHashMulti(seed, fieldA, fieldB, fieldC);
Port a few usages inside qtbase as a demonstration.
[ChangeLog][QtCore][QHash] Added the qHashMulti and
qHashMultiCommutative functions as convenience helpers
to calculate a hash from multiple variables (typically,
data members of a class).
Change-Id: I881a9ad41168df20ceecc6588a94abe7ddc6a532
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/text/qregexp.cpp')
| -rw-r--r-- | src/corelib/text/qregexp.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/text/qregexp.cpp b/src/corelib/text/qregexp.cpp index bf76a1992cb..758a3695c9f 100644 --- a/src/corelib/text/qregexp.cpp +++ b/src/corelib/text/qregexp.cpp @@ -1030,11 +1030,7 @@ static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key static size_t qHash(const QRegExpEngineKey &key, size_t seed = 0) noexcept { - QtPrivate::QHashCombine hash; - seed = hash(seed, key.pattern); - seed = hash(seed, key.patternSyntax); - seed = hash(seed, key.cs); - return seed; + return qHashMulti(seed, key.pattern, key.patternSyntax, key.cs); } class QRegExpEngine; |