mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 15:09:39 +00:00
Code Issues Releases Wiki Activity

Remove return value for in-place toLowerStr

Browse source
This commit is contained in:
scrawl 2015-12-07 22:41:55 +01:00
parent 4dd4c5394b
commit e3d3380c8c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/essimporter/converter.hpp
View file

@ -381,7 +381,7 @@ public:
bool isDeleted = false; bool isDeleted = false;
faction.load(esm, isDeleted); faction.load(esm, isDeleted);
std::string id = Misc::StringUtils::toLower(faction.mId); std::string id = Misc::StringUtils::lowerCase(faction.mId);
for (std::map<std::string, int>::const_iterator it = faction.mReactions.begin(); it != faction.mReactions.end(); ++it) for (std::map<std::string, int>::const_iterator it = faction.mReactions.begin(); it != faction.mReactions.end(); ++it)
{ {

10
components/misc/stringops.hpp
View file

@ -94,22 +94,22 @@ public:
} }
/// Transforms input string to lower case w/o copy /// Transforms input string to lower case w/o copy
static std::string &toLower(std::string &inout) { static void toLower(std::string &inout) {
for (unsigned int i=0; i<inout.size(); ++i) for (unsigned int i=0; i<inout.size(); ++i)
inout[i] = toLower(inout[i]); inout[i] = toLower(inout[i]);
return inout;
} }
static std::string &toLowerStr(std::string &inout) static void toLowerStr(std::string &inout)
{ {
return toLower(inout); toLower(inout);
} }
/// Returns lower case copy of input string /// Returns lower case copy of input string
static std::string lowerCase(const std::string &in) static std::string lowerCase(const std::string &in)
{ {
std::string out = in; std::string out = in;
return toLower(out); toLower(out);
return out;
} }
}; };

2
components/nifosg/nifloader.cpp
View file

@ -254,7 +254,7 @@ namespace
nextpos = std::distance(str.begin(), ++last); nextpos = std::distance(str.begin(), ++last);
} }
std::string result = str.substr(pos, nextpos-pos); std::string result = str.substr(pos, nextpos-pos);
textkeys.insert(std::make_pair(tk->list[i].time, Misc::StringUtils::toLower(result))); textkeys.insert(std::make_pair(tk->list[i].time, Misc::StringUtils::lowerCase(result)));
pos = nextpos; pos = nextpos;
} }