hello, Unix.

phase 1: removing _T()

git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

14 files changed, 84 insertions, 84 deletions

diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index 5538f37b8b..a383681c07 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -332,52 +332,52 @@ int ModulesLoaded(WPARAM, LPARAM)
 		tr.memType = TR_MEM_MIRANDA;

 		tr.flags = TRF_FREEMEM | TRF_PARSEFUNC | TRF_FIELD | TRF_TCHAR;

 

-		tr.tszTokenString = _T("listening_info");

+		tr.tszTokenString = L"listening_info";

 		tr.parseFunctionT = VariablesParseInfo;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Listening info as set in the options");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_type");

+		tr.tszTokenString = L"listening_type";

 		tr.parseFunctionT = VariablesParseType;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Media type: Music, Video, etc.");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_artist");

+		tr.tszTokenString = L"listening_artist";

 		tr.parseFunctionT = VariablesParseArtist;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Artist name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_album");

+		tr.tszTokenString = L"listening_album";

 		tr.parseFunctionT = VariablesParseAlbum;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Album name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_title");

+		tr.tszTokenString = L"listening_title";

 		tr.parseFunctionT = VariablesParseTitle;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_track");

+		tr.tszTokenString = L"listening_track";

 		tr.parseFunctionT = VariablesParseTrack;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Track number");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_year");

+		tr.tszTokenString = L"listening_year";

 		tr.parseFunctionT = VariablesParseYear;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song year");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_genre");

+		tr.tszTokenString = L"listening_genre";

 		tr.parseFunctionT = VariablesParseGenre;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song genre");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_length");

+		tr.tszTokenString = L"listening_length";

 		tr.parseFunctionT = VariablesParseLength;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song length");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		tr.tszTokenString = _T("listening_player");

+		tr.tszTokenString = L"listening_player";

 		tr.parseFunctionT = VariablesParsePlayer;

 		tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Player name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

@@ -539,7 +539,7 @@ void SetListeningInfo(char *proto, LISTENINGTOINFO *lti = NULL)
 			if (opts.xstatus_set == CHECK_XSTATUS_MUSIC) {

 				// Set text to nothing

 				TCHAR *fr[] = {

-					_T("listening"), opts.nothing

+					L"listening", opts.nothing

 				};

 

 				Buffer<TCHAR> name;

@@ -611,16 +611,16 @@ void SetListeningInfo(char *proto, LISTENINGTOINFO *lti = NULL)
 			}

 

 			TCHAR *fr[] = {

-				_T("listening"), GetParsedFormat(lti),

-				_T("artist"), UNKNOWN(lti->ptszArtist),

-				_T("album"), UNKNOWN(lti->ptszAlbum),

-				_T("title"), UNKNOWN(lti->ptszTitle),

-				_T("track"), UNKNOWN(lti->ptszTrack),

-				_T("year"), UNKNOWN(lti->ptszYear),

-				_T("genre"), UNKNOWN(lti->ptszGenre),

-				_T("length"), UNKNOWN(lti->ptszLength),

-				_T("player"), UNKNOWN(lti->ptszPlayer),

-				_T("type"), UNKNOWN(lti->ptszType)

+				L"listening", GetParsedFormat(lti),

+				L"artist", UNKNOWN(lti->ptszArtist),

+				L"album", UNKNOWN(lti->ptszAlbum),

+				L"title", UNKNOWN(lti->ptszTitle),

+				L"track", UNKNOWN(lti->ptszTrack),

+				L"year", UNKNOWN(lti->ptszYear),

+				L"genre", UNKNOWN(lti->ptszGenre),

+				L"length", UNKNOWN(lti->ptszLength),

+				L"player", UNKNOWN(lti->ptszPlayer),

+				L"type", UNKNOWN(lti->ptszType)

 			};

 

 			Buffer<TCHAR> name;

