From 39390b02dbd5aa7eb21a83773fa561b39f8828bc Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 16 Mar 2018 20:01:14 +0300
Subject: always hated these long expressions: contact_iter makes them much
shorter
---
plugins/Msg_Export/src/options.cpp | 2 +-
plugins/Msg_Export/src/utils.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'plugins/Msg_Export')
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index 51b53fe797..a769468e64 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -626,7 +626,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
int nUser = 0;
tstring sTmp;
LVITEM sItem = { 0 };
- for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+ for (auto &hContact : contact_iter()) {
PROTOACCOUNT *pa = Proto_GetAccount(GetContactProto(hContact));
if (pa == nullptr)
continue;
diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 7024e28f42..a6c772801c 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -787,7 +787,7 @@ void UpdateFileToColWidth()
{
clFileTo1ColWidth.clear();
- for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+ for (auto &hContact : contact_iter()) {
tstring sNick = pcli->pfnGetContactDisplayName(hContact, 0);
string::size_type &rnValue = clFileTo1ColWidth[GetFilePathFromUser(hContact)];
if (rnValue < sNick.size())
@@ -1395,7 +1395,7 @@ int nContactDeleted(WPARAM wparam, LPARAM /*lparam*/)
tstring sFilePath = GetFilePathFromUser(hContact);
// Test if there is another user using this file
- for (MCONTACT hOtherContact = db_find_first(); hOtherContact; hOtherContact = db_find_next(hOtherContact))
+ for (auto &hOtherContact : contact_iter())
if (hContact != hOtherContact && sFilePath == GetFilePathFromUser(hOtherContact))
return 0; // we found another contact abort mission :-)
--
cgit v1.2.3