From 058282527241fe458a1aae28d565a727dcc1a811 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:35:40 +0300 Subject: UInfoEx: C++'11 iterators --- plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp') diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 1dec35ecbf..c6fa31e5ff 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -150,13 +150,8 @@ int CExImContactXML::ExportContact(DB::CEnumList* pModules) { if (_pXmlFile->_wExport & EXPORT_DATA) { if (pModules) { - int i; - LPSTR p; - - for (i = 0; i < pModules->getCount(); i++) { - p = (*pModules)[i]; - ExportModule(p); - } + for (auto &it : *pModules) + ExportModule(it); } else { ExportModule(USERINFO); @@ -270,8 +265,8 @@ int CExImContactXML::ExportModule(LPCSTR pszModule) return ERROR_MEMORY_ALLOC; xmod->SetAttribute("key", pszModule); - for (int i = 0; i < Settings.getCount(); i++) - ExportSetting(xmod, pszModule, Settings[i]); + for (auto &it : Settings) + ExportSetting(xmod, pszModule, it); if (!xmod->NoChildren() && _xmlNode->LinkEndChild(xmod)) return ERROR_OK; -- cgit v1.2.3