less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

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

1 files changed, 13 insertions, 13 deletions

diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp
index 58d0ad84e4..42fe0bf575 100644
--- a/protocols/SkypeWeb/src/skype_utils.cpp
+++ b/protocols/SkypeWeb/src/skype_utils.cpp
@@ -32,7 +32,7 @@ time_t CSkypeProto::IsoToUnixTime(const char *stamp)
 	// skip '-' chars

 	int si = 0, sj = 0;

 	while (true) {

-		if (p[si] == _T('-'))

+		if (p[si] == '-')

 			si++;

 		else if (!(p[sj++] = p[si++]))

 			break;

@@ -426,9 +426,9 @@ int CSkypeProto::SkypeToMirandaStatus(const char *status)
 		return ID_STATUS_OFFLINE;

 }

 

-bool CSkypeProto::IsFileExists(std::tstring path)

+bool CSkypeProto::IsFileExists(std::wstring path)

 {

-	return _taccess(path.c_str(), 0) == 0;

+	return _waccess(path.c_str(), 0) == 0;

 }

 

 // url parsing

@@ -480,14 +480,14 @@ CMStringA CSkypeProto::GetServerFromUrl(const char *url)
 

 INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)

 {

-	TCHAR *arg = (TCHAR *)lParam;

+	wchar_t *arg = (wchar_t *)lParam;

 	if (arg == NULL)

 		return 1;

 

 	// skip leading prefix

-	TCHAR szUri[1024];

-	_tcsncpy_s(szUri, arg, _TRUNCATE);

-	TCHAR *szJid = _tcschr(szUri, _T(':'));

+	wchar_t szUri[1024];

+	wcsncpy_s(szUri, arg, _TRUNCATE);

+	wchar_t *szJid = wcschr(szUri, ':');

 	if (szJid == NULL)

 		return 1;

 

@@ -496,13 +496,13 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)
 		return 1;

 

 	// command code

-	TCHAR *szCommand = szJid;

-	szCommand = _tcschr(szCommand, _T('?'));

+	wchar_t *szCommand = szJid;

+	szCommand = wcschr(szCommand, '?');

 	if (szCommand)

 		*(szCommand++) = 0;

 

 	// parameters

-	TCHAR *szSecondParam = szCommand ? _tcschr(szCommand, _T('&')) : NULL;

+	wchar_t *szSecondParam = szCommand ? wcschr(szCommand, '&') : NULL;

 	if (szSecondParam)

 		*(szSecondParam++) = 0;

 

@@ -511,7 +511,7 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)
 	{

 		if (szSecondParam)

 		{

-			TCHAR *szChatId = _tcsstr(szSecondParam, L"id=");

+			wchar_t *szChatId = wcsstr(szSecondParam, L"id=");

 			if (szChatId)

 			{

 				szChatId += 5;

@@ -537,8 +537,8 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)
 		{

 			PROTOSEARCHRESULT psr = { 0 };

 			psr.cbSize = sizeof(psr);

-			psr.id.t = mir_tstrdup(szJid);

-			psr.nick.t = mir_tstrdup(szJid);

+			psr.id.w = mir_tstrdup(szJid);

+			psr.nick.w = mir_tstrdup(szJid);

 			psr.flags = PSR_UNICODE;

 

 			ADDCONTACTSTRUCT acs = { 0 };