Minor conformance tweaks

oblivioncth · Feb 9, 2025 · 0a2a532 · 0a2a532
1 parent d2b1960
commit 0a2a532
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ project(libfp
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("d64498ec2654e7f3145d7efa36bfaa73ac30cc74")
+fetch_ob_cmake("3010a962688a63689cdc365722423f5de40c3c59")
 
 # Initialize project according to standard rules
 include(OB/Project)
@@ -52,7 +52,7 @@ set(LIBFP_QX_COMPONENTS
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "1bfe8bdb6047c1d6c3246e431652869e63cbe797"
+    REF "7d7fc36db896e56703fa6442a1d773ecb08434ca"
     COMPONENTS
         ${LIBFP_QX_COMPONENTS}
 )

diff --git a/lib/include/fp/fp-items.h b/lib/include/fp/fp-items.h
@@ -247,7 +247,7 @@ class FP_FP_EXPORT AddApp
 
 //-Hashing-------------------------------------------------------------------------------------------------------------
 public:
-    friend uint qHash(const AddApp& key, uint seed) noexcept;
+    friend size_t qHash(const AddApp& key, size_t seed) noexcept;
 
 //-Instance Functions------------------------------------------------------------------------------------------------------
 public:

diff --git a/lib/src/fp-items.cpp b/lib/src/fp-items.cpp
@@ -257,18 +257,17 @@ bool operator== (const AddApp& lhs, const AddApp& rhs) noexcept
 }
 
 //-Hashing------------------------------------------------------------------------------------------------------
-uint qHash(const AddApp& key, uint seed) noexcept
+size_t qHash(const AddApp& key, size_t seed) noexcept
 {
-    QtPrivate::QHashCombine hash;
-    seed = hash(seed, key.mId);
-    seed = hash(seed, key.mAppPath);
-    seed = hash(seed, key.mAutorunBefore);
-    seed = hash(seed, key.mLaunchCommand);
-    seed = hash(seed, key.mName);
-    seed = hash(seed, key.mWaitExit);
-    seed = hash(seed, key.mParentId);
-
-    return seed;
+    return qHashMulti(seed,
+        key.mId,
+        key.mAppPath,
+        key.mAutorunBefore,
+        key.mLaunchCommand,
+        key.mName,
+        key.mWaitExit,
+        key.mParentId
+    );
 }
 
 //-Instance Functions------------------------------------------------------------------------------------------------