From e69c372056b574f9d70d216418172405643421fe Mon Sep 17 00:00:00 2001
From: Benjamin Nauck <benjamin@nauck.se>
Date: Wed, 12 Mar 2025 15:59:55 +0100
Subject: [PATCH] Material: use `contains()` and `isEmpty()` instead of
 `count()` where possible

# Conflicts:
#	src/Mod/Material/App/ModelLibrary.cpp
---
 src/Mod/Material/App/MaterialLibrary.cpp | 4 ++--
 src/Mod/Material/App/ModelLibrary.cpp    | 2 +-
 src/Mod/Material/App/ModelLoader.cpp     | 6 +++---
 src/Mod/Material/Gui/MaterialSave.cpp    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Material/App/MaterialLibrary.cpp b/src/Mod/Material/App/MaterialLibrary.cpp
index f0af06492b..b5a83b10a3 100644
--- a/src/Mod/Material/App/MaterialLibrary.cpp
+++ b/src/Mod/Material/App/MaterialLibrary.cpp
@@ -92,7 +92,7 @@ MaterialLibrary::getMaterialTree(const std::shared_ptr<Materials::MaterialFilter
         for (auto& itp : list) {
             if (!itp.isEmpty()) {
                 // Add the folder only if it's not already there
-                if (node->count(itp) == 0) {
+                if (!node->contains(itp)) {
                     auto mapPtr = std::make_shared<
                         std::map<QString, std::shared_ptr<MaterialTreeNode>>>();
                     std::shared_ptr<MaterialTreeNode> child =
@@ -125,7 +125,7 @@ MaterialLibrary::getMaterialTree(const std::shared_ptr<Materials::MaterialFilter
     //             auto node = materialTree;
     //             for (auto& itp : list) {
     //                 // Add the folder only if it's not already there
-    //                 if (node->count(itp) == 0) {
+    //                 if (!node->contains(itp)) {
     //                     std::shared_ptr<std::map<QString, std::shared_ptr<MaterialTreeNode>>>
     //                         mapPtr = std::make_shared<
     //                             std::map<QString, std::shared_ptr<MaterialTreeNode>>>();
diff --git a/src/Mod/Material/App/ModelLibrary.cpp b/src/Mod/Material/App/ModelLibrary.cpp
index c05e39a6bb..a1346ae25c 100644
--- a/src/Mod/Material/App/ModelLibrary.cpp
+++ b/src/Mod/Material/App/ModelLibrary.cpp
@@ -87,7 +87,7 @@ ModelLibrary::getModelTree(ModelFilter filter) const
             std::shared_ptr<std::map<QString, std::shared_ptr<ModelTreeNode>>> node = modelTree;
             for (auto& itp : list) {
                 // Add the folder only if it's not already there
-                if (node->count(itp) == 0) {
+                if (!node->contains(itp)) {
                     auto mapPtr =
                         std::make_shared<std::map<QString, std::shared_ptr<ModelTreeNode>>>();
                     std::shared_ptr<ModelTreeNode> child = std::make_shared<ModelTreeNode>();
diff --git a/src/Mod/Material/App/ModelLoader.cpp b/src/Mod/Material/App/ModelLoader.cpp
index 36dd8b1db6..f615f26abb 100644
--- a/src/Mod/Material/App/ModelLoader.cpp
+++ b/src/Mod/Material/App/ModelLoader.cpp
@@ -163,7 +163,7 @@ void ModelLoader::dereference(const QString& uuid,
     auto childProperties = childYaml[childBase];
     for (auto it = childProperties.begin(); it != childProperties.end(); it++) {
         std::string name = it->first.as<std::string>();
-        if (exclude.count(QString::fromStdString(name)) == 0) {
+        if (!exclude.contains(QString::fromStdString(name))) {
             // showYaml(it->second);
             if (!parentProperties[name]) {
                 parentProperties[name] = it->second;
@@ -261,7 +261,7 @@ void ModelLoader::addToTree(std::shared_ptr<ModelEntry> model,
     auto yamlProperties = yamlModel[base];
     for (auto it = yamlProperties.begin(); it != yamlProperties.end(); it++) {
         std::string propName = it->first.as<std::string>();
-        if (exclude.count(QString::fromStdString(propName)) == 0) {
+        if (!exclude.contains(QString::fromStdString(propName))) {
             // showYaml(it->second);
             auto yamlProp = yamlProperties[propName];
             auto propDisplayName = yamlValue(yamlProp, "DisplayName", "");
@@ -304,7 +304,7 @@ void ModelLoader::addToTree(std::shared_ptr<ModelEntry> model,
             }
 
             auto key = std::pair<QString, QString>(uuid, QString::fromStdString(propName));
-            if (inheritances->count(key) > 0) {
+            if (inheritances->contains(key)) {
                 property.setInheritance((*inheritances)[key]);
             }
 
diff --git a/src/Mod/Material/Gui/MaterialSave.cpp b/src/Mod/Material/Gui/MaterialSave.cpp
index a0c2beca4a..6aca99c381 100644
--- a/src/Mod/Material/Gui/MaterialSave.cpp
+++ b/src/Mod/Material/Gui/MaterialSave.cpp
@@ -404,7 +404,7 @@ void MaterialSave::onSelectModel(const QItemSelection& selected, const QItemSele
     _filename = QString(ui->editFilename->text());  // No filename by default
     auto model = static_cast<QStandardItemModel*>(ui->treeMaterials->model());
     QModelIndexList indexes = selected.indexes();
-    if (indexes.count() == 0) {
+    if (indexes.isEmpty()) {
         _selectedPath = QStringLiteral("/") + _libraryName;
         _selectedFull = _selectedPath;
         _selectedUUID = QString();