From 950d87a920b867f374ad793de122a7a3fd9b2237 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Thu, 27 Jul 2017 13:54:47 +0200 Subject: [PATCH] Removed boost::adaptor from ACTION_MANAGER --- common/tool/action_manager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/tool/action_manager.cpp b/common/tool/action_manager.cpp index e1cbb0b2aa..45c95cbec5 100644 --- a/common/tool/action_manager.cpp +++ b/common/tool/action_manager.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include @@ -197,8 +196,9 @@ void ACTION_MANAGER::UpdateHotKeys() m_actionHotKeys.clear(); m_hotkeys.clear(); - for( TOOL_ACTION* action : m_actionNameIndex | boost::adaptors::map_values ) + for( const auto& actionName : m_actionNameIndex ) { + TOOL_ACTION* action = actionName.second; int hotkey = processHotKey( action ); if( hotkey > 0 ) @@ -208,13 +208,13 @@ void ACTION_MANAGER::UpdateHotKeys() } } -#ifndef NDEBUG +#ifdef DEBUG // Check if there are two global actions assigned to the same hotkey - for( std::list& action_list : m_actionHotKeys | boost::adaptors::map_values ) + for( const auto& action_list : m_actionHotKeys ) { int global_actions_cnt = 0; - for( TOOL_ACTION* action : action_list ) + for( const TOOL_ACTION* action : action_list.second ) { if( action->GetScope() == AS_GLOBAL ) ++global_actions_cnt;