[Bf-blender-cvs] [754f6749773] master: Cleanup: Missing trailing underscore in private asset system member vars

[Julian Eisel]

Commit: 754f67497731ee760852348ce0d3779ca8ae2d05
Author: Julian Eisel
Date:   Fri Nov 18 12:43:33 2022 +0100
Branches: master
https://developer.blender.org/rB754f67497731ee760852348ce0d3779ca8ae2d05

Cleanup: Missing trailing underscore in private asset system member vars

See style guide:
https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Class_data_member_names

===================================================================

M	source/blender/asset_system/AS_asset_catalog.hh
M	source/blender/asset_system/intern/asset_catalog.cc

===================================================================

diff --git a/source/blender/asset_system/AS_asset_catalog.hh b/source/blender/asset_system/AS_asset_catalog.hh
index d11717736af..6c4fdeedaad 100644
--- a/source/blender/asset_system/AS_asset_catalog.hh
+++ b/source/blender/asset_system/AS_asset_catalog.hh
@@ -424,8 +424,8 @@ using MutableAssetCatalogOrderedSet = std::set<AssetCatalog *, AssetCatalogLessT
  * \see AssetCatalogService::create_catalog_filter()
  */
 class AssetCatalogFilter {
-  const Set<CatalogID> matching_catalog_ids;
-  const Set<CatalogID> known_catalog_ids;
+  const Set<CatalogID> matching_catalog_ids_;
+  const Set<CatalogID> known_catalog_ids_;
 
   friend AssetCatalogService;
 
diff --git a/source/blender/asset_system/intern/asset_catalog.cc b/source/blender/asset_system/intern/asset_catalog.cc
index 67663503213..9b47aca1209 100644
--- a/source/blender/asset_system/intern/asset_catalog.cc
+++ b/source/blender/asset_system/intern/asset_catalog.cc
@@ -960,14 +960,14 @@ std::string AssetCatalog::sensible_simple_name_for_path(const AssetCatalogPath &
 
 AssetCatalogFilter::AssetCatalogFilter(Set<CatalogID> &&matching_catalog_ids,
                                        Set<CatalogID> &&known_catalog_ids)
-    : matching_catalog_ids(std::move(matching_catalog_ids)),
-      known_catalog_ids(std::move(known_catalog_ids))
+    : matching_catalog_ids_(std::move(matching_catalog_ids)),
+      known_catalog_ids_(std::move(known_catalog_ids))
 {
 }
 
 bool AssetCatalogFilter::contains(const CatalogID asset_catalog_id) const
 {
-  return matching_catalog_ids.contains(asset_catalog_id);
+  return matching_catalog_ids_.contains(asset_catalog_id);
 }
 
 bool AssetCatalogFilter::is_known(const CatalogID asset_catalog_id) const
@@ -975,7 +975,7 @@ bool AssetCatalogFilter::is_known(const CatalogID asset_catalog_id) const
   if (BLI_uuid_is_nil(asset_catalog_id)) {
     return false;
   }
-  return known_catalog_ids.contains(asset_catalog_id);
+  return known_catalog_ids_.contains(asset_catalog_id);
 }
 
 }  // namespace blender::asset_system