1 files changed, 0 insertions, 153 deletions
diff --git a/src/libui_sdl/libui/windows/utf16.cpp b/src/libui_sdl/libui/windows/utf16.cpp
deleted file mode 100644
index 98954d0..0000000
--- a/src/libui_sdl/libui/windows/utf16.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// 21 april 2016
-#include "uipriv_windows.hpp"
-
-// see http://stackoverflow.com/a/29556509/3408572
-
-#define MBTWC(str, wstr, bufsiz) MultiByteToWideChar(CP_UTF8, 0, str, -1, wstr, bufsiz)
-
-WCHAR *toUTF16(const char *str)
-{
-	WCHAR *wstr;
-	int n;
-
-	if (*str == '\0')			// empty string
-		return emptyUTF16();
-	n = MBTWC(str, NULL, 0);
-	if (n == 0) {
-		logLastError(L"error figuring out number of characters to convert to");
-		return emptyUTF16();
-	}
-	wstr = (WCHAR *) uiAlloc(n * sizeof (WCHAR), "WCHAR[]");
-	if (MBTWC(str, wstr, n) != n) {
-		logLastError(L"error converting from UTF-8 to UTF-16");
-		// and return an empty string
-		*wstr = L'\0';
-	}
-	return wstr;
-}
-
-#define WCTMB(wstr, str, bufsiz) WideCharToMultiByte(CP_UTF8, 0, wstr, -1, str, bufsiz, NULL, NULL)
-
-char *toUTF8(const WCHAR *wstr)
-{
-	char *str;
-	int n;
-
-	if (*wstr == L'\0')		// empty string
-		return emptyUTF8();
-	n = WCTMB(wstr, NULL, 0);
-	if (n == 0) {
-		logLastError(L"error figuring out number of characters to convert to");
-		return emptyUTF8();
-	}
-	str = (char *) uiAlloc(n * sizeof (char), "char[]");
-	if (WCTMB(wstr, str, n) != n) {
-		logLastError(L"error converting from UTF-16 to UTF-8");
-		// and return an empty string
-		*str = '\0';
-	}
-	return str;
-}
-
-WCHAR *utf16dup(const WCHAR *orig)
-{
-	WCHAR *out;
-	size_t len;
-
-	len = wcslen(orig);
-	out = (WCHAR *) uiAlloc((len + 1) * sizeof (WCHAR), "WCHAR[]");
-	wcscpy_s(out, len + 1, orig);
-	return out;
-}
-
-WCHAR *strf(const WCHAR *format, ...)
-{
-	va_list ap;
-	WCHAR *str;
-
-	va_start(ap, format);
-	str = vstrf(format, ap);
-	va_end(ap);
-	return str;
-}
-
-WCHAR *vstrf(const WCHAR *format, va_list ap)
-{
-	va_list ap2;
-	WCHAR *buf;
-	size_t n;
-
-	if (*format == L'\0')
-		return emptyUTF16();
-
-	va_copy(ap2, ap);
-	n = _vscwprintf(format, ap2);
-	va_end(ap2);
-	n++;		// terminating L'\0'
-
-	buf = (WCHAR *) uiAlloc(n * sizeof (WCHAR), "WCHAR[]");
-	// includes terminating L'\0' according to example in https://msdn.microsoft.com/en-us/library/xa1a1a6z.aspx
-	vswprintf_s(buf, n, format, ap);
-
-	return buf;
-}
-
-// Let's shove these utility routines here too.
-// Prerequisite: lfonly is UTF-8.
-char *LFtoCRLF(const char *lfonly)
-{
-	char *crlf;
-	size_t i, len;
-	char *out;
-
-	len = strlen(lfonly);
-	crlf = (char *) uiAlloc((len * 2 + 1) * sizeof (char), "char[]");
-	out = crlf;
-	for (i = 0; i < len; i++) {
-		if (*lfonly == '\n')
-			*crlf++ = '\r';
-		*crlf++ = *lfonly++;
-	}
-	*crlf = '\0';
-	return out;
-}
-
-// Prerequisite: s is UTF-8.
-void CRLFtoLF(char *s)
-{
-	char *t = s;
-
-	for (; *s != '\0'; s++) {
-		// be sure to preserve \rs that are genuinely there
-		if (*s == '\r' && *(s + 1) == '\n')
-			continue;
-		*t++ = *s;
-	}
-	*t = '\0';
-	// pad out the rest of t, just to be safe
-	while (t != s)
-		*t++ = '\0';
-}
-
-// std::to_string() always uses %f; we want %g
-// fortunately std::iostream seems to use %g by default so
-WCHAR *ftoutf16(double d)
-{
-	std::wostringstream ss;
-	std::wstring s;
-
-	ss << d;
-	s = ss.str();		// to be safe
-	return utf16dup(s.c_str());
-}
-
-// to complement the above
-WCHAR *itoutf16(int i)
-{
-	std::wostringstream ss;
-	std::wstring s;
-
-	ss << i;
-	s = ss.str();		// to be safe
-	return utf16dup(s.c_str());
-}