more cleanup and grouping functions logically together

1 files changed, 1 insertions, 25 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 4f31b959..a379dbc7 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #include "error.h"
+#include "utility/string.h"
 #include "window.h"
 
 using namespace NCurses;
@@ -923,31 +924,6 @@ Window &Window::operator<<(size_t s)
 	return *this;
 }
 
-std::string ToString(const std::wstring &ws)
-{
-	std::string result;
-	char s[MB_CUR_MAX];
-	for (size_t i = 0; i < ws.length(); ++i)
-	{
-		int n = wcrtomb(s, ws[i], 0);
-		if (n > 0)
-			result.append(s, n);
-	}
-	return result;
-}
-
-std::wstring ToWString(const std::string &s)
-{
-	std::wstring result;
-	wchar_t *ws = new wchar_t[s.length()];
-	const char *c_s = s.c_str();
-	int n = mbsrtowcs(ws, &c_s, s.length(), 0);
-	if (n > 0)
-		result.append(ws, n);
-	delete [] ws;
-	return result;
-}
-
 size_t Window::Length(const std::wstring &ws)
 {
 #	ifdef WIN32