hello, Unix.

phase 1: removing _T()

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

18 files changed, 66 insertions, 66 deletions

diff --git a/plugins/Clist_ng/CLUIFrames/cluiframes.cpp b/plugins/Clist_ng/CLUIFrames/cluiframes.cpp
index 222bbbf176..353c08669d 100644
--- a/plugins/Clist_ng/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_ng/CLUIFrames/cluiframes.cpp
@@ -1133,7 +1133,7 @@ INT_PTR CLUIFramesShowHideFrame(WPARAM wParam, LPARAM lParam)
 
 	lockfrm();
 	pos = id2pos((INT_PTR)wParam);
-	if (pos >= 0 && !lstrcmp(Frames[pos].name, _T("My Contacts")))
+	if (pos >= 0 && !lstrcmp(Frames[pos].name, L"My Contacts"))
 		Frames[pos].visible = 1;
 	else {
 		if (pos >= 0 && (int)pos < nFramescount)
@@ -2627,7 +2627,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				}
 				hmenu = CreatePopupMenu();
 				AppendMenu(hmenu, MF_STRING | MF_DISABLED | MF_GRAYED, 15, Frames[framepos].name);
-				AppendMenu(hmenu, MF_SEPARATOR, 16, _T(""));
+				AppendMenu(hmenu, MF_SEPARATOR, 16, L"");
 
 				if (Frames[framepos].Locked)
 					AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_lock, TranslateT("Lock Frame"));
@@ -3266,7 +3266,7 @@ wchar_t g_ptszEventName[100];
 
 static int CLUIFrameOnModulesLoad(WPARAM, LPARAM)
 {
-	mir_sntprintf(g_ptszEventName, _countof(g_ptszEventName), _T("mf_update_evt_%d"), GetCurrentThreadId());
+	mir_sntprintf(g_ptszEventName, _countof(g_ptszEventName), L"mf_update_evt_%d", GetCurrentThreadId());
 	g_hEventThread = CreateEvent(NULL, TRUE, FALSE, g_ptszEventName);
 	hThreadMFUpdate = mir_forkthread(MF_UpdateThread, NULL);
 	SetThreadPriority(hThreadMFUpdate, THREAD_PRIORITY_IDLE);
@@ -3396,7 +3396,7 @@ void RegisterCLUIFrameClasses()
 	cntclass.hCursor       = LoadCursor(NULL, IDC_ARROW);
 	cntclass.hbrBackground = NULL;
 	cntclass.lpszMenuName  = NULL;
-	cntclass.lpszClassName = _T("FramesContainer");
+	cntclass.lpszClassName = L"FramesContainer";
 	RegisterClass(&cntclass);
 }
 
diff --git a/plugins/Clist_ng/CLUIFrames/cluiframes.h b/plugins/Clist_ng/CLUIFrames/cluiframes.h
index c56b471ab3..587f6b4736 100644
--- a/plugins/Clist_ng/CLUIFrames/cluiframes.h
+++ b/plugins/Clist_ng/CLUIFrames/cluiframes.h
@@ -121,7 +121,7 @@ struct FRAMEWND
 #define OFFSET_PROTOPOS 200

 #define OFFSET_VISIBLE 400

 

-#define CLUIFrameTitleBarClassName		_T("CLUIFrameTitleBar")

