Fix qHash-related size compatibility warnings by MSVC

Change-Id: I3b7981ce78b67db4b996f99682284a0b911d8cd7
orgads · Oct 17, 2021 · 31439e6 · 31439e6
1 parent 57fccec
commit 31439e6
Show file tree

Hide file tree

Showing 60 changed files with 128 additions and 86 deletions.
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
@@ -517,7 +517,7 @@ QDebug operator <<(QDebug debug, const ServerNodeInstance &instance)
     return debug.space();
 }
 
-uint qHash(const ServerNodeInstance &instance)
+ServerNodeInstance::QHashValueType qHash(const ServerNodeInstance &instance)
 {
     return ::qHash(instance.instanceId());
 }

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
@@ -67,6 +67,13 @@ namespace Internal {
 
 class ServerNodeInstance
 {
+public:
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+using QHashValueType = uint;
+#else
+using QHashValueType = size_t;
+#endif
+
     friend class NodeInstanceServer;
     friend class Qt4NodeInstanceServer;
     friend class Qt4PreviewNodeInstanceServer;
@@ -76,7 +83,7 @@ class ServerNodeInstance
     friend class Qt5CapturePreviewNodeInstanceServer;
     friend class Qt5TestNodeInstanceServer;
     friend class QHash<qint32, ServerNodeInstance>;
-    friend uint qHash(const ServerNodeInstance &instance);
+    friend QHashValueType qHash(const ServerNodeInstance &instance);
     friend bool operator==(const ServerNodeInstance &first, const ServerNodeInstance &second);
     friend QDebug operator<<(QDebug debug, const ServerNodeInstance &instance);
     friend class NodeMetaInfo;
@@ -220,7 +227,7 @@ class ServerNodeInstance
     QSharedPointer<Internal::ObjectNodeInstance> m_nodeInstance;
 };
 
-uint qHash(const ServerNodeInstance &instance);
+ServerNodeInstance::QHashValueType qHash(const ServerNodeInstance &instance);
 bool operator ==(const ServerNodeInstance &first, const ServerNodeInstance &second);
 bool operator <(const ServerNodeInstance &first, const ServerNodeInstance &second);
 QDebug operator <<(QDebug debug, const ServerNodeInstance &instance);

diff --git a/src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp b/src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp
@@ -284,7 +284,7 @@ class HlFilesChecker
 
                 friend uint qHash(const Item &item, uint seed = 0)
                 {
-                    return qHash(item.content, seed);
+                    return uint(qHash(item.content, seed));
                 }
 
                 friend bool operator==(const Item &item0, const Item &item1)
@@ -650,7 +650,7 @@ class HlFilesChecker
 
             friend uint qHash(const Style &style, uint seed = 0)
             {
-                return qHash(style.name, seed);
+                return uint(qHash(style.name, seed));
             }
 
             friend bool operator==(const Style &style0, const Style &style1)

diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
@@ -38,6 +38,7 @@
 #include <cplusplus/Control.h>
 
 #include <utils/algorithm.h>
+#include <utils/porting.h>
 
 #include <QStack>
 #include <QHash>
@@ -150,9 +151,9 @@ bool operator==(const FullyQualifiedName &left, const FullyQualifiedName &right)
     return compareFullyQualifiedName(left.fqn, right.fqn);
 }
 
