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 /src/core | |
| 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 'src/core')
| -rw-r--r-- | src/core/stdclist/src/clistopts.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 6 | ||||
| -rw-r--r-- | src/core/stduseronline/src/useronline.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index 8748604ff9..3027e38563 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -32,7 +32,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP MCONTACT hContact = wParam;
DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *)lParam;
if (hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL &&
- mir_strcmpi(ws->szModule, "CList") == 0 && mir_strcmpi(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg)) {
+ strcmp(ws->szModule, "CList") == 0 && strcmp(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg)) {
CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, ws->value.bVal == 0 ? BST_CHECKED : BST_UNCHECKED);
}
}
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 66655cc34f..5840092717 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -199,14 +199,14 @@ static int MessageSettingChanged(WPARAM hContact, LPARAM lParam) if (cws->szModule == NULL)
return 0;
- if (!mir_strcmp(cws->szModule, "CList"))
+ if (!strcmp(cws->szModule, "CList"))
WindowList_Broadcast(g_dat.hMessageWindowList, DM_UPDATETITLE, (WPARAM)cws, 0);
else if (hContact) {
- if (cws->szSetting && !mir_strcmp(cws->szSetting, "Timezone"))
+ if (cws->szSetting && !strcmp(cws->szSetting, "Timezone"))
WindowList_Broadcast(g_dat.hMessageWindowList, DM_NEWTIMEZONE, (WPARAM)cws, 0);
else {
char *szProto = GetContactProto(hContact);
- if (szProto && !mir_strcmp(cws->szModule, szProto))
+ if (szProto && !strcmp(cws->szModule, szProto))
WindowList_Broadcast(g_dat.hMessageWindowList, DM_UPDATETITLE, (WPARAM)cws, 0);
}
}
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp index dc6a5e682b..fe30974a67 100644 --- a/src/core/stduseronline/src/useronline.cpp +++ b/src/core/stduseronline/src/useronline.cpp @@ -34,7 +34,7 @@ static bool Proto_IsAccountEnabled(PROTOACCOUNT *pa) static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
{
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
- if (hContact == NULL || mir_strcmp(cws->szSetting, "Status"))
+ if (hContact == NULL || strcmp(cws->szSetting, "Status"))
return 0;
int newStatus = cws->value.wVal;
|