+#define CLUIFrameTitleBarClassName		L"CLUIFrameTitleBar"

 #define CLUIFrameModule					"CLUIFrames"

 

 class CLUIFrames {

diff --git a/plugins/Clist_ng/SRC/CLCButton.cpp b/plugins/Clist_ng/SRC/CLCButton.cpp
index e470b58e19..341c638388 100644
--- a/plugins/Clist_ng/SRC/CLCButton.cpp
+++ b/plugins/Clist_ng/SRC/CLCButton.cpp
@@ -586,7 +586,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			if(!(char*) wParam)

 				break;

 			if(!hwndToolTips) {

-				hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

+				hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, L"", WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

 				SetWindowPos(hwndToolTips, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);

 			}

 			ZeroMemory(&ti, sizeof(ti));

diff --git a/plugins/Clist_ng/SRC/clcitems.cpp b/plugins/Clist_ng/SRC/clcitems.cpp
index 99aadd11c7..e9cd5ae901 100644
--- a/plugins/Clist_ng/SRC/clcitems.cpp
+++ b/plugins/Clist_ng/SRC/clcitems.cpp
@@ -511,7 +511,7 @@ int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, str
         }

         if(cfg::dat.bFilterEffective & CLVM_FILTER_GROUPS) {

             if(!cfg::getTString(hContact, "CList", "Group", &dbv)) {

-                _sntprintf(szGroupMask, safe_sizeof(szGroupMask), _T("%s|"), &dbv.ptszVal[1]);

+                _sntprintf(szGroupMask, safe_sizeof(szGroupMask), L"%s|", &dbv.ptszVal[1]);

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

                 mir_free(dbv.ptszVal);

             }

diff --git a/plugins/Clist_ng/SRC/clcopts.cpp b/plugins/Clist_ng/SRC/clcopts.cpp
index 2c4e81ae39..283c87bd0c 100644
--- a/plugins/Clist_ng/SRC/clcopts.cpp
+++ b/plugins/Clist_ng/SRC/clcopts.cpp
@@ -756,17 +756,17 @@ INT_PTR CALLBACK cfg::DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam,
 }

 

 ORDERTREEDATA OrderTreeData[] = {

-	{EXTRA_ICON_RES0, _T("Reserved, unused"), 9, TRUE, 0},

-	{EXTRA_ICON_EMAIL, _T("E-mail"), 0, TRUE, 0},

-	{EXTRA_ICON_RES1, _T("Reserved #1"), 7, TRUE, 0},

-	{EXTRA_ICON_SMS, _T("Telephone"), 2, TRUE, 0},

-	{EXTRA_ICON_ADV1, _T("Advanced #1 (X-Status)"), 3, TRUE, 0},

-	{EXTRA_ICON_ADV2, _T("Advanced #2"), 4, TRUE, 0},

-	{EXTRA_ICON_WEB, _T("Homepage"), 1, TRUE, 0},

-	{EXTRA_ICON_CLIENT, _T("Client (fingerprint required)"), 10, TRUE, 0},

-	{EXTRA_ICON_RES2, _T("Reserved #2"), 8, TRUE, 0},

-	{EXTRA_ICON_ADV3, _T("Advanced #3"), 5, TRUE, 0},

-	{EXTRA_ICON_ADV4, _T("Advanced #4"), 6, TRUE, 0},

+	{EXTRA_ICON_RES0, L"Reserved, unused", 9, TRUE, 0},

+	{EXTRA_ICON_EMAIL, L"E-mail", 0, TRUE, 0},

+	{EXTRA_ICON_RES1, L"Reserved #1", 7, TRUE, 0},

+	{EXTRA_ICON_SMS, L"Telephone", 2, TRUE, 0},

+	{EXTRA_ICON_ADV1, L"Advanced #1 (X-Status)", 3, TRUE, 0},

+	{EXTRA_ICON_ADV2, L"Advanced #2", 4, TRUE, 0},

+	{EXTRA_ICON_WEB, L"Homepage", 1, TRUE, 0},

+	{EXTRA_ICON_CLIENT, L"Client (fingerprint required)", 10, TRUE, 0},

+	{EXTRA_ICON_RES2, L"Reserved #2", 8, TRUE, 0},

+	{EXTRA_ICON_ADV3, L"Advanced #3", 5, TRUE, 0},

+	{EXTRA_ICON_ADV4, L"Advanced #4", 6, TRUE, 0},

 };

 

 static int dragging = 0;

diff --git a/plugins/Clist_ng/SRC/clcpaint.cpp b/plugins/Clist_ng/SRC/clcpaint.cpp
index 3b7afc0ee4..b71c58a213 100644
--- a/plugins/Clist_ng/SRC/clcpaint.cpp
+++ b/plugins/Clist_ng/SRC/clcpaint.cpp
@@ -954,7 +954,7 @@ text:
 				RECT 		rc = rcContent;
 				COLORREF 	oldColor = 0;
 
