From ad20fde08f434944c0332eba8a48736b3a2b6ea7 Mon Sep 17 00:00:00 2001
From: kelson42 <kelson@kiwix.org>
Date: Tue, 12 Nov 2013 02:03:34 +0100
Subject: [PATCH] + android integrates now libicu

---
 src/common/stringTools.cpp | 14 --------------
 src/common/stringTools.h   |  2 --
 2 files changed, 16 deletions(-)

diff --git a/src/common/stringTools.cpp b/src/common/stringTools.cpp
index 68527ad49..1553c5ba8 100644
--- a/src/common/stringTools.cpp
+++ b/src/common/stringTools.cpp
@@ -176,15 +176,10 @@ std::string kiwix::ucFirst (const std::string &word) {
 
   std::string result;
 
-#ifdef __ANDROID__
-  result = word;
-  result[0] = toupper(result[0]);
-#else
   UnicodeString unicodeWord(word.c_str());
   UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toUpper();
   unicodeWord.replace(0, 1, unicodeFirstLetter);
   unicodeWord.toUTF8String(result); 
-#endif
 
   return result;
 }
@@ -195,15 +190,10 @@ std::string kiwix::lcFirst (const std::string &word) {
 
   std::string result;
 
-#ifdef __ANDROID__
-  result = word;
-  result[0] = tolower(result[0]);
-#else
   UnicodeString unicodeWord(word.c_str());
   UnicodeString unicodeFirstLetter = unicodeWord.tempSubString(0, 1).toLower();
   unicodeWord.replace(0, 1, unicodeFirstLetter);
   unicodeWord.toUTF8String(result);
-#endif
 
   return result;
 }
@@ -215,13 +205,9 @@ std::string kiwix::toTitle (const std::string &word) {
 
   std::string result;
 
-#ifdef __ANDROID__
-  result = word;
-#else
   UnicodeString unicodeWord(word.c_str());
   unicodeWord = unicodeWord.toTitle(0);
   unicodeWord.toUTF8String(result);
-#endif
 
   return result;
 }
diff --git a/src/common/stringTools.h b/src/common/stringTools.h
index 8993c65f5..a3f6da718 100644
--- a/src/common/stringTools.h
+++ b/src/common/stringTools.h
@@ -20,7 +20,6 @@
 #ifndef KIWIX_STRINGTOOLS_H
 #define KIWIX_STRINGTOOLS_H
 
-#ifndef __ANDROID__
 #include <unicode/translit.h>
 #include <unicode/normlzr.h>
 #include <unicode/unistr.h>
@@ -29,7 +28,6 @@
 #include <unicode/uniset.h>
 #include <unicode/ustring.h>
 #include <unicode/ucnv.h>
-#endif
 
 #include <iostream>
 #include <vector>