-uint qHash(const FullyQualifiedName &fullyQualifiedName)
+Utils::QHashValueType qHash(const FullyQualifiedName &fullyQualifiedName)
 {
-    uint h = 0;
+    Utils::QHashValueType h = 0;
     for (int i = 0; i < fullyQualifiedName.fqn.size(); ++i) {
         if (const Name *n = fullyQualifiedName.fqn.at(i)) {
             if (const Identifier *id = n->identifier()) {

diff --git a/src/libs/cplusplus/LookupItem.cpp b/src/libs/cplusplus/LookupItem.cpp
@@ -33,10 +33,10 @@
 
 using namespace CPlusPlus;
 
-uint CPlusPlus::qHash(const LookupItem &key)
+Utils::QHashValueType CPlusPlus::qHash(const LookupItem &key)
 {
-    const uint h1 = QT_PREPEND_NAMESPACE(qHash)(key.type().type());
-    const uint h2 = QT_PREPEND_NAMESPACE(qHash)(key.scope());
+    const Utils::QHashValueType h1 = QT_PREPEND_NAMESPACE(qHash)(key.type().type());
+    const Utils::QHashValueType h2 = QT_PREPEND_NAMESPACE(qHash)(key.scope());
     return ((h1 << 16) | (h1 >> 16)) ^ h2;
 }
 

diff --git a/src/libs/cplusplus/LookupItem.h b/src/libs/cplusplus/LookupItem.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <cplusplus/FullySpecifiedType.h>
+#include <utils/porting.h>
 
 #include <QHash>
 
@@ -70,6 +71,6 @@ class CPLUSPLUS_EXPORT LookupItem
     ClassOrNamespace *_binding;
 };
 
-uint qHash(const CPlusPlus::LookupItem &result);
+Utils::QHashValueType qHash(const CPlusPlus::LookupItem &result);
 
 } // namespace CPlusPlus
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
@@ -155,7 +155,7 @@ using namespace ExtensionSystem::Internal;
     \fn uint ExtensionSystem::qHash(const ExtensionSystem::PluginDependency &value)
     \internal
 */
-uint ExtensionSystem::qHash(const PluginDependency &value)
+Utils::QHashValueType ExtensionSystem::qHash(const PluginDependency &value)
 {
     return qHash(value.name);
 }

diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
@@ -27,6 +27,8 @@
 
 #include "extensionsystem_global.h"
 
+#include <utils/porting.h>
+
 #include <QString>
 #include <QHash>
 #include <QVector>
@@ -65,7 +67,7 @@ struct EXTENSIONSYSTEM_EXPORT PluginDependency
     QString toString() const;
 };
 
-uint qHash(const ExtensionSystem::PluginDependency &value);
+Utils::QHashValueType qHash(const ExtensionSystem::PluginDependency &value);
 
 struct EXTENSIONSYSTEM_EXPORT PluginArgumentDescription
 {

diff --git a/src/libs/modelinglib/qmt/infrastructure/handle.h b/src/libs/modelinglib/qmt/infrastructure/handle.h
@@ -74,7 +74,7 @@ class Handle
 };
 
 template<class T>
-inline int qHash(const Handle<T> &handle)
+inline auto qHash(const Handle<T> &handle)
 {
     return qHash(handle.uid());
 }

diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -38,6 +38,7 @@
 #include "qmt/infrastructure/qmtassert.h"
 
 #include <utils/algorithm.h>
+#include <utils/porting.h>
 
 #include <QSet>
 
@@ -82,7 +83,7 @@ class ObjectStyleKey
     ObjectVisuals m_objectVisuals;
 };
 
-uint qHash(const ObjectStyleKey &styleKey)
+Utils::QHashValueType qHash(const ObjectStyleKey &styleKey)
 {
     return ::qHash(styleKey.m_elementType) ^ qHash(styleKey.m_objectVisuals);
 }
@@ -106,7 +107,7 @@ class RelationStyleKey
     DObject::VisualPrimaryRole m_visualPrimaryRole = DObject::PrimaryRoleNormal;
 };
 
-uint qHash(const RelationStyleKey &styleKey)
+Utils::QHashValueType qHash(const RelationStyleKey &styleKey)
 {
     return ::qHash(styleKey.m_elementType) ^ ::qHash(styleKey.m_visualPrimaryRole);
 }
@@ -127,7 +128,7 @@ class AnnotationStyleKey
     DAnnotation::VisualRole m_visualRole = DAnnotation::RoleNormal;
 };
 
-uint qHash(const AnnotationStyleKey &styleKey)
+Utils::QHashValueType qHash(const AnnotationStyleKey &styleKey)
 {
     return ::qHash(styleKey.m_visualRole);
 }
@@ -142,11 +143,11 @@ class BoundaryStyleKey
 {
 };
 
-uint qHash(const BoundaryStyleKey &styleKey)
+Utils::QHashValueType qHash(const BoundaryStyleKey &styleKey)
 {
     Q_UNUSED(styleKey)
 
-    return 1;
+    return ::qHash(1);
 }
 
 bool operator==(const BoundaryStyleKey &lhs, const BoundaryStyleKey &rhs)