-				if (TimeZone_PrintDateTime(cEntry->hTimeZone, _T("t"), szResult, _countof(szResult), 0))

+				if (TimeZone_PrintDateTime(cEntry->hTimeZone, L"t", szResult, _countof(szResult), 0))

 					goto nodisplay;

 
 				oldColor = Gfx::getTextColor();
diff --git a/plugins/Clist_ng/SRC/clcutils.cpp b/plugins/Clist_ng/SRC/clcutils.cpp
index 440832a7e1..549caed102 100644
--- a/plugins/Clist_ng/SRC/clcutils.cpp
+++ b/plugins/Clist_ng/SRC/clcutils.cpp
@@ -529,7 +529,7 @@ void CLC::BeginRenameSelection(HWND hwnd, ClcData *dat)
 		for (i = 0; i <= FONTID_LAST; i++)

 			if (h < dat->fontInfo[i].fontHeight + 2) h = dat->fontInfo[i].fontHeight + 2;

 	}

-	dat->hwndRenameEdit = CreateWindowEx(0, _T("RichEdit20W"), contact->szText, WS_CHILD | WS_BORDER | ES_MULTILINE | ES_AUTOHSCROLL, x, y, clRect.right - x, h, hwnd, NULL, g_hInst, NULL);

+	dat->hwndRenameEdit = CreateWindowEx(0, L"RichEdit20W", contact->szText, WS_CHILD | WS_BORDER | ES_MULTILINE | ES_AUTOHSCROLL, x, y, clRect.right - x, h, hwnd, NULL, g_hInst, NULL);

 	{

 		if((contact->type == CLCIT_CONTACT && cfg::eCache[contact->extraCacheEntry].dwCFlags & ECF_RTLNICK) || (contact->type == CLCIT_GROUP && contact->isRtl)) {

 			PARAFORMAT2 pf2;

@@ -537,12 +537,12 @@ void CLC::BeginRenameSelection(HWND hwnd, ClcData *dat)
 			pf2.cbSize = sizeof(pf2);

 			pf2.dwMask = PFM_RTLPARA;

 			pf2.wEffects = PFE_RTLPARA;

-			SetWindowText(dat->hwndRenameEdit, _T(""));

+			SetWindowText(dat->hwndRenameEdit, L"");

 			SendMessage(dat->hwndRenameEdit, EM_SETPARAFORMAT, 0, (LPARAM)&pf2);

 			SetWindowText(dat->hwndRenameEdit, contact->szText);

 		}

 	}

-	//dat->hwndRenameEdit = CreateWindow(_T("EDIT"), contact->szText, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, x, y, clRect.right - x, dat->rowHeight, hwnd, NULL, g_hInst, NULL);

+	//dat->hwndRenameEdit = CreateWindow(L"EDIT", contact->szText, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, x, y, clRect.right - x, dat->rowHeight, hwnd, NULL, g_hInst, NULL);

 	OldRenameEditWndProc = (WNDPROC) SetWindowLongPtr(dat->hwndRenameEdit, GWLP_WNDPROC, (LONG_PTR) RenameEditSubclassProc);

 	SendMessage(dat->hwndRenameEdit, WM_SETFONT, (WPARAM) (contact->type == CLCIT_GROUP ? dat->fontInfo[FONTID_GROUPS].hFont : dat->fontInfo[FONTID_CONTACTS].hFont), 0);

 	SendMessage(dat->hwndRenameEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN | EC_USEFONTINFO, 0);

@@ -567,7 +567,7 @@ void CLC::LoadClcOptions(HWND hwnd, ClcData *dat, BOOL first)
 

 		HFONT holdfont = (HFONT)SelectObject(hdc, dat->fontInfo[i].hFont);

 		SIZE fontSize;

-		GetTextExtentPoint32(hdc, _T("x"), 1, &fontSize);

+		GetTextExtentPoint32(hdc, L"x", 1, &fontSize);

 		SelectObject(hdc, holdfont);

 

 		dat->fontInfo[i].fontHeight = fontSize.cy;

