diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2021-07-07 17:32:53 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-07-07 17:39:46 +0000 |
commit | 40d03d1896e5f5dc0abf92a13e2da44b97c6704c (patch) | |
tree | 8ce9bb9e7f0760d80fd6f08ad6784cbaf02fb30c /src/libs/modelinglib | |
parent | cd843318485749d4e019a3f039ba16dc18079a7a (diff) |
Avoid size_t to (u)int warnings with auto, where it is possible
Change-Id: I1ec7454ebce59d99bc828bfd5086907eb0905632
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/libs/modelinglib')
-rw-r--r-- | src/libs/modelinglib/qmt/infrastructure/uid.h | 2 | ||||
-rw-r--r-- | src/libs/modelinglib/qmt/stereotype/customrelation.h | 6 | ||||
-rw-r--r-- | src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/modelinglib/qmt/infrastructure/uid.h b/src/libs/modelinglib/qmt/infrastructure/uid.h index 757f5c11b0..852daea248 100644 --- a/src/libs/modelinglib/qmt/infrastructure/uid.h +++ b/src/libs/modelinglib/qmt/infrastructure/uid.h @@ -55,7 +55,7 @@ private: QUuid m_uuid; }; -inline uint qHash(const Uid &uid) +inline auto qHash(const Uid &uid) { return qHash(uid.get()); } diff --git a/src/libs/modelinglib/qmt/stereotype/customrelation.h b/src/libs/modelinglib/qmt/stereotype/customrelation.h index 0b72be20fd..d74bd0dd4e 100644 --- a/src/libs/modelinglib/qmt/stereotype/customrelation.h +++ b/src/libs/modelinglib/qmt/stereotype/customrelation.h @@ -151,15 +151,15 @@ private: QColor m_color; }; -inline uint qHash(CustomRelation::Relationship relationship) { +inline auto qHash(CustomRelation::Relationship relationship) { return ::qHash(static_cast<int>(relationship)); } -inline uint qHash(CustomRelation::ShaftPattern pattern) { +inline auto qHash(CustomRelation::ShaftPattern pattern) { return ::qHash(static_cast<int>(pattern)); } -inline uint qHash(CustomRelation::Head head) { +inline auto qHash(CustomRelation::Head head) { return ::qHash(static_cast<int>(head)); } diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp index ae1974717b..925b7bb19a 100644 --- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp +++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp @@ -77,7 +77,7 @@ bool operator==(const IconKey &lhs, const IconKey &rhs) { && lhs.m_lineWidth == rhs.m_lineWidth; } -uint qHash(const IconKey &key) { +auto qHash(const IconKey &key) { return ::qHash(key.m_element) + qHash(key.m_stereotypes) + qHash(key.m_defaultIconPath) + qHash(key.m_styleUid) + ::qHash(key.m_size.width()) + ::qHash(key.m_size.height()); } |