mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 13:06:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'minor_simp_multidircoll' into 'master'

Browse source 
Minor simplification in multidircollection.cpp

See merge request OpenMW/openmw!1963
This commit is contained in:
jvoisin 2022-06-03 17:22:19 +00:00
commit 075ecc8558
2 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/files/multidircollection.cpp
View file

@ -16,22 +16,7 @@ namespace Files
{ {
if (mStrict) if (mStrict)
return left==right; return left==right;
return Misc::StringUtils::ciEqual(left, right);
std::size_t len = left.length();
if (len!=right.length())
return false;
for (std::size_t i=0; i<len; ++i)
{
char l = Misc::StringUtils::toLower (left[i]);
char r = Misc::StringUtils::toLower (right[i]);
if (l!=r)
return false;
}
return true;
} }
}; };

16
components/files/multidircollection.hpp
View file

@ -24,21 +24,7 @@ namespace Files
{ {
if (mStrict) if (mStrict)
return left<right; return left<right;
return Misc::StringUtils::ciLess(left, right);
std::size_t min = std::min (left.length(), right.length());
for (std::size_t i=0; i<min; ++i)
{
char l = Misc::StringUtils::toLower (left[i]);
char r = Misc::StringUtils::toLower (right[i]);
if (l<r)
return true;
if (l>r)
return false;
}
return left.length()<right.length();
} }
}; };