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/MirLua/src/mlua_metatable.h | 10 ++++------ plugins/MirLua/src/mlua_options.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'plugins/MirLua') diff --git a/plugins/MirLua/src/mlua_metatable.h b/plugins/MirLua/src/mlua_metatable.h index 6b4f916668..7fb8c27578 100644 --- a/plugins/MirLua/src/mlua_metatable.h +++ b/plugins/MirLua/src/mlua_metatable.h @@ -217,14 +217,12 @@ private: CMStringA data(MT::name); data += "("; - for (int i = 0; i < fields.getCount(); i++) { - CMTField &field = fields[i]; - - data += field.GetName(); + for (auto &it : fields) { + data += it->GetName(); data += "="; - MTValue value = field.GetValue(obj); - int type = field.GetType(); + MTValue value = it->GetValue(obj); + int type = it->GetType(); switch (type) { case LUA_TNIL: data.Append("nil"); diff --git a/plugins/MirLua/src/mlua_options.cpp b/plugins/MirLua/src/mlua_options.cpp index 6a2dbd669b..9a4438d408 100644 --- a/plugins/MirLua/src/mlua_options.cpp +++ b/plugins/MirLua/src/mlua_options.cpp @@ -34,12 +34,11 @@ CMLuaOptions::CMLuaOptions(int idDialog) void CMLuaOptions::LoadScripts() { - for (int i = 0; i < g_mLua->Scripts.getCount(); i++) + for (auto &it : g_mLua->Scripts) { - CMLuaScript *script = g_mLua->Scripts[i]; - wchar_t *fileName = NEWWSTR_ALLOCA(script->GetFileName()); - int iIcon = script->GetStatus() - 1; - int iItem = m_scripts.AddItem(fileName, iIcon, (LPARAM)script); + wchar_t *fileName = NEWWSTR_ALLOCA(it->GetFileName()); + int iIcon = it->GetStatus() - 1; + int iItem = m_scripts.AddItem(fileName, iIcon, (LPARAM)it); if (db_get_b(NULL, MODULE, _T2A(fileName), 1)) m_scripts.SetCheckState(iItem, TRUE); m_scripts.SetItem(iItem, 1, TranslateT("Open"), 2); -- cgit v1.2.3