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

Removed boost::adaptors from TOOL_MANAGER

This commit is contained in:
Maciej Suminski 2017-03-07 17:18:22 +01:00
parent 29eb696ef7
commit c6e3ac7067
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/tool_manager.cpp
View File

@ -29,7 +29,6 @@
#include <algorithm> #include <algorithm>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/range/adaptor/map.hpp>
#include <wx/event.h> #include <wx/event.h>
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
@ -418,10 +417,10 @@ void TOOL_MANAGER::ResetTools( TOOL_BASE::RESET_REASON aReason )
{ {
DeactivateTool(); DeactivateTool();
for( TOOL_BASE* tool : m_toolState | boost::adaptors::map_keys ) for( auto& state : m_toolState )
{ {
tool->Reset( aReason ); state.first->Reset( aReason );
tool->SetTransitions(); state.first->SetTransitions();
} }
} }
@ -545,8 +544,9 @@ void TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
} }
} }
for( TOOL_STATE* st : ( m_toolState | boost::adaptors::map_values ) ) for( auto& state : m_toolState )
{ {
TOOL_STATE* st = state.second;
bool finished = false; bool finished = false;
// no state handler in progress - check if there are any transitions (defined by // no state handler in progress - check if there are any transitions (defined by