diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-16 20:01:14 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-16 20:01:14 +0300 |
| commit | 39390b02dbd5aa7eb21a83773fa561b39f8828bc (patch) | |
| tree | 7982eda1257f7466b5663c2865fdb7804c397257 /plugins/HistoryStats | |
| parent | 5046973a41e412afd06d6a78a3b9bce226e3cf50 (diff) | |
always hated these long expressions: contact_iter makes them much shorter
Diffstat (limited to 'plugins/HistoryStats')
| -rw-r--r-- | plugins/HistoryStats/src/dlgoption_subexclude.cpp | 10 | ||||
| -rw-r--r-- | plugins/HistoryStats/src/mirandahistory.cpp | 2 |
2 files changed, 3 insertions, 9 deletions
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<HANDLE>(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<HANDLE>(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<WPARAM>(hItem), MAKELPARAM(0, 0)) == 0xFF)
SendMessage(hCList, CLM_SETEXTRAIMAGE, reinterpret_cast<WPARAM>(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<MCONTACT> 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);
|