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

Merge branch 'master' into osxff29

This commit is contained in:
rgaudin 2014-05-04 18:41:02 +00:00
parent 9a5e6d70d6 8573f9eda0
commit 53b16f6b89
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/stringTools.cpp
View File

@ -119,6 +119,8 @@ std::string kiwix::urlEncode(const std::string &c) {
return escaped;
}
#endif
static char charFromHex(std::string a) {
std::istringstream Blat(a);
int Z;
@ -137,8 +139,6 @@ std::string kiwix::urlDecode(const std::string &originalUrl) {
return url;
}
#endif
/* Split string in a token array */
std::vector<std::string> kiwix::split(const std::string & str,
const std::string & delims=" *-")

3
src/common/stringTools.h
View File

@ -42,13 +42,14 @@ namespace kiwix {
std::string removeAccents(const std::string &text);
std::string beautifyInteger(const unsigned int number);
std::string urlEncode(const std::string &c);
std::string urlDecode(const std::string &c);
void printStringInHexadecimal(const char *s);
void printStringInHexadecimal(UnicodeString s);
void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr);
#endif
std::string urlDecode(const std::string &c);
std::vector<std::string> split(const std::string&, const std::string&);
std::vector<std::string> split(const char*, const char*);
std::vector<std::string> split(const std::string&, const char*);