diff --git a/plugins/Clist_ng/SRC/clistmenus.cpp b/plugins/Clist_ng/SRC/clistmenus.cpp
index 6b3f0ea92e..9b1014e77d 100644
--- a/plugins/Clist_ng/SRC/clistmenus.cpp
+++ b/plugins/Clist_ng/SRC/clistmenus.cpp
@@ -103,7 +103,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, dwMask);

 			SendMessage(hWnd, WM_USER + 120, 0, 0);

 			TranslateDialogDefault(hWnd);

-			hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

+			hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, L"CLCButtonClass", L"FOO", WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

 			SendMessage(hwndAdd, BUTTONSETASFLATBTN, 0, 1);

 			SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

 

@@ -111,7 +111,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			SetWindowText(hwndAdd, TranslateT("Add permanently"));

 			EnableWindow(hwndAdd, cfg::getByte(hContact, "CList", "NotOnList", 0));

 

-            hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

+            hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, L"CLCButtonClass", L"FOO", WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

             SendMessage(hwndAdd, BUTTONSETASFLATBTN, 0, 1);

             SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

 

diff --git a/plugins/Clist_ng/SRC/clui.cpp b/plugins/Clist_ng/SRC/clui.cpp
index a5a9409c7a..f23c9e7c73 100644
--- a/plugins/Clist_ng/SRC/clui.cpp
+++ b/plugins/Clist_ng/SRC/clui.cpp
@@ -235,7 +235,7 @@ int CLUI::createCLC(HWND parent)
 	{

 		CLISTFrame frame = {0};

 		frame.cbSize = sizeof(frame);

-		frame.tname = _T("EventArea");

+		frame.tname = L"EventArea";

 		frame.TBtname = TranslateT("Event Area");

 		frame.hIcon = 0;

 		frame.height = 20;

@@ -260,7 +260,7 @@ int CLUI::createCLC(HWND parent)
 		Frame.align = alClient;

 		Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 		Frame.Flags = F_VISIBLE | F_SHOWTB | F_SHOWTBTIP | F_NOBORDER | F_TCHAR;

-		Frame.tname = _T("My Contacts");

+		Frame.tname = L"My Contacts";

 		Frame.TBtname = TranslateT("My Contacts");

 		Frame.height = 200;

 		hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM) & Frame, (LPARAM)0);

@@ -326,13 +326,13 @@ static void CacheClientIcons()
 

 static void InitIcoLib()

 {

-	Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Default"), myIcons, _countof(myIcons));

+	Icon_RegisterT(g_hInst, LPGENT("Contact list") L"/" LPGENT("Default"), myIcons, _countof(myIcons));

 

 	for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) {

 		char szBuffer[128];

 		mir_snprintf(szBuffer, _countof(szBuffer), "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE));

 		IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };

-		Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Overlay icons"), &icon, 1);

+		Icon_RegisterT(g_hInst, LPGENT("Contact list") L"/" LPGENT("Overlay icons"), &icon, 1);

 	}

 

 	PROTOACCOUNT **accs = NULL;

@@ -345,7 +345,7 @@ static void InitIcoLib()
 		TCHAR szDescr[128];

 		mir_sntprintf(szDescr, _countof(szDescr), TranslateT("%s connecting"), accs[k]->tszAccountName);

 		IconItemT icon = { szDescr, "conn", IDI_PROTOCONNECTING };

-		Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName);

+		Icon_RegisterT(g_hInst, LPGENT("Contact list") L"/" LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName);

 	}

 }

 

@@ -469,7 +469,7 @@ void CreateButtonBar(HWND hWnd)
 		if (top_buttons[i].id != IDC_TBGLOBALSTATUS && top_buttons[i].id != IDC_TBMENU)

 			continue;

 

-		top_buttons[i].hwnd = CreateWindowEx(0, _T("CLCButtonClass"), _T(""), BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU) top_buttons[i].id, g_hInst, NULL);

+		top_buttons[i].hwnd = CreateWindowEx(0, L"CLCButtonClass", L"", BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU) top_buttons[i].id, g_hInst, NULL);

 

 		hIcon = top_buttons[i].hIcon = IcoLib_GetIcon(top_buttons[i].szIcoLibIcon);

 		if (top_buttons[i].szIcoLibAltIcon)

