--- smsdaemon/util.h	2008/06/09 18:15:53	26
+++ smsdaemon/util.h	2008/06/11 19:42:24	59
@@ -4,7 +4,6 @@
 
 #include <string>
 #include <vector>
-#include <cctype>
 
 struct timeval;
 
@@ -12,11 +11,26 @@
 {
 	std::vector<std::string> str_split(std::string input, std::string delimiter);
 	void str_dump(const std::string& str);
-	void str_clean(std::string* str, std::string search, std::string replace = "");
+
+	std::string str_replace(std::string str, std::string search, std::string replace = "");
+	std::string str_striptags(std::string str);
+	std::string str_trim(std::string str);
+
+	std::string str_toupper(std::string str);
+	std::string str_tolower(std::string str);
+
+	std::string str_formatint(int i);
+
+	std::string str_replace_char(std::string str, char search, char replace);
+	std::string str_characters(std::string str);
+
+	std::string str_gsm2latin(std::string str);
+	std::string str_latin2gsm(std::string str);
 
 	std::string readUrl(std::string url, std::string tempfile);
 
 	std::string convertToUnicode(std::string);
+	std::string convertFromUnicode(std::string);
 
 	int uTimeDiff(const timeval& then, const timeval& now);
 	int mTimeDiff(const timeval& then, const timeval& now);
@@ -27,13 +41,6 @@
 	        usleep(1000);
 	}
 
-	inline std::string str_tolower(std::string str)
-	{
-	    for(unsigned int i=0; i<str.size();++i)
-	        str[i] = tolower(str[i]);
-	    return str;
-	}
-
 }