Commit 80901c69 authored by Maciej Suminski's avatar Maciej Suminski

Reformatting.

parent 12e10fd4
...@@ -229,7 +229,6 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent &aEvent ) ...@@ -229,7 +229,6 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent &aEvent )
m_toolMgr->ProcessEvent( *evt ); m_toolMgr->ProcessEvent( *evt );
aEvent.Skip(); aEvent.Skip();
} }
......
...@@ -44,7 +44,7 @@ TOOL_INTERACTIVE::~TOOL_INTERACTIVE() ...@@ -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 );
} }
......
...@@ -46,14 +46,14 @@ template<class ReturnType, class Arg> ...@@ -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: ...@@ -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> ...@@ -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:
......
...@@ -102,7 +102,7 @@ public: ...@@ -102,7 +102,7 @@ public:
* @param aRequiredId is the id of the required layer. * @param aRequiredId is the id of the required layer.
* @param aRequired tells if the required layer should be added or removed from the list. * @param aRequired tells if the required layer should be added or removed from the list.
*/ */
void SetRequired( int aLayerId, int aRequiredId, bool aRequired = true ); void SetRequired( int aLayerId, int aRequiredId, bool aRequired = true );
/** /**
* Function CopySettings() * Function CopySettings()
...@@ -378,7 +378,7 @@ public: ...@@ -378,7 +378,7 @@ public:
*/ */
bool IsDirty() const; bool IsDirty() const;
static const int VIEW_MAX_LAYERS = 128; ///* maximum number of layers that may be shown static const int VIEW_MAX_LAYERS = 128; ///* maximum number of layers that may be shown
private: private:
struct VIEW_LAYER struct VIEW_LAYER
......
...@@ -119,8 +119,8 @@ void SELECTION_TOOL::selectSingle( const VECTOR2I& aWhere, bool aAdditive ) ...@@ -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 ) ...@@ -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() ...@@ -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" ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment