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/MirFox/src/MirandaOptions.cpp | 2 +- plugins/MirFox/src/MirandaUtils.cpp | 2 +- plugins/MirFox/src/MirfoxData.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/MirFox') diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp index ed6857ff96..b57156d191 100644 --- a/plugins/MirFox/src/MirandaOptions.cpp +++ b/plugins/MirFox/src/MirandaOptions.cpp @@ -464,7 +464,7 @@ INT_PTR CALLBACK DlgProcOpts_Tab2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case PSN_APPLY: { - for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){ + for (auto &hContact : contact_iter()){ HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC2_CONTACTS_LIST, CLM_FINDCONTACT, hContact, 0); if(hItem) { diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index 0e0592b242..5391d8063f 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -504,7 +504,7 @@ void MirandaUtils::translateOldDBNames() { } //contacts "state" - for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){ + for (auto &hContact : contact_iter()){ logger->log_p(L"TranslateOldDBNames: found CONTACT: [" SCNuPTR L"]", hContact); int keyValue = db_get_b(hContact, OLD_PLUGIN_DB_ID, "state", 0); diff --git a/plugins/MirFox/src/MirfoxData.cpp b/plugins/MirFox/src/MirfoxData.cpp index 5e7bd0809e..e63cdf25bb 100644 --- a/plugins/MirFox/src/MirfoxData.cpp +++ b/plugins/MirFox/src/MirfoxData.cpp @@ -631,7 +631,7 @@ void MirfoxData::initializeMirandaContacts() //get contects from miranda - for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){ + for (auto &hContact : contact_iter()){ //"Hidden" contacts not allowed in MirfoxData and SM, "NotOnList" contacts allowed and enabled if (db_get_b(hContact, "CList", "Hidden", 0) == 1) continue; -- cgit v1.2.3