X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fbase%2Festring.h;h=727d591e45671dbe05fd721f78e9a8d6c9ebd00e;hb=26ffb5f9f32d3939c8f4bb6601bfed424bd13a14;hp=a0b161de99059ec2a01511a0cd51319a73126601;hpb=4269ecde13580077c4d234b21784f704bf43e8fc;p=vuplus_dvbapp

diff --git a/lib/base/estring.h b/lib/base/estring.h
index a0b161d..727d591 100644
--- a/lib/base/estring.h
+++ b/lib/base/estring.h
@@ -6,13 +6,23 @@
 #include <stdio.h>
 #include "eerror.h"
 
+std::string buildShortName( const std::string &str );
+
 int strnicmp(const char*, const char*, int);
 
 std::string getNum(int num, int base=10);
-std::string convertDVBUTF8(const unsigned char *data, int len, int table=5);
-std::string convertUTF8DVB(const std::string &string);  // with default ISO8859-5
-std::string convertDVBUTF8(const std::string &s, int table=5);
+
+std::string convertDVBUTF8(const unsigned char *data, int len, int table=1, int tsidonid=1); // with default ISO8859-1 / Latin1
 std::string convertLatin1UTF8(const std::string &string);
 int isUTF8(const std::string &string);
 
+std::string removeDVBChars(const std::string &s);
+void makeUpper(std::string &s);
+std::string replace_all(const std::string &in, const std::string &entity, const std::string &symbol);
+
+inline std::string convertDVBUTF8(const std::string &string, int table=1, int tsidonid=1) // with default ISO8859-1 / Latin1
+{
+	return convertDVBUTF8((const unsigned char*)string.c_str(), string.length(), table, tsidonid);
+}
+
 #endif // __E_STRING__