Completed split up of Unicode and ANSI version

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@542 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 0 insertions, 101 deletions

diff --git a/tipper/str_utils.cpp b/tipper/str_utils.cpp
index b226bfe..d1273be 100644
--- a/tipper/str_utils.cpp
+++ b/tipper/str_utils.cpp
@@ -18,35 +18,6 @@ bool w2a(const wchar_t *ws, char *buff, int bufflen) {
 	return true;

 }

 

-bool u2w(const char *us, wchar_t *buff, int bufflen) {

-	if(us) MultiByteToWideChar(CP_UTF8, 0, us, -1, buff, bufflen);

-	return true;

-}

-

-bool w2u(const wchar_t *ws, char *buff, int bufflen) {

-	if(ws) WideCharToMultiByte(CP_UTF8, 0, ws, -1, buff, bufflen, 0, 0);

-	return true;

-}

-

-bool a2u(const char *as, char *buff, int bufflen) {

-	if(!as) return false;

-

-	wchar_t *ws = a2w(as);

-	if(ws) WideCharToMultiByte(CP_UTF8, 0, ws, -1, buff, bufflen, 0, 0);

-	free(ws);

-	return true;

-}

-

-bool u2a(const char *us, char *buff, int bufflen) {

-	if(!us) return false;

-

-	wchar_t *ws = u2w(us);

-	if(ws) WideCharToMultiByte(code_page, 0, ws, -1, buff, bufflen, 0, 0);

-	free(ws);

-	return true;

-}

-

-

 bool t2w(const TCHAR *ts, wchar_t *buff, int bufflen) {

 #ifdef _UNICODE

 	wcsncpy(buff, ts, bufflen);

@@ -83,42 +54,6 @@ bool a2t(const char *as, TCHAR *buff, int bufflen) {
 #endif

 }

 

-bool t2u(const TCHAR *ts, char *buff, int bufflen) {

-#ifdef _UNICODE

-	return w2u(ts, buff, bufflen);

-#else

-	return a2u(ts, buff, bufflen);

-#endif

-}

-

-bool u2t(const char *us, TCHAR *buff, int bufflen) {

-#ifdef _UNICODE

-	return u2w(us, buff, bufflen);

-#else

-	return u2a(us, buff, bufflen);

-#endif

-}

-

-wchar_t *u2w(const char *us) {

-	if(us) {

-		int size = MultiByteToWideChar(CP_UTF8, 0, us, -1, 0, 0);

-		wchar_t *buff = (wchar_t *)malloc(size * sizeof(wchar_t));

-		MultiByteToWideChar(CP_UTF8, 0, us, -1, buff, size);

-		return buff;

-	} else

-		return 0;

-}

-

-char *w2u(const wchar_t *ws) {

-	if(ws) {

-		int size = WideCharToMultiByte(CP_UTF8, 0, ws, -1, 0, 0, 0, 0);

-		char *buff = (char *)malloc(size);

-		WideCharToMultiByte(CP_UTF8, 0, ws, -1, buff, size, 0, 0);

-		return buff;

-	} else 

-		return 0;

-}

-

 wchar_t *a2w(const char *as) {

 	int size = MultiByteToWideChar(code_page, 0, as, -1, 0, 0);

 	wchar_t *buff = (wchar_t *)malloc(size * sizeof(wchar_t));

@@ -133,20 +68,6 @@ char *w2a(const wchar_t *ws) {
 	return buff;

 }

 

-char *u2a(const char *utfs) {

-	wchar_t *ws = u2w(utfs);

-	char *ret = w2a(ws);

-	free(ws);

-	return ret;

-}

-

-char *a2u(const char *as) {

-	wchar_t *ws = a2w(as);

-	char *ret = w2u(ws);

-	free(ws);

-	return ret;

-}

-

 TCHAR *w2t(const wchar_t *ws) {

 #ifdef _UNICODE

 	return wcsdup(ws);

@@ -179,25 +100,3 @@ TCHAR *a2t(const char *as) {
 	return _strdup(as);

 #endif

 }

-

-TCHAR *u2t(const char *utfs) {

-#ifdef _UNICODE

-	return u2w(utfs);

-#else

-	wchar_t *ws = u2w(utfs);

-	char *ret = w2a(ws);

-	free(ws);

-	return ret;

-#endif

-}

-

-char *t2u(const TCHAR *ts) {

-#ifdef _UNICODE

-	return w2u(ts);

-#else

-	wchar_t *ws = a2w(ts);

-	char *ret = w2u(ws);

-	free(ws);

-	return ret;

-#endif

-}