hello, Unix.

phase 1: removing _T()

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

23 files changed, 157 insertions, 157 deletions

diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 5dafc9d4fd..94b4ad3170 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -139,7 +139,7 @@ int SetAlpha(BYTE Alpha)
 			if (!(l & WS_EX_LAYERED)) {

 				HWND parent = NULL;

 				if (g_CluiData.fOnDesktop) {

-					HWND hProgMan = FindWindow(_T("Progman"), NULL);

+					HWND hProgMan = FindWindow(L"Progman", NULL);

 					if (IsWindow(hProgMan))

 						parent = hProgMan;

 				}

@@ -1608,7 +1608,7 @@ static int _us_DoAddFrame(WPARAM wParam, LPARAM)
 	SetWindowPos(g_pfwFrames[g_nFramesCount].TitleBar.hwndTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);

 	{

 		TOOLINFO ti = { sizeof(ti) };

-		ti.lpszText = _T("");

+		ti.lpszText = L"";

 		ti.hinst = g_hInst;

 		ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS;

 		ti.uId = (UINT_PTR)g_pfwFrames[g_nFramesCount].TitleBar.hwnd;

@@ -2655,7 +2655,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 			hmenu = CreatePopupMenu();

 			//				Frames[Frameid].TitleBar.hmenu = hmenu;

 			AppendMenu(hmenu, MF_STRING | MF_DISABLED | MF_GRAYED, 15, g_pfwFrames[framepos].name);

-			AppendMenu(hmenu, MF_SEPARATOR, 16, _T(""));

+			AppendMenu(hmenu, MF_SEPARATOR, 16, L"");

 			AppendMenu(hmenu, g_pfwFrames[framepos].Locked ? (MF_STRING | MF_CHECKED) : MF_STRING, frame_menu_lock, TranslateT("Lock frame"));

 			AppendMenu(hmenu, g_pfwFrames[framepos].visible ? (MF_STRING | MF_CHECKED) : MF_STRING, frame_menu_visible, TranslateT("Visible"));

 			AppendMenu(hmenu, g_pfwFrames[framepos].TitleBar.ShowTitleBar ? (MF_STRING | MF_CHECKED) : MF_STRING, frame_menu_showtitlebar, TranslateT("Show title bar"));

@@ -2735,7 +2735,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 			if (pos != -1) {

 				int oldflags;

 

-				mir_sntprintf(TBcapt, _T("%s - h:%d, vis:%d, fl:%d, fl:(%d,%d,%d,%d),or: %d"),

+				mir_sntprintf(TBcapt, L"%s - h:%d, vis:%d, fl:%d, fl:(%d,%d,%d,%d),or: %d",

 					g_pfwFrames[pos].name, g_pfwFrames[pos].height, g_pfwFrames[pos].visible, g_pfwFrames[pos].floating,

 					g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y,

 					g_pfwFrames[pos].FloatingSize.x, g_pfwFrames[pos].FloatingSize.y,

@@ -3065,10 +3065,10 @@ static LRESULT CALLBACK CLUIFrameSubContainerProc(HWND hwnd, UINT msg, WPARAM wP
 

 static HWND CreateSubContainerWindow(HWND parent, int x, int y, int width, int height)

 {

-	HWND hwnd = CreateWindowEx(WS_EX_LAYERED, CLUIFrameSubContainerClassName, _T("SubContainerWindow"), WS_POPUP | (!g_CluiData.fLayered ? WS_BORDER : 0), x, y, width, height, parent, 0, g_hInst, 0);

+	HWND hwnd = CreateWindowEx(WS_EX_LAYERED, CLUIFrameSubContainerClassName, L"SubContainerWindow", WS_POPUP | (!g_CluiData.fLayered ? WS_BORDER : 0), x, y, width, height, parent, 0, g_hInst, 0);

 	SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) & ~(WS_CAPTION | WS_BORDER));

 	if (g_CluiData.fOnDesktop) {

-		HWND hProgMan = FindWindow(_T("Progman"), NULL);

+		HWND hProgMan = FindWindow(L"Progman", NULL);

 		if (IsWindow(hProgMan))

 			SetParent(hwnd, hProgMan);

 	}

@@ -3218,7 +3218,7 @@ static LRESULT CALLBACK CLUIFrameContainerWndProc(HWND hwnd, UINT msg, WPARAM wP
 

 static HWND CreateContainerWindow(HWND parent, int x, int y, int width, int height)

 {

-	return CreateWindow(_T("FramesContainer"), _T("FramesContainer"), WS_POPUP | WS_THICKFRAME, x, y, width, height, parent, 0, g_hInst, 0);

+	return CreateWindow(L"FramesContainer", L"FramesContainer", WS_POPUP | WS_THICKFRAME, x, y, width, height, parent, 0, g_hInst, 0);

 }

 

 static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam)

@@ -3365,7 +3365,7 @@ int LoadCLUIFramesModule(void)
 	cntclass.lpfnWndProc = CLUIFrameContainerWndProc;

 	cntclass.hInstance = g_hInst;

 	cntclass.hCursor = LoadCursor(NULL, IDC_ARROW);

-	cntclass.lpszClassName = _T("FramesContainer");

+	cntclass.lpszClassName = L"FramesContainer";

 	RegisterClass(&cntclass);

 	//end container helper

 

@@ -3416,7 +3416,7 @@ int LoadCLUIFramesModule(void)
 

 	CreateCluiFramesServices();

 

-	hWndExplorerToolBar = FindWindowEx(0, 0, _T("Shell_TrayWnd"), NULL);

+	hWndExplorerToolBar = FindWindowEx(0, 0, L"Shell_TrayWnd", NULL);

 	OnFrameTitleBarBackgroundChange(0, 0);

 	_fCluiFramesModuleNotStarted = FALSE;

 	return 0;

diff --git a/plugins/Clist_modern/src/cluiframes.h b/plugins/Clist_modern/src/cluiframes.h
index 09af1b44f2..155fdba991 100644
--- a/plugins/Clist_modern/src/cluiframes.h
+++ b/plugins/Clist_modern/src/cluiframes.h
@@ -128,8 +128,8 @@ struct FRAMEWND
 #define OFFSET_PROTOPOS 200

 #define OFFSET_VISIBLE 400

 

-#define CLUIFrameSubContainerClassName			_T("CLUIFrameSubContainer")

-#define CLUIFrameTitleBarClassName				_T("CLUIFrameTitleBar")

+#define CLUIFrameSubContainerClassName			L"CLUIFrameSubContainer"

+#define CLUIFrameTitleBarClassName				L"CLUIFrameTitleBar"

 #define CLUIFrameModule							"CLUIFrames"

 

 #endif

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index fe7a2fd8e6..60358a3851 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -32,7 +32,7 @@ void GDIPlus_ExtractAnimatedGIF(TCHAR *szName, int width, int height, HBITMAP &p
 BOOL GDIPlus_IsAnimatedGif(TCHAR *szName);

 

 /* Next is module */

-#define ANIAVAWINDOWCLASS _T("MirandaModernAniAvatar")

+#define ANIAVAWINDOWCLASS L"MirandaModernAniAvatar"

 #define aacheck if (!s_bModuleStarted) return

 

 #define AAO_HAS_BORDER	  0x01

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 8e7965316d..326722ab11 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -394,7 +394,7 @@ LBL_Status:
 			ptrT tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
 			if (tszXStatusMsg != NULL && tszXStatusMsg[0] != 0) {
 				TCHAR *tmp = NEWTSTR_ALLOCA(text);
-				mir_sntprintf(text, text_size, _T("%s: %s"), tmp, tszXStatusMsg);
+				mir_sntprintf(text, text_size, L"%s: %s", tmp, tszXStatusMsg);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
@@ -416,7 +416,7 @@ LBL_Status:
 			ptrT tszXStatusName(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusName"));
 			if (tszXStatusName != NULL && tszXStatusName[0] != 0) {
 				TCHAR *tmp = NEWTSTR_ALLOCA(text);
-				mir_sntprintf(text, text_size, _T("%s: %s"), tszXStatusName, tmp);
+				mir_sntprintf(text, text_size, L"%s: %s", tszXStatusName, tmp);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
@@ -457,7 +457,7 @@ LBL_Status:
 		if (pdnce->hTimeZone) {
 			// Get pdnce time
 			text[0] = 0;
-			TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), text, text_size, 0);
+			TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", text, text_size, 0);
 		}
 		return TEXT_CONTACT_TIME;
 	}
@@ -486,7 +486,7 @@ void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact)
 			if (mir_tstrcmpi(name, nick) == 0)
 				mir_tstrncpy(contact->szText, name, _countof(contact->szText));
 			else // Append then
-				mir_sntprintf(contact->szText, _T("%s - %s"), name, nick);
+				mir_sntprintf(contact->szText, L"%s - %s", name, nick);
 		}
 		else mir_tstrncpy(contact->szText, name, _countof(contact->szText));
 	}
@@ -570,21 +570,21 @@ static int CopySkipUnprintableChars(TCHAR *to, TCHAR * buf, DWORD size)
 	*cp = 0;
 
 	//remove bbcodes: [b] [i] [u]  <b> <i> <u>
-	RemoveTag(to, _T("[b]")); RemoveTag(to, _T("[/b]"));
-	RemoveTag(to, _T("[u]")); RemoveTag(to, _T("[/u]"));
-	RemoveTag(to, _T("[i]")); RemoveTag(to, _T("[/i]"));
+	RemoveTag(to, L"[b]"); RemoveTag(to, L"[/b]");
+	RemoveTag(to, L"[u]"); RemoveTag(to, L"[/u]");
+	RemoveTag(to, L"[i]"); RemoveTag(to, L"[/i]");
 
-	RemoveTag(to, _T("<b>")); RemoveTag(to, _T("</b>"));
-	RemoveTag(to, _T("<u>")); RemoveTag(to, _T("</u>"));
-	RemoveTag(to, _T("<i>")); RemoveTag(to, _T("</i>"));
+	RemoveTag(to, L"<b>"); RemoveTag(to, L"</b>");
+	RemoveTag(to, L"<u>"); RemoveTag(to, L"</u>");
+	RemoveTag(to, L"<i>"); RemoveTag(to, L"</i>");
 
-	RemoveTag(to, _T("[B]")); RemoveTag(to, _T("[/b]"));
-	RemoveTag(to, _T("[U]")); RemoveTag(to, _T("[/u]"));
-	RemoveTag(to, _T("[I]")); RemoveTag(to, _T("[/i]"));
+	RemoveTag(to, L"[B]"); RemoveTag(to, L"[/b]");
+	RemoveTag(to, L"[U]"); RemoveTag(to, L"[/u]");
+	RemoveTag(to, L"[I]"); RemoveTag(to, L"[/i]");
 
-	RemoveTag(to, _T("<B>")); RemoveTag(to, _T("</B>"));
-	RemoveTag(to, _T("<U>")); RemoveTag(to, _T("</U>"));
-	RemoveTag(to, _T("<I>")); RemoveTag(to, _T("</I>"));
+	RemoveTag(to, L"<B>"); RemoveTag(to, L"</B>");
+	RemoveTag(to, L"<U>"); RemoveTag(to, L"</U>");
+	RemoveTag(to, L"<I>"); RemoveTag(to, L"</I>");
 	return i;
 }
 
@@ -669,7 +669,7 @@ void Cache_ProceedAvatarInList(ClcData *dat, ClcContact *contact)
 		else
 			height_clip = width_clip * ace->bmHeight / ace->bmWidth;
 
-		if (wildcmpit(contact->avatar_data->szFilename, _T("*.gif"))) {
+		if (wildcmpit(contact->avatar_data->szFilename, L"*.gif")) {
 			if (old_pos == AVATAR_POS_ANIMATED)
 				AniAva_RemoveAvatar(contact->hContact);
 
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 5113cd4013..ebc88e2976 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1216,7 +1216,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 					if (shortGroup) {

 						NeedRename = TRUE;

 						if (sourceGrName)

-							mir_sntprintf(newName, _T("%s\\%s"), sourceGrName, shortGroup);

+							mir_sntprintf(newName, L"%s\\%s", sourceGrName, shortGroup);

 						else

 							mir_tstrncpy(newName, shortGroup, _countof(newName));

 					}

@@ -1558,7 +1558,7 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 	HookEvent(ME_MODERNOPT_INITIALIZE, ModernSkinOptInit);

 

 	HookEvent(ME_FOLDERS_PATH_CHANGED, ReloadSkinFolder);

-	hSkinFolder = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Modern contact list"), MIRANDA_PATHT _T("\\") _T(DEFAULT_SKIN_FOLDER));

+	hSkinFolder = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Modern contact list"), MIRANDA_PATHT L"\\" _T(DEFAULT_SKIN_FOLDER));

 	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _T(DEFAULT_SKIN_FOLDER));

 

 	// Get icons

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 889effd163..03259dd5a0 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -436,7 +436,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat)
 			ptrT tszGroup(db_get_tsa(hContact, "CList", "Group"));

 			if (tszGroup != NULL) {

 				TCHAR szGroupMask[256];

-				mir_sntprintf(szGroupMask, _T("%s|"), tszGroup);

+				mir_sntprintf(szGroupMask, L"%s|", tszGroup);

 				filterResult = (g_CluiData.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | (_tcsstr(g_CluiData.groupFilter, szGroupMask) ? 1 : 0)) : (filterResult & (_tcsstr(g_CluiData.groupFilter, szGroupMask) ? 1 : 0));

 			}

 			else if (g_CluiData.filterFlags & CLVM_INCLUDED_UNGROUPED)

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 6a42da09a6..5c98b322f1 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -52,16 +52,16 @@ struct FontOptionsList {
 	char size;

 };

 

-#define CLCGROUP			LPGENT("Contact list") _T("/") LPGENT("Contact names")

-#define CLCLINESGROUP		LPGENT("Contact list") _T("/") LPGENT("Row items")

-#define CLCFRAMESGROUP		LPGENT("Contact list") _T("/") LPGENT("Frame texts")

-#define CLCCOLOURSGROUP		LPGENT("Contact list") _T("/") LPGENT("Special colors")

+#define CLCGROUP			LPGENT("Contact list") L"/" LPGENT("Contact names")

+#define CLCLINESGROUP		LPGENT("Contact list") L"/" LPGENT("Row items")

+#define CLCFRAMESGROUP		LPGENT("Contact list") L"/" LPGENT("Frame texts")

+#define CLCCOLOURSGROUP		LPGENT("Contact list") L"/" LPGENT("Special colors")

 

 #define DEFAULT_COLOUR		RGB(0, 0, 0)

 #define DEFAULT_GREYCOLOUR	RGB(128, 128, 128)

 #define DEFAULT_BACKCOLOUR	RGB(255, 255, 255)

 

-#define DEFAULT_FAMILY		_T("Arial")

+#define DEFAULT_FAMILY		L"Arial"

 #define DEFAULT_EFFECT		{ 0, 0x00000000, 0x00000000 }

 

 #define DEFAULT_SIZE		-11

@@ -1159,7 +1159,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			g_mutex_bChangingMode = TRUE;

 

 			if (IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)) {

-				HWND hProgMan = FindWindow(_T("Progman"), NULL);

+				HWND hProgMan = FindWindow(L"Progman", NULL);

 				if (IsWindow(hProgMan)) {

 					SetParent(pcli->hwndContactList, hProgMan);

 					Sync(CLUIFrames_SetParentForContainers, (HWND)hProgMan);

@@ -1380,7 +1380,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;

 			ofn.nMaxFile = _countof(str);

 			ofn.nMaxFileTitle = MAX_PATH;

-			ofn.lpstrDefExt = _T("bmp");

+			ofn.lpstrDefExt = L"bmp";

 			if (!GetOpenFileName(&ofn))

 				break;

 

@@ -1786,7 +1786,7 @@ int ModernOptInit(WPARAM wParam, LPARAM)
 	obj.iSection = MODERNOPT_PAGE_CLIST;

 	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

 	obj.iBoldControls = iBoldControls;

-	obj.lptzSubsection = _T("Fonts");

+	obj.lptzSubsection = L"Fonts";

 	obj.lpzClassicGroup = NULL;

 	obj.lpzClassicPage = "Contact list";

 	obj.lpzHelpUrl = "http://wiki.miranda-ng.org/";

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 8f31531595..deebf09991 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -426,12 +426,12 @@ void CLCPaint::_DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, TCHA
 			i = 0;

 

 		// Get real height of the line

-		row_height = ske_DrawText(hdcMem, _T("A"), 1, &tmp_rc, DT_CALCRECT | uTextFormat);

+		row_height = ske_DrawText(hdcMem, L"A", 1, &tmp_rc, DT_CALCRECT | uTextFormat);

 

 		// Just draw ellipsis

 		if (free_rc->right <= free_rc->left) {

 			if (gl_TrimText)

-				ske_DrawText(hdcMem, _T("..."), 3, free_rc, uTextFormat & ~DT_END_ELLIPSIS);

+				ske_DrawText(hdcMem, L"...", 3, free_rc, uTextFormat & ~DT_END_ELLIPSIS);

 		}

 		else {

 			// Draw text and smileys

@@ -486,7 +486,7 @@ void CLCPaint::_DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, TCHA
 								fac_width, fac_height, 0, NULL, DI_NORMAL | ((factor < 1) ? 128 : 0)); //TO DO enchance drawing quality

 						}

 						else {

-							ske_DrawText(hdcMem, _T("..."), 3, &text_rc, uTextFormat);

+							ske_DrawText(hdcMem, L"...", 3, &text_rc, uTextFormat);

 						}

 

 						pos_x += fac_width;

@@ -786,7 +786,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 				if (szCounts && mir_tstrlen(szCounts) > 0) {

 					// calc width and height

 					ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

-					ske_DrawText(hdcMem, _T(" "), 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

+					ske_DrawText(hdcMem, L" ", 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

 					count_size.cx = count_rc.right - count_rc.left;

 					space_width = count_size.cx;

 					count_rc.right = 0;

@@ -863,7 +863,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 					SIZE counts_size = { 0 };

 					// Get widths

 					counts_rc = fr_rc;

-					DrawText(hdcMem, _T(" "), 1, &space_rc, DT_CALCRECT | DT_NOPREFIX);

+					DrawText(hdcMem, L" ", 1, &space_rc, DT_CALCRECT | DT_NOPREFIX);

 

 					space_size.cx = space_rc.right - space_rc.left;

 					space_size.cy = min(space_rc.bottom - space_rc.top, fr_rc.bottom - fr_rc.top);

@@ -1007,7 +1007,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 						if (szCounts && mir_tstrlen(szCounts) > 0) {

 							// calc width and height

 							ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

-							ske_DrawText(hdcMem, _T(" "), 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

+							ske_DrawText(hdcMem, L" ", 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

 							count_size.cx = count_rc.right - count_rc.left;

 							space_width = count_size.cx;

 							count_rc.right = 0;

@@ -1080,10 +1080,10 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 

 					if (dat->secondLine.show && dat->secondLine.type == TEXT_CONTACT_TIME && pdnce->hTimeZone) {

 						// Get contact time

-						TCHAR buf[70] = _T("");

+						TCHAR buf[70] = L"";

 						mir_free_and_nil(pdnce->szSecondLineText);

 

-						TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, _countof(buf), 0);

+						TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

 						pdnce->szSecondLineText = mir_tstrdup(buf);

 					}

 

@@ -1108,10 +1108,10 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 

 					if (dat->thirdLine.show && dat->thirdLine.type == TEXT_CONTACT_TIME && pdnce->hTimeZone) {

 						// Get contact time

-						TCHAR buf[70] = _T("");

+						TCHAR buf[70] = L"";

 						mir_free(pdnce->szThirdLineText);

 

-						TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, _countof(buf), 0);

+						TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

 						pdnce->szThirdLineText = mir_tstrdup(buf);

 					}

 

@@ -1392,7 +1392,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 

 			case TC_TIME:

 				TCHAR szResult[80];

-				if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, _countof(szResult), 0)) {

+				if (!TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", szResult, _countof(szResult), 0)) {

 					// Select font

 					ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

 					ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), &p_rect, DT_NOPREFIX | DT_SINGLELINE | (dat->text_rtl ? DT_RTLREADING : 0));

@@ -2105,7 +2105,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 			if (Drawing->type == CLCIT_CONTACT && dat->contact_time_show && pdnce->hTimeZone) {

 				TCHAR szResult[80];

 

-				if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, _countof(szResult), 0)) {

+				if (!TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", szResult, _countof(szResult), 0)) {

 					// Select font

 					ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

 

@@ -2206,7 +2206,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 				free_height = free_row_rc.bottom - free_row_rc.top;

 

 				// Get widths

-				ske_DrawText(hdcMem, _T(" "), 1, &space_rc, DT_CALCRECT | DT_NOPREFIX);

+				ske_DrawText(hdcMem, L" ", 1, &space_rc, DT_CALCRECT | DT_NOPREFIX);

 

 				SIZE space_size;

 				space_size.cx = space_rc.right - space_rc.left;

@@ -2265,8 +2265,8 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 			if (dat->secondLine.show) {

 				if (dat->secondLine.type == TEXT_CONTACT_TIME && pdnce->hTimeZone) {

 					// Get contact time

-					TCHAR buf[70] = _T("");

-					TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, _countof(buf), 0);

+					TCHAR buf[70] = L"";

+					TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

 					replaceStrT(pdnce->szSecondLineText, buf);

 				}

 

@@ -2298,8 +2298,8 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 			if (dat->thirdLine.show) {

 				if (dat->thirdLine.type == TEXT_CONTACT_TIME && pdnce->hTimeZone) {

 					// Get contact time

-					TCHAR buf[70] = _T("");

-					TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, _countof(buf), 0);

+					TCHAR buf[70] = L"";

+					TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

 					replaceStrT(pdnce->szThirdLineText, buf);

 				}

 				if (pdnce->szThirdLineText != NULL && pdnce->szThirdLineText[0] && free_height > dat->thirdLine.top_space) {

@@ -2723,7 +2723,7 @@ void CLCPaint::_DrawContactTime(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 	if (!pdnce)

 		return;

 

-	if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, _countof(szResult), 0)) {

+	if (!TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", szResult, _countof(szResult), 0)) {

 		// Select font

 		ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

 		ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), prcItem, DT_NOPREFIX | DT_SINGLELINE);

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index 51d242579d..d65e2f32bc 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -281,9 +281,9 @@ void cliBeginRenameSelection(HWND hwnd, ClcData *dat)
 	if (dat->text_rtl)

 		a |= EN_ALIGN_RTL_EC;

 	if (contact->type == CLCIT_GROUP)

-		dat->hwndRenameEdit = CreateWindow(_T("EDIT"), contact->szText, WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, NULL, g_hInst, NULL);

+		dat->hwndRenameEdit = CreateWindow(L"EDIT", contact->szText, WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, NULL, g_hInst, NULL);

 	else

-		dat->hwndRenameEdit = CreateWindow(_T("EDIT"), pcli->pfnGetContactDisplayName(contact->hContact, 0), WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, NULL, g_hInst, NULL);

+		dat->hwndRenameEdit = CreateWindow(L"EDIT", pcli->pfnGetContactDisplayName(contact->hContact, 0), WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, NULL, g_hInst, NULL);

 

 	SetWindowLongPtr(dat->hwndRenameEdit, GWL_STYLE, GetWindowLongPtr(dat->hwndRenameEdit, GWL_STYLE)&(~WS_CAPTION) | WS_BORDER);

 	SetWindowLongPtr(dat->hwndRenameEdit, GWLP_USERDATA, (LONG_PTR)dat);

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 8bb268aae1..0c05a92028 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -119,7 +119,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
 				TCHAR szwProto[64];

 				MultiByteToWideChar(CP_ACP, 0, szProto, -1, szwProto, 64);

 				szwProto[63] = 0;

-				mir_sntprintf(szBuffer, _T("%s: %s (%s)"), szwProto, szName, szStatus);

+				mir_sntprintf(szBuffer, L"%s: %s (%s)", szwProto, szName, szStatus);

 				szBuffer[127] = 0;

 				AppendMenu(g_CluiData.hMenuNotify, MF_BYCOMMAND | MF_STRING, g_CluiData.wNextMenuID, szBuffer);

 				mii.hbmpItem = HBMMENU_CALLBACK;

@@ -488,7 +488,7 @@ int EventArea_Create(HWND hCluiWnd)
 	ehhEventAreaBackgroundSettingsChanged(0, 0);

 

 	WNDCLASS wndclass = { 0 };

-	TCHAR pluginname[] = _T("EventArea");

+	TCHAR pluginname[] = L"EventArea";

 	int h = GetSystemMetrics(SM_CYSMICON) + 2;

 	if (GetClassInfo(g_hInst, pluginname, &wndclass) == 0) {

 		wndclass.style = 0;

@@ -513,7 +513,7 @@ int EventArea_Create(HWND hCluiWnd)
 	Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);

 	Frame.Flags = (db_get_b(NULL, "CLUI", "ShowEventArea", SETTING_SHOWEVENTAREAFRAME_DEFAULT) ? F_VISIBLE : 0) | F_LOCKED | F_NOBORDER | F_NO_SUBCONTAINER | F_TCHAR;

 	Frame.height = h;

-	Frame.tname = _T("EventArea"); //do not translate

+	Frame.tname = L"EventArea"; //do not translate

 	Frame.TBtname = TranslateT("Event area");

 	hNotifyFrame = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);

 	CallService(MS_SKINENG_REGISTERPAINTSUB, (WPARAM)Frame.hWnd, (LPARAM)EventArea_PaintCallbackProc); //$$$$$ register sub for frame

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 1eef9fc23e..92dde8c3c1 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -88,7 +88,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 	if (!bContactRate)

 		tszName = FAVMENUROOTNAME;

 	else

-		tszName.Format(_T("%s (%s)"), TranslateTS(FAVMENUROOTNAME), TranslateTS(rates[bContactRate]));

+		tszName.Format(L"%s (%s)", TranslateTS(FAVMENUROOTNAME), TranslateTS(rates[bContactRate]));

 	Menu_ModifyItem(hFavoriteContactMenu, tszName);

 

 	for (int i = 0; i < _countof(rates); i++)

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 37723a8279..0a92bb92cc 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -306,7 +306,7 @@ HRESULT CLUI::LoadDllsRuntime()
 	g_CluiData.fLayered = (g_CluiData.fLayered*db_get_b(NULL, "ModernData", "EnableLayering", g_CluiData.fLayered)) && !db_get_b(NULL, "ModernData", "DisableEngine", SETTING_DISABLESKIN_DEFAULT);

 

 	if (IsWinVerVistaPlus()) {

-		m_hDwmapiDll = LoadLibrary(_T("dwmapi.dll"));

+		m_hDwmapiDll = LoadLibrary(L"dwmapi.dll");

 		if (m_hDwmapiDll)

 			g_proc_DWMEnableBlurBehindWindow = (HRESULT(WINAPI *)(HWND, DWM_BLURBEHIND *))GetProcAddress(m_hDwmapiDll, "DwmEnableBlurBehindWindow");

 	}

@@ -348,7 +348,7 @@ HRESULT CLUI::RegisterAvatarMenu()
 

 HRESULT CLUI::CreateCLCWindow(const HWND hwndClui)

 {

-	pcli->hwndContactTree = CreateWindow(_T(CLISTCONTROL_CLASS), _T(""),

+	pcli->hwndContactTree = CreateWindow(_T(CLISTCONTROL_CLASS), L"",

 		WS_CHILD | WS_CLIPCHILDREN | CLS_CONTACTLIST

 		| (db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0)

 		| (db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0)

@@ -712,7 +712,7 @@ void CLUI_ChangeWindowMode()
 

 	// 6 - Pin to desktop mode

 	if (db_get_b(NULL, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT)) {

-		HWND hProgMan = FindWindow(_T("Progman"), NULL);

+		HWND hProgMan = FindWindow(L"Progman", NULL);

 		if (IsWindow(hProgMan)) {

 			SetParent(pcli->hwndContactList, hProgMan);

 			Sync(CLUIFrames_SetParentForContainers, (HWND)hProgMan);

@@ -893,7 +893,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 

 	if (szAccoName) {

 		// first of all try to find by account name( or empty - global )

-		mir_sntprintf(fileFull, _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, szAccoName);

+		mir_sntprintf(fileFull, L"%s\\Icons\\proto_conn_%S.dll", tszFolderPath, szAccoName);

 		if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 			return count;

 

@@ -901,7 +901,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 			// second try to find by protocol name

 			PROTOACCOUNT *acc = Proto_GetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

-				mir_sntprintf(fileFull, _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, acc->szProtoName);

+				mir_sntprintf(fileFull, L"%s\\Icons\\proto_conn_%S.dll", tszFolderPath, acc->szProtoName);

 				if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 					return count;

 			}

@@ -909,7 +909,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 	}

 

 	// third try global

-	mir_sntprintf(fileFull, _T("%s\\Icons\\proto_conn.dll"), tszFolderPath);

+	mir_sntprintf(fileFull, L"%s\\Icons\\proto_conn.dll", tszFolderPath);

 	if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 		return count;

 

@@ -919,7 +919,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 static HICON CLUI_LoadIconFromExternalFile(TCHAR *filename, int i)

 {

 	TCHAR szPath[MAX_PATH], szFullPath[MAX_PATH];

-	mir_sntprintf(szPath, _T("Icons\\%s"), filename);

+	mir_sntprintf(szPath, L"Icons\\%s", filename);

 	PathToAbsoluteT(szPath, szFullPath);

 	if (_taccess(szPath, 0))

 		return NULL;

@@ -935,7 +935,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 	HICON hIcon;

 

 	if (szAccoName) {

-		mir_sntprintf(szFullPath, _T("proto_conn_%S.dll"), szAccoName);

+		mir_sntprintf(szFullPath, L"proto_conn_%S.dll", szAccoName);

 		if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 			return hIcon;

 

@@ -943,7 +943,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 			// second try to find by protocol name

 			PROTOACCOUNT *acc = Proto_GetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

-				mir_sntprintf(szFullPath, _T("proto_conn_%S.dll"), acc->szProtoName);

+				mir_sntprintf(szFullPath, L"proto_conn_%S.dll", acc->szProtoName);

 				if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 					return hIcon;

 			}

@@ -951,7 +951,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 	}

 

 	// third try global

-	mir_tstrncpy(szFullPath, _T("proto_conn.dll"), _countof(szFullPath));

+	mir_tstrncpy(szFullPath, L"proto_conn.dll", _countof(szFullPath));

 	if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 		return hIcon;

 

@@ -1500,7 +1500,7 @@ BOOL cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)
 

 static BOOL FileExists(TCHAR * tszFilename)

 {

-	FILE * f = _tfopen(tszFilename, _T("r"));

+	FILE * f = _tfopen(tszFilename, L"r");

 	if (f == NULL) return FALSE;

 	fclose(f);

 	return TRUE;

@@ -1897,7 +1897,7 @@ LRESULT CLUI::OnCreate(UINT, WPARAM, LPARAM)
 	mii.dwItemData = MENU_MINIMIZE;

 	SetMenuItemInfo(GetMenu(m_hWnd), 2, TRUE, &mii);

 

-	uMsgGetProfile = RegisterWindowMessage(_T("Miranda::GetProfile")); // don't localise

+	uMsgGetProfile = RegisterWindowMessage(L"Miranda::GetProfile"); // don't localise

 	bTransparentFocus = 1;

 	return FALSE;

 }

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 816294ea61..33c21ce24c 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -71,7 +71,7 @@ DWORD CompareContacts2_getLMTime(MCONTACT hContact)
 }

 

 #define SAFESTRING(a) a?a:""

-#define SAFETSTRING(a) a?a:_T("")

+#define SAFETSTRING(a) a?a:L""

 

 int GetProtoIndex(char * szName)

 {

diff --git a/plugins/Clist_modern/src/modern_effectenum.h b/plugins/Clist_modern/src/modern_effectenum.h
index b15c4a1f11..28f30beaf8 100644
--- a/plugins/Clist_modern/src/modern_effectenum.h
+++ b/plugins/Clist_modern/src/modern_effectenum.h
@@ -25,13 +25,13 @@ TCHAR * ModernEffectNames[] =
 TCHAR * _ModernEffectNames[] =

 #endif

 {

-	_T("Shadow at left"),

-	_T("Shadow at right"),

-	_T("Outline"),

-	_T("Outline smooth"),

-	_T("Smooth bump"),

-	_T("Contour thin"),

-	_T("Contour heavy"),

+	L"Shadow at left",

+	L"Shadow at right",

+	L"Outline",

+	L"Outline smooth",

+	L"Smooth bump",

+	L"Contour thin",

+	L"Contour heavy",

 };

 

 #ifdef _EFFECTENUM_FULL_H

diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp
index 159698e21a..1597927b16 100644
--- a/plugins/Clist_modern/src/modern_newrowopts.cpp
+++ b/plugins/Clist_modern/src/modern_newrowopts.cpp
@@ -171,7 +171,7 @@ BOOL CALLBACK DlgProcItemNewRowOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPara
 		TRACE("*********** Nodes DUMP 2 ***********\n");

 		TraceTreeLevel(RootNode);

 		//CheckDlgButton(hwndDlg, IDC_HIDE_ICON_ON_AVATAR, db_get_b(NULL,"CList","IconHideOnAvatar",SETTING_HIDEICONONAVATAR_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );

-		MessageBox(hwndDlg, _T("Init NewRow Dialog"), _T("Notify"), MB_OK);

+		MessageBox(hwndDlg, L"Init NewRow Dialog", L"Notify", MB_OK);

 		break;

 	}

 	case WM_NOTIFY:

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index b3b7f48f2f..fbe18a6583 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -113,7 +113,7 @@ int RowHeight_CalcRowHeight(ClcData *dat, ClcContact *contact, int item)
 							RECT count_rc = { 0 };

 							// calc width and height

 							g_clcPainter.ChangeToFont(hdc, dat, contact->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

-							ske_DrawText(hdc, _T(" "), 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

+							ske_DrawText(hdc, L" ", 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

 							size.cx += count_rc.right - count_rc.left;

 							count_rc.right = 0;

 							count_rc.left = 0;

@@ -241,7 +241,7 @@ int RowHeight_CalcRowHeight(ClcData *dat, ClcContact *contact, int item)
 					if (item == -1) {

 						TCHAR szResult[80];

 

-						if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, _countof(szResult), 0)) {

+						if (!TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", szResult, _countof(szResult), 0)) {

 							SIZE text_size = { 0 };

 							RECT rc = { 0 };

 							// Select font

diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
index 097d889042..902812a8de 100644
--- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
+++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
@@ -29,10 +29,10 @@ static char* rowOptTmplStr;
 static ROWCELL* rowOptTmplRoot;

 static ROWCELL* rowOptTA[100];

 TCHAR *types[] = {

-	_T("none"), _T("text1"), _T("text2"), _T("text3"), _T("status"),

-	_T("avatar"), _T("extra"), _T("extra1"), _T("extra2"), _T("extra3"),

-	_T("extra4"), _T("extra5"), _T("extra6"), _T("extra7"), _T("extra8"),

-	_T("extra9"), _T("time"), _T("space"), _T("fspace")

+	L"none", L"text1", L"text2", L"text3", L"status",

+	L"avatar", L"extra", L"extra1", L"extra2", L"extra3",

+	L"extra4", L"extra5", L"extra6", L"extra7", L"extra8",

+	L"extra9", L"time", L"space", L"fspace"

 };

 

 RECT da = { 205, 58, 440, 130 }; // Draw area

@@ -136,10 +136,10 @@ void rowOptGenerateTreeView(pROWCELL cell, HTREEITEM node, HWND hwnd)
 

 	switch (cell->cont) {

 	case TC_ROW:

-		tvis.item.pszText = _T("Line");

+		tvis.item.pszText = L"Line";

 		break;

 	case TC_COL:

-		tvis.item.pszText = _T("Column");

+		tvis.item.pszText = L"Column";

 	}

 

 	tvis.item.iImage = cell->child ? 1 : 2;

@@ -171,7 +171,7 @@ void rowOptAddContainer(HWND htree, HTREEITEM hti)
 		rowAddCell(rowOptTmplRoot, TC_ROW);

 		tvis.hParent = NULL;

 		tvis.hInsertAfter = TVI_ROOT;

-		tvis.item.pszText = _T("Line");

+		tvis.item.pszText = L"Line";

 		tvis.item.lParam = (LPARAM)rowOptTmplRoot;

 		cell = rowOptTmplRoot;

 	}

@@ -183,9 +183,9 @@ void rowOptAddContainer(HWND htree, HTREEITEM hti)
 		cell = (pROWCELL)tviparent.lParam;

 

 		if (cell->cont == TC_ROW)

-			tvis.item.pszText = _T("Column");

+			tvis.item.pszText = L"Column";

 		else

-			tvis.item.pszText = _T("Line");

+			tvis.item.pszText = L"Line";

 

 		if (cell->child) {

 			cell = cell->child;

@@ -362,14 +362,14 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		}

 		SendDlgItemMessage(hwndDlg, IDC_CONTTYPE, CB_SETCURSEL, 0, 0);

 

-		TCHAR *h_alignment[] = { _T("left"), _T("hCenter"), _T("right") };

+		TCHAR *h_alignment[] = { L"left", L"hCenter", L"right" };

 		for (i = 0; i < _countof(h_alignment); i++) {

 			item = SendDlgItemMessage(hwndDlg, IDC_HALIGN, CB_ADDSTRING, 0, (LPARAM)TranslateTS(h_alignment[i]));

 			SendDlgItemMessage(hwndDlg, IDC_HALIGN, CB_SETITEMDATA, item, 0);

 		}

 		SendDlgItemMessage(hwndDlg, IDC_HALIGN, CB_SETCURSEL, 0, 0);

 

-		TCHAR *v_alignment[] = { _T("top"), _T("vCenter"), _T("bottom") };

+		TCHAR *v_alignment[] = { L"top", L"vCenter", L"bottom" };

 		for (i = 0; i < _countof(v_alignment); i++) {

 			item = SendDlgItemMessage(hwndDlg, IDC_VALIGN, CB_ADDSTRING, 0, (LPARAM)TranslateTS(v_alignment[i]));

 			SendDlgItemMessage(hwndDlg, IDC_VALIGN, CB_SETITEMDATA, item, 0);

diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index e6c9db1ace..e6c325481e 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -126,7 +126,7 @@ IniParser::IniParser(TCHAR * tcsFileName, BYTE flags) : _Flags(flags)
 		return;
 	}
 
-	_hFile = _tfopen(tcsFileName, _T("r"));
+	_hFile = _tfopen(tcsFileName, L"r");
 	if (_hFile != NULL) {
 		_eType = IT_FILE;
 		_isValid = true;
@@ -215,9 +215,9 @@ int IniParser::GetSkinFolder(IN const TCHAR * szFileName, OUT TCHAR * pszFolderN
 	while (b3 > custom_folder && *b3 != _T('\\')) { b3--; }
 	*b3 = _T('\0');
 
-	GetPrivateProfileString(_T("Skin_Description_Section"), _T("SkinFolder"), _T(""), cus, _countof(custom_folder), szFileName);
+	GetPrivateProfileString(L"Skin_Description_Section", L"SkinFolder", L"", cus, _countof(custom_folder), szFileName);
 	if (cus[0] != 0)
-		mir_sntprintf(pszFolderName, MAX_PATH, _T("%s\\%s"), custom_folder, cus);
+		mir_sntprintf(pszFolderName, MAX_PATH, L"%s\\%s", custom_folder, cus);
 
 	mir_free(szBuff);
 	PathToRelativeT(pszFolderName, pszFolderName);
@@ -1471,11 +1471,11 @@ int ske_GetFullFilename(TCHAR *buf, const TCHAR *file, TCHAR *skinfolder, BOOL m
 {
 	TCHAR *SkinPlace = db_get_tsa(NULL, SKIN, "SkinFolder");
 	if (SkinPlace == NULL)
-		SkinPlace = mir_tstrdup(_T("\\Skin\\default"));
+		SkinPlace = mir_tstrdup(L"\\Skin\\default");
 
 	TCHAR b2[MAX_PATH];
 	if (file[0] != '\\' && file[1] != ':')
-		mir_sntprintf(b2, _T("%s\\%s"), (skinfolder == NULL) ? SkinPlace : ((INT_PTR)skinfolder != -1) ? skinfolder : _T(""), file);
+		mir_sntprintf(b2, L"%s\\%s", (skinfolder == NULL) ? SkinPlace : ((INT_PTR)skinfolder != -1) ? skinfolder : L"", file);
 	else
 		mir_tstrncpy(b2, file, _countof(b2));
 
@@ -1564,9 +1564,9 @@ static HBITMAP ske_LoadGlyphImage_TGA(const TCHAR *szFilename)
 	BOOL err = FALSE;
 	tga_header_t header;
 	if (!szFilename) return NULL;
-	if (!wildcmpit(szFilename, _T("*\\*%.tga"))) {
+	if (!wildcmpit(szFilename, L"*\\*%.tga")) {
 		//Loading TGA image from file
-		FILE *fp = _tfopen(szFilename, _T("rb"));
+		FILE *fp = _tfopen(szFilename, L"rb");
 		if (!fp) {
 			TRACEVAR("error: couldn't open \"%s\"!\n", szFilename);
 			return NULL;
@@ -1631,7 +1631,7 @@ static HBITMAP ske_LoadGlyphImageByDecoders(const TCHAR *tszFileName)
 	HBITMAP hBitmap;
 	bool f = false;
 
-	if (!mir_tstrcmpi(ext, _T(".tga"))) {
+	if (!mir_tstrcmpi(ext, L".tga")) {
 		hBitmap = ske_LoadGlyphImage_TGA(tszFileName);
 		f = true;
 	}
@@ -1663,7 +1663,7 @@ static HBITMAP ske_LoadGlyphImageByDecoders(const TCHAR *tszFileName)
 
 static HBITMAP ske_skinLoadGlyphImage(const TCHAR *tszFileName)
 {
-	if (!wildcmpit(tszFileName, _T("*.tga")))
+	if (!wildcmpit(tszFileName, L"*.tga"))
 		return GDIPlus_LoadGlyphImage(tszFileName);
 
 	return ske_LoadGlyphImageByDecoders(tszFileName);
@@ -1918,7 +1918,7 @@ static int ske_GetSkinFromDB(char *, SKINOBJECTSLIST *Skin)
 		if (Skin->szSkinPlace && _tcschr(Skin->szSkinPlace, '%'))
 			bOnlyObjects = TRUE;
 		mir_free(Skin->szSkinPlace);
-		Skin->szSkinPlace = mir_tstrdup(_T("%Default%"));
+		Skin->szSkinPlace = mir_tstrdup(L"%Default%");
 		ske_LoadSkinFromResource(bOnlyObjects);
 	}
 
@@ -2275,7 +2275,7 @@ static int ske_AlphaTextOut(HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect,
 		lpWorkString = (TCHAR*)mir_alloc((visibleCharCount + 4) * sizeof(TCHAR));
 
 		memcpy((void*)lpWorkString, lpString, visibleCharCount * sizeof(TCHAR));
-		memcpy((void*)(lpWorkString + visibleCharCount), _T("..."), 4 * sizeof(TCHAR)); // 3 + 1
+		memcpy((void*)(lpWorkString + visibleCharCount), L"...", 4 * sizeof(TCHAR)); // 3 + 1
 
 		nCount = visibleCharCount + 3;
 	}
@@ -3311,8 +3311,8 @@ static TCHAR *ske_ReAppend(TCHAR *lfirst, TCHAR * lsecond, int len)
 
 TCHAR* ske_ReplaceVar(TCHAR *var)
 {
-	if (!var) return mir_tstrdup(_T(""));
-	if (!mir_tstrcmpi(var, _T("Profile"))) {
+	if (!var) return mir_tstrdup(L"");
+	if (!mir_tstrcmpi(var, L"Profile")) {
 		char buf[MAX_PATH] = { 0 };
 		CallService(MS_DB_GETPROFILENAME, (WPARAM)MAX_PATH, (LPARAM)buf);
 
@@ -3324,7 +3324,7 @@ TCHAR* ske_ReplaceVar(TCHAR *var)
 	}
 
 	mir_free(var);
-	return mir_tstrdup(_T(""));
+	return mir_tstrdup(L"");
 }
 
 TCHAR *ske_ParseText(TCHAR *stzText)
@@ -3355,7 +3355,7 @@ TCHAR *ske_ParseText(TCHAR *stzText)
 				result = ske_ReAppend(result, var, 0);
 				mir_free(var);
 			}
-			else result = ske_ReAppend(result, _T("%"), 0);
+			else result = ske_ReAppend(result, L"%", 0);
 
 			curpos++;
 			stpos = curpos;
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 3c116d4b84..3be1b39192 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -70,7 +70,7 @@ int ModernSkinOptInit(WPARAM wParam, LPARAM)
 	obj.hInstance = g_hInst;
 	obj.iSection = MODERNOPT_PAGE_SKINS;
 	obj.iType = MODERNOPT_TYPE_SELECTORPAGE;
-	obj.lptzSubsection = _T("Contact list");
+	obj.lptzSubsection = L"Contact list";
 	obj.lpzThemeExtension = ".msf";
 	obj.lpzThemeModuleName = "ModernSkinSel";
 	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
@@ -119,10 +119,10 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 
 				TCHAR Author[255], URL[MAX_PATH], Contact[255], Description[400], text[2000];
 				if (!_tcschr(sd->File, _T('%'))) {
-					GetPrivateProfileString(_T("Skin_Description_Section"), _T("Author"), TranslateT("( unknown )"), Author, _countof(Author), sd->File);
-					GetPrivateProfileString(_T("Skin_Description_Section"), _T("URL"), _T(""), URL, _countof(URL), sd->File);
-					GetPrivateProfileString(_T("Skin_Description_Section"), _T("Contact"), _T(""), Contact, _countof(Contact), sd->File);
-					GetPrivateProfileString(_T("Skin_Description_Section"), _T("Description"), _T(""), Description, _countof(Description), sd->File);
+					GetPrivateProfileString(L"Skin_Description_Section", L"Author", TranslateT("( unknown )"), Author, _countof(Author), sd->File);
+					GetPrivateProfileString(L"Skin_Description_Section", L"URL", L"", URL, _countof(URL), sd->File);
+					GetPrivateProfileString(L"Skin_Description_Section", L"Contact", L"", Contact, _countof(Contact), sd->File);
+					GetPrivateProfileString(L"Skin_Description_Section", L"Description", L"", Description, _countof(Description), sd->File);
 					mir_sntprintf(text, TranslateT("%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s"),
 						sd->Name, Description, Author, Contact, URL, sd->File);
 				}
@@ -131,8 +131,8 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 						TranslateT("reVista for Modern v0.5"),
 						TranslateT("This is second default Modern Contact list skin in Vista Aero style"),
 						TranslateT("Angeli-Ka (graphics), FYR (template)"),
-						_T("JID: fyr@jabber.ru"),
-						_T("fyr.mirandaim.ru"),
+						L"JID: fyr@jabber.ru",
+						L"fyr.mirandaim.ru",
 						TranslateT("Inside library"));
 				}
 				MessageBox(hwndDlg, text, TranslateT("Skin information"), MB_OK | MB_ICONINFORMATION);
@@ -259,9 +259,9 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 					SetDlgItemText(hwndDlg, IDC_EDIT_SKIN_FILENAME, buf);
 
 					TCHAR prfn[MAX_PATH] = { 0 }, imfn[MAX_PATH] = { 0 }, skinfolder[MAX_PATH] = { 0 };
-					GetPrivateProfileString(_T("Skin_Description_Section"), _T("Preview"), _T(""), imfn, _countof(imfn), sd->File);
+					GetPrivateProfileString(L"Skin_Description_Section", L"Preview", L"", imfn, _countof(imfn), sd->File);
 					IniParser::GetSkinFolder(sd->File, skinfolder);
-					mir_sntprintf(prfn, _T("%s\\%s"), skinfolder, imfn);
+					mir_sntprintf(prfn, L"%s\\%s", skinfolder, imfn);
 					PathToAbsoluteT(prfn, imfn);
 					hPreviewBitmap = ske_LoadGlyphImage(imfn);
 
@@ -284,10 +284,10 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 
 						TCHAR Author[255], URL[MAX_PATH], Contact[255], Description[400], text[2000];
 						if (sd2->File && !_tcschr(sd2->File, _T('%'))) {
-							GetPrivateProfileString(_T("Skin_Description_Section"), _T("Author"), TranslateT("( unknown )"), Author, _countof(Author), sd2->File);
-							GetPrivateProfileString(_T("Skin_Description_Section"), _T("URL"), _T(""), URL, _countof(URL), sd2->File);
-							GetPrivateProfileString(_T("Skin_Description_Section"), _T("Contact"), _T(""), Contact, _countof(Contact), sd2->File);
-							GetPrivateProfileString(_T("Skin_Description_Section"), _T("Description"), _T(""), Description, _countof(Description), sd2->File);
+							GetPrivateProfileString(L"Skin_Description_Section", L"Author", TranslateT("( unknown )"), Author, _countof(Author), sd2->File);
+							GetPrivateProfileString(L"Skin_Description_Section", L"URL", L"", URL, _countof(URL), sd2->File);
+							GetPrivateProfileString(L"Skin_Description_Section", L"Contact", L"", Contact, _countof(Contact), sd2->File);
+							GetPrivateProfileString(L"Skin_Description_Section", L"Description", L"", Description, _countof(Description), sd2->File);
 							mir_sntprintf(text, TranslateT("Preview is not available\n\n%s\n----------------------\n\n%s\n\nAUTHOR(S):\n%s\n\nCONTACT:\n%s\n\nHOMEPAGE:\n%s"),
 								sd2->Name, Description, Author, Contact, URL);
 						}
@@ -296,8 +296,8 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 								TranslateT("reVista for Modern v0.5"),
 								TranslateT("This is second default Modern Contact list skin in Vista Aero style"),
 								TranslateT("graphics by Angeli-Ka\ntemplate by FYR"),
-								_T("JID: fyr@jabber.ru"),
-								_T("fyr.mirandaim.ru"));
+								L"JID: fyr@jabber.ru",
+								L"fyr.mirandaim.ru");
 						}
 						ShowWindow(GetDlgItem(hwndDlg, IDC_PREVIEW), SW_HIDE);
 						ShowWindow(GetDlgItem(hwndDlg, IDC_STATIC_INFO), SW_SHOW);
@@ -330,7 +330,7 @@ int SearchSkinFiles(HWND hwndDlg, TCHAR * Folder)
 	struct _tfinddata_t fd = { 0 };
 	TCHAR mask[MAX_PATH];
 	long hFile;
-	mir_sntprintf(mask, _T("%s\\*.msf"), Folder);
+	mir_sntprintf(mask, L"%s\\*.msf", Folder);
 	//fd.attrib = _A_SUBDIR;
 	hFile = _tfindfirst(mask, &fd);
 	if (hFile != -1) {
@@ -339,13 +339,13 @@ int SearchSkinFiles(HWND hwndDlg, TCHAR * Folder)
 		} while (!_tfindnext(hFile, &fd));
 		_findclose(hFile);
 	}
-	mir_sntprintf(mask, _T("%s\\*"), Folder);
+	mir_sntprintf(mask, L"%s\\*", Folder);
 	hFile = _tfindfirst(mask, &fd);
 	{
 		do {
-			if (fd.attrib&_A_SUBDIR && !(mir_tstrcmpi(fd.name, _T(".")) == 0 || mir_tstrcmpi(fd.name, _T("..")) == 0)) {//Next level of subfolders
+			if (fd.attrib&_A_SUBDIR && !(mir_tstrcmpi(fd.name, L".") == 0 || mir_tstrcmpi(fd.name, L"..") == 0)) {//Next level of subfolders
 				TCHAR path[MAX_PATH];
-				mir_sntprintf(path, _T("%s\\%s"), Folder, fd.name);
+				mir_sntprintf(path, L"%s\\%s", Folder, fd.name);
 				SearchSkinFiles(hwndDlg, path);
 			}
 		} while (!_tfindnext(hFile, &fd));
@@ -361,7 +361,7 @@ HTREEITEM FillAvailableSkinList(HWND hwndDlg)
 	int attrib;
 
 	TreeView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_TREE1));
-	AddSkinToList(hwndDlg, TranslateT("Default Skin"), _T("%Default Skin%"));
+	AddSkinToList(hwndDlg, TranslateT("Default Skin"), L"%Default Skin%");
 	attrib = GetFileAttributes(SkinsFolder);
 	if (attrib != INVALID_FILE_ATTRIBUTES && (attrib & FILE_ATTRIBUTE_DIRECTORY))
 		SearchSkinFiles(hwndDlg, SkinsFolder);
@@ -403,15 +403,15 @@ HTREEITEM AddSkinToList(HWND hwndDlg, TCHAR * path, TCHAR* file)
 		return 0;
 
 	if (!file || _tcschr(file, _T('%'))) {
-		mir_sntprintf(sd->File, _T("%%Default Skin%%"));
+		mir_sntprintf(sd->File, L"%%Default Skin%%");
 		mir_sntprintf(sd->Name, TranslateT("%Default Skin%"));
 		_tcsncpy_s(fullName, TranslateT("Default Skin"), _TRUNCATE);
 	}
 	else {
-		mir_sntprintf(fullName, _T("%s\\%s"), path, file);
+		mir_sntprintf(fullName, L"%s\\%s", path, file);
 		_tcsncpy_s(defskinname, file, _TRUNCATE);
 		TCHAR *p = _tcsrchr(defskinname, '.'); if (p) *p = 0;
-		GetPrivateProfileString(_T("Skin_Description_Section"), _T("Name"), defskinname, sd->Name, _countof(sd->Name), fullName);
+		GetPrivateProfileString(L"Skin_Description_Section", L"Name", defskinname, sd->Name, _countof(sd->Name), fullName);
 		_tcsncpy_s(sd->File, fullName, _TRUNCATE);
 	}
 	return AddItemToTree(GetDlgItem(hwndDlg, IDC_TREE1), sd->Name, sd);
@@ -522,9 +522,9 @@ INT_PTR SvcPreviewSkin(WPARAM wParam, LPARAM lParam)
 		TCHAR prfn[MAX_PATH] = { 0 };
 		TCHAR imfn[MAX_PATH] = { 0 };
 		TCHAR skinfolder[MAX_PATH] = { 0 };
-		GetPrivateProfileString(_T("Skin_Description_Section"), _T("Preview"), _T(""), imfn, _countof(imfn), (LPCTSTR)lParam);
+		GetPrivateProfileString(L"Skin_Description_Section", L"Preview", L"", imfn, _countof(imfn), (LPCTSTR)lParam);
 		IniParser::GetSkinFolder((LPCTSTR)lParam, skinfolder);
-		mir_sntprintf(prfn, _T("%s\\%s"), skinfolder, imfn);
+		mir_sntprintf(prfn, L"%s\\%s", skinfolder, imfn);
 		PathToAbsoluteT(prfn, imfn);
 
 		hPreviewBitmap = ske_LoadGlyphImage(imfn);
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index 4eca4f67b4..ade67318a6 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -241,7 +241,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 				int nEmails = (int)CallProtoService(szProto, PS_GETUNREADEMAILCOUNT, 0, 0);

 				if (nEmails > 0) {

 					TCHAR str[40];

-					mir_sntprintf(str, _T("[%d]"), nEmails);

+					mir_sntprintf(str, L"[%d]", nEmails);

 					p->szProtoEMailCount = mir_tstrdup(str);

 				}

 			}

@@ -815,7 +815,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 							}

 						}

 

-						SaveViewMode(filterName, _T(""), g_CluiData.protoFilter, 0, -1, 0, 0, 0, 0);

+						SaveViewMode(filterName, L"", g_CluiData.protoFilter, 0, -1, 0, 0, 0, 0);

 

 						ApplyViewMode(filterName);

 					}

@@ -861,7 +861,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 	return DefWindowProc(hwnd, msg, wParam, lParam);

 }

 

-TCHAR pluginname[] = _T("ModernStatusBar");

+TCHAR pluginname[] = L"ModernStatusBar";

 

 HWND StatusBar_Create(HWND parent)

 {

@@ -887,7 +887,7 @@ HWND StatusBar_Create(HWND parent)
 	if (db_get_b(NULL, "CLUI", "ShowSBar", SETTING_SHOWSBAR_DEFAULT))

 		Frame.Flags |= F_VISIBLE;

 	Frame.height = h;

-	Frame.tname = _T("Status bar");

+	Frame.tname = L"Status bar";

 	Frame.TBtname = TranslateT("Status bar");

 	hFramehModernStatusBar = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);

 	CallService(MS_SKINENG_REGISTERPAINTSUB, (WPARAM)Frame.hWnd, (LPARAM)NewStatusPaintCallbackProc); //$$$$$ register sub for frame

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 52c2b1fcc5..051ec14f57 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -69,13 +69,13 @@ void Modern_InitButtons()
 			char buf[255];

 			if (i != 0) {

 				mir_snprintf(buf, "%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn");

-				tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"), BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource);

+				tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, L"icons\\toolbar_icons.dll", BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource);

 			}

 			else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, NULL, 0, NULL, SKINICON_OTHER_MAINMENU);

 

 			if (BTNS[i].pszTooltipDn) {

 				mir_snprintf(buf, "%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_up");

-				tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"), BTNS[i].icoDefIdx + 1, g_hInst, BTNS[i].defResource2);

+				tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, L"icons\\toolbar_icons.dll", BTNS[i].icoDefIdx + 1, g_hInst, BTNS[i].defResource2);

 			}

 			else tbb.hIconHandleDn = NULL;

 		}

@@ -279,7 +279,7 @@ void CustomizeToolbar(HWND hwnd)
 	ModernToolbarCtrl* pMTBInfo = (ModernToolbarCtrl*)GetWindowLongPtr(hwnd, 0);

 

 	CLISTFrame Frame = { sizeof(Frame) };

-	Frame.tname = _T("Toolbar");

+	Frame.tname = L"Toolbar";

 	Frame.hWnd = hwnd;

 	Frame.align = alTop;

 	Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_TCHAR | F_NO_SUBCONTAINER;

diff --git a/plugins/Clist_modern/src/modern_utils.cpp b/plugins/Clist_modern/src/modern_utils.cpp
index 03152cbf9a..469836c255 100644
--- a/plugins/Clist_modern/src/modern_utils.cpp
+++ b/plugins/Clist_modern/src/modern_utils.cpp
@@ -42,7 +42,7 @@ void TRACE_ERROR()
 		return;

 	}

 #ifdef _DEBUG

-	MessageBox(NULL, (LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION);

+	MessageBox(NULL, (LPCTSTR)lpMsgBuf, L"Error", MB_OK | MB_ICONINFORMATION);

 	DebugBreak();

 #endif

 	LocalFree(lpMsgBuf);

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 0afc589a10..7124d3f4b4 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -372,7 +372,7 @@ void SaveViewMode(const char *name, const TCHAR *szGroupFilter, const char *szPr
 

 void SaveState()

 {

-	TCHAR newGroupFilter[2048] = _T("|");

+	TCHAR newGroupFilter[2048] = L"|";

 	char newProtoFilter[2048] = "|";

 	DWORD statusMask = 0;

 	DWORD operators = 0;

@@ -414,7 +414,7 @@ void SaveState()
 				item.iItem = i;

 				SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item);

 				mir_tstrncat(newGroupFilter, szTemp, _countof(newGroupFilter) - mir_tstrlen(newGroupFilter));

-				mir_tstrncat(newGroupFilter, _T("|"), _countof(newGroupFilter) - mir_tstrlen(newGroupFilter));

+				mir_tstrncat(newGroupFilter, L"|", _countof(newGroupFilter) - mir_tstrlen(newGroupFilter));

 				newGroupFilter[2047] = 0;

 			}

 		}

@@ -561,7 +561,7 @@ static void UpdateFilters()
 		for (i = 1; i < ListView_GetItemCount(hwndList); i++) {

 			item.iItem = i;

 			SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item);

-			mir_sntprintf(szMask, _T("%s|"), szTemp);

+			mir_sntprintf(szMask, L"%s|", szTemp);

 			if (szGF && _tcsstr(szGF, szMask))

 				ListView_SetCheckState(hwndList, i, TRUE)

 			else

@@ -783,14 +783,14 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					int iNewItem = SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_INSERTSTRING, -1, (LPARAM)szBuf);

 					if (iNewItem != LB_ERR) {

 						SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_SETCURSEL, (WPARAM)iNewItem, 0);

