3 files changed, 18 insertions, 18 deletions

diff --git a/plugins/Watrack_MPD/src/main.cpp b/plugins/Watrack_MPD/src/main.cpp
index 079718a0f9..a4ca0c1943 100755
--- a/plugins/Watrack_MPD/src/main.cpp
+++ b/plugins/Watrack_MPD/src/main.cpp
@@ -75,7 +75,7 @@ int Parser()
 		if(!Connected)
 		{
 			char tmp[128];
-			char *tmp2 = mir_t2a(gbPassword);
+			char *tmp2 = mir_u2a(gbPassword);
 			recvResult = CallService(MS_NETLIB_GETMOREPACKETS,(WPARAM)ghPacketReciever, (LPARAM)&nlpr);
 			if(recvResult == SOCKET_ERROR)
 			{
@@ -124,20 +124,20 @@ int Parser()
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
 		strncpy_s(ver, tmp, _TRUNCATE);
-		SongInfo.txtver = mir_utf8decodeT(tmp);
+		SongInfo.txtver = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.txtver = mir_utf8decodeT(ver);
+		SongInfo.txtver = mir_utf8decodeW(ver);
 	if(ptr = strstr(buf, "file:"))
 	{
 		ptr = &ptr[6];
 		for(i = 0; ((ptr[i] != '\n') && (ptr[i] != '\0')); i++)
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
-		SongInfo.mfile = mir_utf8decodeT(tmp);
+		SongInfo.mfile = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.mfile = mir_tstrdup(L"");
+		SongInfo.mfile = mir_wstrdup(L"");
 	if(ptr = strstr(buf, "Time:"))
 	{
 		ptr = &ptr[6];
@@ -164,50 +164,50 @@ int Parser()
 		for(i = 0; ((ptr[i] != '\n') && (ptr[i] != '\0')); i++)
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
-		SongInfo.title = mir_utf8decodeT(tmp);
+		SongInfo.title = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.title = mir_tstrdup(L"Unknown track");
+		SongInfo.title = mir_wstrdup(L"Unknown track");
 	if(ptr = strstr(buf, "Artist:"))
 	{
 		ptr = &ptr[8];
 		for(i = 0; ((ptr[i] != '\n') && (ptr[i] != '\0')); i++)
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
-		SongInfo.artist = mir_utf8decodeT(tmp);
+		SongInfo.artist = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.artist = mir_tstrdup(L"Unknown artist");
+		SongInfo.artist = mir_wstrdup(L"Unknown artist");
 	if(ptr = strstr(buf, "Genre:"))
 	{
 		ptr = &ptr[7];
 		for(i = 0; ((ptr[i] != '\n') && (ptr[i] != '\0')); i++)
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
-		SongInfo.genre = mir_utf8decodeT(tmp);
+		SongInfo.genre = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.genre =  mir_tstrdup(L"Unknown genre");
+		SongInfo.genre =  mir_wstrdup(L"Unknown genre");
 	if(ptr = strstr(buf, "Album:"))
 	{
 		ptr = &ptr[7];
 		for(i = 0; ((ptr[i] != '\n') && (ptr[i] != '\0')); i++)
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
-		SongInfo.album = mir_utf8decodeT(tmp);
+		SongInfo.album = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.album =  mir_tstrdup(L"Unknown album");
+		SongInfo.album =  mir_wstrdup(L"Unknown album");
 	if(ptr = strstr(buf, "Date:"))
 	{
 		ptr = &ptr[6];
 		for(i = 0; ((ptr[i] != '\n') && (ptr[i] != '\0')); i++)
 			tmp[i] = ptr[i];
 		tmp[i] = '\0';
-		SongInfo.year = mir_utf8decodeT(tmp);
+		SongInfo.year = mir_utf8decodeW(tmp);
 	}
 	else
-		SongInfo.year =  mir_tstrdup(L"Unknown year");
+		SongInfo.year =  mir_wstrdup(L"Unknown year");
 	if(ptr = strstr(buf, "volume:"))
 	{
 		ptr = &ptr[8];
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp
index 315c2f4100..3178947f61 100755
--- a/plugins/Watrack_MPD/src/options.cpp
+++ b/plugins/Watrack_MPD/src/options.cpp
@@ -52,10 +52,10 @@ static INT_PTR CALLBACK DlgProcWaMpdOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 			gbPort = (WORD)GetDlgItemInt(hwndDlg, IDC_PORT, NULL, FALSE);
 			GetDlgItemText(hwndDlg, IDC_SERVER, szText, _countof(szText));
 			db_set_ts(NULL, szModuleName, "Server", szText);
-			mir_tstrcpy(gbHost, szText);
+			mir_wstrcpy(gbHost, szText);
 			GetDlgItemText(hwndDlg, IDC_PASSWORD, szText, _countof(szText));
 			db_set_ts(NULL, szModuleName, "Password", szText);
-			mir_tstrcpy(gbPassword, szText);
+			mir_wstrcpy(gbPassword, szText);
           return TRUE;
         }
       }
diff --git a/plugins/Watrack_MPD/src/utilities.cpp b/plugins/Watrack_MPD/src/utilities.cpp
index edaf3f42bd..c3e9e40cc8 100755
--- a/plugins/Watrack_MPD/src/utilities.cpp
+++ b/plugins/Watrack_MPD/src/utilities.cpp
@@ -20,5 +20,5 @@
 wchar_t* __stdcall UniGetContactSettingUtf(MCONTACT hContact, const char *szModule,const char* szSetting, wchar_t* szDef)
 {
 	wchar_t *szRes = db_get_tsa(hContact, szModule, szSetting);
-	return szRes ? szRes  : mir_tstrdup(szDef);
+	return szRes ? szRes  : mir_wstrdup(szDef);
 }