<tchar.h> removed from <m_system.h>

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

3 files changed, 11 insertions, 11 deletions

diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index 246dbf71e9..a3a4d04ec0 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -8,7 +8,7 @@ wchar_t g_fingerprint_store_filename[MAX_PATH];
 wchar_t g_instag_filename[MAX_PATH];
 HANDLE hPATH_MIROTR;
 Options options;
-#define DATA_DIRECTORY MIRANDA_USERDATAT L"\\" _T(MODULENAME)
+#define DATA_DIRECTORY MIRANDA_USERDATAT L"\\" _A2W(MODULENAME)
 
 struct PROTOREGENKEYOPTIONS {
 	HWND refresh;
@@ -21,16 +21,16 @@ void SetFilenames(const wchar_t *path)
 		return;
 	CreateDirectoryTreeT(path);
 	
-	mir_sntprintf(g_private_key_filename, L"%s\\" _T(PRIVATE_KEY_FILENAME), path);
-	mir_sntprintf(g_fingerprint_store_filename, L"%s\\" _T(FINGERPRINT_STORE_FILENAME), path);
-	mir_sntprintf(g_instag_filename, L"%s\\" _T(INSTAG_FILENAME), path);
+	mir_sntprintf(g_private_key_filename,       L"%s\\" _A2W(PRIVATE_KEY_FILENAME),       path);
+	mir_sntprintf(g_fingerprint_store_filename, L"%s\\" _A2W(FINGERPRINT_STORE_FILENAME), path);
+	mir_sntprintf(g_instag_filename,            L"%s\\" _A2W(INSTAG_FILENAME),            path);
 }
 
 int FoldersChanged(WPARAM, LPARAM)
 {
 	wchar_t path[MAX_PATH];
 	if ( FoldersGetCustomPathT(hPATH_MIROTR, path, _countof(path), L""))
-		SetFilenames( VARST(DATA_DIRECTORY));
+		SetFilenames(VARST(DATA_DIRECTORY));
 	else
 		SetFilenames(path);
 
diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp
index e21c05c762..8bd87e7dd0 100644
--- a/plugins/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/src/svcs_menu.cpp
@@ -163,13 +163,13 @@ void InitMenu()
 	mi.position = -400000;
 
 	SET_UID(mi, 0xAB574FAD, 0x15D8, 0x49FF, 0xB7, 0x03, 0xDA, 0x2B, 0x45, 0x46, 0xC3, 0x56);
-	mi.name.w = _T(LANG_STOP_OTR);
+	mi.name.w = _A2W(LANG_STOP_OTR);
 	mi.pszService = MS_OTR_MENUSTOP;
 	mi.hIcolibItem = IcoLib_GetIconHandle(ICON_PRIVATE);
 	hStopItem = Menu_AddContactMenuItem(&mi);
 	
 	mi.uid.d[7]++;
-	mi.name.w = _T(LANG_START_OTR);
+	mi.name.w = _A2W(LANG_START_OTR);
 	mi.pszService = MS_OTR_MENUSTART;
 	mi.hIcolibItem = IcoLib_GetIconHandle(ICON_NOT_PRIVATE);
 	hStartItem = Menu_AddContactMenuItem(&mi);
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index f7471b9c98..e4fbc217ec 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -115,7 +115,7 @@ void ShowPopup(const wchar_t* line1, const wchar_t* line2, int timeout, const MC
 
 	if ( !options.bHavePopups) {	
 		wchar_t title[256];
-		mir_sntprintf(title, L"%s Message", _T(MODULENAME));
+		mir_sntprintf(title, L"%s Message", _A2W(MODULENAME));
 
 		if(line1 && line2) {
 			int size = int(mir_tstrlen(line1) + mir_tstrlen(line2) + 3);
@@ -165,7 +165,7 @@ void ShowWarning(wchar_t *msg) {
 	if(disp == ED_POP && !options.bHavePopups) disp = ED_BAL;
 	if(disp == ED_BAL && !ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) disp = ED_MB;
 
-	mir_sntprintf(buffer, L"%s Warning", _T(MODULENAME));
+	mir_sntprintf(buffer, L"%s Warning", _A2W(MODULENAME));
 
 	
 	switch(disp) {
@@ -211,7 +211,7 @@ void ShowError(wchar_t *msg) {
 	if(disp == ED_POP && !options.bHavePopups) disp = ED_BAL;
 	if(disp == ED_BAL && !ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) disp = ED_MB;
 
-	mir_sntprintf(buffer, L"%s Error", _T(MODULENAME));
+	mir_sntprintf(buffer, L"%s Error", _A2W(MODULENAME));
 
 
 	wchar_t *message;
@@ -269,7 +269,7 @@ void ShowErrorUtf(char* msg) {
 
 void ShowMessageInline(const MCONTACT hContact, const wchar_t *msg) {
 	wchar_t buff[1024];
-	mir_sntprintf(buff, L"%s%s", _T(LANG_INLINE_PREFIX), msg);
+	mir_sntprintf(buff, L"%s%s", _A2W(LANG_INLINE_PREFIX), msg);
 	T2Utf utf(buff);
 
 	PROTORECVEVENT pre = {0};