diff options
Diffstat (limited to '3rdparty/lzma/CPP/Common/TextConfig.cpp')
-rw-r--r-- | 3rdparty/lzma/CPP/Common/TextConfig.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/3rdparty/lzma/CPP/Common/TextConfig.cpp b/3rdparty/lzma/CPP/Common/TextConfig.cpp index 9ae4074b690..d3e561c2d29 100644 --- a/3rdparty/lzma/CPP/Common/TextConfig.cpp +++ b/3rdparty/lzma/CPP/Common/TextConfig.cpp @@ -15,7 +15,7 @@ static AString GetIDString(const char *s, unsigned &finishPos) AString result; for (finishPos = 0; ; finishPos++) { - char c = s[finishPos]; + const char c = s[finishPos]; if (IsDelimitChar(c) || c == '=') break; result += c; @@ -35,7 +35,7 @@ static bool SkipSpaces(const AString &s, unsigned &pos) { for (; pos < s.Len(); pos++) { - char c = s[pos]; + const char c = s[pos]; if (!IsDelimitChar(c)) { if (c != ';') @@ -61,7 +61,7 @@ bool GetTextConfig(const AString &s, CObjectVector<CTextConfigPair> &pairs) break; CTextConfigPair pair; unsigned finishPos; - AString temp = GetIDString(((const char *)s) + pos, finishPos); + const AString temp (GetIDString(((const char *)s) + pos, finishPos)); if (!ConvertUTF8ToUnicode(temp, pair.ID)) return false; if (finishPos == 0) @@ -107,17 +107,17 @@ bool GetTextConfig(const AString &s, CObjectVector<CTextConfigPair> &pairs) return true; } -int FindTextConfigItem(const CObjectVector<CTextConfigPair> &pairs, const UString &id) throw() +int FindTextConfigItem(const CObjectVector<CTextConfigPair> &pairs, const char *id) throw() { FOR_VECTOR (i, pairs) - if (pairs[i].ID == id) - return i; + if (pairs[i].ID.IsEqualTo(id)) + return (int)i; return -1; } -UString GetTextConfigValue(const CObjectVector<CTextConfigPair> &pairs, const UString &id) +UString GetTextConfigValue(const CObjectVector<CTextConfigPair> &pairs, const char *id) { - int index = FindTextConfigItem(pairs, id); + const int index = FindTextConfigItem(pairs, id); if (index < 0) return UString(); return pairs[index].String; |