From 68887e79a08eeac891ecbbbf87d0c74c5dac1345 Mon Sep 17 00:00:00 2001 From: Igor Fedosov Date: Thu, 14 Jul 2022 17:02:35 +0300 Subject: [PATCH 1/3] Makes key inside Collection::getCollection use lowercase --- components/files/collections.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/files/collections.cpp b/components/files/collections.cpp index a933eb682c..6f8935d322 100644 --- a/components/files/collections.cpp +++ b/components/files/collections.cpp @@ -20,11 +20,12 @@ namespace Files const MultiDirCollection& Collections::getCollection(const std::string& extension) const { - MultiDirCollectionContainer::iterator iter = mCollections.find(extension); + std::string ext = Misc::StringUtils::lowerCase(extension); + MultiDirCollectionContainer::iterator iter = mCollections.find(ext); if (iter==mCollections.end()) { std::pair result = - mCollections.insert(std::make_pair(extension, MultiDirCollection(mDirectories, extension, mFoldCase))); + mCollections.insert(std::make_pair(ext, MultiDirCollection(mDirectories, ext, mFoldCase))); iter = result.first; } From 32d50765ab851259d0d70a361faec7ab37d488af Mon Sep 17 00:00:00 2001 From: Matt <3397065-ZehMatt@users.noreply.gitlab.com> Date: Thu, 14 Jul 2022 16:50:15 +0000 Subject: [PATCH 2/3] Apply 1 suggestion(s) to 1 file(s) --- components/files/collections.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/files/collections.cpp b/components/files/collections.cpp index 6f8935d322..0db24f2ab8 100644 --- a/components/files/collections.cpp +++ b/components/files/collections.cpp @@ -25,7 +25,7 @@ namespace Files if (iter==mCollections.end()) { std::pair result = - mCollections.insert(std::make_pair(ext, MultiDirCollection(mDirectories, ext, mFoldCase))); + mCollections.emplace(ext, MultiDirCollection(mDirectories, ext, mFoldCase)); iter = result.first; } From 888d009a1e03570832f7cfdcbb7f7a767348e04f Mon Sep 17 00:00:00 2001 From: Matt <3397065-ZehMatt@users.noreply.gitlab.com> Date: Thu, 14 Jul 2022 16:50:25 +0000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) --- components/files/collections.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/files/collections.cpp b/components/files/collections.cpp index 0db24f2ab8..3668aeadcd 100644 --- a/components/files/collections.cpp +++ b/components/files/collections.cpp @@ -21,7 +21,7 @@ namespace Files const MultiDirCollection& Collections::getCollection(const std::string& extension) const { std::string ext = Misc::StringUtils::lowerCase(extension); - MultiDirCollectionContainer::iterator iter = mCollections.find(ext); + auto iter = mCollections.find(ext); if (iter==mCollections.end()) { std::pair result =