lstr* replacements

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

1 files changed, 5 insertions, 5 deletions

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index 101a9cfa00..c2c13b2549 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -38,7 +38,7 @@ static TCHAR *StrTrimCopy(TCHAR *str)
 	if (!*str) return mir_tstrdup(str);

 

 	TCHAR *res = mir_tstrdup(str);

-	for (TCHAR *p = res + lstrlen(res) - 1; p >= res; --p) {

+	for (TCHAR *p = res + mir_tstrlen(res) - 1; p >= res; --p) {

 		if (_istspace(*p))

 			*p = 0;

 		else

@@ -85,8 +85,8 @@ void CNoteItem::SetData(TCHAR *title, TCHAR *from, TCHAR *text, TCHAR *tags)
 	m_szFrom = StrTrimCopy(from);

 

 	const TCHAR *szTags = tags;

-	TCHAR *p = m_szTags = (TCHAR *)mir_alloc((lstrlen(szTags) + 2 /*for double zero*/) * sizeof(TCHAR));

-	TCHAR *q = m_szTagsStr = (TCHAR *)mir_alloc((lstrlen(szTags) + 1) * sizeof(TCHAR));

+	TCHAR *p = m_szTags = (TCHAR *)mir_alloc((mir_tstrlen(szTags) + 2 /*for double zero*/) * sizeof(TCHAR));

+	TCHAR *q = m_szTagsStr = (TCHAR *)mir_alloc((mir_tstrlen(szTags) + 1) * sizeof(TCHAR));

 	for (; szTags && *szTags; ++szTags) {

 		if (_istspace(*szTags))

 			continue;

@@ -108,7 +108,7 @@ bool CNoteItem::HasTag(const TCHAR *szTag)
 	if (!szTag || !*szTag)

 		return true;

 

-	for (TCHAR *p = m_szTags; p && *p; p = p + lstrlen(p) + 1)

+	for (TCHAR *p = m_szTags; p && *p; p = p + mir_tstrlen(p) + 1)

 		if (!lstrcmp(p, szTag))

 			return true;

 

@@ -479,7 +479,7 @@ private:
 		LIST<TCHAR> tagSet(5, _tcscmp);

 		for (int i = 0; i < m_proto->m_notes.getCount(); i++) {

 			TCHAR *tags = m_proto->m_notes[i].GetTags();

-			for (TCHAR *tag = tags; tag && *tag; tag = tag + lstrlen(tag) + 1)

+			for (TCHAR *tag = tags; tag && *tag; tag = tag + mir_tstrlen(tag) + 1)

 			if (!tagSet.find(tag))

 				tagSet.insert(tag);

 		}