From 39390b02dbd5aa7eb21a83773fa561b39f8828bc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Mar 2018 20:01:14 +0300 Subject: always hated these long expressions: contact_iter makes them much shorter --- plugins/Non-IM Contact/src/files.cpp | 2 +- plugins/Non-IM Contact/src/services.cpp | 2 +- plugins/Non-IM Contact/src/timer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/Non-IM Contact/src') diff --git a/plugins/Non-IM Contact/src/files.cpp b/plugins/Non-IM Contact/src/files.cpp index 232532dc4a..b7e45a7154 100644 --- a/plugins/Non-IM Contact/src/files.cpp +++ b/plugins/Non-IM Contact/src/files.cpp @@ -14,7 +14,7 @@ INT_PTR exportContacts(WPARAM, LPARAM) if (!file) return 0; - for (MCONTACT hContact = db_find_first(MODNAME); hContact; hContact = db_find_next(hContact, MODNAME)) { + for (auto &hContact : contact_iter(MODNAME)) { int tmp; char DBVar[1024]; if (!db_get_static(hContact, MODNAME, "Name", DBVar, _countof(DBVar))) { diff --git a/plugins/Non-IM Contact/src/services.cpp b/plugins/Non-IM Contact/src/services.cpp index 46282ef90a..649ae0100b 100644 --- a/plugins/Non-IM Contact/src/services.cpp +++ b/plugins/Non-IM Contact/src/services.cpp @@ -62,7 +62,7 @@ int SetLCStatus(WPARAM wParam, LPARAM) else if (db_get_w(NULL, MODNAME, "Timer", 1)) startTimer(TIMER); - for (MCONTACT hContact = db_find_first(MODNAME); hContact; hContact = db_find_next(hContact, MODNAME)) { + for (auto &hContact : contact_iter(MODNAME)) { if (LCStatus != ID_STATUS_OFFLINE) replaceAllStrings(hContact); diff --git a/plugins/Non-IM Contact/src/timer.cpp b/plugins/Non-IM Contact/src/timer.cpp index dc20309a9b..31b9616c46 100644 --- a/plugins/Non-IM Contact/src/timer.cpp +++ b/plugins/Non-IM Contact/src/timer.cpp @@ -40,7 +40,7 @@ void timerFunc(void*) } /* update all the contacts */ - for (MCONTACT hContact = db_find_first(MODNAME); hContact; hContact = db_find_next(hContact, MODNAME)) { + for (auto &hContact : contact_iter(MODNAME)) { int timer = db_get_w(hContact, MODNAME, "Timer", 15); if (timer && !(timerCount % timer)) if (!db_get_static(hContact, MODNAME, "Name", text, _countof(text))) -- cgit v1.2.3