diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-03-01 11:03:37 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-03-01 11:03:37 +1100 |
| commit | 1b808ad6a4e623c564513a72cedc17581426942f (patch) | |
| tree | f0671c60ec9680f4c4d2e9f7e8c85028b833b0cf /src/CaseConvert.cxx | |
| parent | 13f7cab5a5894313d2245ae56d6f2e7b1f0d7307 (diff) | |
| download | scintilla-mirror-1b808ad6a4e623c564513a72cedc17581426942f.tar.gz | |
Backport: Mark variables as const where simple.
Backport of changeset 6470:d78a4b522662.
Diffstat (limited to 'src/CaseConvert.cxx')
| -rw-r--r-- | src/CaseConvert.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx index df293f338..76bc0c652 100644 --- a/src/CaseConvert.cxx +++ b/src/CaseConvert.cxx @@ -621,11 +621,11 @@ public: for (int b=1; b<widthCharBytes; b++) { bytes[b] = (mixedPos+b < lenMixed) ? mixed[mixedPos+b] : 0; } - int classified = UTF8Classify(bytes, widthCharBytes); + const int classified = UTF8Classify(bytes, widthCharBytes); if (!(classified & UTF8MaskInvalid)) { // valid UTF-8 lenMixedChar = classified & UTF8MaskWidth; - int character = UnicodeFromUTF8(bytes); + const int character = UnicodeFromUTF8(bytes); caseConverted = Find(character); } } @@ -759,7 +759,7 @@ void SetupConversions(enum CaseConversion conversion) { sComplex++; lowerUTF8[i] = 0; - int character = UnicodeFromUTF8(reinterpret_cast<unsigned char *>(originUTF8)); + const int character = UnicodeFromUTF8(reinterpret_cast<unsigned char *>(originUTF8)); if (conversion == CaseConversionFold && foldedUTF8[0]) { caseConvFold.Add(character, foldedUTF8); @@ -826,7 +826,7 @@ size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixe std::string CaseConvertString(const std::string &s, enum CaseConversion conversion) { std::string retMapped(s.length() * maxExpansionCaseConversion, 0); - size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(), + const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(), conversion); retMapped.resize(lenMapped); return retMapped; |