smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ fix kiwix:ucFirst and kiwix:lcFirst

This commit is contained in:
kelson42 2013-11-05 12:08:43 +01:00
parent 835388daf9
commit 2ad238f095
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/stringTools.cpp
View File

@ -174,36 +174,36 @@ std::string kiwix::ucFirst (const std::string &word) {
if (word.empty()) if (word.empty())
return ""; return "";
std::string ucFirstWord; std::string result;
#ifdef __ANDROID__ #ifdef __ANDROID__
ucFirstWord = word; result = word;
ucFirstWord[0] = toupper(ucFirstWord[0]); result[0] = toupper(result[0]);
#else #else
UnicodeString firstLetter = UnicodeString(word.substr(0, 1).c_str()); UnicodeString unicodeWord(word.c_str());
UnicodeString ucFirstLetter = firstLetter.toUpper(); UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toUpper();
ucFirstLetter.toUTF8String(ucFirstWord); unicodeWord.replace(0, 1, unicodeFirstLetter);
ucFirstWord += word.substr(1); unicodeWord.toUTF8String(result);
#endif #endif
return ucFirstWord; return result;
} }
std::string kiwix::lcFirst (const std::string &word) { std::string kiwix::lcFirst (const std::string &word) {
if (word.empty()) if (word.empty())
return ""; return "";
std::string ucFirstWord; std::string result;
#ifdef __ANDROID__ #ifdef __ANDROID__
ucFirstWord = word; result = word;
ucFirstWord[0] = tolower(ucFirstWord[0]); result[0] = tolower(result[0]);
#else #else
UnicodeString firstLetter = UnicodeString(word.substr(0, 1).c_str()); UnicodeString unicodeWord(word.c_str());
UnicodeString ucFirstLetter = firstLetter.toLower(); UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toLower();
ucFirstLetter.toUTF8String(ucFirstWord); unicodeWord.replace(0, 1, unicodeFirstLetter);
ucFirstWord += word.substr(1); unicodeWord.toUTF8String(result);
#endif #endif
return ucFirstWord; return result;
} }