From 623e04b81f60d4134720ac9ef3796a9cb867ebcf Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 13 Feb 2019 19:33:18 +0300
Subject: minus tchar.h in mir_app

---
 src/mir_app/src/chat_tools.cpp  | 2 +-
 src/mir_app/src/clui.cpp        | 6 +++---
 src/mir_app/src/database.cpp    | 2 +-
 src/mir_app/src/movetogroup.cpp | 2 +-
 src/mir_app/src/path.cpp        | 2 +-
 src/mir_app/src/skinicons.cpp   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp
index 7a13ba81da..74c86116e6 100644
--- a/src/mir_app/src/chat_tools.cpp
+++ b/src/mir_app/src/chat_tools.cpp
@@ -389,7 +389,7 @@ bool IsHighlighted(SESSION_INFO *si, GCEVENT *gce)
 
 		// time to get the next/first word in the incoming text string
 		for (const wchar_t *p = buf; *p != '\0'; p += wcscspn(p, L" ")) {
-			p += _tcsspn(p, L" ");
+			p += wcsspn(p, L" ");
 
 			// compare the words, using wildcards
 			if (wildcmpiw(p, tszToken))
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp
index ba3c5e77f9..84918f548f 100644
--- a/src/mir_app/src/clui.cpp
+++ b/src/mir_app/src/clui.cpp
@@ -293,12 +293,12 @@ int LoadCLUIModule(void)
 	wndclass.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA, true);
 	wndclass.hCursor = LoadCursor(nullptr, IDC_ARROW);
 	wndclass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
-	wndclass.lpszClassName = _T(MIRANDACLASS);
+	wndclass.lpszClassName = _A2W(MIRANDACLASS);
 	wndclass.hIconSm = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
 	RegisterClassEx(&wndclass);
 
 	if (db_get_ws(0, "CList", "TitleText", &dbv))
-		mir_wstrncpy(titleText, _T(MIRANDANAME), _countof(titleText));
+		mir_wstrncpy(titleText, _A2W(MIRANDANAME), _countof(titleText));
 	else {
 		mir_wstrncpy(titleText, dbv.pwszVal, _countof(titleText));
 		db_free(&dbv);
@@ -314,7 +314,7 @@ int LoadCLUIModule(void)
 
 	g_clistApi.hwndContactList = CreateWindowEx(
 		(db_get_b(0, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ? WS_EX_TOOLWINDOW : WS_EX_APPWINDOW),
-		_T(MIRANDACLASS),
+		_A2W(MIRANDACLASS),
 		titleText,
 		WS_POPUPWINDOW | WS_THICKFRAME | WS_CLIPCHILDREN |
 		(db_get_b(0, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT) ? WS_CAPTION | WS_SYSMENU |
diff --git a/src/mir_app/src/database.cpp b/src/mir_app/src/database.cpp
index 26019404d5..2de759ee96 100644
--- a/src/mir_app/src/database.cpp
+++ b/src/mir_app/src/database.cpp
@@ -460,7 +460,7 @@ int LoadDatabaseModule(void)
 {
 	wchar_t szProfile[MAX_PATH];
 	PathToAbsoluteW(L".", szProfile);
-	_tchdir(szProfile);
+	_wchdir(szProfile);
 	szProfile[0] = 0;
 
 	// find out which profile to load
diff --git a/src/mir_app/src/movetogroup.cpp b/src/mir_app/src/movetogroup.cpp
index 19de6ff677..d3ce3f24ae 100644
--- a/src/mir_app/src/movetogroup.cpp
+++ b/src/mir_app/src/movetogroup.cpp
@@ -43,7 +43,7 @@ struct GroupItemSort
 
 	static int compare(const GroupItemSort* d1, const GroupItemSort* d2)
 	{
-		return _tcscoll(d1->name, d2->name);
+		return wcscoll(d1->name, d2->name);
 	}
 };
 
diff --git a/src/mir_app/src/path.cpp b/src/mir_app/src/path.cpp
index 5317af26fe..cf6f935f07 100644
--- a/src/mir_app/src/path.cpp
+++ b/src/mir_app/src/path.cpp
@@ -44,7 +44,7 @@ wchar_t* GetContactID(MCONTACT hContact)
 /////////////////////////////////////////////////////////////////////////////////////////
 // Variables parser
 
-#define XSTR(target, s) _xstrselect(target, s, _T(s))
+#define XSTR(target, s) _xstrselect(target, s, _A2W(s))
 
 static __forceinline int _xcscmp(const char *s1, const char *s2) { return strcmp(s1, s2); }
 static __forceinline int _xcsncmp(const char *s1, const char *s2, size_t n) { return strncmp(s1, s2, n); }
diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index 24a4d6b5e5..c8ac4a39d2 100644
--- a/src/mir_app/src/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -280,7 +280,7 @@ MIR_APP_DLL(HICON) Skin_LoadProtoIcon(const char *szProto, int status, bool big)
 
 			// Queried protocol isn't in list, adding
 			wchar_t tszSection[MAX_PATH];
-			mir_snwprintf(tszSection, _T(PROTOCOLS_PREFIX)L"/%s", pa->tszAccountName);
+			mir_snwprintf(tszSection, _A2W(PROTOCOLS_PREFIX)L"/%s", pa->tszAccountName);
 
 			SKINICONDESC sid = {};
 			sid.section.w = tszSection;
-- 
cgit v1.2.3