@@ -722,15 +722,15 @@ TCHAR *GetParsedFormat(LISTENINGTOINFO *lti)
 		return NULL;

 

 	TCHAR *fr[] = {

-		_T("artist"), UNKNOWN(lti->ptszArtist),

-		_T("album"), UNKNOWN(lti->ptszAlbum),

-		_T("title"), UNKNOWN(lti->ptszTitle),

-		_T("track"), UNKNOWN(lti->ptszTrack),

-		_T("year"), UNKNOWN(lti->ptszYear),

-		_T("genre"), UNKNOWN(lti->ptszGenre),

-		_T("length"), UNKNOWN(lti->ptszLength),

-		_T("player"), UNKNOWN(lti->ptszPlayer),

-		_T("type"), UNKNOWN(lti->ptszType)

+		L"artist", UNKNOWN(lti->ptszArtist),

+		L"album", UNKNOWN(lti->ptszAlbum),

+		L"title", UNKNOWN(lti->ptszTitle),

+		L"track", UNKNOWN(lti->ptszTrack),

+		L"year", UNKNOWN(lti->ptszYear),

+		L"genre", UNKNOWN(lti->ptszGenre),

+		L"length", UNKNOWN(lti->ptszLength),

+		L"player", UNKNOWN(lti->ptszPlayer),

+		L"type", UNKNOWN(lti->ptszType)

 	};

 

 	Buffer<TCHAR> ret;

@@ -910,19 +910,19 @@ TCHAR* VariablesParseInfo(ARGUMENTSINFO *ai)
 	LISTENINGTOINFO *lti = GetListeningInfo();

 	if (lti == NULL) {

 		ai->flags = AIF_FALSE;

-		return mir_tstrdup(_T(""));

+		return mir_tstrdup(L"");

 	}

 

 	TCHAR *fr[] = {

-		_T("artist"), UNKNOWN(lti->ptszArtist),

-		_T("album"), UNKNOWN(lti->ptszAlbum),

-		_T("title"), UNKNOWN(lti->ptszTitle),

-		_T("track"), UNKNOWN(lti->ptszTrack),

-		_T("year"), UNKNOWN(lti->ptszYear),

-		_T("genre"), UNKNOWN(lti->ptszGenre),

-		_T("length"), UNKNOWN(lti->ptszLength),

-		_T("player"), UNKNOWN(lti->ptszPlayer),

-		_T("type"), UNKNOWN(lti->ptszType)

+		L"artist", UNKNOWN(lti->ptszArtist),

+		L"album", UNKNOWN(lti->ptszAlbum),

+		L"title", UNKNOWN(lti->ptszTitle),

+		L"track", UNKNOWN(lti->ptszTrack),

+		L"year", UNKNOWN(lti->ptszYear),

+		L"genre", UNKNOWN(lti->ptszGenre),

+		L"length", UNKNOWN(lti->ptszLength),

+		L"player", UNKNOWN(lti->ptszPlayer),

+		L"type", UNKNOWN(lti->ptszType)

 	};

 

 	Buffer<TCHAR> ret;