@@ -1466,7 +1466,7 @@ skipbg:
 									SendMessage(item->hWnd, BM_SETCHECK, 0, 0);

 							}

 							if (!contactOK)

-								MessageBox(0, _T("The requested action requires a valid contact selection. Please select a contact from the contact list and repeat"), _T("Parameter mismatch"), MB_OK);

+								MessageBox(0, L"The requested action requires a valid contact selection. Please select a contact from the contact list and repeat", L"Parameter mismatch", MB_OK);

 							if (serviceFailure) {

 								char szError[512];

 

@@ -1773,7 +1773,7 @@ buttons_done:
 					else szName[0] = 0;

 

 					if (lstrlen(szName) < sizeof(szName) - 1)

-						lstrcat(szName, _T(" "));

+						lstrcat(szName, L" ");

 					GetTextExtentPoint32(dis->hDC, szName, lstrlen(szName), &textSize);

 					dis->rcItem.left += x;

 					Gfx::renderText(dis->hDC, (HANDLE)dis->CtlID, szName, &dis->rcItem, DT_VCENTER | DT_SINGLELINE, 0);

diff --git a/plugins/Clist_ng/SRC/cluiservices.cpp b/plugins/Clist_ng/SRC/cluiservices.cpp
index 088b0db00e..8f12e35e7e 100644
--- a/plugins/Clist_ng/SRC/cluiservices.cpp
+++ b/plugins/Clist_ng/SRC/cluiservices.cpp
@@ -149,7 +149,7 @@ void CluiProtocolStatusChanged( int parStatus, const char* szProto )
 				lstrcpyn( szName, pa->tszAccountName, _countof(szName));

 				szName[ _countof(szName)-1 ] = 0;

 				if (( showOpts & 4 ) && lstrlen(szName) < sizeof(szName)-1 )

-					lstrcat( szName, _T(" "));

+					lstrcat( szName, L" ");

 				GetTextExtentPoint32( hdc, szName, lstrlen(szName), &textSize );

 				x += textSize.cx + GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

 			}

