diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-16 21:05:31 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-16 21:05:31 +0300 |
| commit | 12225716d38830a23477b97a6979b6414faeec7b (patch) | |
| tree | baa3169833239de523eef0c7cf1c1c1fe0731c35 /plugins/Variables | |
| parent | 39390b02dbd5aa7eb21a83773fa561b39f8828bc (diff) | |
entities' names to be started with capital letters
Diffstat (limited to 'plugins/Variables')
| -rw-r--r-- | plugins/Variables/src/contact.cpp | 2 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index 9c8e51ecaa..9e40bc71dd 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -197,7 +197,7 @@ MCONTACT getContactFromString(const wchar_t *tszContact, DWORD dwFlags, int nMat MCONTACT hContact;
LIST<void> arResults(1);
- for (auto &hContact : contact_iter()) {
+ for (auto &hContact : Contacts()) {
// <_HANDLE_:hContact>
tmp.Format(L"<%s:%d>", _A2W(PROTOID_HANDLE), hContact);
bool bMatch = (tmp == tszContact);
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 8eb429ba81..0dad8e92a0 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -439,7 +439,7 @@ static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags) DBEVENTINFO dbe = {};
if (flags & DBE_FIRST) {
- for (auto &hSearchContact : contact_iter()) {
+ for (auto &hSearchContact : Contacts()) {
hSearchEvent = findDbEvent(hSearchContact, NULL, flags);
dbe.cbBlob = 0;
if (!db_event_get(hSearchEvent, &dbe)) {
@@ -452,7 +452,7 @@ static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags) hDbEvent = hMatchEvent;
}
else if (flags & DBE_LAST) {
- for (auto &hSearchContact : contact_iter()) {
+ for (auto &hSearchContact : Contacts()) {
hSearchEvent = findDbEvent(hSearchContact, NULL, flags);
dbe.cbBlob = 0;
if (!db_event_get(hSearchEvent, &dbe)) {
@@ -468,7 +468,7 @@ static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags) dbe.cbBlob = 0;
if (!db_event_get(hDbEvent, &dbe)) {
priorTimestamp = dbe.timestamp;
- for (auto &hSearchContact : contact_iter()) {
+ for (auto &hSearchContact : Contacts()) {
hSearchEvent = findDbEvent(hSearchContact, hDbEvent, flags);
dbe.cbBlob = 0;
if (!db_event_get(hSearchEvent, &dbe)) {
@@ -484,7 +484,7 @@ static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags) else if (flags & DBE_PREV) {
if (!db_event_get(hDbEvent, &dbe)) {
priorTimestamp = dbe.timestamp;
- for (auto &hSearchContact : contact_iter()) {
+ for (auto &hSearchContact : Contacts()) {
hSearchEvent = findDbEvent(hSearchContact, hDbEvent, flags);
dbe.cbBlob = 0;
if (!db_event_get(hSearchEvent, &dbe)) {
|