hello, Unix.

phase 1: removing _T()

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

10 files changed, 37 insertions, 37 deletions

diff --git a/protocols/AimOscar/src/avatars.cpp b/protocols/AimOscar/src/avatars.cpp
index 4b53eaa8a4..52280c13e2 100644
--- a/protocols/AimOscar/src/avatars.cpp
+++ b/protocols/AimOscar/src/avatars.cpp
@@ -118,7 +118,7 @@ void CAimProto::avatar_retrieval_handler(const char* sn, const char* /*hash*/, c
 

 int CAimProto::get_avatar_filename(MCONTACT hContact, TCHAR* pszDest, size_t cbLen, const TCHAR *ext)

 {

-	int tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%S"), VARST(_T("%miranda_avatarcache%")), m_szModuleName);

+	int tPathLen = mir_sntprintf(pszDest, cbLen, L"%s\\%S", VARST(L"%miranda_avatarcache%"), m_szModuleName);

 

 	if (ext && _taccess(pszDest, 0))

 		CreateDirectoryTreeT(pszDest);

@@ -127,19 +127,19 @@ int CAimProto::get_avatar_filename(MCONTACT hContact, TCHAR* pszDest, size_t cbL
 

 	DBVARIANT dbv;

 	if (getTString(hContact, AIM_KEY_AH, &dbv)) return GAIR_NOAVATAR;

-	tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s"), dbv.ptszVal);

+	tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s", dbv.ptszVal);

 	db_free(&dbv);

 

 	bool found = false;

 	if (ext == NULL) {

-		mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T(".*"));

+		mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L".*");

 

 		_tfinddata_t c_file;

 		long hFile = _tfindfirst(pszDest, &c_file);

 		if (hFile > -1L) {

 			do {

 				if (_tcsrchr(c_file.name, '.')) {

-					mir_sntprintf(pszDest + tPathLen2, cbLen - tPathLen2, _T("\\%s"), c_file.name);

+					mir_sntprintf(pszDest + tPathLen2, cbLen - tPathLen2, L"\\%s", c_file.name);

 					found = true;

 				}

 			} while (_tfindnext(hFile, &c_file) == 0);

diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp
index 3bf8adab9f..82508f63f0 100644
--- a/protocols/AimOscar/src/chat.cpp
+++ b/protocols/AimOscar/src/chat.cpp
@@ -203,7 +203,7 @@ int CAimProto::OnGCMenuHook(WPARAM, LPARAM lParam)
 			static const struct gc_item Items[] = {

 				{ TranslateT("User &details"), 10, MENU_ITEM, FALSE },

 				{ TranslateT("User &history"), 20, MENU_ITEM, FALSE },

-				{ _T(""), 100, MENU_SEPARATOR, FALSE },

+				{ L"", 100, MENU_SEPARATOR, FALSE },

 				{ TranslateT("&Leave chat session"), 110, MENU_ITEM, FALSE }

 			};

 			gcmi->nItems = _countof(Items);

diff --git a/protocols/AimOscar/src/connection.cpp b/protocols/AimOscar/src/connection.cpp
index 3ac57d6e0b..a6a41bef4d 100755
--- a/protocols/AimOscar/src/connection.cpp
+++ b/protocols/AimOscar/src/connection.cpp
@@ -155,11 +155,11 @@ bool parse_clientlogin_response(NETLIBHTTPREQUEST *nlhr, NETLIBHTTPHEADER *my_he
 	}

 

 	ptrW buf_w(mir_utf8decodeW(nlhr->pData));

-	HXML root = xmlParseString(buf_w, &datalen, _T(""));

+	HXML root = xmlParseString(buf_w, &datalen, L"");

 	if (!root)

 		return false;

 

-	HXML status = xmlGetChildByPath(root, _T("response/statusCode"), 0);

+	HXML status = xmlGetChildByPath(root, L"response/statusCode", 0);

 	if (!status)

 		return false;

 

@@ -168,12 +168,12 @@ bool parse_clientlogin_response(NETLIBHTTPREQUEST *nlhr, NETLIBHTTPHEADER *my_he
 	if (wcscmp(status_text, L"200"))

 		return false;

 

-	HXML secret_node = xmlGetChildByPath(root, _T("response/data/sessionSecret"), 0);

-	HXML hosttime_node = xmlGetChildByPath(root, _T("response/data/hostTime"), 0);

+	HXML secret_node = xmlGetChildByPath(root, L"response/data/sessionSecret", 0);

+	HXML hosttime_node = xmlGetChildByPath(root, L"response/data/hostTime", 0);

 	if (!secret_node || !hosttime_node)

 		return false;

 

-	HXML token_node = xmlGetChildByPath(root, _T("response/data/token/a"), 0);

+	HXML token_node = xmlGetChildByPath(root, L"response/data/token/a", 0);

 	if (!token_node)

 		return false;

 

@@ -218,11 +218,11 @@ bool parse_start_socar_session_response(const char *response, CMStringA &bos_hos
 

 	int datalen = 0;

 	ptrW buf_w(mir_utf8decodeW(response));

-	HXML root = xmlParseString(buf_w, &datalen, _T(""));

+	HXML root = xmlParseString(buf_w, &datalen, L"");

 	if (!root)

 		return false;

 

-	HXML status = xmlGetChildByPath(root, _T("response/statusCode"), 0);

+	HXML status = xmlGetChildByPath(root, L"response/statusCode", 0);

 	if (!status)

 		return false;

 

@@ -231,9 +231,9 @@ bool parse_start_socar_session_response(const char *response, CMStringA &bos_hos
 	if (wcscmp(status_text, L"200"))

 		return false;

 

-	HXML host_node = xmlGetChildByPath(root, _T("response/data/host"), 0);

-	HXML port_node = xmlGetChildByPath(root, _T("response/data/port"), 0);

-	HXML cookie_node = xmlGetChildByPath(root, _T("response/data/cookie"), 0);

+	HXML host_node = xmlGetChildByPath(root, L"response/data/host", 0);

+	HXML port_node = xmlGetChildByPath(root, L"response/data/port", 0);

+	HXML cookie_node = xmlGetChildByPath(root, L"response/data/cookie", 0);

 	if (!host_node || !port_node || !cookie_node)

 		return false;

 

@@ -246,7 +246,7 @@ bool parse_start_socar_session_response(const char *response, CMStringA &bos_hos
 	cookie = _T2A(cookie_w);

 

 	if (encryption) {

-		HXML tls_node = xmlGetChildByPath(root, _T("response/data/tlsCertName"), 0); //tls is optional, so this is not fatal error

+		HXML tls_node = xmlGetChildByPath(root, L"response/data/tlsCertName", 0); //tls is optional, so this is not fatal error

 		if (tls_node) {

 			LPCTSTR certname_w = xmlGetText(tls_node);

 			if (certname_w)

diff --git a/protocols/AimOscar/src/conv.cpp b/protocols/AimOscar/src/conv.cpp
index f114c52311..287aec3a84 100644
--- a/protocols/AimOscar/src/conv.cpp
+++ b/protocols/AimOscar/src/conv.cpp
@@ -538,7 +538,7 @@ char* rtf_to_html(HWND hwndDlg, int DlgItem)
 			isSize = 1;

 		else

 			isSize = 3;

-		TCHAR text[3] = _T("");

+		TCHAR text[3] = L"";

 		SendDlgItemMessage(hwndDlg, DlgItem, EM_GETSELTEXT, 0, (LPARAM)&text);

 		if (Bold != isBold) {

 			Bold = isBold;

diff --git a/protocols/AimOscar/src/file.cpp b/protocols/AimOscar/src/file.cpp
index 8774998b51..9d19984558 100644
--- a/protocols/AimOscar/src/file.cpp
+++ b/protocols/AimOscar/src/file.cpp
@@ -324,7 +324,7 @@ int CAimProto::receiving_file(file_transfer *ft, HANDLE hServerPacketRecver, NET
 					mir_free(buf);

 

 					TCHAR fname[256];

-					mir_sntprintf(fname, _T("%s%s"), ft->pfts.tszWorkingDir, name);

+					mir_sntprintf(fname, L"%s%s", ft->pfts.tszWorkingDir, name);

 					mir_free(name);

 					mir_free(ft->pfts.tszCurrentFile);

 					ft->pfts.tszCurrentFile = mir_tstrdup(fname);

diff --git a/protocols/AimOscar/src/links.cpp b/protocols/AimOscar/src/links.cpp
index ea187bfbe6..25ae226baa 100644
--- a/protocols/AimOscar/src/links.cpp
+++ b/protocols/AimOscar/src/links.cpp
@@ -84,16 +84,16 @@ static INT_PTR ServiceParseAimLink(WPARAM, LPARAM lParam)
 		open chatroom: aim:gochat?roomname=ROOM&exchange=NUM

 	*/

 	/* add a contact to the list */

-	if (!_tcsnicmp(arg, _T("addbuddy?"), 9)) {

+	if (!_tcsnicmp(arg, L"addbuddy?", 9)) {

 		TCHAR *tok, *tok2;

 		char *sn = NULL, *group = NULL;

 

 		for (tok = arg + 8; tok != NULL; tok = tok2) {

 			tok2 = _tcschr(++tok, '&'); /* first token */

 			if (tok2) *tok2 = 0;

-			if (!_tcsnicmp(tok, _T("screenname="), 11) && *(tok + 11) != 0)

+			if (!_tcsnicmp(tok, L"screenname=", 11) && *(tok + 11) != 0)

 				sn = mir_t2a(url_decode(tok + 11));

-			if (!_tcsnicmp(tok, _T("groupname="), 10) && *(tok + 10) != 0)

+			if (!_tcsnicmp(tok, L"groupname=", 10) && *(tok + 10) != 0)

 				group = mir_utf8encodeT(url_decode(tok + 10));  /* group is currently ignored */

 		}

 		if (sn == NULL) {

@@ -111,16 +111,16 @@ static INT_PTR ServiceParseAimLink(WPARAM, LPARAM lParam)
 		return 0;

 	}

 	/* send a message to a contact */

-	else if (!_tcsnicmp(arg, _T("goim?"), 5)) {

+	else if (!_tcsnicmp(arg, L"goim?", 5)) {

 		TCHAR *tok, *tok2, *msg = NULL;

 		char *sn = NULL;

 

 		for (tok = arg + 4; tok != NULL; tok = tok2) {

 			tok2 = _tcschr(++tok, '&'); /* first token */

 			if (tok2) *tok2 = 0;

-			if (!_tcsnicmp(tok, _T("screenname="), 11) && *(tok + 11) != 0)

+			if (!_tcsnicmp(tok, L"screenname=", 11) && *(tok + 11) != 0)

 				sn = mir_t2a(url_decode(tok + 11));

-			if (!_tcsnicmp(tok, _T("message="), 8) && *(tok + 8) != 0)

+			if (!_tcsnicmp(tok, L"message=", 8) && *(tok + 8) != 0)

 				msg = url_decode(tok + 8);

 		}

 		if (sn == NULL) return 1; /* parse failed */

@@ -134,7 +134,7 @@ static INT_PTR ServiceParseAimLink(WPARAM, LPARAM lParam)
 	}

 

 	/* open a chatroom */

-	else if (!_tcsnicmp(arg, _T("gochat?"), 7)) {

+	else if (!_tcsnicmp(arg, L"gochat?", 7)) {

 		TCHAR *tok, *tok2;

 		char *rm = NULL;

 		int exchange = 0;

@@ -142,12 +142,12 @@ static INT_PTR ServiceParseAimLink(WPARAM, LPARAM lParam)
 		for (tok = arg + 6; tok != NULL; tok = tok2) {

 			tok2 = _tcschr(++tok, '&'); /* first token */

 			if (tok2) *tok2 = 0;

-			if (!_tcsnicmp(tok, _T("roomname="), 9) && *(tok + 9) != 0) {

+			if (!_tcsnicmp(tok, L"roomname=", 9) && *(tok + 9) != 0) {

 				rm = mir_t2a(url_decode(tok + 9));

 				for (char *ch = rm; *ch; ++ch)

 					if (*ch == '+') *ch = ' ';

 			}

-			if (!_tcsnicmp(tok, _T("exchange="), 9))

+			if (!_tcsnicmp(tok, L"exchange=", 9))

 				exchange = _ttoi(tok + 9);

 		}

 		if (rm == NULL || exchange <= 0) {

diff --git a/protocols/AimOscar/src/popup.cpp b/protocols/AimOscar/src/popup.cpp
index 13d1888690..03b4fa8ba3 100644
--- a/protocols/AimOscar/src/popup.cpp
+++ b/protocols/AimOscar/src/popup.cpp
@@ -88,7 +88,7 @@ void CAimProto::ShowPopup(const char* msg, int flags, char* url)
 		if (flags & MAIL_POPUP)

 		{

 			size_t len = mir_tstrlen(ppd.lptzText);

-			mir_sntprintf(&ppd.lptzText[len], _countof(ppd.lptzText) - len, _T(" %s"), TranslateT("Open mail account?"));

+			mir_sntprintf(&ppd.lptzText[len], _countof(ppd.lptzText) - len, L" %s", TranslateT("Open mail account?"));

 			if (MessageBox(NULL, ppd.lptzText, ppd.lptzContactName, MB_YESNO | MB_ICONINFORMATION) == IDYES)

 				ShellExecuteA(NULL, "open", url, NULL, NULL, SW_SHOW);

 		}

diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp
index c780fb5129..fa297a5664 100644
--- a/protocols/AimOscar/src/server.cpp
+++ b/protocols/AimOscar/src/server.cpp
@@ -1661,7 +1661,7 @@ void CAimProto::snac_mail_response(SNAC &snac)//family 0x0018
 		if (new_mail && num_msgs) {

 			TCHAR msg[1024];

 

-			int len = mir_sntprintf(msg, _T("%S@%S (%d)\r\n%s "), sn, address, num_msgs,

+			int len = mir_sntprintf(msg, L"%S@%S (%d)\r\n%s ", sn, address, num_msgs,

 				TranslateT("You've got mail! Checked at"));

 

 			SYSTEMTIME stLocal;

diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index d8df3f87f6..2b906bc355 100755
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -1267,7 +1267,7 @@ static void clist_chat_invite_send(MCONTACT hItem, HWND hwndList, chat_list_item
 			int chk = SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0);

 			if (chk) {

 				if (IsHContactInfo(hItem)) {

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

+					TCHAR buf[128] = L"";

 					SendMessage(hwndList, CLM_GETITEMTEXT, (WPARAM)hItem, (LPARAM)buf);

 

 					char *sn = mir_t2a(buf);

diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp
index 8212a70b42..b5e23b21aa 100755
--- a/protocols/AimOscar/src/utility.cpp
+++ b/protocols/AimOscar/src/utility.cpp
@@ -533,14 +533,14 @@ int CAimProto::open_contact_file(const char*, const TCHAR* file, const char*, TC
 {

 	path = (TCHAR*)mir_alloc(MAX_PATH * sizeof(TCHAR));

 

-	int pos = mir_sntprintf(path, MAX_PATH, _T("%s\\%S"), VARST(_T("%miranda_userdata%")), m_szModuleName);

+	int pos = mir_sntprintf(path, MAX_PATH, L"%s\\%S", VARST(L"%miranda_userdata%"), m_szModuleName);

 	if (contact_dir)

-		pos += mir_sntprintf(path + pos, MAX_PATH - pos, _T("\\%S"), m_szModuleName);

+		pos += mir_sntprintf(path + pos, MAX_PATH - pos, L"\\%S", m_szModuleName);

 

 	if (_taccess(path, 0))

 		CreateDirectoryTreeT(path);

 

-	mir_sntprintf(path + pos, MAX_PATH - pos, _T("\\%s"), file);

+	mir_sntprintf(path + pos, MAX_PATH - pos, L"\\%s", file);

 	int fid = _topen(path, _O_CREAT | _O_RDWR | _O_BINARY, _S_IREAD);

 	if (fid < 0) {

 		TCHAR errmsg[512];

@@ -553,7 +553,7 @@ int CAimProto::open_contact_file(const char*, const TCHAR* file, const char*, TC
 void CAimProto::write_away_message(const char* sn, const char* msg, bool utf)

 {

 	TCHAR* path;

-	int fid = open_contact_file(sn, _T("away.html"), "wb", path, 1);

+	int fid = open_contact_file(sn, L"away.html", "wb", path, 1);

 	if (fid >= 0) {

 		if (utf) _write(fid, "\xEF\xBB\xBF", 3);

 		char* s_msg = process_status_msg(msg, sn);

@@ -562,7 +562,7 @@ void CAimProto::write_away_message(const char* sn, const char* msg, bool utf)
 		_write(fid, "'s Away Message:</h3>", 21);

 		_write(fid, s_msg, (unsigned)mir_strlen(s_msg));

 		_close(fid);

-		ShellExecute(NULL, _T("open"), path, NULL, NULL, SW_SHOW);

+		ShellExecute(NULL, L"open", path, NULL, NULL, SW_SHOW);

 		mir_free(path);

 		mir_free(s_msg);

 	}

@@ -571,7 +571,7 @@ void CAimProto::write_away_message(const char* sn, const char* msg, bool utf)
 void CAimProto::write_profile(const char* sn, const char* msg, bool utf)

 {

 	TCHAR* path;

-	int fid = open_contact_file(sn, _T("profile.html"), "wb", path, 1);

+	int fid = open_contact_file(sn, L"profile.html", "wb", path, 1);

 	if (fid >= 0) {

 		if (utf) _write(fid, "\xEF\xBB\xBF", 3);

 		char* s_msg = process_status_msg(msg, sn);

@@ -580,7 +580,7 @@ void CAimProto::write_profile(const char* sn, const char* msg, bool utf)
 		_write(fid, "'s Profile:</h3>", 16);

 		_write(fid, s_msg, (unsigned)mir_strlen(s_msg));

 		_close(fid);

-		ShellExecute(NULL, _T("open"), path, NULL, NULL, SW_SHOW);

+		ShellExecute(NULL, L"open", path, NULL, NULL, SW_SHOW);

 		mir_free(path);

 		mir_free(s_msg);

 	}