diff options
| author | Robert Pösel <robyer@seznam.cz> | 2015-10-28 08:32:01 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2015-10-28 08:32:01 +0000 |
| commit | 2ec5040dda86f76532d48302fede21866916954a (patch) | |
| tree | 698107b99b7778977da70d99f2b268a2c09de813 /plugins/MirandaG15/src | |
| parent | 94fa24ec096e8e5f828e7028100ec542144443c7 (diff) | |
Optimize ME_DB_CONTACT_SETTINGCHANGED functions to not use mir_strcmp() but just strcmp() (and similar methods)
It's not needed to user mir_* for checking null pointers when we're comparing const strings with DBCONTACTWRITESETTING values which should be always initialized correctly.
Somewhere also changed strcmpi to just strcmp, because these settings are case-sensitive anyway.
git-svn-id: http://svn.miranda-ng.org/main/trunk@15631 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirandaG15/src')
| -rw-r--r-- | plugins/MirandaG15/src/CAppletManager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index d7c9388caa..037018765e 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -1440,7 +1440,7 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam) { DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - if ((wParam == 0) || (mir_strcmp(cws->szSetting, "Status") != NULL)) + if ((wParam == 0) || (strcmp(cws->szSetting, "Status") != NULL)) return 0; @@ -1665,10 +1665,10 @@ int CAppletManager::HookSettingChanged(WPARAM hContact, LPARAM lParam) CEvent Event; Event.hContact = hContact; - if (!mir_strcmp(dbcws->szSetting, "Nick") || !mir_strcmp(dbcws->szSetting, "MyHandle")) { + if (!strcmp(dbcws->szSetting, "Nick") || !strcmp(dbcws->szSetting, "MyHandle")) { DBVARIANT dbv = { 0 }; // if the protocol nick has changed, check if a custom handle is set - if (!mir_strcmp(dbcws->szSetting, "Nick")) { + if (!strcmp(dbcws->szSetting, "Nick")) { if (!db_get_ts(Event.hContact, "CList", "MyHandle", &dbv)) { // handle found, ignore this event if (dbv.pszVal && mir_strlen(dbv.pszVal) > 0) @@ -1692,12 +1692,12 @@ int CAppletManager::HookSettingChanged(WPARAM hContact, LPARAM lParam) db_free(&dbv); } } - else if (!mir_strcmp(dbcws->szModule, "CList")) { - if (!mir_strcmp(dbcws->szSetting, "Hidden")) { + else if (!strcmp(dbcws->szModule, "CList")) { + if (!strcmp(dbcws->szSetting, "Hidden")) { Event.eType = EVENT_CONTACT_HIDDEN; Event.iValue = db_get_b(hContact, "CList", "Hidden", 0); } - else if (!mir_strcmp(dbcws->szSetting, "Group")) { + else if (!strcmp(dbcws->szSetting, "Group")) { Event.eType = EVENT_CONTACT_GROUP; DBVARIANT dbv; int res = db_get_ts(hContact, "CList", "Group", &dbv); |