From 477a6ea70d0bb1b1dfe9cbd9a15b6dad0284ddeb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:40:03 +0300 Subject: all another C++'11 iterators --- plugins/Dbx_mdbx/src/dbcontacts.cpp | 6 ++---- plugins/Dbx_mdbx/src/dbsettings.cpp | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/Dbx_mdbx') diff --git a/plugins/Dbx_mdbx/src/dbcontacts.cpp b/plugins/Dbx_mdbx/src/dbcontacts.cpp index 72a88492d1..8c2efb9df1 100644 --- a/plugins/Dbx_mdbx/src/dbcontacts.cpp +++ b/plugins/Dbx_mdbx/src/dbcontacts.cpp @@ -130,8 +130,7 @@ BOOL CDbxMDBX::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) LIST list(1000); GatherContactHistory(ccSub->contactID, list); - for (int i = 0; i < list.getCount(); i++) { - EventItem *EI = list[i]; + for (auto &EI : list) { { txn_ptr trnlck(m_env); @@ -163,8 +162,7 @@ BOOL CDbxMDBX::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) LIST list(1000); GatherContactHistory(ccSub->contactID, list); - for (int i = 0; i < list.getCount(); i++) { - EventItem *EI = list[i]; + for (auto &EI : list) { { txn_ptr trnlck(m_env); DBEventSortingKey insVal = { ccMeta->contactID, EI->eventId, EI->ts }; diff --git a/plugins/Dbx_mdbx/src/dbsettings.cpp b/plugins/Dbx_mdbx/src/dbsettings.cpp index 775e69b733..b4491189bf 100644 --- a/plugins/Dbx_mdbx/src/dbsettings.cpp +++ b/plugins/Dbx_mdbx/src/dbsettings.cpp @@ -399,8 +399,8 @@ STDMETHODIMP_(BOOL) CDbxMDBX::EnumContactSettings(MCONTACT hContact, DBSETTINGEN } int result = -1; - for (int i=0; i < arKeys.getCount(); i++) - result = pfnEnumProc(arKeys[i], param); + for (auto &it : arKeys) + result = pfnEnumProc(it, param); return result; } -- cgit v1.2.3