replace _tcscmp to mir_tstrcmp

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

1 files changed, 14 insertions, 14 deletions

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 041f665e58..a109b3bea3 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -35,7 +35,7 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode, CJabberIqInfo*)
 		return;

 

 	const TCHAR *type = xmlGetAttrValue(iqNode, _T("type"));

-	if ( _tcscmp(type, _T("result")))

+	if ( mir_tstrcmp(type, _T("result")))

 		return;

 

 	HXML query = xmlGetChildByTag(iqNode, "query", "xmlns", JABBER_FEAT_DISCO_INFO);

@@ -68,7 +68,7 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode, CJabberIqInfo*)
 				continue;

 

 			for (int j = 0; g_JabberFeatCapPairs[j].szFeature; j++) {

-				if (!_tcscmp(g_JabberFeatCapPairs[j].szFeature, featureName)) {

+				if (!mir_tstrcmp(g_JabberFeatCapPairs[j].szFeature, featureName)) {

 					m_ThreadInfo->jabberServerCaps |= g_JabberFeatCapPairs[j].jcbCap;

 					break;

 				}

@@ -96,7 +96,7 @@ void CJabberProto::OnIqResultNestedRosterGroups(HXML iqNode, CJabberIqInfo *pInf
 		return;

 

 	// is our default delimiter?

-	if ((!szGroupDelimeter && bPrivateStorageSupport) || (szGroupDelimeter && _tcscmp(szGroupDelimeter, _T("\\"))))

+	if ((!szGroupDelimeter && bPrivateStorageSupport) || (szGroupDelimeter && mir_tstrcmp(szGroupDelimeter, _T("\\"))))

 		m_ThreadInfo->send(

 			XmlNodeIq(_T("set"), SerialNext()) << XQUERY(JABBER_FEAT_PRIVATE_STORAGE)

 				<< XCHILD(_T("roster"), _T("\\")) << XATTR(_T("xmlns"), JABBER_FEAT_NESTED_ROSTER_GROUPS));

@@ -352,7 +352,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo)
 		return;

 	}

 

-	if (!_tcscmp(szGroupDelimeter, _T("\\"))) {

+	if (!mir_tstrcmp(szGroupDelimeter, _T("\\"))) {

 		mir_free(szGroupDelimeter);

 		szGroupDelimeter = NULL;

 	}

@@ -367,16 +367,16 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo)
 		if (!itemNode)

 			break;

 

-		if (_tcscmp(xmlGetName(itemNode), _T("item")))

+		if (mir_tstrcmp(xmlGetName(itemNode), _T("item")))

 			continue;

 

 		const TCHAR *str = xmlGetAttrValue(itemNode, _T("subscription"));

 

 		JABBER_SUBSCRIPTION sub;

 		if (str == NULL) sub = SUB_NONE;

-		else if (!_tcscmp(str, _T("both"))) sub = SUB_BOTH;

-		else if (!_tcscmp(str, _T("to"))) sub = SUB_TO;

-		else if (!_tcscmp(str, _T("from"))) sub = SUB_FROM;

+		else if (!mir_tstrcmp(str, _T("both"))) sub = SUB_BOTH;

+		else if (!mir_tstrcmp(str, _T("to"))) sub = SUB_TO;

+		else if (!mir_tstrcmp(str, _T("from"))) sub = SUB_FROM;

 		else sub = SUB_NONE;

 

 		const TCHAR *jid = xmlGetAttrValue(itemNode, _T("jid"));

@@ -621,7 +621,7 @@ void CJabberProto::OnIqResultGetVcardPhoto(HXML n, MCONTACT hContact, bool &hasP
 			}

 			if (item != NULL) {

 				hasPhoto = TRUE;

-				if (item->photoFileName && _tcscmp(item->photoFileName, szAvatarFileName))

+				if (item->photoFileName && mir_tstrcmp(item->photoFileName, szAvatarFileName))

 					DeleteFile(item->photoFileName);

 				replaceStrT(item->photoFileName, szAvatarFileName);

 				debugLog(_T("Contact's picture saved to %s"), szAvatarFileName);

@@ -715,7 +715,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*)
 			if (!n)

 				break;

 			if (xmlGetName(n) == NULL) continue;

-			if (!_tcscmp(xmlGetName(n), _T("FN"))) {

+			if (!mir_tstrcmp(xmlGetName(n), _T("FN"))) {

 				if (xmlGetText(n) != NULL) {

 					hasFn = true;

 					setTString(hContact, "FullName", xmlGetText(n));

@@ -1277,7 +1277,7 @@ void CJabberProto::OnIqResultGetVCardAvatar(HXML iqNode, CJabberIqInfo*)
 

 	const TCHAR *type;

 	if ((type = xmlGetAttrValue(iqNode, _T("type"))) == NULL) return;

-	if (_tcscmp(type, _T("result"))) return;

+	if (mir_tstrcmp(type, _T("result"))) return;

 

 	HXML vCard = xmlGetChild(iqNode , "vCard");

 	if (vCard == NULL) return;

@@ -1316,7 +1316,7 @@ void CJabberProto::OnIqResultGetClientAvatar(HXML iqNode, CJabberIqInfo*)
 		return;

 

 	HXML n = NULL;

-	if ((type = xmlGetAttrValue(iqNode, _T("type"))) != NULL && !_tcscmp(type, _T("result"))) {

+	if ((type = xmlGetAttrValue(iqNode, _T("type"))) != NULL && !mir_tstrcmp(type, _T("result"))) {

 		HXML queryNode = xmlGetChild(iqNode , "query");

 		if (queryNode != NULL) {

 			const TCHAR *xmlns = xmlGetAttrValue(queryNode, _T("xmlns"));

@@ -1465,7 +1465,7 @@ void CJabberProto::OnIqResultDiscoBookmarks(HXML iqNode, CJabberIqInfo*)
 			HXML itemNode;

 			for (int i = 0; itemNode = xmlGetChild(storageNode, i); i++) {

 				if (LPCTSTR name = xmlGetName(itemNode)) {

-					if (!_tcscmp(name, _T("conference")) && (jid = xmlGetAttrValue(itemNode, _T("jid")))) {

+					if (!mir_tstrcmp(name, _T("conference")) && (jid = xmlGetAttrValue(itemNode, _T("jid")))) {

 						JABBER_LIST_ITEM *item = ListAdd(LIST_BOOKMARK, jid);

 						item->name = mir_tstrdup(xmlGetAttrValue(itemNode, _T("name")));

 						item->type = mir_tstrdup(_T("conference"));

@@ -1477,7 +1477,7 @@ void CJabberProto::OnIqResultDiscoBookmarks(HXML iqNode, CJabberIqInfo*)
 						if (autoJ != NULL)

 							item->bAutoJoin = (!mir_tstrcmp(autoJ, _T("true")) || !mir_tstrcmp(autoJ, _T("1"))) ? true : false;

 					}

-					else if (!_tcscmp(name, _T("url")) && (jid = xmlGetAttrValue(itemNode, _T("url")))) {

+					else if (!mir_tstrcmp(name, _T("url")) && (jid = xmlGetAttrValue(itemNode, _T("url")))) {

 						JABBER_LIST_ITEM *item = ListAdd(LIST_BOOKMARK, jid);

 						item->bUseResource = TRUE;

 						item->name = mir_tstrdup(xmlGetAttrValue(itemNode, _T("name")));