From f6f49a63cedefebefa3015b10dd50caf8b6ceb2d Mon Sep 17 00:00:00 2001 From: kelson42 Date: Wed, 1 Oct 2014 20:26:43 +0200 Subject: [PATCH] Re move ANDROID pragma. This is not useful anymore (libicu) is now included --- src/common/stringTools.cpp | 4 ---- src/common/stringTools.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/common/stringTools.cpp b/src/common/stringTools.cpp index 15913b1cc..ef57cab3c 100644 --- a/src/common/stringTools.cpp +++ b/src/common/stringTools.cpp @@ -33,8 +33,6 @@ void kiwix::loadICUExternalTables() { #endif } -#ifndef __ANDROID__ - /* Prepare integer for display */ std::string kiwix::beautifyInteger(const unsigned int number) { std::stringstream numberStream; @@ -143,8 +141,6 @@ std::string kiwix::urlEncode(const std::string &c) { return escaped; } -#endif - static char charFromHex(std::string a) { std::istringstream Blat(a); int Z; diff --git a/src/common/stringTools.h b/src/common/stringTools.h index 8a6683af5..c03953c7f 100644 --- a/src/common/stringTools.h +++ b/src/common/stringTools.h @@ -39,8 +39,6 @@ namespace kiwix { -#ifndef __ANDROID__ - std::string removeAccents(const std::string &text); std::string beautifyInteger(const unsigned int number); std::string beautifyFileSize(const unsigned int number); @@ -49,8 +47,6 @@ namespace kiwix { void printStringInHexadecimal(UnicodeString s); void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr); -#endif - void loadICUExternalTables(); std::string urlDecode(const std::string &c);