diff --git a/plugins/Clist_ng/SRC/config.cpp b/plugins/Clist_ng/SRC/config.cpp
index 4674f398c5..8816643f09 100644
--- a/plugins/Clist_ng/SRC/config.cpp
+++ b/plugins/Clist_ng/SRC/config.cpp
@@ -352,10 +352,10 @@ void cfg::FS_RegisterFonts()
 }

 

 TSkinDescription cfg::my_default_skin[] = {

-	IDR_SKIN_BASE, _T("base.cng"),

-	IDR_SKIN_BACK, _T("back.png"),

-	IDR_SKIN_BACKAERO, _T("AeroBack.png"),

-	IDR_SKIN_GLYPHS, _T("glyphs.png"),

+	IDR_SKIN_BASE, L"base.cng",

+	IDR_SKIN_BACK, L"back.png",

+	IDR_SKIN_BACKAERO, L"AeroBack.png",

+	IDR_SKIN_GLYPHS, L"glyphs.png",

 };

 

 /**

@@ -619,8 +619,8 @@ void CRTException::display() const
 	wchar_t*	tszMsg = mir_a2t(what());

 	wchar_t  	tszBoxMsg[500];

 

-	mir_sntprintf(tszBoxMsg, 500, _T("%s\n\n(%s)"), tszMsg, m_szParam);

-	::MessageBox(0, tszBoxMsg, _T("ClistNG runtime error"), MB_OK | MB_ICONERROR);

+	mir_sntprintf(tszBoxMsg, 500, L"%s\n\n(%s)", tszMsg, m_szParam);

+	::MessageBox(0, tszBoxMsg, L"ClistNG runtime error", MB_OK | MB_ICONERROR);

 	mir_free(tszMsg);

 }

 

diff --git a/plugins/Clist_ng/SRC/extBackg.cpp b/plugins/Clist_ng/SRC/extBackg.cpp
index cdfdc00ebd..62ced87242 100644
--- a/plugins/Clist_ng/SRC/extBackg.cpp
+++ b/plugins/Clist_ng/SRC/extBackg.cpp
@@ -367,7 +367,7 @@ static int ScanSkinDir(const wchar_t* tszFolder, HWND hwndCombobox)
 		LRESULT lr;

 		TCHAR	szBuf[255];

 

-		mir_sntprintf(tszFinalName, MAX_PATH, _T("%s%s"), tszFolder, fd.cFileName);

+		mir_sntprintf(tszFinalName, MAX_PATH, L"%s%s", tszFolder, fd.cFileName);

 

 		GetPrivateProfileStringW(L"SkinInfo", L"Name", L"None", szBuf, 500, tszFinalName);

 		if(!wcscmp(szBuf, L"None")) {

@@ -414,7 +414,7 @@ static int RescanSkins(HWND hwndCombobox)
 	while (h != INVALID_HANDLE_VALUE) {

 		if(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && fd.cFileName[0] != '.') {

 			TCHAR	tszSubDir[MAX_PATH];

-			mir_sntprintf(tszSubDir, MAX_PATH, _T("%s%s\\"), tszSkinRoot, fd.cFileName);

+			mir_sntprintf(tszSubDir, MAX_PATH, L"%s%s\\", tszSkinRoot, fd.cFileName);

 			ScanSkinDir(tszSubDir, hwndCombobox);

 		}

 	    if(FindNextFile(h, &fd) == 0)

diff --git a/plugins/Clist_ng/SRC/skin.cpp b/plugins/Clist_ng/SRC/skin.cpp
index 4137b30c87..5c3974f967 100644
--- a/plugins/Clist_ng/SRC/skin.cpp
+++ b/plugins/Clist_ng/SRC/skin.cpp
@@ -1071,7 +1071,7 @@ void SkinLoader::readButtonItem(const char *itemName, const char *file)
         newItem->nextItem = 0;

         curItem->nextItem = newItem;

     }

-    newItem->hWnd = CreateWindowEx(0, _T("CLCButtonClass"), _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 5, 5, pcli->hwndContactList, (HMENU)newItem->uId, g_hInst, NULL);

+    newItem->hWnd = CreateWindowEx(0, L"CLCButtonClass", L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 5, 5, pcli->hwndContactList, (HMENU)newItem->uId, g_hInst, NULL);

 

     SendMessage(newItem->hWnd, BM_SETBTNITEM, 0, (LPARAM)newItem);

     SendMessage(newItem->hWnd, BUTTONSETASFLATBTN, 0, 0);

diff --git a/plugins/Clist_ng/SRC/statusfloater.cpp b/plugins/Clist_ng/SRC/statusfloater.cpp
index 0d2353710a..02e4e366f9 100644
--- a/plugins/Clist_ng/SRC/statusfloater.cpp
+++ b/plugins/Clist_ng/SRC/statusfloater.cpp
@@ -713,19 +713,19 @@ void SFL_RegisterWindowClass()
     wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);

     wndclass.hbrBackground = (HBRUSH) (COLOR_3DFACE);

     wndclass.lpszMenuName = 0;

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

+    wndclass.lpszClassName = L"StatusFloaterClass";

     RegisterClass(&wndclass);

 

     wndclass.style = CS_DBLCLKS;

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

+	wndclass.lpszClassName = L"ContactFloaterClass";

     wndclass.lpfnWndProc = ContactFloaterClassProc;

     RegisterClass(&wndclass);

 }

 

 void SFL_UnregisterWindowClass()

 {

-	UnregisterClass(_T("StatusFloaterClass"), g_hInst);

-	UnregisterClass(_T("ContactFloaterClass"), g_hInst);

+	UnregisterClass(L"StatusFloaterClass", g_hInst);

+	UnregisterClass(L"ContactFloaterClass", g_hInst);

 }

 

 void SFL_Destroy()

@@ -737,7 +737,7 @@ void SFL_Destroy()
 

 static HICON sfl_hIcon = (HICON)-1;

 static int sfl_iIcon = -1;

-static wchar_t sfl_statustext[100] = _T("");

+static wchar_t sfl_statustext[100] = L"";

 

 void SFL_Update(HICON hIcon, int iIcon, HIMAGELIST hIml, const wchar_t *szText, BOOL refresh)

 {

@@ -887,7 +887,7 @@ void SFL_SetSize()
 void SFL_Create()

 {

 	if(g_hwndSFL == 0 && cfg::dat.bUseFloater & CLUI_USE_FLOATER)

-		g_hwndSFL = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED, _T("StatusFloaterClass"), _T("sfl"), WS_VISIBLE, 0, 0, 0, 0, 0, 0, g_hInst, 0);

+		g_hwndSFL = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED, L"StatusFloaterClass", L"sfl", WS_VISIBLE, 0, 0, 0, 0, 0, 0, g_hInst, 0);

 	else

 		return;

 

@@ -943,7 +943,7 @@ void FLT_Create(int iEntry)
 			if(centry->floater == NULL)

 				return;

 			FLT_AddToList(centry->floater);

-			centry->floater->hwnd = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED, _T("ContactFloaterClass"), _T("sfl"), WS_VISIBLE, 0, 0, 0, 0, 0, 0, g_hInst, (LPVOID)iEntry);

+			centry->floater->hwnd = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED, L"ContactFloaterClass", L"sfl", WS_VISIBLE, 0, 0, 0, 0, 0, 0, g_hInst, (LPVOID)iEntry);

 			centry->floater->hContact = centry->hContact;

 		}

 		else if(centry->floater != NULL) {

diff --git a/plugins/Clist_ng/SRC/utils.cpp b/plugins/Clist_ng/SRC/utils.cpp
index 99c33d9bcc..81a53458e5 100644
--- a/plugins/Clist_ng/SRC/utils.cpp
+++ b/plugins/Clist_ng/SRC/utils.cpp
@@ -33,7 +33,7 @@
 

 #include <commonheaders.h>

 

-#define RTF_DEFAULT_HEADER _T("{\\rtf1\\ansi\\deff0\\pard\\li%u\\fi-%u\\ri%u\\tx%u")

+#define RTF_DEFAULT_HEADER L"{\\rtf1\\ansi\\deff0\\pard\\li%u\\fi-%u\\ri%u\\tx%u"

 

 wchar_t* WarningDlg::m_warnings[WarningDlg::WARN_LAST] = {

 		LPGENT("Notes|release notes"),

@@ -68,7 +68,7 @@ void Utils::extractResource(const HMODULE h, const UINT uID, const wchar_t* tszN
 			HANDLE  hFile;

 			char 	*pData = (char *)LockResource(hResource);

 			DWORD	dwSize = SizeofResource(g_hInst, hRes), written = 0;

-			mir_sntprintf(szFilename, MAX_PATH, _T("%s%s"), tszPath, tszFilename);

+			mir_sntprintf(szFilename, MAX_PATH, L"%s%s", tszPath, tszFilename);

 			if(!fForceOverwrite) {

 				if(PathFileExistsW(szFilename))

 					return;

diff --git a/plugins/Clist_ng/SRC/viewmodes.cpp b/plugins/Clist_ng/SRC/viewmodes.cpp
index 34142bb736..3c9509ce07 100644
--- a/plugins/Clist_ng/SRC/viewmodes.cpp
+++ b/plugins/Clist_ng/SRC/viewmodes.cpp
@@ -352,7 +352,7 @@ void SaveViewMode(const char *name, const wchar_t *szGroupFilter, const char *sz
 

 void SaveState()

 {

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

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

     char newProtoFilter[2048] = "|";

     int i, iLen;

     HWND hwndList;

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

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

                 _tcsncat(newGroupFilter, szTemp, 2048);

-                _tcsncat(newGroupFilter, _T("|"), 2048);

+                _tcsncat(newGroupFilter, L"|", 2048);

                 newGroupFilter[2047] = 0;

             }

         }

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

             item.iItem = i;

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

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

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

             if(dbv_gf.ptszVal && _tcsstr(dbv_gf.ptszVal, szMask))

                 ListView_SetCheckState(hwndList, i, TRUE)

             else

@@ -639,7 +639,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
             SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETEXTRACOLUMNS, ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE, 0);

             cii.cbSize = sizeof(cii);

             cii.hParentGroup = 0;

-            cii.pszText = _T("*** All contacts ***");

+            cii.pszText = L"*** All contacts ***";

             hInfoItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

             SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0);

             if(SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_SETCURSEL, 0, 0) != LB_ERR) {

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

                             if(iNewItem != LB_ERR) {

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

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

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

                                 clvm_curItem = iNewItem;

                                 UpdateStickies();

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

@@ -901,14 +901,14 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		{

 			HWND hwndButton;

 

-			hwndSelector = CreateWindowEx(0, _T("CLCButtonClass"), _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

+			hwndSelector = CreateWindowEx(0, L"CLCButtonClass", L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

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

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

 			SendMessage(hwndSelector, BM_SETASMENUACTION, 1, 0);

-			hwndButton = CreateWindowEx(0, _T("CLCButtonClass"), _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

+			hwndButton = CreateWindowEx(0, L"CLCButtonClass", L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

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

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

-			hwndButton = CreateWindowEx(0, _T("CLCButtonClass"), _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

+			hwndButton = CreateWindowEx(0, L"CLCButtonClass", L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,

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

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

 			SendMessage(hwnd, WM_USER + 100, 0, 0);

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

     wndclass.hbrBackground = (HBRUSH) (COLOR_3DFACE);

     wndclass.lpszMenuName = 0;

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

+    wndclass.lpszClassName = L"CLVMFrameWindow";

 

     RegisterClass(&wndclass);

 

     ZeroMemory(&frame, sizeof(frame));

     frame.cbSize = sizeof(frame);

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

+    frame.tname = L"View modes";

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

     frame.hIcon = 0;

     frame.height = 22;

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

     frame.align = alBottom;

-    frame.hWnd = CreateWindowEx(0, _T("CLVMFrameWindow"), _T("CLVM"), 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", L"CLVM", 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,(LPARAM)0);

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

diff --git a/plugins/Clist_ng/coolsb/coolsblib.cpp b/plugins/Clist_ng/coolsb/coolsblib.cpp
index e5da7f7605..5368a42eac 100644
--- a/plugins/Clist_ng/coolsb/coolsblib.cpp
+++ b/plugins/Clist_ng/coolsb/coolsblib.cpp
@@ -34,7 +34,7 @@
 #include "userdefs.h"

 #include "coolsb_internal.h"

 

-static wchar_t szPropStr[] = _T("CoolSBSubclassPtr");

+static wchar_t szPropStr[] = L"CoolSBSubclassPtr";

 

 LRESULT CALLBACK CoolSBWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

 

@@ -249,7 +249,7 @@ BOOL WINAPI InitializeCoolSB(HWND hwnd)
 	ice.dwICC  = ICC_BAR_CLASSES;

 	InitCommonControlsEx(&ice);

 

-	sw->hwndToolTip = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, TOOLTIPS_CLASS, _T(""),

+	sw->hwndToolTip = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, TOOLTIPS_CLASS, L"",

                             WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP,

                             CW_USEDEFAULT, CW_USEDEFAULT,

                             CW_USEDEFAULT, CW_USEDEFAULT,

diff --git a/plugins/Clist_ng/skineditor/skinedit.cpp b/plugins/Clist_ng/skineditor/skinedit.cpp
index c883f63c87..0641be1f8c 100644
--- a/plugins/Clist_ng/skineditor/skinedit.cpp
+++ b/plugins/Clist_ng/skineditor/skinedit.cpp
@@ -674,7 +674,7 @@ static BOOL CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
             SendMessage(hwndDlg, WM_USER + 101, 0, 0);

 

             psd->hMenuItems = CreatePopupMenu();

-            AppendMenu(psd->hMenuItems, MF_STRING | MF_DISABLED, (UINT_PTR)0, _T("Copy from"));

+            AppendMenu(psd->hMenuItems, MF_STRING | MF_DISABLED, (UINT_PTR)0, L"Copy from");

             AppendMenuA(psd->hMenuItems, MF_SEPARATOR, (UINT_PTR)0, NULL);

 

             {