From 159b565b390687258ee65a3b66596e118752063c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:33:13 +0000 Subject: replace strcmp to mir_strcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13752 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/extraicons/DefaultExtraIcons.cpp | 12 ++++++------ src/modules/extraicons/extraicons.cpp | 2 +- src/modules/extraicons/usedIcons.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/modules/extraicons') diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp index 72f835b85a..dc1833d00f 100644 --- a/src/modules/extraicons/DefaultExtraIcons.cpp +++ b/src/modules/extraicons/DefaultExtraIcons.cpp @@ -169,13 +169,13 @@ static int SettingChanged(WPARAM hContact, LPARAM lParam) return 0; DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - bool isProto = (strcmp(cws->szModule, proto) == 0); - if (isProto && strcmp(cws->szSetting, "ApparentMode") == 0) { + bool isProto = (mir_strcmp(cws->szModule, proto) == 0); + if (isProto && mir_strcmp(cws->szSetting, "ApparentMode") == 0) { SetVisibility(hContact, cws->value.type == DBVT_DELETED ? 0 : cws->value.wVal, true); return 0; } - if (strcmp(cws->szSetting, "Gender") == 0 && (isProto || strcmp(cws->szModule, "UserInfo") == 0)) { + if (mir_strcmp(cws->szSetting, "Gender") == 0 && (isProto || mir_strcmp(cws->szModule, "UserInfo") == 0)) { SetGender(hContact, cws->value.type == DBVT_DELETED ? 0 : cws->value.bVal, true); return 0; } @@ -188,9 +188,9 @@ static int SettingChanged(WPARAM hContact, LPARAM lParam) break; if (p.db[j] == NULL && !isProto) continue; - if (p.db[j] != NULL && strcmp(cws->szModule, p.db[j])) + if (p.db[j] != NULL && mir_strcmp(cws->szModule, p.db[j])) continue; - if (strcmp(cws->szSetting, p.db[j + 1])) + if (mir_strcmp(cws->szSetting, p.db[j + 1])) continue; bool show = (cws->value.type != DBVT_DELETED && !IsEmpty(cws->value.pszVal)); @@ -245,7 +245,7 @@ struct ProtoInfo }; static int CompareProtos(const ProtoInfo *p1, const ProtoInfo *p2) -{ return strcmp(p1->proto, p2->proto); +{ return mir_strcmp(p1->proto, p2->proto); } OBJLIST arProtos(10, CompareProtos); diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index 77be5eae80..b2ca2b9c95 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -122,7 +122,7 @@ BaseExtraIcon* GetExtraIconByName(const char *name) { for (int i=0; i < registeredExtraIcons.getCount(); i++) { BaseExtraIcon *extra = registeredExtraIcons[i]; - if (strcmp(name, extra->getName()) == 0) + if (mir_strcmp(name, extra->getName()) == 0) return extra; } return NULL; diff --git a/src/modules/extraicons/usedIcons.cpp b/src/modules/extraicons/usedIcons.cpp index 37fe581ff1..db967687dd 100644 --- a/src/modules/extraicons/usedIcons.cpp +++ b/src/modules/extraicons/usedIcons.cpp @@ -41,7 +41,7 @@ struct Icon static int SortFunc(const Icon *p1, const Icon *p2) { - return strcmp(p1->name, p2->name); + return mir_strcmp(p1->name, p2->name); } static OBJLIST usedIcons(50, SortFunc); -- cgit v1.2.3