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

+ android integrates now libicu

This commit is contained in:
kelson42 2013-11-12 02:03:34 +01:00
parent 39fa510af5
commit ad20fde08f
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/stringTools.cpp
View File

@ -176,15 +176,10 @@ std::string kiwix::ucFirst (const std::string &word) {
std::string result; std::string result;
#ifdef __ANDROID__
result = word;
result[0] = toupper(result[0]);
#else
UnicodeString unicodeWord(word.c_str()); UnicodeString unicodeWord(word.c_str());
UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toUpper(); UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toUpper();
unicodeWord.replace(0, 1, unicodeFirstLetter); unicodeWord.replace(0, 1, unicodeFirstLetter);
unicodeWord.toUTF8String(result); unicodeWord.toUTF8String(result);
#endif
return result; return result;
} }
@ -195,15 +190,10 @@ std::string kiwix::lcFirst (const std::string &word) {
std::string result; std::string result;
#ifdef __ANDROID__
result = word;
result[0] = tolower(result[0]);
#else
UnicodeString unicodeWord(word.c_str()); UnicodeString unicodeWord(word.c_str());
UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toLower(); UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toLower();
unicodeWord.replace(0, 1, unicodeFirstLetter); unicodeWord.replace(0, 1, unicodeFirstLetter);
unicodeWord.toUTF8String(result); unicodeWord.toUTF8String(result);
#endif
return result; return result;
} }
@ -215,13 +205,9 @@ std::string kiwix::toTitle (const std::string &word) {
std::string result; std::string result;
#ifdef __ANDROID__
result = word;
#else
UnicodeString unicodeWord(word.c_str()); UnicodeString unicodeWord(word.c_str());
unicodeWord = unicodeWord.toTitle(0); unicodeWord = unicodeWord.toTitle(0);
unicodeWord.toUTF8String(result); unicodeWord.toUTF8String(result);
#endif
return result; return result;
} }

2
src/common/stringTools.h
View File

@ -20,7 +20,6 @@
#ifndef KIWIX_STRINGTOOLS_H #ifndef KIWIX_STRINGTOOLS_H
#define KIWIX_STRINGTOOLS_H #define KIWIX_STRINGTOOLS_H
#ifndef __ANDROID__
#include <unicode/translit.h> #include <unicode/translit.h>
#include <unicode/normlzr.h> #include <unicode/normlzr.h>
#include <unicode/unistr.h> #include <unicode/unistr.h>
@ -29,7 +28,6 @@
#include <unicode/uniset.h> #include <unicode/uniset.h>
#include <unicode/ustring.h> #include <unicode/ustring.h>
#include <unicode/ucnv.h> #include <unicode/ucnv.h>
#endif
#include <iostream> #include <iostream>
#include <vector> #include <vector>