haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed boost::adaptor from ACTION_MANAGER

This commit is contained in:
Maciej Suminski 2017-07-27 13:54:47 +02:00
parent 3ee2f80188
commit 950d87a920
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/tool/action_manager.cpp
View File

@ -28,7 +28,6 @@
#include <draw_frame.h> #include <draw_frame.h>
#include <hotkeys_basic.h> #include <hotkeys_basic.h>
#include <boost/range/adaptor/map.hpp>
#include <cctype> #include <cctype>
#include <cassert> #include <cassert>
@ -197,8 +196,9 @@ void ACTION_MANAGER::UpdateHotKeys()
m_actionHotKeys.clear(); m_actionHotKeys.clear();
m_hotkeys.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 ); int hotkey = processHotKey( action );
if( hotkey > 0 ) 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 // Check if there are two global actions assigned to the same hotkey
for( std::list<TOOL_ACTION*>& action_list : m_actionHotKeys | boost::adaptors::map_values ) for( const auto& action_list : m_actionHotKeys )
{ {
int global_actions_cnt = 0; int global_actions_cnt = 0;
for( TOOL_ACTION* action : action_list ) for( const TOOL_ACTION* action : action_list.second )
{ {
if( action->GetScope() == AS_GLOBAL ) if( action->GetScope() == AS_GLOBAL )
++global_actions_cnt; ++global_actions_cnt;