@@ -162,11 +163,11 @@ class SwimlaneStyleKey
 {
 };
 
-uint qHash(const SwimlaneStyleKey &styleKey)
+Utils::QHashValueType qHash(const SwimlaneStyleKey &styleKey)
 {
     Q_UNUSED(styleKey)
 
-    return 1;
+    return ::qHash(1);
 }
 
 bool operator==(const SwimlaneStyleKey &lhs, const SwimlaneStyleKey &rhs)

diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.cpp b/src/libs/modelinglib/qmt/style/objectvisuals.cpp
@@ -82,7 +82,7 @@ bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs)
             && lhs.depth() == rhs.depth();
 }
 
-uint qHash(const ObjectVisuals &objectVisuals)
+Utils::QHashValueType qHash(const ObjectVisuals &objectVisuals)
 {
     return ::qHash(static_cast<int>(objectVisuals.visualPrimaryRole()))
             ^ ::qHash(static_cast<int>(objectVisuals.visualSecondaryRole()))

diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.h b/src/libs/modelinglib/qmt/style/objectvisuals.h
@@ -27,6 +27,8 @@
 
 #include "qmt/diagram/dobject.h"
 
+#include <utils/porting.h>
+
 #include <QColor>
 
 namespace qmt {
@@ -60,6 +62,6 @@ class QMT_EXPORT ObjectVisuals
 };
 
 bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs);
-uint qHash(const ObjectVisuals &objectVisuals);
+Utils::QHashValueType qHash(const ObjectVisuals &objectVisuals);
 
 } // namespace qmt
diff --git a/src/libs/qmljs/qmljsdialect.cpp b/src/libs/qmljs/qmljsdialect.cpp
@@ -221,9 +221,9 @@ QList<Dialect> Dialect::companionLanguages() const
     return langs;
 }
 
-uint qHash(const Dialect &o)
+Utils::QHashValueType qHash(const Dialect &o)
 {
-    return uint(o.dialect());
+    return Utils::QHashValueType(o.dialect());
 }
 
 QDebug operator << (QDebug &dbg, const Dialect &dialect)

diff --git a/src/libs/qmljs/qmljsdialect.h b/src/libs/qmljs/qmljsdialect.h
@@ -28,6 +28,7 @@
 #include "qmljs_global.h"
 
 #include <utils/fileutils.h>
+#include <utils/porting.h>
 
 #include <QDebug>
 #include <QString>
@@ -73,7 +74,7 @@ class QMLJS_EXPORT Dialect {
     Enum m_dialect;
 };
 
-QMLJS_EXPORT uint qHash(const Dialect &o);
+QMLJS_EXPORT Utils::QHashValueType qHash(const Dialect &o);
 
 QMLJS_EXPORT QDebug operator << (QDebug &dbg, const Dialect &dialect);
 

diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp
@@ -502,9 +502,9 @@ QString ImportKey::toString() const
     return res;
 }
 
-uint qHash(const ImportKey &info)
+Utils::QHashValueType qHash(const ImportKey &info)
 {
-    uint res = ::qHash(info.type) ^
+    Utils::QHashValueType res = ::qHash(info.type) ^
             ::qHash(info.majorVersion) ^ ::qHash(info.minorVersion);
     foreach (const QString &s, info.splitPath)
         res = res ^ ::qHash(s);

diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h
@@ -29,6 +29,7 @@
 #include "qmljsdialect.h"
 
 #include <languageutils/componentversion.h>
+#include <utils/porting.h>
 
 #include <QObject>
 #include <QString>
@@ -117,7 +118,7 @@ class QMLJS_EXPORT ImportKey
     QString toString() const;
 };
 
-uint qHash(const ImportKey &info);
+Utils::QHashValueType qHash(const ImportKey &info);
 bool operator ==(const ImportKey &i1, const ImportKey &i2);
 bool operator !=(const ImportKey &i1, const ImportKey &i2);
 bool operator <(const ImportKey &i1, const ImportKey &i2);

diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -175,7 +175,7 @@ bool FakeMetaObjectWithOrigin::operator ==(const FakeMetaObjectWithOrigin &o) co
     return fakeMetaObject == o.fakeMetaObject;
 }
 
-uint qHash(const FakeMetaObjectWithOrigin &fmoo)
+Utils::QHashValueType qHash(const FakeMetaObjectWithOrigin &fmoo)
 {
     return qHash(fmoo.fakeMetaObject);
 }

diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
@@ -31,6 +31,7 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 
 #include <languageutils/fakemetaobject.h>
+#include <utils/porting.h>
 
 #include <QFileInfoList>
 #include <QHash>
@@ -734,7 +735,7 @@ class QMLJS_EXPORT FakeMetaObjectWithOrigin
     bool operator ==(const FakeMetaObjectWithOrigin &o) const;
 };
 
-QMLJS_EXPORT uint qHash(const FakeMetaObjectWithOrigin &fmoo);
+QMLJS_EXPORT Utils::QHashValueType qHash(const FakeMetaObjectWithOrigin &fmoo);
 
 class QMLJS_EXPORT CppQmlTypes
 {

diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
@@ -32,6 +32,7 @@
 #include "qmljsmodelmanagerinterface.h"
 #include "qmljsconstants.h"
 
+#include <utils/porting.h>
 #include <utils/qrcparser.h>
 
 #include <QDir>
@@ -54,7 +55,7 @@ class ImportCacheKey
     {}
 
 private:
-    friend uint qHash(const ImportCacheKey &);
+    friend Utils::QHashValueType qHash(const ImportCacheKey &);
     friend bool operator==(const ImportCacheKey &, const ImportCacheKey &);
 
     int m_type;
@@ -63,7 +64,7 @@ class ImportCacheKey
     int m_minorVersion;
 };
 
-uint qHash(const ImportCacheKey &info)
+Utils::QHashValueType qHash(const ImportCacheKey &info)
 {
     return ::qHash(info.m_type) ^ ::qHash(info.m_path) ^
             ::qHash(info.m_majorVersion) ^ ::qHash(info.m_minorVersion);

diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
@@ -1298,7 +1298,7 @@ FilePath FilePath::stringAppended(const QString &str) const
     return fn;
 }
 
-uint FilePath::hash(uint seed) const
+QHashValueType FilePath::hash(uint seed) const
 {
     if (Utils::HostOsInfo::fileNameCaseSensitivity() == Qt::CaseInsensitive)
         return qHash(m_data.toUpper(), seed);

diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+#include "porting.h"
 
 #include "hostosinfo.h"
 
@@ -140,7 +141,7 @@ class QTCREATOR_UTILS_EXPORT FilePath
     void clear();
     bool isEmpty() const;
 
-    uint hash(uint seed) const;
+    QHashValueType hash(uint seed) const;
 
     [[nodiscard]] FilePath resolvePath(const FilePath &tail) const;
     [[nodiscard]] FilePath resolvePath(const QString &tail) const;

diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
@@ -29,6 +29,7 @@
 
 #include "filepath.h"
 #include "hostosinfo.h"
+#include "porting.h"
 
 #include <QCoreApplication>
 #include <QDir>
@@ -316,7 +317,7 @@ class QTCREATOR_UTILS_EXPORT TempFileSaver : public FileSaverBase
 
 QTCREATOR_UTILS_EXPORT QTextStream &operator<<(QTextStream &s, const FilePath &fn);
 
-inline uint qHash(const Utils::FilePath &a, uint seed = 0) { return a.hash(seed); }
+inline QHashValueType qHash(const Utils::FilePath &a, uint seed = 0) { return a.hash(seed); }
 
 } // namespace Utils
 

diff --git a/src/libs/utils/id.cpp b/src/libs/utils/id.cpp
@@ -84,7 +84,7 @@ static bool operator==(const StringHolder &sh1, const StringHolder &sh2)
 }
 
 
-static uint qHash(const StringHolder &sh)
+static auto qHash(const StringHolder &sh)
 {
     return QT_PREPEND_NAMESPACE(qHash)(sh.h, 0);
 }