From b280d2eae93fb22b4fdb45218d8a06287a97030e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:49:22 +0000 Subject: replace _tcscmp to mir_tstrcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/avatar.cpp | 4 ++-- protocols/Gadu-Gadu/src/gg_proto.cpp | 2 +- protocols/Gadu-Gadu/src/groupchat.cpp | 4 ++-- protocols/Gadu-Gadu/src/services.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/Gadu-Gadu') diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index e6fcdaa74c..a0dbc4101c 100644 --- a/protocols/Gadu-Gadu/src/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp @@ -88,7 +88,7 @@ bool GGPROTO::getAvatarFileInfo(uin_t uin, char **avatarurl, char **avatarts) if (hXml != NULL) { HXML node = xi.getChildByPath(hXml, _T("users/user/avatars/avatar"), 0); const TCHAR *blank = (node != NULL) ? xi.getAttrValue(node, _T("blank")) : NULL; - if (blank != NULL && _tcscmp(blank, _T("1"))) { + if (blank != NULL && mir_tstrcmp(blank, _T("1"))) { node = xi.getChildByPath(hXml, _T("users/user/avatars/avatar/timestamp"), 0); *avatarts = node != NULL ? mir_t2a(xi.getText(node)) : NULL; node = xi.getChildByPath(hXml, _T("users/user/avatars/avatar/bigavatar"), 0); //new gg convention @@ -112,7 +112,7 @@ bool GGPROTO::getAvatarFileInfo(uin_t uin, char **avatarurl, char **avatarts) ptrT respJSON_blank(json_as_string(json_get(respJSONavatar, "_blank"))); ptrT respJSONoriginBigAvatar(json_as_string(json_get(respJSONavatar, "originBigAvatar"))); ptrT respJSONtimestamp(json_as_string(json_get(respJSONavatar, "timestamp"))); - if (respJSON_blank && _tcscmp(respJSON_blank, TEXT("1")) && respJSONoriginBigAvatar && respJSONtimestamp){ + if (respJSON_blank && mir_tstrcmp(respJSON_blank, TEXT("1")) && respJSONoriginBigAvatar && respJSONtimestamp){ *avatarurl = mir_t2a(respJSONoriginBigAvatar); *avatarts = mir_t2a(respJSONtimestamp); } diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 9f93b0c6f7..6c532d195b 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -692,7 +692,7 @@ int GGPROTO::SetAwayMsg(int iStatus, const PROTOCHAR *newMsg) } // Check if we change status here somehow - if (*msgPtr && newMsg && !_tcscmp(*msgPtr, newMsg) + if (*msgPtr && newMsg && !mir_tstrcmp(*msgPtr, newMsg) || !*msgPtr && (!newMsg || !*newMsg)) { if (status == m_iDesiredStatus && m_iDesiredStatus == m_iStatus) diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 5386d62273..4735a055e9 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -106,7 +106,7 @@ GGGC* GGPROTO::gc_lookup(const TCHAR *id) for(l = chats; l; l = l->next) { chat = (GGGC *)l->data; - if (chat && !_tcscmp(chat->id, id)) + if (chat && !mir_tstrcmp(chat->id, id)) return chat; } @@ -142,7 +142,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam) MCONTACT hNext = db_find_next(hContact); DBVARIANT dbv; if (!getTString(hContact, "ChatRoomID", &dbv)) { - if (dbv.ptszVal && !_tcscmp(gch->pDest->ptszID, dbv.ptszVal)) + if (dbv.ptszVal && !mir_tstrcmp(gch->pDest->ptszID, dbv.ptszVal)) CallService(MS_DB_CONTACT_DELETE, hContact, 0); db_free(&dbv); } diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp index d9f06b06aa..26c0d62734 100644 --- a/protocols/Gadu-Gadu/src/services.cpp +++ b/protocols/Gadu-Gadu/src/services.cpp @@ -339,7 +339,7 @@ INT_PTR GGPROTO::setmyavatar(WPARAM wParam, LPARAM lParam) TCHAR szMyFilename[MAX_PATH]; getAvatarFilename(NULL, szMyFilename, SIZEOF(szMyFilename)); - if ( _tcscmp(szFilename, szMyFilename) && !CopyFile(szFilename, szMyFilename, FALSE)) { + if ( mir_tstrcmp(szFilename, szMyFilename) && !CopyFile(szFilename, szMyFilename, FALSE)) { debugLogA("setmyavatar(): Failed to set user avatar. File with type %d could not be created/overwritten.", iAvType); return -1; } -- cgit v1.2.3