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

Removed aCreateUndoEntry flag from COMMIT::Push() 

It was not used anywhere and COMMIT should handle creating
undo buffer entries.
This commit is contained in:
Maciej Suminski 2016-12-09 14:08:51 +01:00
parent 89055c4425
commit c96db4f5c4
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/commit.h
View File

@ -127,7 +127,7 @@ public:
COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED ); COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED );
///> Executes the changes. ///> Executes the changes.
virtual void Push( const wxString& aMessage = wxT( "A commit" ), bool aCreateUndoEntry = true ) = 0; virtual void Push( const wxString& aMessage = wxT( "A commit" ) ) = 0;
///> Revertes the commit by restoring the modifed items state. ///> Revertes the commit by restoring the modifed items state.
virtual void Revert() = 0; virtual void Revert() = 0;

22
pcbnew/board_commit.cpp
View File

@ -53,7 +53,7 @@ BOARD_COMMIT::~BOARD_COMMIT()
} }
void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry ) void BOARD_COMMIT::Push( const wxString& aMessage )
{ {
// Objects potentially interested in changes: // Objects potentially interested in changes:
PICKED_ITEMS_LIST undoList; PICKED_ITEMS_LIST undoList;
@ -91,13 +91,10 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry )
assert( ent.m_item->Type() == PCB_MODULE_T ); assert( ent.m_item->Type() == PCB_MODULE_T );
assert( ent.m_copy->Type() == PCB_MODULE_T ); assert( ent.m_copy->Type() == PCB_MODULE_T );
if ( aCreateUndoEntry ) ITEM_PICKER itemWrapper( ent.m_item, UR_CHANGED );
{ itemWrapper.SetLink( ent.m_copy );
ITEM_PICKER itemWrapper( ent.m_item, UR_CHANGED ); undoList.PushItem( itemWrapper );
itemWrapper.SetLink( ent.m_copy ); frame->SaveCopyInUndoList( undoList, UR_CHANGED );
undoList.PushItem( itemWrapper );
frame->SaveCopyInUndoList( undoList, UR_CHANGED );
}
savedModules.insert( ent.m_item ); savedModules.insert( ent.m_item );
static_cast<MODULE*>( ent.m_item )->SetLastEditTime(); static_cast<MODULE*>( ent.m_item )->SetLastEditTime();
@ -110,8 +107,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry )
{ {
if( !m_editModules ) if( !m_editModules )
{ {
if( aCreateUndoEntry ) undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) );
undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) );
if( !( changeFlags & CHT_DONE ) ) if( !( changeFlags & CHT_DONE ) )
board->Add( boardItem ); board->Add( boardItem );
@ -139,7 +135,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry )
case CHT_REMOVE: case CHT_REMOVE:
{ {
if( !m_editModules && aCreateUndoEntry ) if( !m_editModules )
{ {
undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) ); undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) );
} }
@ -245,7 +241,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry )
case CHT_MODIFY: case CHT_MODIFY:
{ {
if( !m_editModules && aCreateUndoEntry ) if( !m_editModules )
{ {
ITEM_PICKER itemWrapper( boardItem, UR_CHANGED ); ITEM_PICKER itemWrapper( boardItem, UR_CHANGED );
assert( ent.m_copy ); assert( ent.m_copy );
@ -270,7 +266,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry )
} }
} }
if( !m_editModules && aCreateUndoEntry ) if( !m_editModules )
frame->SaveCopyInUndoList( undoList, UR_UNSPECIFIED ); frame->SaveCopyInUndoList( undoList, UR_UNSPECIFIED );
if( TOOL_MANAGER* toolMgr = frame->GetToolManager() ) if( TOOL_MANAGER* toolMgr = frame->GetToolManager() )

2
pcbnew/board_commit.h
View File

@ -40,7 +40,7 @@ public:
BOARD_COMMIT( PCB_BASE_FRAME* aFrame ); BOARD_COMMIT( PCB_BASE_FRAME* aFrame );
virtual ~BOARD_COMMIT(); virtual ~BOARD_COMMIT();
virtual void Push( const wxString& aMessage = wxT( "A commit" ), bool aCreateUndoEntry = true ) override; virtual void Push( const wxString& aMessage = wxT( "A commit" ) ) override;
virtual void Revert() override; virtual void Revert() override;
private: private:

2
pcbnew/ratsnest_viewitem.h
View File

@ -47,7 +47,7 @@ public:
const BOX2I ViewBBox() const override; const BOX2I ViewBBox() const override;
/// @copydoc VIEW_ITEM::ViewDraw() /// @copydoc VIEW_ITEM::ViewDraw()
void ViewDraw( int aLayer, KIGFX::VIEW* aView ) const; void ViewDraw( int aLayer, KIGFX::VIEW* aView ) const override;
/// @copydoc VIEW_ITEM::ViewGetLayers() /// @copydoc VIEW_ITEM::ViewGetLayers()
void ViewGetLayers( int aLayers[], int& aCount ) const override; void ViewGetLayers( int aLayers[], int& aCount ) const override;