From e4e088d37070bab69b1457621706d65472874243 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:33:29 +0300 Subject: SmileyAdd: C++'11 iterators --- plugins/SmileyAdd/src/customsmiley.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/SmileyAdd/src/customsmiley.cpp') diff --git a/plugins/SmileyAdd/src/customsmiley.cpp b/plugins/SmileyAdd/src/customsmiley.cpp index 72690198d3..686560a9d0 100644 --- a/plugins/SmileyAdd/src/customsmiley.cpp +++ b/plugins/SmileyAdd/src/customsmiley.cpp @@ -51,9 +51,9 @@ bool SmileyPackCListType::AddSmiley(MCONTACT hContact, wchar_t *path) SmileyPackCType* SmileyPackCListType::GetSmileyPack(MCONTACT id) { - for (int i = 0; i < m_SmileyPacks.getCount(); i++) - if (m_SmileyPacks[i].GetId() == id) - return &m_SmileyPacks[i]; + for (auto &it : m_SmileyPacks) + if (it->GetId() == id) + return it; return nullptr; } @@ -131,9 +131,9 @@ bool SmileyPackCType::LoadSmiley(wchar_t *path) CMStringW name = dirs.Mid(slash + 1, dot - slash - 1); - for (int i = 0; i < m_SmileyList.getCount(); i++) - if (m_SmileyList[i].GetTriggerText() == name) { - m_SmileyList[i].LoadFromResource(dirs, 0); + for (auto &it : m_SmileyList) + if (it->GetTriggerText() == name) { + it->LoadFromResource(dirs, 0); return true; } -- cgit v1.2.3