diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-03-01 16:11:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 11:37:02 +0100 |
| commit | f8b727d94bf1cbbb61eee6efaf04de46787eccc4 (patch) | |
| tree | 82f048e2cb0c322adde61831de70e3edf7556b6a /src/corelib/tools | |
| parent | 96c0a433e6adddbbdae41287f2ab07203cb01281 (diff) | |
Make qHash(QChar) constexpr
The signature needs a small change -- from qHash(QChar, uint) to
qHash(const QChar, uint). The reason is that we need to select
the const (and constexpr) overload of QChar::unicode in the body.
Apart from this, it shouldn't have any effect on user code.
Change-Id: I38f4f66a715111c7472e3d7def75a6cff7030919
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qhash.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 65c88d35ab..928707660b 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -802,7 +802,7 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW } #endif -/*! \fn uint qHash(QChar key, uint seed = 0) +/*! \fn uint qHash(const QChar key, uint seed = 0) \relates QHash \since 5.0 diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index c09d7aaccb..7a421a4586 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -86,7 +86,7 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(double key, uint seed = 0) Q_DECL #ifndef Q_OS_DARWIN Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(long double key, uint seed = 0) Q_DECL_NOTHROW; #endif -Q_DECL_CONST_FUNCTION inline uint qHash(QChar key, uint seed = 0) Q_DECL_NOTHROW { return qHash(key.unicode(), seed); } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(const QChar key, uint seed = 0) Q_DECL_NOTHROW { return qHash(key.unicode(), seed); } Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QByteArray &key, uint seed = 0) Q_DECL_NOTHROW; Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QString &key, uint seed = 0) Q_DECL_NOTHROW; Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QStringRef &key, uint seed = 0) Q_DECL_NOTHROW; |