From 88f16720ef778c01219ee147751cf97f2fea76c3 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Tue, 25 Feb 2025 17:08:27 +0000 Subject: Rename AttributesEnum::find to ::contains to match its meaning **** mana/plus!134 --- src/enums/simpletypes/stringdefines.h | 2 +- src/enums/simpletypes/stringdefines2.h | 2 +- src/resources/db/statdb.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/enums/simpletypes/stringdefines.h b/src/enums/simpletypes/stringdefines.h index 4eaf0e76b..b11a80658 100644 --- a/src/enums/simpletypes/stringdefines.h +++ b/src/enums/simpletypes/stringdefines.h @@ -26,7 +26,7 @@ #define stringEnumStart(type) \ std::map mStringsArray; \ - bool find(const std::string &key) \ + bool contains(const std::string &key) \ { \ return mStringsArray.find(key) != mStringsArray.end(); \ } \ diff --git a/src/enums/simpletypes/stringdefines2.h b/src/enums/simpletypes/stringdefines2.h index ab451347b..e162c014c 100644 --- a/src/enums/simpletypes/stringdefines2.h +++ b/src/enums/simpletypes/stringdefines2.h @@ -25,7 +25,7 @@ #include "localconsts.h" #define stringEnumDef(type) \ - bool find(const std::string &key); \ + bool contains(const std::string &key); \ type get(const std::string &key); \ void init(); diff --git a/src/resources/db/statdb.cpp b/src/resources/db/statdb.cpp index d86ac5eb5..64efed07e 100644 --- a/src/resources/db/statdb.cpp +++ b/src/resources/db/statdb.cpp @@ -106,7 +106,7 @@ static void loadBasicStats(XmlNodeConstPtr rootNode) { const std::string name = XML::getProperty(node, "name", ""); const std::string attr = XML::getProperty(node, "attr", ""); - if (attr.empty() || AttributesEnum::find(attr) == false) + if (attr.empty() || AttributesEnum::contains(attr) == false) { const int id = XML::getProperty(node, "id", 0); if (id <= 0 || id >= maxAttr) @@ -144,7 +144,7 @@ static void loadStats(XmlNodeConstPtr rootNode, { const std::string name = XML::getProperty(node, "name", ""); const std::string attr = XML::getProperty(node, "attr", ""); - if (attr.empty() || AttributesEnum::find(attr) == false) + if (attr.empty() || AttributesEnum::contains(attr) == false) { const int id = XML::getProperty(node, "id", 0); if (id <= 0 || id >= maxAttr) -- cgit v1.2.3-70-g09d2