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

Reformatting.

This commit is contained in:
Maciej Suminski 2013-08-08 19:41:20 +02:00
parent 12e10fd43a
commit 80901c69cf
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/tool/tool_dispatcher.cpp
View File

@ -229,7 +229,6 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent &aEvent )
m_toolMgr->ProcessEvent( *evt ); m_toolMgr->ProcessEvent( *evt );
aEvent.Skip(); aEvent.Skip();
} }

2
common/tool/tool_interactive.cpp
View File

@ -44,7 +44,7 @@ TOOL_INTERACTIVE::~TOOL_INTERACTIVE()
} }
OPT_TOOL_EVENT TOOL_INTERACTIVE::Wait ( const TOOL_EVENT_LIST & aEventList ) OPT_TOOL_EVENT TOOL_INTERACTIVE::Wait( const TOOL_EVENT_LIST& aEventList )
{ {
return m_toolMgr->ScheduleWait( this, aEventList ); return m_toolMgr->ScheduleWait( this, aEventList );
} }

17
include/tool/delegate.h
View File

@ -46,14 +46,14 @@ template<class ReturnType, class Arg>
template<class T> template<class T>
DELEGATE ( T* object, ReturnType (T::*ptr)( Arg ) ) DELEGATE ( T* object, ReturnType (T::*ptr)( Arg ) )
{ {
m_ptr = reinterpret_cast<MemberPointer>(ptr); m_ptr = reinterpret_cast<MemberPointer>( ptr );
m_object = reinterpret_cast<void *> (object); m_object = reinterpret_cast<void *>( object );
}; };
ReturnType operator()( Arg a ) const ReturnType operator()( Arg a ) const
{ {
DELEGATE<ReturnType, Arg> *casted = reinterpret_cast<DELEGATE<ReturnType, Arg> * >(m_object); DELEGATE<ReturnType, Arg> *casted = reinterpret_cast<DELEGATE<ReturnType, Arg>*>( m_object );
return (casted->*m_ptr)(a); return (casted->*m_ptr)(a);
} }
@ -69,8 +69,7 @@ private:
template<class ReturnType> template<class ReturnType>
class DELEGATE0 { class DELEGATE0 {
public: public:
typedef ReturnType (DELEGATE0<ReturnType>::*MemberPointer)( ); typedef ReturnType ( DELEGATE0<ReturnType>::*MemberPointer )();
typedef ReturnType _ReturnType; typedef ReturnType _ReturnType;
DELEGATE0 () DELEGATE0 ()
@ -80,15 +79,15 @@ template<class ReturnType>
template<class T> template<class T>
DELEGATE0 ( T* object, ReturnType (T::*ptr)( ) ) DELEGATE0 ( T* object, ReturnType (T::*ptr)( ) )
{ {
m_ptr = reinterpret_cast<MemberPointer>(ptr); m_ptr = reinterpret_cast<MemberPointer>( ptr );
m_object = reinterpret_cast<void *> (object); m_object = reinterpret_cast<void*>( object );
}; };
ReturnType operator()( ) const ReturnType operator()( ) const
{ {
DELEGATE0<ReturnType> *casted = reinterpret_cast<DELEGATE0<ReturnType> * >(m_object); DELEGATE0<ReturnType>* casted = reinterpret_cast<DELEGATE0<ReturnType>*>( m_object );
return (casted->*m_ptr)(); return ( casted->*m_ptr )();
} }
private: private:

8
pcbnew/tools/selection_tool.cpp
View File

@ -119,8 +119,8 @@ void SELECTION_TOOL::selectSingle( const VECTOR2I& aWhere, bool aAdditive )
GENERAL_COLLECTORS_GUIDE guide = getEditFrame<PCB_EDIT_FRAME>()->GetCollectorsGuide(); GENERAL_COLLECTORS_GUIDE guide = getEditFrame<PCB_EDIT_FRAME>()->GetCollectorsGuide();
GENERAL_COLLECTOR collector; GENERAL_COLLECTOR collector;
collector.Collect( pcb, GENERAL_COLLECTOR::AllBoardItems, wxPoint( aWhere.x, aWhere.y ), collector.Collect( pcb, GENERAL_COLLECTOR::AllBoardItems,
guide ); wxPoint( aWhere.x, aWhere.y ), guide );
switch( collector.GetCount() ) switch( collector.GetCount() )
{ {
@ -186,7 +186,7 @@ void SELECTION_TOOL::handleHighlight( const VECTOR2D& aP )
void SELECTION_TOOL::selectMultiple() void SELECTION_TOOL::selectMultiple()
{ {
OPT_TOOL_EVENT evt; OPT_TOOL_EVENT evt;
VIEW *v = getView(); VIEW* v = getView();
v->Add( m_selArea ); v->Add( m_selArea );
@ -217,7 +217,7 @@ void SELECTION_TOOL::selectMultiple()
BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR *aCollector ) BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR *aCollector )
{ {
OPT_TOOL_EVENT evt; OPT_TOOL_EVENT evt;
BOARD_ITEM *current = NULL; BOARD_ITEM* current = NULL;
m_menu.reset( new CONTEXT_MENU() ); m_menu.reset( new CONTEXT_MENU() );
m_menu->SetTitle( _( "Clarify selection" ) ); m_menu->SetTitle( _( "Clarify selection" ) );