-						SaveViewMode(szUTF8Buf, _T(""), "", 0, -1, 0, 0, 0, 0);

+						SaveViewMode(szUTF8Buf, L"", "", 0, -1, 0, 0, 0, 0);

 						clvm_curItem = iNewItem;

 						UpdateStickies();

 						SendDlgItemMessage(hwndDlg, IDC_PROTOGROUPOP, CB_SETCURSEL, 0, 0);

 						SendDlgItemMessage(hwndDlg, IDC_GROUPSTATUSOP, CB_SETCURSEL, 0, 0);

 					}

 				}

-				SetDlgItemText(hwndDlg, IDC_NEWVIEMODE, _T(""));

+				SetDlgItemText(hwndDlg, IDC_NEWVIEMODE, L"");

 			}

 			EnableWindow(GetDlgItem(hwndDlg, IDC_ADDVIEWMODE), FALSE);

 			UpdateFilters();

@@ -923,7 +923,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	case WM_CREATE:

 	{

 		RECT rcMargins = { 12, 0, 2, 0 };

-		hwndSelector = CreateWindow(MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

+		hwndSelector = CreateWindow(MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

 			hwnd, (HMENU)IDC_SELECTMODE, g_hInst, NULL);

 		MakeButtonSkinned(hwndSelector);

 		SendMessage(hwndSelector, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Select a view mode"), BATF_TCHAR);

@@ -935,7 +935,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		SendMessage(hwndSelector, BUTTONSETSENDONDOWN, 0, (LPARAM)1);

 

 		//SendMessage(hwndSelector, BM_SETASMENUACTION, 1, 0);

-		HWND hwndButton = CreateWindow(MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

+		HWND hwndButton = CreateWindow(MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

 			hwnd, (HMENU)IDC_CONFIGUREMODES, g_hInst, NULL);

 		MakeButtonSkinned(hwndButton);

 		SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Setup view modes"), BATF_TCHAR);

@@ -943,7 +943,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		SendMessage(hwndButton, BUTTONSETASFLATBTN, TRUE, 0);

 		SendMessage(hwndButton, MBM_UPDATETRANSPARENTFLAG, 0, 2);

 

-		hwndButton = CreateWindow(MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

+		hwndButton = CreateWindow(MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

 			hwnd, (HMENU)IDC_RESETMODES, g_hInst, NULL);

 		MakeButtonSkinned(hwndButton);

 		SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Clear view mode and return to default display"), BATF_TCHAR);

@@ -1193,18 +1193,18 @@ void CreateViewModeFrame()
 	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);

 	wndclass.hbrBackground = (HBRUSH)GetSysColorBrush(COLOR_3DFACE);

 	wndclass.lpszMenuName = 0;

-	wndclass.lpszClassName = _T("CLVMFrameWindow");

+	wndclass.lpszClassName = L"CLVMFrameWindow";

 	RegisterClass(&wndclass);

 

 	CLISTFrame frame = { 0 };

 	frame.cbSize = sizeof(frame);

-	frame.tname = _T("View modes");

+	frame.tname = L"View modes";

 	frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);

 	frame.height = 18;

 	frame.TBtname = TranslateT("View modes");

 	frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER | F_NO_SUBCONTAINER | F_TCHAR;

 	frame.align = alBottom;

-	frame.hWnd = CreateWindowEx(0, _T("CLVMFrameWindow"), _T(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU)0, g_hInst, NULL);

+	frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", _T(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU)0, g_hInst, NULL);

 	g_hwndViewModeFrame = frame.hWnd;

 	hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&frame, 0);

 	CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS);