From 370031f809d2f9e5ae76618b120c7f03ea14c7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Thu, 28 Nov 2024 13:08:25 +0100
Subject: [PATCH] Use QHash::tryEmplace

Instead of size != oldSize pattern.

Just some locations I could find using a simple regex lookup.

Task-number: QTBUG-130259
Change-Id: I0ac6a4faf8705ce54cb8dd875ee5524ef13f03dc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/io/qloggingregistry.cpp | 6 ++----
 src/corelib/kernel/qmetatype.cpp    | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index 7745b8ad945..ee7b7c56132 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -337,11 +337,9 @@ void QLoggingRegistry::registerCategory(QLoggingCategory *cat, QtMsgType enableF
 {
     const auto locker = qt_scoped_lock(registryMutex);
 
-    const auto oldSize = categories.size();
-    auto &e = categories[cat];
-    if (categories.size() != oldSize) {
+    auto r = categories.tryEmplace(cat, enableForLevel);
+    if (r.inserted) {
         // new entry
-        e = enableForLevel;
         (*categoryFilter)(cat);
     }
 }
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 045f1e80d4a..f3b9937f6b7 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1688,12 +1688,8 @@ public:
     bool insertIfNotContains(Key k, const T &f)
     {
         const QWriteLocker locker(&lock);
-        const qsizetype oldSize = map.size();
-        auto &e = map[k];
-        if (map.size() == oldSize) // already present
-            return false;
-        e = f;
-        return true;
+        auto r = map.tryEmplace(k, f);
+        return r.inserted;
     }
 
     const T *function(Key k) const