@@ -938,7 +938,7 @@ TCHAR* VariablesParseInfo(ARGUMENTSINFO *ai)
 	if (lti == NULL) \

 			{ \

 		ai->flags = AIF_FALSE; \

-		return mir_tstrdup(_T("")); \

+		return mir_tstrdup(L""); \

 			} \

 				else if (IsEmpty(lti->__field__))  \

 	{ \

diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp
index 90c9c58293..2e36c42b2a 100644
--- a/plugins/ListeningTo/src/options.cpp
+++ b/plugins/ListeningTo/src/options.cpp
@@ -51,10 +51,10 @@ static OptPageControl optionsControls[] = {
 };

 

 static OptPageControl formatControls[] = {

-	{ &opts.templ, CONTROL_TEXT, IDC_TEMPLATE, "Template", (ULONG_PTR)_T("%artist% - %title%") },

+	{ &opts.templ, CONTROL_TEXT, IDC_TEMPLATE, "Template", (ULONG_PTR)L"%artist% - %title%" },

 	{ &opts.unknown, CONTROL_TEXT, IDC_UNKNOWN, "Unknown", (ULONG_PTR)LPGENT("<Unknown>"), 0, 0, 128 },

 	{ &opts.xstatus_name, CONTROL_TEXT, IDC_XSTATUS_NAME, "XStatusName", (ULONG_PTR)LPGENT("Listening to") },

-	{ &opts.xstatus_message, CONTROL_TEXT, IDC_XSTATUS_MESSAGE, "XStatusMessage", (ULONG_PTR)_T("%listening%") },

+	{ &opts.xstatus_message, CONTROL_TEXT, IDC_XSTATUS_MESSAGE, "XStatusMessage", (ULONG_PTR)L"%listening%" },

 	{ &opts.nothing, CONTROL_TEXT, IDC_NOTHING, "Nothing", (ULONG_PTR)LPGENT("<Nothing is playing now>"), 0, 0, 128 }

 };

 

@@ -188,8 +188,8 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			// Init combo

 			int total = EXTRA_ICON_COUNT, first = 0;

 

-			SendDlgItemMessage(hwndDlg, IDC_ADV_ICON, CB_ADDSTRING, 0, (LPARAM)_T("1"));

-			SendDlgItemMessage(hwndDlg, IDC_ADV_ICON, CB_ADDSTRING, 0, (LPARAM)_T("2"));

+			SendDlgItemMessage(hwndDlg, IDC_ADV_ICON, CB_ADDSTRING, 0, (LPARAM)L"1");

+			SendDlgItemMessage(hwndDlg, IDC_ADV_ICON, CB_ADDSTRING, 0, (LPARAM)L"2");

 

 			if (total > 0) {

 				TCHAR tmp[10];

diff --git a/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp b/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp
index 5e7fa9a856..60fbf8ebe7 100644
--- a/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp
+++ b/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp
@@ -131,7 +131,7 @@ void dialog_resize_helper::add_sizegrip()
 {

 	if (parent != 0 && sizegrip == 0)

 	{

-		sizegrip = CreateWindowEx(0, WC_SCROLLBAR, _T(""), WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SBS_SIZEGRIP | SBS_SIZEBOXBOTTOMRIGHTALIGN,

+		sizegrip = CreateWindowEx(0, WC_SCROLLBAR, L"", WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SBS_SIZEGRIP | SBS_SIZEBOXBOTTOMRIGHTALIGN,

 			0, 0, CW_USEDEFAULT, CW_USEDEFAULT,

 			parent, (HMENU)0, NULL, NULL);

 		if (sizegrip != 0)

diff --git a/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/win32_misc.cpp b/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/win32_misc.cpp
index 07d5034898..21560dcfcc 100644
--- a/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/win32_misc.cpp
+++ b/plugins/ListeningTo/src/players/foo_mlt/foobar2000/helpers/win32_misc.cpp
@@ -77,14 +77,14 @@ void GetOSVersionString(pfc::string_base & out) {
 }

 

 static bool running_under_wine(void) {

-    HMODULE module = GetModuleHandle(_T("ntdll.dll"));

+    HMODULE module = GetModuleHandle(L"ntdll.dll");

     if (!module) return false;

     return GetProcAddress(module, "wine_server_call") != NULL;

 }

 static bool FetchWineInfoAppend(pfc::string_base & out) {

 	typedef const char *(__cdecl *t_wine_get_build_id)(void);

     typedef void (__cdecl *t_wine_get_host_version)( const char **sysname, const char **release );

-	const HMODULE ntdll = GetModuleHandle(_T("ntdll.dll"));

+	const HMODULE ntdll = GetModuleHandle(L"ntdll.dll");

 	if (ntdll == NULL) return false;

 	t_wine_get_build_id wine_get_build_id;

 	t_wine_get_host_version wine_get_host_version;

diff --git a/plugins/ListeningTo/src/players/foo_mlt/pfc/profiler.cpp b/plugins/ListeningTo/src/players/foo_mlt/pfc/profiler.cpp
index 3ec7ae5789..8eeac44c03 100644
--- a/plugins/ListeningTo/src/players/foo_mlt/pfc/profiler.cpp
+++ b/plugins/ListeningTo/src/players/foo_mlt/pfc/profiler.cpp
@@ -24,7 +24,7 @@ profiler_static::~profiler_static()
 		OutputDebugStringA(message);

 	} catch(...) {

 		//should never happen

-		OutputDebugString(_T("unexpected profiler failure\n"));

+		OutputDebugString(L"unexpected profiler failure\n");

 	}

 }

 

diff --git a/plugins/ListeningTo/src/players/foobar.cpp b/plugins/ListeningTo/src/players/foobar.cpp
index 4c1a2f8372..eb06043b11 100644
--- a/plugins/ListeningTo/src/players/foobar.cpp
+++ b/plugins/ListeningTo/src/players/foobar.cpp
@@ -20,15 +20,15 @@ Boston, MA 02111-1307, USA.
 #include "../stdafx.h"

 

 static TCHAR *wcs[] = {

-	_T("{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}/1"),	// Foobar 0.9.1

-	_T("{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}"),

-	_T("{97E27FAA-C0B3-4b8e-A693-ED7881E99FC1}"),	// Foobar 0.9.5.3

-	_T("{E7076D1C-A7BF-4f39-B771-BCBE88F2A2A8}"),	// Foobar Columns UI

+	L"{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}/1",	// Foobar 0.9.1

+	L"{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}",

+	L"{97E27FAA-C0B3-4b8e-A693-ED7881E99FC1}",	// Foobar 0.9.5.3

+	L"{E7076D1C-A7BF-4f39-B771-BCBE88F2A2A8}",	// Foobar Columns UI

 };

 

 Foobar::Foobar()

 {

-	name = _T("foobar2000");

+	name = L"foobar2000";

 	window_classes = wcs;

 	num_window_classes = _countof(wcs);

 }

diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp
index 10bb76f9f7..62456fd480 100644
--- a/plugins/ListeningTo/src/players/generic.cpp
+++ b/plugins/ListeningTo/src/players/generic.cpp
@@ -27,12 +27,12 @@ GenericPlayer *singleton = NULL;
 void m_log(const TCHAR *function, const TCHAR *fmt, ...)

 {

 	if (hLog == NULL) {

-		hLog = mir_createLog(MODULE_NAME, _T("ListeningTo log"), _T("c:\\temp\\listeningto.txt"), 0);

+		hLog = mir_createLog(MODULE_NAME, L"ListeningTo log", L"c:\\temp\\listeningto.txt", 0);

 		if (hLog == NULL)

 			return;

 	}

 

-	mir_writeLogT(hLog, _T("%s: "), function);

+	mir_writeLogT(hLog, L"%s: ", function);

 

 	va_list args;

 	va_start(args, fmt);

@@ -67,7 +67,7 @@ static LRESULT CALLBACK ReceiverWndProc(HWND hWnd, UINT message, WPARAM wParam,
 

 GenericPlayer::GenericPlayer()

 {

-	name = _T("GenericPlayer");

+	name = L"GenericPlayer";

 

 	enabled = TRUE;

 	received[0] = L'\0';

@@ -122,7 +122,7 @@ void GenericPlayer::ProcessReceived()
 		parts[pCount] = p;

 		pCount++;

 		p = p1 + 2;

-		p1 = wcsstr(p, _T("\\0"));

+		p1 = wcsstr(p, L"\\0");

 	} while (p1 != NULL && pCount < 10);

 	if (p1 != NULL)

 		*p1 = _T('\0');

@@ -154,7 +154,7 @@ void GenericPlayer::ProcessReceived()
 

 		li->cbSize = sizeof(listening_info);

 		li->dwFlags = LTI_TCHAR;

-		li->ptszType = U2TD(parts[2], _T("Music"));

+		li->ptszType = U2TD(parts[2], L"Music");

 		li->ptszTitle = U2T(parts[3]);

 		li->ptszArtist = U2T(parts[4]);

 		li->ptszAlbum = U2T(parts[5]);

@@ -177,9 +177,9 @@ void GenericPlayer::ProcessReceived()
 				int h = (length / 60) / 60;

 

 				if (h > 0)

-					mir_sntprintf(li->ptszLength, 9, _T("%d:%02d:%02d"), h, m, s);

+					mir_sntprintf(li->ptszLength, 9, L"%d:%02d:%02d", h, m, s);

 				else

-					mir_sntprintf(li->ptszLength, 9, _T("%d:%02d"), m, s);

+					mir_sntprintf(li->ptszLength, 9, L"%d:%02d", m, s);

 			}

 		}

 	}

diff --git a/plugins/ListeningTo/src/players/itunes.cpp b/plugins/ListeningTo/src/players/itunes.cpp
index af6723ece3..79cea49a13 100644
--- a/plugins/ListeningTo/src/players/itunes.cpp
+++ b/plugins/ListeningTo/src/players/itunes.cpp
@@ -26,7 +26,7 @@ extern "C"
 

 ITunes::ITunes()

 {

-	name = _T("iTunes");

+	name = L"iTunes";

 	needPoll = TRUE;

 

 	filename[0] = L'\0';

@@ -40,7 +40,7 @@ ITunes::ITunes()
 

 void ITunes::FindWindow()

 {

-	hwnd = ::FindWindow(_T("iTunes"), _T("iTunes"));

+	hwnd = ::FindWindow(L"iTunes", L"iTunes");

 }

 

 void ITunes::FreeTempData()

@@ -125,12 +125,12 @@ BOOL ITunes::FillCache()
 		int h = (lret / 60) / 60;

 

 		if (h > 0)

-			mir_sntprintf(listening_info.ptszLength, 9, _T("%d:%02d:%02d"), h, m, s);

+			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d:%02d", h, m, s);

 		else

-			mir_sntprintf(listening_info.ptszLength, 9, _T("%d:%02d"), m, s);

+			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d", m, s);

 	}

 

-	listening_info.ptszType = mir_tstrdup(_T("Music"));

+	listening_info.ptszType = mir_tstrdup(L"Music");

 

 	if (listening_info.ptszTitle == NULL) {

 		// Get from filename

diff --git a/plugins/ListeningTo/src/players/mradio.cpp b/plugins/ListeningTo/src/players/mradio.cpp
index e2ce0b40ef..5654325be2 100644
--- a/plugins/ListeningTo/src/players/mradio.cpp
+++ b/plugins/ListeningTo/src/players/mradio.cpp
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.
 

 MRadio::MRadio()

 {

-	name = _T("mRadio");

+	name = L"mRadio";

 	needPoll = TRUE;

 }

 

@@ -43,8 +43,8 @@ int MRadio::GetData()
 		if (!db_get_s(hContact, "mRadio", "Nick", &dbv)) {

 			listening_info.cbSize = sizeof(listening_info);

 			listening_info.dwFlags = LTI_TCHAR;

-			listening_info.ptszArtist = mir_tstrdup(_T("Radio"));

-			listening_info.ptszType = mir_tstrdup(_T("Radio"));

+			listening_info.ptszArtist = mir_tstrdup(L"Radio");

+			listening_info.ptszType = mir_tstrdup(L"Radio");

 			listening_info.ptszTitle = mir_a2t(dbv.pszVal);

 

 			db_free(&dbv);

diff --git a/plugins/ListeningTo/src/players/player.cpp b/plugins/ListeningTo/src/players/player.cpp
index 652f58fc20..a2bfcd1751 100644
--- a/plugins/ListeningTo/src/players/player.cpp
+++ b/plugins/ListeningTo/src/players/player.cpp
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.
 

 extern void HasNewListeningInfo();

 

-Player::Player() : name(_T("Player")), enabled(FALSE), needPoll(FALSE)

+Player::Player() : name(L"Player"), enabled(FALSE), needPoll(FALSE)

 {

 	memset(&listening_info, 0, sizeof(listening_info));

 }

@@ -59,7 +59,7 @@ void Player::FreeData()
 

 ExternalPlayer::ExternalPlayer()

 {

-	name = _T("ExternalPlayer");

+	name = L"ExternalPlayer";

 	needPoll = TRUE;

 

 	window_classes = NULL;

@@ -94,7 +94,7 @@ BOOL ExternalPlayer::GetListeningInfo(LISTENINGTOINFO *lti)
 

 CodeInjectionPlayer::CodeInjectionPlayer()

 {

-	name = _T("CodeInjectionPlayer");

+	name = L"CodeInjectionPlayer";

 	dll_name = NULL;

 	message_window_class = NULL;

 	next_request_time = 0;

diff --git a/plugins/ListeningTo/src/players/watrack.cpp b/plugins/ListeningTo/src/players/watrack.cpp
index 1e5af52236..3a7cd24a0f 100644
--- a/plugins/ListeningTo/src/players/watrack.cpp
+++ b/plugins/ListeningTo/src/players/watrack.cpp
@@ -32,7 +32,7 @@ int NewStatusCallback(WPARAM wParam, LPARAM lParam)
 

 WATrack::WATrack()

 {

-	name = _T("WATrack");

+	name = L"WATrack";

 	instance = this;

 	hNewStatusHook = NULL;

 }

@@ -102,15 +102,15 @@ void WATrack::GetData()
 		int h = (si->total / 60) / 60;

 

 		if (h > 0)

-			mir_sntprintf(listening_info.ptszLength, 9, _T("%d:%02d:%02d"), h, m, s);

+			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d:%02d", h, m, s);

 		else

-			mir_sntprintf(listening_info.ptszLength, 9, _T("%d:%02d"), m, s);

+			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d", m, s);

 	}

 

 	if (si->width > 0)

-		listening_info.ptszType = mir_tstrdup(_T("Video"));

+		listening_info.ptszType = mir_tstrdup(L"Video");

 	else

-		listening_info.ptszType = mir_tstrdup(_T("Music"));

+		listening_info.ptszType = mir_tstrdup(L"Music");

 

 	listening_info.ptszPlayer = DUPD(si->player, name);

 

diff --git a/plugins/ListeningTo/src/players/winamp.cpp b/plugins/ListeningTo/src/players/winamp.cpp
index 1c3dd02e3e..35bfde5cfe 100644
--- a/plugins/ListeningTo/src/players/winamp.cpp
+++ b/plugins/ListeningTo/src/players/winamp.cpp
@@ -20,14 +20,14 @@ Boston, MA 02111-1307, USA.
 #include "../stdafx.h"

 

 static TCHAR *wcs[] = {

-	_T("Winamp v1.x")

+	L"Winamp v1.x"

 };

 

 Winamp::Winamp()

 {

-	name = _T("Winamp");

+	name = L"Winamp";

 	window_classes = wcs;

 	num_window_classes = _countof(wcs);

-	message_window_class = MIRANDA_WINDOWCLASS _T(".Winamp");

+	message_window_class = MIRANDA_WINDOWCLASS L".Winamp";

 	dll_name = "gen_mlt";

 }

diff --git a/plugins/ListeningTo/src/players/winamp_mlt/mlt_winamp.cpp b/plugins/ListeningTo/src/players/winamp_mlt/mlt_winamp.cpp
index 1844186570..8c354ea49d 100644
--- a/plugins/ListeningTo/src/players/winamp_mlt/mlt_winamp.cpp
+++ b/plugins/ListeningTo/src/players/winamp_mlt/mlt_winamp.cpp
@@ -83,7 +83,7 @@ void WindowThread(void *param)
 
 	RegisterClass(&wc);
 
-	hMsgWnd = CreateWindow(MESSAGE_WINDOWCLASS, _T("Miranda ListeningTo Winamp Plugin"), 
+	hMsgWnd = CreateWindow(MESSAGE_WINDOWCLASS, L"Miranda ListeningTo Winamp Plugin", 
 							0, 0, 0, 0, 0, NULL, NULL, hInst, NULL);
 
 	if (hMsgWnd != NULL)
@@ -466,5 +466,5 @@ int init()
 } 
 
 void config() {
-	MessageBox(NULL, _T("Copyright (C) 2006 Ricardo Pescuma Domenecci"), _T("Miranda ListeningTo Winamp Plugin"), 0);
+	MessageBox(NULL, L"Copyright (C) 2006 Ricardo Pescuma Domenecci", L"Miranda ListeningTo Winamp Plugin", 0);
 }
diff --git a/plugins/ListeningTo/src/players/wmp.cpp b/plugins/ListeningTo/src/players/wmp.cpp
index 93776b626c..639c384b40 100644
--- a/plugins/ListeningTo/src/players/wmp.cpp
+++ b/plugins/ListeningTo/src/players/wmp.cpp
@@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA.
 

 #include "../stdafx.h"

 

-#define WMP_WINDOWCLASS _T("MsnMsgrUIManager")

+#define WMP_WINDOWCLASS L"MsnMsgrUIManager"

 

 static LRESULT CALLBACK ReceiverWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);

 

@@ -29,7 +29,7 @@ WindowsMediaPlayer *singleton = NULL;
 

 WindowsMediaPlayer::WindowsMediaPlayer()

 {

-	name = _T("WindowsMediaPlayer");

+	name = L"WindowsMediaPlayer";

 	received[0] = _T('\0');

 	singleton = this;