hello, Unix.

phase 1: removing _T()

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

7 files changed, 131 insertions, 131 deletions

diff --git a/plugins/TabSRMM/src/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h
index a9a6f92ff9..536f837528 100644
--- a/plugins/TabSRMM/src/chat/chat.h
+++ b/plugins/TabSRMM/src/chat/chat.h
@@ -160,6 +160,6 @@ BOOL          LogToFile(SESSION_INFO *si, GCEVENT *gce);
 

 extern char szIndicators[];

 

-#define DEFLOGFILENAME _T("%miranda_logpath%\\%proto%\\%userid%.log")

+#define DEFLOGFILENAME L"%miranda_logpath%\\%proto%\\%userid%.log"

 

 #endif

diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index 33121fd580..a7894b3e37 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -115,7 +115,7 @@ static int Log_AppendIEView(LOGSTREAMDATA* streamData, BOOL simpleMode, TCHAR **
 						szTemp3[1] = line[2];

 						szTemp3[2] = '\0';

 						col = _ttoi(szTemp3);

-						mir_sntprintf(szTemp, _T("%%%c#%02X%02X%02X"), c, GetRValue(mi->crColors[col]), GetGValue(mi->crColors[col]), GetBValue(mi->crColors[col]));

+						mir_sntprintf(szTemp, L"%%%c#%02X%02X%02X", c, GetRValue(mi->crColors[col]), GetGValue(mi->crColors[col]), GetBValue(mi->crColors[col]));

 					}

 				}

 				line += 2;

@@ -123,7 +123,7 @@ static int Log_AppendIEView(LOGSTREAMDATA* streamData, BOOL simpleMode, TCHAR **
 			case 'C':

 			case 'F':

 				if (!g_Settings.bStripFormat && !streamData->bStripFormat) {

-					mir_sntprintf(szTemp, _T("%%%c"), *line);

+					mir_sntprintf(szTemp, L"%%%c", *line);

 				}

 				break;

 			case 'b':

@@ -134,7 +134,7 @@ static int Log_AppendIEView(LOGSTREAMDATA* streamData, BOOL simpleMode, TCHAR **
 			case 'I':

 			case 'r':

 				if (!streamData->bStripFormat) {

-					mir_sntprintf(szTemp, _T("%%%c"), *line);

+					mir_sntprintf(szTemp, L"%%%c", *line);

 				}

 				break;

 			}

@@ -161,7 +161,7 @@ static int Log_AppendIEView(LOGSTREAMDATA* streamData, BOOL simpleMode, TCHAR **
 static void AddEventTextToBufferIEView(TCHAR **buffer, int *bufferEnd, int *bufferAlloced, LOGSTREAMDATA *streamData)

 {

 	if (streamData->lin->ptszText)

-		Log_AppendIEView(streamData, FALSE, str, _T(": %s"), streamData->lin->ptszText);

+		Log_AppendIEView(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 }

 

 static void AddEventToBufferIEView(TCHAR **buffer, int *bufferEnd, int *bufferAlloced, LOGSTREAMDATA *streamData, TCHAR *pszNick)

@@ -178,14 +178,14 @@ static void AddEventToBufferIEView(TCHAR **buffer, int *bufferEnd, int *bufferAl
 					ptszText = ptszTemp = a2tcp(aText, streamData->dat->codePage);

 					mir_free(aText);

 				}

-				Log_AppendIEView(streamData, FALSE, str, _T("%s"), ptszText);

+				Log_AppendIEView(streamData, FALSE, str, L"%s", ptszText);

 				mir_free(ptszTemp);

 			}

 			break;

 		case GC_EVENT_ACTION:

 			if (pszNick && streamData->lin->ptszText) {

-				Log_AppendIEView(streamData, TRUE, str, _T("%s "), streamData->lin->ptszNick);

-				Log_AppendIEView(streamData, FALSE, str, _T("%s"), streamData->lin->ptszText);

+				Log_AppendIEView(streamData, TRUE, str, L"%s ", streamData->lin->ptszNick);

+				Log_AppendIEView(streamData, FALSE, str, L"%s", streamData->lin->ptszText);

 			}

 			break;

 		case GC_EVENT_JOIN:

@@ -227,7 +227,7 @@ static void AddEventToBufferIEView(TCHAR **buffer, int *bufferEnd, int *bufferAl
 			break;

 		case GC_EVENT_TOPIC:

 			if (streamData->lin->ptszText)

-				Log_AppendIEView(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, _T("%r"));

+				Log_AppendIEView(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, L"%r");

 			if (pszNick)

 				Log_AppendIEView(streamData, TRUE, str,

 				streamData->lin->ptszUserInfo ? TranslateT(" (set by %s on %s)") : TranslateT(" (set by %s)"),

@@ -235,7 +235,7 @@ static void AddEventToBufferIEView(TCHAR **buffer, int *bufferEnd, int *bufferAl
 			break;

 		case GC_EVENT_INFORMATION:

 			if (streamData->lin->ptszText)

-				Log_AppendIEView(streamData, FALSE, str, (streamData->lin->bIsMe) ? _T("--> %s") : _T("%s"), streamData->lin->ptszText);

+				Log_AppendIEView(streamData, FALSE, str, (streamData->lin->bIsMe) ? L"--> %s" : L"%s", streamData->lin->ptszText);

 			break;

 		case GC_EVENT_ADDSTATUS:

 			if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

@@ -532,17 +532,17 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 	if (streamData->lin->ptszNick) {

 		if (g_Settings.bLogLimitNames && mir_tstrlen(streamData->lin->ptszNick) > 20) {

 			_tcsncpy_s(szTemp, 20, streamData->lin->ptszNick, _TRUNCATE);

-			_tcsncpy_s(szTemp + 20, 4, _T("..."), _TRUNCATE);

+			_tcsncpy_s(szTemp + 20, 4, L"...", _TRUNCATE);

 		}

 		else _tcsncpy_s(szTemp, streamData->lin->ptszNick, _TRUNCATE);

 

 		if (g_Settings.bClickableNicks)

-			mir_sntprintf(szTemp2, _T("~~++#%s#++~~"), szTemp);

+			mir_sntprintf(szTemp2, L"~~++#%s#++~~", szTemp);

 		else

 			_tcsncpy_s(szTemp2, szTemp, _TRUNCATE);

 

 		if (streamData->lin->ptszUserInfo && streamData->lin->iType != GC_EVENT_TOPIC)

-			mir_sntprintf(szTemp, _T("%s (%s)"), szTemp2, streamData->lin->ptszUserInfo);

+			mir_sntprintf(szTemp, L"%s (%s)", szTemp2, streamData->lin->ptszUserInfo);

 		else

 			_tcsncpy_s(szTemp, szTemp2, _TRUNCATE);

 		pszNick = szTemp;

@@ -551,12 +551,12 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 	switch (streamData->lin->iType) {

 	case GC_EVENT_MESSAGE:

 		if (streamData->lin->ptszText)

-			Log_AppendRTF(streamData, FALSE, str, _T("%s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_ACTION:

 		if (streamData->lin->ptszNick && streamData->lin->ptszText) {

-			Log_AppendRTF(streamData, TRUE, str, _T("%s "), streamData->lin->ptszNick);

-			Log_AppendRTF(streamData, FALSE, str, _T("%s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, TRUE, str, L"%s ", streamData->lin->ptszNick);

+			Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);

 		}

 		break;

 	case GC_EVENT_JOIN:

@@ -572,13 +572,13 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 		if (pszNick)

 			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has left"), pszNick);

 		if (streamData->lin->ptszText)

-			Log_AppendRTF(streamData, FALSE, str, _T(": %s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_QUIT:

 		if (pszNick)

 			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has disconnected"), pszNick);

 		if (streamData->lin->ptszText)

-			Log_AppendRTF(streamData, FALSE, str, _T(": %s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_NICK:

 		if (pszNick && streamData->lin->ptszText) {

@@ -594,17 +594,17 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 			TranslateT("%s kicked %s"), streamData->lin->ptszStatus, pszNick);

 

 		if (streamData->lin->ptszText)

-			Log_AppendRTF(streamData, FALSE, str, _T(": %s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_NOTICE:

 		if (pszNick && streamData->lin->ptszText) {

 			Log_AppendRTF(streamData, TRUE, str, TranslateT("Notice from %s: "), pszNick);

-			Log_AppendRTF(streamData, FALSE, str, _T("%s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);

 		}

 		break;

 	case GC_EVENT_TOPIC:

 		if (streamData->lin->ptszText)

-			Log_AppendRTF(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, _T("%r"));

+			Log_AppendRTF(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, L"%r");

 		if (pszNick)

 			Log_AppendRTF(streamData, TRUE, str,

 			(streamData->lin->ptszUserInfo) ? TranslateT(" (set by %s on %s)") :

@@ -613,7 +613,7 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 		break;

 	case GC_EVENT_INFORMATION:

 		if (streamData->lin->ptszText)

-			Log_AppendRTF(streamData, FALSE, str, (streamData->lin->bIsMe) ? _T("--> %s") : _T("%s"), streamData->lin->ptszText);

+			Log_AppendRTF(streamData, FALSE, str, (streamData->lin->bIsMe) ? L"--> %s" : L"%s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_ADDSTATUS:

 		if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

@@ -776,7 +776,7 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 				_tcsncpy_s(szOldTimeStamp, pci->MakeTimeStamp(g_Settings.pszTimeStamp, streamData->si->LastTime), _TRUNCATE);

 				if (!g_Settings.bShowTimeIfChanged || streamData->si->LastTime == 0 || mir_tstrcmp(szTimeStamp, szOldTimeStamp)) {

 					streamData->si->LastTime = lin->time;

-					Log_AppendRTF(streamData, TRUE, str, _T("%s"), szTimeStamp);

+					Log_AppendRTF(streamData, TRUE, str, L"%s", szTimeStamp);

 				}

 				str.Append("\\tab ");

 			}

@@ -796,10 +796,10 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 					str.Append(pszIndicator);

 

 				CMString pszTemp(lin->bIsMe ? g_Settings.pszOutgoingNick : g_Settings.pszIncomingNick);

-				pszTemp.Replace(_T("%n"), _T("%s"));

+				pszTemp.Replace(L"%n", L"%s");

 				if (!lin->bIsMe) {

 					if (g_Settings.bClickableNicks)

-						pszTemp.Replace(_T("%s"), _T("~~++#%s#++~~"));

+						pszTemp.Replace(L"%s", L"~~++#%s#++~~");

 

 					if (g_Settings.bColorizeNicksInLog && pszIndicator[0])

 						str.AppendFormat("\\cf%u ", OPTIONS_FONTCOUNT + streamData->crCount + crNickIndex);

@@ -935,10 +935,10 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, bool bRedra
 		memset(&cf2, 0, sizeof(CHARFORMAT2));

 		cf2.cbSize = sizeof(cf2);

 

-		fi2.lpstrText = _T("#++~~");

+		fi2.lpstrText = L"#++~~";

 		fi.chrg.cpMin = bRedraw ? 0 : sel.cpMin;

 		fi.chrg.cpMax = -1;

-		fi.lpstrText = _T("~~++#");

+		fi.lpstrText = L"~~++#";

 

 		while (SendMessage(hwndRich, EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

 			fi2.chrg.cpMin = fi.chrgText.cpMin;

@@ -947,11 +947,11 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, bool bRedra
 			if (SendMessage(hwndRich, EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi2) > -1) {

 

 				SendMessage(hwndRich, EM_EXSETSEL, 0, (LPARAM)&fi.chrgText);

-				SendMessage(hwndRich, EM_REPLACESEL, TRUE, (LPARAM)_T(""));

+				SendMessage(hwndRich, EM_REPLACESEL, TRUE, (LPARAM)L"");

 				fi2.chrgText.cpMin -= fi.chrgText.cpMax - fi.chrgText.cpMin;

 				fi2.chrgText.cpMax -= fi.chrgText.cpMax - fi.chrgText.cpMin;

 				SendMessage(hwndRich, EM_EXSETSEL, 0, (LPARAM)&fi2.chrgText);

-				SendMessage(hwndRich, EM_REPLACESEL, TRUE, (LPARAM)_T(""));

+				SendMessage(hwndRich, EM_REPLACESEL, TRUE, (LPARAM)L"");

 				fi2.chrgText.cpMax = fi2.chrgText.cpMin;

 

 				fi2.chrgText.cpMin = fi.chrgText.cpMin;

@@ -985,7 +985,7 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, bool bRedra
 	// this uses hidden marks in the rich text to find the events which should be deleted

 	if (si->bTrimmed) {

 		TCHAR szPattern[50];

-		mir_sntprintf(szPattern, _T("~-+%d+-~"), si->pLogEnd);

+		mir_sntprintf(szPattern, L"~-+%d+-~", si->pLogEnd);

 

 		FINDTEXTEX fi;

 		fi.lpstrText = szPattern;

@@ -996,7 +996,7 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, bool bRedra
 			rng.cpMin = 0;

 			rng.cpMax = 20;

 			SendMessage(hwndRich, EM_SETSEL, 0, fi.chrgText.cpMax + 1);

-			SendMessage(hwndRich, EM_REPLACESEL, TRUE, (LPARAM)_T(""));

+			SendMessage(hwndRich, EM_REPLACESEL, TRUE, (LPARAM)L"");

 		}

 		si->bTrimmed = FALSE;

 	}

diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index a158607a14..eee0f6823d 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -181,8 +181,8 @@ static void OnLoadSettings()
 	pci->LoadMsgDlgFont(5, &lf, NULL);

 	g_Settings.UserListFonts[CHAT_STATUS_OFFLINE] = CreateFontIndirect(&lf);

 

-	int ih = GetTextPixelSize(_T("AQGglo"), g_Settings.UserListFonts[CHAT_STATUS_NORMAL], false);

-	int ih2 = GetTextPixelSize(_T("AQGglo"), g_Settings.UserListFonts[CHAT_STATUS_AWAY], false);

+	int ih = GetTextPixelSize(L"AQGglo", g_Settings.UserListFonts[CHAT_STATUS_NORMAL], false);

+	int ih2 = GetTextPixelSize(L"AQGglo", g_Settings.UserListFonts[CHAT_STATUS_AWAY], false);

 	g_Settings.iNickListFontHeight = max(M.GetByte(CHAT_MODULE, "NicklistRowDist", 12), (ih > ih2 ? ih : ih2));

 

 	for (int i = 0; i < 5; i++) {

@@ -269,7 +269,7 @@ int Chat_Load()
 {

 	CheckUpdate();

 

-	CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Message Sessions") _T("/") LPGENT("Group chats"), FONTMODE_ALTER };

+	CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Message Sessions") L"/" LPGENT("Group chats"), FONTMODE_ALTER };

 	mir_getCI(&data);

 	saveCI = *pci;

 	pci->OnCreateModule = OnCreateModule;

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index c28cc51af0..36c9ec9d29 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -60,32 +60,32 @@ struct ColorOptionsList
 static ColorOptionsList _clrs[] = {

 	{ 0, LPGENT("Message Sessions"), LPGENT("Input area background"), "inputbg", SRMSGDEFSET_BKGCOLOUR },

 	{ 1, LPGENT("Message Sessions"), LPGENT("Log background"), SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR },

-	{ 0, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Outgoing background"), "outbg", SRMSGDEFSET_BKGOUTCOLOUR },

-	{ 1, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Incoming background"), "inbg", SRMSGDEFSET_BKGINCOLOUR },

-	{ 2, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Status background"), "statbg", SRMSGDEFSET_BKGCOLOUR },

-	{ 3, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Incoming background(old)"), "oldinbg", SRMSGDEFSET_BKGINCOLOUR },

-	{ 4, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Outgoing background(old)"), "oldoutbg", SRMSGDEFSET_BKGOUTCOLOUR },

-	{ 5, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Horizontal Grid Lines"), "hgrid", RGB(224, 224, 224) },

-	{ 0, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), LPGENT("Panel background low"), "ipfieldsbg", 0x62caff },

-	{ 1, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), LPGENT("Panel background high"), "ipfieldsbgHigh", 0xf0f0f0 },

-	{ 0, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Toolbar background high"), "tbBgHigh", 0 },

-	{ 1, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Toolbar background low"), "tbBgLow", 0 },

-	{ 2, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Window fill color"), "fillColor", 0 },

-	{ 3, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Text area borders"), "cRichBorders", 0 },

-	{ 4, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Aero glow effect"), "aeroGlow", RGB(40, 40, 255) },

-	{ 4, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Generic text color (only when fill color is set)"), "genericTxtClr", 0xff000000 | COLOR_BTNTEXT },

+	{ 0, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), LPGENT("Outgoing background"), "outbg", SRMSGDEFSET_BKGOUTCOLOUR },

+	{ 1, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), LPGENT("Incoming background"), "inbg", SRMSGDEFSET_BKGINCOLOUR },

+	{ 2, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), LPGENT("Status background"), "statbg", SRMSGDEFSET_BKGCOLOUR },

+	{ 3, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), LPGENT("Incoming background(old)"), "oldinbg", SRMSGDEFSET_BKGINCOLOUR },

+	{ 4, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), LPGENT("Outgoing background(old)"), "oldoutbg", SRMSGDEFSET_BKGOUTCOLOUR },

+	{ 5, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), LPGENT("Horizontal Grid Lines"), "hgrid", RGB(224, 224, 224) },

+	{ 0, LPGENT("Message Sessions") L"/" LPGENT("Info Panel"), LPGENT("Panel background low"), "ipfieldsbg", 0x62caff },

+	{ 1, LPGENT("Message Sessions") L"/" LPGENT("Info Panel"), LPGENT("Panel background high"), "ipfieldsbgHigh", 0xf0f0f0 },

+	{ 0, LPGENT("Message Sessions") L"/" LPGENT("Common colors"), LPGENT("Toolbar background high"), "tbBgHigh", 0 },

+	{ 1, LPGENT("Message Sessions") L"/" LPGENT("Common colors"), LPGENT("Toolbar background low"), "tbBgLow", 0 },

+	{ 2, LPGENT("Message Sessions") L"/" LPGENT("Common colors"), LPGENT("Window fill color"), "fillColor", 0 },

+	{ 3, LPGENT("Message Sessions") L"/" LPGENT("Common colors"), LPGENT("Text area borders"), "cRichBorders", 0 },

+	{ 4, LPGENT("Message Sessions") L"/" LPGENT("Common colors"), LPGENT("Aero glow effect"), "aeroGlow", RGB(40, 40, 255) },

+	{ 4, LPGENT("Message Sessions") L"/" LPGENT("Common colors"), LPGENT("Generic text color (only when fill color is set)"), "genericTxtClr", 0xff000000 | COLOR_BTNTEXT },

 };

 

 static ColorOptionsList _tabclrs[] = {

-	{ 0, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Normal text"), "tab_txt_normal", 0xff000000 | COLOR_BTNTEXT },

-	{ 1, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Active text"), "tab_txt_active", 0xff000000 | COLOR_BTNTEXT },

-	{ 2, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Hovered text"), "tab_txt_hottrack", 0xff000000 | COLOR_HOTLIGHT },

-	{ 3, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Unread text"), "tab_txt_unread", 0xff000000 | COLOR_HOTLIGHT },

-

-	{ 4, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Normal background"), "tab_bg_normal", 0xff000000 | COLOR_3DFACE },

-	{ 5, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Active background"), "tab_bg_active", 0xff000000 | COLOR_3DFACE },

-	{ 6, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Hovered background"), "tab_bg_hottrack", 0xff000000 | COLOR_3DFACE },

-	{ 7, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Unread background"), "tab_bg_unread", 0xff000000 | COLOR_3DFACE }

+	{ 0, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Normal text"), "tab_txt_normal", 0xff000000 | COLOR_BTNTEXT },

+	{ 1, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Active text"), "tab_txt_active", 0xff000000 | COLOR_BTNTEXT },

+	{ 2, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Hovered text"), "tab_txt_hottrack", 0xff000000 | COLOR_HOTLIGHT },

+	{ 3, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Unread text"), "tab_txt_unread", 0xff000000 | COLOR_HOTLIGHT },

+

+	{ 4, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Normal background"), "tab_bg_normal", 0xff000000 | COLOR_3DFACE },

+	{ 5, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Active background"), "tab_bg_active", 0xff000000 | COLOR_3DFACE },

+	{ 6, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Hovered background"), "tab_bg_hottrack", 0xff000000 | COLOR_3DFACE },

+	{ 7, LPGENT("Message Sessions") L"/" LPGENT("Tabs"), LPGENT("Unread background"), "tab_bg_unread", 0xff000000 | COLOR_3DFACE }

 };

 

 extern LOGFONT lfDefault;

@@ -111,8 +111,8 @@ static FontOptionsList IM_fontOptionsList[] = {
 	{ LPGENT("* Status changes"), RGB(50, 50, 50), lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

 	{ LPGENT("* Dividers"), RGB(50, 50, 50), lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

 	{ LPGENT("* Error and warning messages"), RGB(50, 50, 50), lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

-	{ LPGENT("* Symbols (incoming)"), RGB(50, 50, 50), _T("Webdings"), SYMBOL_CHARSET, 0, -12 },

-	{ LPGENT("* Symbols (outgoing)"), RGB(50, 50, 50), _T("Webdings"), SYMBOL_CHARSET, 0, -12 },

+	{ LPGENT("* Symbols (incoming)"), RGB(50, 50, 50), L"Webdings", SYMBOL_CHARSET, 0, -12 },

+	{ LPGENT("* Symbols (outgoing)"), RGB(50, 50, 50), L"Webdings", SYMBOL_CHARSET, 0, -12 },

 };

 

 static FontOptionsList IP_fontOptionsList[] = {

@@ -222,7 +222,7 @@ void LoadMsgDlgFont(int section, int i, LOGFONT *lf, COLORREF* colour, char *szM
 		mir_snprintf(str, "Font%d", i);

 		if ((i == 17 && !mir_strcmp(szMod, CHATFONT_MODULE)) || ((i == 20 || i == 21) && !mir_strcmp(szMod, FONTMODULE))) {

 			lf->lfCharSet = SYMBOL_CHARSET;

-			_tcsncpy_s(lf->lfFaceName, _T("Webdings"), _TRUNCATE);

+			_tcsncpy_s(lf->lfFaceName, L"Webdings", _TRUNCATE);

 		}

 		else {

 			ptrT tszDefFace(db_get_tsa(NULL, szMod, str));

@@ -411,7 +411,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			FillBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading2, branch2, _countof(branch2), 0x0000);

 

 			TCHAR* pszGroup = NULL;

-			InitSetting(pszGroup, "AddToGroup", _T("Chat rooms"));

+			InitSetting(pszGroup, "AddToGroup", L"Chat rooms");

 			SetDlgItemText(hwndDlg, IDC_GROUP, pszGroup);

 			mir_free(pszGroup);

 		}

@@ -444,7 +444,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 					GetDlgItemText(hwndDlg, IDC_GROUP, pszText, iLen + 1);

 					db_set_ts(NULL, CHAT_MODULE, "AddToGroup", pszText);

 				}

-				else db_set_ts(NULL, CHAT_MODULE, "AddToGroup", _T(""));

+				else db_set_ts(NULL, CHAT_MODULE, "AddToGroup", L"");

 

 				mir_free(pszText);

 

@@ -509,8 +509,8 @@ void RegisterFontServiceFonts()
 		fid.deffontsettings.charset = lf.lfCharSet;

 		fid.flags = fid.flags & ~FIDF_CLASSMASK | (fid.deffontsettings.style&FONTF_BOLD ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL);

 		_tcsncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);

-		_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), _countof(fid.backgroundGroup));

-		_tcsncpy(fid.group, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), _countof(fid.group));

+		_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), _countof(fid.backgroundGroup));

+		_tcsncpy(fid.group, LPGENT("Message Sessions") L"/" LPGENT("Single Messaging"), _countof(fid.group));

 		switch (i) {

 		case MSGFONTID_MYMSG:

 		case 1:

@@ -546,7 +546,7 @@ void RegisterFontServiceFonts()
 			_tcsncpy(fid.backgroundName, LPGENT("Log background"), _countof(fid.backgroundName));

 			break;

 		case 19:

-			_tcsncpy(fid.backgroundName, _T(""), _countof(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, L"", _countof(fid.backgroundName));

 			break;

 		default:

 			_tcsncpy(fid.backgroundName, LPGENT("Incoming background"), _countof(fid.backgroundName));

@@ -557,8 +557,8 @@ void RegisterFontServiceFonts()
 

 	fontOptionsList = IP_fontOptionsList;

 	fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS;

-	_tcsncpy(fid.group, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), _countof(fid.group));

-	_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), _countof(fid.backgroundGroup));

+	_tcsncpy(fid.group, LPGENT("Message Sessions") L"/" LPGENT("Info Panel"), _countof(fid.group));

+	_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions") L"/" LPGENT("Info Panel"), _countof(fid.backgroundGroup));

 	_tcsncpy(fid.backgroundName, LPGENT("Fields background"), _countof(fid.backgroundName));

 	for (int i = 0; i < IPFONTCOUNT; i++) {

 		LoadMsgDlgFont(FONTSECTION_IP, i + 100, &lf, &fontOptionsList[i].colour, FONTMODULE);

@@ -574,14 +574,14 @@ void RegisterFontServiceFonts()
 		fid.deffontsettings.charset = lf.lfCharSet;

 		_tcsncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);

 		if (i == IPFONTCOUNT - 1) {

-			_tcsncpy(fid.backgroundGroup, _T(""), _countof(fid.backgroundGroup));

-			_tcsncpy(fid.backgroundName, _T(""), _countof(fid.backgroundName));

+			_tcsncpy(fid.backgroundGroup, L"", _countof(fid.backgroundGroup));

+			_tcsncpy(fid.backgroundName, L"", _countof(fid.backgroundName));

 			_tcsncpy(fid.group, LPGENT("Message Sessions"), _countof(fid.group));

 		}

 		FontRegisterT(&fid);

 	}

 

-	_tcsncpy(cid.group, LPGENT("Message Sessions") _T("/") LPGENT("Group chats"), _countof(cid.group));

+	_tcsncpy(cid.group, LPGENT("Message Sessions") L"/" LPGENT("Group chats"), _countof(cid.group));

 	strncpy(cid.dbSettingsGroup, CHAT_MODULE, _countof(cid.dbSettingsGroup));

 	for (int i = 0; i <= 7; i++) {

 		mir_snprintf(szTemp, "NickColor%d", i);

@@ -692,36 +692,36 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			TCHAR tszTooltipText[2048];

 

 			mir_sntprintf(tszTooltipText,

-				_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n")

-				_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n")

-				_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

+				L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n"

+				L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n"

+				L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s",

 				// contact vars

-				_T("%nick%"), TranslateT("nick of current contact (if defined)"),

-				_T("%proto%"), TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),

-				_T("%accountname%"), TranslateT("user-defined account name of current contact (if defined)."),

-				_T("%userid%"), TranslateT("user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc."),

+				L"%nick%", TranslateT("nick of current contact (if defined)"),

+				L"%proto%", TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),

+				L"%accountname%", TranslateT("user-defined account name of current contact (if defined)."),

+				L"%userid%", TranslateT("user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc."),

 				// global vars

-				_T("%miranda_path%"), TranslateT("path to Miranda root folder"),

-				_T("%miranda_profilesdir%"), TranslateT("path to folder containing Miranda profiles"),

-				_T("%miranda_profilename%"), TranslateT("name of current Miranda profile (filename, without extension)"),

-				_T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),

-				_T("%miranda_logpath%"), TranslateT("will return parsed string %miranda_userdata%\\Logs"),

-				_T("%appdata%"), TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

-				_T("%username%"), TranslateT("username for currently logged-on Windows user"),

-				_T("%mydocuments%"), TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

-				_T("%desktop%"), TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

-				_T("%xxxxxxx%"), TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)"),

+				L"%miranda_path%", TranslateT("path to Miranda root folder"),

+				L"%miranda_profilesdir%", TranslateT("path to folder containing Miranda profiles"),

+				L"%miranda_profilename%", TranslateT("name of current Miranda profile (filename, without extension)"),

+				L"%miranda_userdata%", TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),

+				L"%miranda_logpath%", TranslateT("will return parsed string %miranda_userdata%\\Logs"),

+				L"%appdata%", TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

+				L"%username%", TranslateT("username for currently logged-on Windows user"),

+				L"%mydocuments%", TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

+				L"%desktop%", TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

+				L"%xxxxxxx%", TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)"),

 				// date/time vars

-				_T("%d%"), TranslateT("day of month, 1-31"),

-				_T("%dd%"), TranslateT("day of month, 01-31"),

-				_T("%m%"), TranslateT("month number, 1-12"),

-				_T("%mm%"), TranslateT("month number, 01-12"),

-				_T("%mon%"), TranslateT("abbreviated month name"),

-				_T("%month%"), TranslateT("full month name"),

-				_T("%yy%"), TranslateT("year without century, 01-99"),

-				_T("%yyyy%"), TranslateT("year with century, 1901-9999"),

-				_T("%wday%"), TranslateT("abbreviated weekday name"),

-				_T("%weekday%"), TranslateT("full weekday name"));

+				L"%d%", TranslateT("day of month, 1-31"),

+				L"%dd%", TranslateT("day of month, 01-31"),

+				L"%m%", TranslateT("month number, 1-12"),

+				L"%mm%", TranslateT("month number, 01-12"),

+				L"%mon%", TranslateT("abbreviated month name"),

+				L"%month%", TranslateT("full month name"),

+				L"%yy%", TranslateT("year without century, 01-99"),

+				L"%yyyy%", TranslateT("year with century, 1901-9999"),

+				L"%wday%", TranslateT("abbreviated weekday name"),

+				L"%weekday%", TranslateT("full weekday name"));

 			hPathTip = CreateToolTip(GetDlgItem(hwndDlg, IDC_LOGDIRECTORY), tszTooltipText, TranslateT("Variables"));

 		}

 		if (hPathTip)

@@ -757,12 +757,12 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 					*p1 = 0;

 

 			TCHAR tszInitialDir[_MAX_DRIVE + _MAX_PATH + 10];

-			mir_sntprintf(tszInitialDir, _T("%s%s"), M.getChatLogPath(), p);

+			mir_sntprintf(tszInitialDir, L"%s%s", M.getChatLogPath(), p);

 			if (!PathFileExists(tszInitialDir))

 				_tcsncpy_s(tszInitialDir, M.getChatLogPath(), _TRUNCATE);

 

 			TCHAR	tszReturnName[MAX_PATH]; tszReturnName[0] = 0;

-			mir_sntprintf(tszTemp, _T("%s%c*.*%c%c"), TranslateT("All files"), 0, 0, 0);

+			mir_sntprintf(tszTemp, L"%s%c*.*%c%c", TranslateT("All files"), 0, 0, 0);

 

 			OPENFILENAME ofn = { 0 };

 			ofn.lpstrInitialDir = tszInitialDir;

@@ -772,7 +772,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			ofn.nMaxFile = MAX_PATH;

 			ofn.nMaxFileTitle = MAX_PATH;

 			ofn.Flags = OFN_HIDEREADONLY | OFN_DONTADDTORECENT;

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

+			ofn.lpstrDefExt = L"log";

 			GetOpenFileName(&ofn);

 		}

 		break;

@@ -795,7 +795,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				if (idList) {

 					const TCHAR *szUserDir = M.getUserDir();

 					SHGetPathFromIDList(idList, tszDirectory);

-					mir_tstrcat(tszDirectory, _T("\\"));

+					mir_tstrcat(tszDirectory, L"\\");

 

 					TCHAR tszTemp[MAX_PATH];

 					PathToRelativeT(tszDirectory, tszTemp, szUserDir);

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index 0215f305f7..d892fc66aa 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -34,10 +34,10 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 	if (M.FindWindow(hContact) != 0)

 		return 0;

 

-	if (hContact != 0 && M.GetByte("limittabs", 0) && !_tcsncmp(pContainer->szName, _T("default"), 6)) {

-		if ((pContainer = FindMatchingContainer(_T("default"))) == NULL) {

+	if (hContact != 0 && M.GetByte("limittabs", 0) && !_tcsncmp(pContainer->szName, L"default", 6)) {

+		if ((pContainer = FindMatchingContainer(L"default")) == NULL) {

 			TCHAR szName[CONTAINER_NAMELEN + 1];

-			mir_sntprintf(szName, _T("default"));

+			mir_sntprintf(szName, L"default");

 			if ((pContainer = CreateContainer(szName, CNT_CREATEFLAG_CLONED, hContact)) == NULL)

 				return 0;

 		}

@@ -59,7 +59,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 		else

 			_tcsncpy_s(newcontactname, contactName, _TRUNCATE);

 	}

-	else _tcsncpy_s(newcontactname, _T("_U_"), _TRUNCATE);

+	else _tcsncpy_s(newcontactname, L"_U_", _TRUNCATE);

 

 	newData.item.pszText = newcontactname;

 	newData.item.mask = TCIF_TEXT | TCIF_IMAGE | TCIF_PARAM;

@@ -167,8 +167,8 @@ void ShowRoom(SESSION_INFO *si, WPARAM, BOOL)
 	TContainerData *pContainer = si->pContainer;

 	if (pContainer == NULL) {

 		GetContainerNameForContact(si->hContact, szName, CONTAINER_NAMELEN);

-		if (!g_Settings.bOpenInDefault && !mir_tstrcmp(szName, _T("default")))

-			_tcsncpy(szName, _T("Chat Rooms"), CONTAINER_NAMELEN);

+		if (!g_Settings.bOpenInDefault && !mir_tstrcmp(szName, L"default"))

+			_tcsncpy(szName, L"Chat Rooms", CONTAINER_NAMELEN);

 		szName[CONTAINER_NAMELEN] = 0;

 		pContainer = FindContainerByName(szName);

 	}

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index febc897b1b..98a3b8f603 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -113,7 +113,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoNa
 		pd.lchIcon = LoadIconEx("window");

 

 	PROTOACCOUNT *pa = Proto_GetAccount(pszProtoName);

-	mir_sntprintf(pd.lptzContactName, _T("%s - %s"), (pa == NULL) ? _A2T(pszProtoName) : pa->tszAccountName, pcli->pfnGetContactDisplayName(hContact, 0));

+	mir_sntprintf(pd.lptzContactName, L"%s - %s", (pa == NULL) ? _A2T(pszProtoName) : pa->tszAccountName, pcli->pfnGetContactDisplayName(hContact, 0));

 	_tcsncpy_s(pd.lptzText, TranslateTS(szBuf), _TRUNCATE);

 	pd.iSeconds = g_Settings.iPopupTimeout;

 

@@ -146,10 +146,10 @@ BOOL DoPopup(SESSION_INFO *si, GCEVENT* gce)
 

 	TCHAR *bbStart, *bbEnd;

 	if (g_Settings.bBBCodeInPopups) {

-		bbStart = _T("[b]");

-		bbEnd = _T("[/b]");

+		bbStart = L"[b]";

+		bbEnd = L"[/b]";

 	}

-	else bbStart = bbEnd = _T("");

+	else bbStart = bbEnd = L"";

 

 	if (nen_options.iMUCDisable)                          // no popups at all. Period

 		return 0;

@@ -478,7 +478,7 @@ TCHAR* my_strstri(const TCHAR* s1, const TCHAR* s2)
 {

 	int i, j, k;

 

-	_tsetlocale(LC_ALL, _T(""));

+	_tsetlocale(LC_ALL, L"");

 	for (i = 0; s1[i]; i++)

 		for (j = i, k = 0; _totlower(s1[j]) == _totlower(s2[k]); j++, k++)

 			if (!s2[k + 1])

@@ -546,7 +546,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 			_tcsncpy_s(szTemp, TranslateT("&Message"), _TRUNCATE);

 

 		if (mir_tstrlen(szTemp) > 40)

-			_tcsncpy_s(szTemp + 40, 4, _T("..."), _TRUNCATE);

+			_tcsncpy_s(szTemp + 40, 4, L"...", _TRUNCATE);

 		ModifyMenu(*hMenu, ID_MESS, MF_STRING | MF_BYCOMMAND, ID_MESS, szTemp);

 		gcmi.Type = MENU_ON_NICKLIST;

 	}

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 71bdd2811b..c633d50ee9 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -141,7 +141,7 @@ bool IsStringValidLink(TCHAR *pszText)
 	if (_totlower(pszText[0]) == 'w' && _totlower(pszText[1]) == 'w' && _totlower(pszText[2]) == 'w' && pszText[3] == '.' && _istalnum(pszText[4]))
 		return true;
 
-	return _tcsstr(pszText, _T("://")) != NULL;
+	return _tcsstr(pszText, L"://") != NULL;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -471,7 +471,7 @@ LBL_SkipEnd:
 		int topicStart = start;
 		while (topicStart > 0 && (pszText[topicStart - 1] == ' ' || pszText[topicStart - 1] == 13 || pszText[topicStart - 1] == VK_TAB))
 			topicStart--;
-		if (topicStart > 5 && _tcsstr(&pszText[topicStart - 6], _T("/topic")) == &pszText[topicStart - 6])
+		if (topicStart > 5 && _tcsstr(&pszText[topicStart - 6], L"/topic") == &pszText[topicStart - 6])
 			isTopic = TRUE;
 	}
 	if (dat->szSearchQuery == NULL) {
@@ -843,7 +843,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 			if (lpPrevCmd)
 				SendMessage(hwnd, EM_SETTEXTEX, (WPARAM)&ste, (LPARAM)lpPrevCmd);
 			else
-				SetWindowText(hwnd, _T(""));
+				SetWindowText(hwnd, L"");
 
 			GETTEXTLENGTHEX gtl = { 0 };
 			gtl.flags = GTL_PRECISE;
@@ -1321,7 +1321,7 @@ static void ProcessNickListHovering(HWND hwnd, int hoveredItem, SESSION_INFO *pa
 		}
 
 		if (tszBuf[0] == 0)
-			mir_sntprintf(tszBuf, _T("%s: %s\r\n%s: %s\r\n%s: %s"),
+			mir_sntprintf(tszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s",
 			TranslateT("Nickname"), ui1->pszNick,
 			TranslateT("Unique ID"), ui1->pszUID,
 			TranslateT("Status"), pci->TM_WordToString(parentdat->pStatuses, ui1->Status));
@@ -1671,7 +1671,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 					}
 				}
 				if (tszBuf[0] == 0)
-					mir_sntprintf(tszBuf, _T("<b>%s:</b>\t%s\n<b>%s:</b>\t%s\n<b>%s:</b>\t%s"),
+					mir_sntprintf(tszBuf, L"<b>%s:</b>\t%s\n<b>%s:</b>\t%s\n<b>%s:</b>\t%s",
 					TranslateT("Nick"), ui1->pszNick,
 					TranslateT("Unique ID"), ui1->pszUID,
 					TranslateT("Status"), pci->TM_WordToString(parentdat->pStatuses, ui1->Status));
@@ -1813,7 +1813,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			GetMYUIN(dat);
 			GetMyNick(dat);
 
-			CustomizeButton(CreateWindowEx(0, _T("MButtonClass"), _T(""), WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, 6, DPISCALEY_S(20),
+			CustomizeButton(CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, 6, DPISCALEY_S(20),
 				hwndDlg, (HMENU)IDC_CHAT_TOGGLESIDEBAR, g_hInst, NULL));
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASTHEMEDBTN, 1, 0);
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);
@@ -1905,7 +1905,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				hIcon = Skin_LoadProtoIcon(si->pszModule, (dat->wStatus <= ID_STATUS_OFFLINE) ? ID_STATUS_OFFLINE : dat->wStatus);
 				mir_sntprintf(szTemp,
 					(si->nUsersInNicklist == 1) ? TranslateT("%s: chat room (%u user%s)") : TranslateT("%s: chat room (%u users%s)"),
-					szNick, si->nUsersInNicklist, si->bFilterEnabled ? TranslateT(", event filter active") : _T(""));
+					szNick, si->nUsersInNicklist, si->bFilterEnabled ? TranslateT(", event filter active") : L"");
 				break;
 			case GCW_PRIVMESS:
 				hIcon = Skin_LoadProtoIcon(si->pszModule, (dat->wStatus <= ID_STATUS_OFFLINE) ? ID_STATUS_OFFLINE : dat->wStatus);
@@ -1915,7 +1915,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					mir_sntprintf(szTemp, TranslateT("%s: message session (%u users)"), szNick, si->nUsersInNicklist);
 				break;
 			case GCW_SERVER:
-				mir_sntprintf(szTemp, _T("%s: Server"), szNick);
+				mir_sntprintf(szTemp, L"%s: Server", szNick);
 				hIcon = LoadIconEx("window");
 				break;
 			}
@@ -1988,7 +1988,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			}
 			else {
 				if (si->ptszStatusbarText)
-					mir_sntprintf(szFinalStatusBarText, _T("%s %s"), mi->ptszModDispName, si->ptszStatusbarText);
+					mir_sntprintf(szFinalStatusBarText, L"%s %s", mi->ptszModDispName, si->ptszStatusbarText);
 				else
 					_tcsncpy_s(szFinalStatusBarText, mi->ptszModDispName, _TRUNCATE);
 			}
@@ -2094,7 +2094,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 	case GC_ACKMESSAGE:
 		SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETREADONLY, FALSE, 0);
-		SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, _T(""));
+		SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, L"");
 		return TRUE;
 
 	case DM_TYPING:
@@ -2263,7 +2263,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			return TRUE;
 
 		case WINDOW_CLEARLOG:
-			SetDlgItemText(hwndDlg, IDC_CHAT_LOG, _T(""));
+			SetDlgItemText(hwndDlg, IDC_CHAT_LOG, L"");
 			return TRUE;
 
 		case SESSION_TERMINATE:
@@ -2564,14 +2564,14 @@ LABEL_SHOWWINDOW:
 
 					case ID_SEARCH_GOOGLE:
 						if (pszWord[0])
-							Utils_OpenUrlT(CMString(FORMAT, _T("http://www.google.com/search?q=%s"), pszWord));
+							Utils_OpenUrlT(CMString(FORMAT, L"http://www.google.com/search?q=%s", pszWord));
 
 						PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);
 						break;
 
 					case ID_SEARCH_WIKIPEDIA:
 						if (pszWord[0])
-							Utils_OpenUrlT(CMString(FORMAT, _T("http://en.wikipedia.org/wiki/%s"), pszWord));
+							Utils_OpenUrlT(CMString(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord));
 
 						PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);
 						break;
@@ -2684,7 +2684,7 @@ LABEL_SHOWWINDOW:
 								CHARRANGE chr;
 								SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_EXGETSEL, 0, (LPARAM)&chr);
 
-								TCHAR tszAplTmpl[] = _T("%s:");
+								TCHAR tszAplTmpl[] = L"%s:";
 								size_t bufSize = mir_tstrlen(tr.lpstrText) + mir_tstrlen(tszAplTmpl) + 3;
 								TCHAR *tszTmp = (TCHAR*)mir_alloc(bufSize * sizeof(TCHAR)), *tszAppeal = tszTmp;
 
@@ -2791,9 +2791,9 @@ LABEL_SHOWWINDOW:
 						int start = LOWORD(lResult);
 						CMString tszName;
 						if (start == 0)
-							tszName.Format(_T("%s: "), ui->pszNick);
+							tszName.Format(L"%s: ", ui->pszNick);
 						else
-							tszName.Format(_T("%s "), ui->pszNick);
+							tszName.Format(L"%s ", ui->pszNick);
 
 						SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_REPLACESEL, FALSE, (LPARAM)tszName.GetString());
 						PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);
@@ -2830,13 +2830,13 @@ LABEL_SHOWWINDOW:
 
 				DoRtfToTags(si->dat, ptszText, mi->nColorCount, mi->crColors);
 				ptszText.Trim();
-				ptszText.Replace(_T("%"), _T("%%"));
+				ptszText.Replace(L"%", L"%%");
 
 				if (mi->bAckMsg) {
 					Utils::enableDlgControl(hwndDlg, IDC_CHAT_MESSAGE, false);
 					SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETREADONLY, TRUE, 0);
 				}
-				else SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, _T(""));
+				else SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, L"");
 
 				Utils::enableDlgControl(hwndDlg, IDOK, false);