X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Festring.h;h=99b839bd70f200bdd7d5041517ce2a97474c074b;hp=9cc3180fcb564e92d1a58976c7df0a54897603b9;hb=8bea76d0df509b8d3f570d67a1855efa49c3eaaf;hpb=ddc3964ed95d01e72229dc9af968a327cd84e56c

diff --git a/lib/base/estring.h b/lib/base/estring.h
index 9cc3180..99b839b 100644
--- a/lib/base/estring.h
+++ b/lib/base/estring.h
@@ -6,12 +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(unsigned char *data, int len, int table=5);
-std::string convertUTF8DVB(const std::string &string);  // with default ISO8859-5
+
+std::string convertDVBUTF8(const unsigned char *data, int len, int table=1, int tsidonid=0); // 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=0) // with default ISO8859-1 / Latin1
+{
+	return convertDVBUTF8((const unsigned char*)string.c_str(), string.length(), table, tsidonid);
+}
+
 #endif // __E_STRING__