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/HistoryStats/src/dlgoption_subexclude.cpp | 10 ++-------- plugins/HistoryStats/src/mirandahistory.cpp | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/dlgoption_subexclude.cpp b/plugins/HistoryStats/src/dlgoption_subexclude.cpp index c0bf6e97f9..f94345ce7f 100644 --- a/plugins/HistoryStats/src/dlgoption_subexclude.cpp +++ b/plugins/HistoryStats/src/dlgoption_subexclude.cpp @@ -169,8 +169,7 @@ void DlgOption::SubExclude::saveSettings() db.setModule(con::ModHistoryStats); - MCONTACT hContact = db_find_first(); - while (hContact) { + for (auto &hContact : contact_iter()) { HANDLE hItem = reinterpret_cast(SendMessage(hCList, CLM_FINDCONTACT, hContact, 0)); if (hItem) { db.setContact(hContact); @@ -183,8 +182,6 @@ void DlgOption::SubExclude::saveSettings() else if (!bExcludeOld && iImage == 1) db.writeBool(con::SettExclude, true); } - - hContact = db_find_next(hContact); } // reset dirty flag @@ -243,8 +240,7 @@ void DlgOption::SubExclude::updateAllContacts(HWND hCList) db.setModule(con::ModHistoryStats); - MCONTACT hContact = db_find_first(); - while (hContact) { + for (auto &hContact : contact_iter()) { HANDLE hItem = reinterpret_cast(SendMessage(hCList, CLM_FINDCONTACT, hContact, 0)); if (hItem) { db.setContact(hContact); @@ -252,8 +248,6 @@ void DlgOption::SubExclude::updateAllContacts(HWND hCList) if (SendMessage(hCList, CLM_GETEXTRAIMAGE, reinterpret_cast(hItem), MAKELPARAM(0, 0)) == 0xFF) SendMessage(hCList, CLM_SETEXTRAIMAGE, reinterpret_cast(hItem), MAKELPARAM(0, db.settingExists(con::SettExclude) ? 1 : 0)); } - - hContact = db_find_next(hContact); } } diff --git a/plugins/HistoryStats/src/mirandahistory.cpp b/plugins/HistoryStats/src/mirandahistory.cpp index 93b834aa87..fe96757165 100644 --- a/plugins/HistoryStats/src/mirandahistory.cpp +++ b/plugins/HistoryStats/src/mirandahistory.cpp @@ -61,7 +61,7 @@ void MirandaHistory::readContacts() std::vector sources; - for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (auto &hContact : contact_iter()) { db.setContact(hContact); const char* pProtoName = GetContactProto(hContact); -- cgit v1.2.3