Fix compile warnings

Change-Id: I1f5264b7e5395d5b27c0bfc3a52fc4c4bc0b04d0
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Runtime/ogl-runtime/src/foundation/StringTable.h b/src/Runtime/ogl-runtime/src/foundation/StringTable.h
index aa57857a..d46c111f 100644
--- a/src/Runtime/ogl-runtime/src/foundation/StringTable.h
+++ b/src/Runtime/ogl-runtime/src/foundation/StringTable.h
@@ -50,6 +50,7 @@
 #include "foundation/Qt3DSOption.h"
 
 #include <QtCore/qstring.h>
+#include <QtCore/qhashfunctions.h>
 
 namespace qt3ds {
 namespace foundation {
@@ -73,7 +74,7 @@ namespace foundation {
 
     public:
         CStrTableOrDataRef()
-            : m_StrTable(NULL)
+            : m_StrTable(nullptr)
         {
         }
         CStrTableOrDataRef(NVDataRef<QT3DSU8> inData)
@@ -95,7 +96,7 @@ namespace foundation {
             m_StrTable = inOther.m_StrTable;
             return *this;
         }
-        bool HasStrTable() const { return m_StrTable != NULL; }
+        bool HasStrTable() const { return m_StrTable != nullptr; }
         bool HasDataRef() const { return m_DataRef.hasValue(); }
         NVDataRef<QT3DSU8> GetDataRef() const { return *m_DataRef; }
         IStringTable *GetStringTable() const
@@ -180,7 +181,10 @@ namespace foundation {
 
     inline uint qHash(const CRegisteredString &rString)
     {
-        return eastl::hash<uint>()(reinterpret_cast<size_t>(rString.c_str()));
+        // Note that we are intentionally hashing a pointer to the string rather than its content,
+        // as CRegisteredString strings reside in the string table, which guarantees two instances
+        // with same string point to same string table string.
+        return QT_PREPEND_NAMESPACE(qHash(rString.c_str()));
     }
 
     class IStringTable;