From 8c017be24afd6852d904681dc381466f1698c857 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 10 Oct 2023 15:43:45 +0100
Subject: [PATCH] Clearer naming.
---
eeschema/tools/sch_edit_tool.cpp | 4 ++--
eeschema/tools/sch_edit_tool.h | 2 +-
eeschema/tools/symbol_editor_edit_tool.cpp | 4 ++--
eeschema/tools/symbol_editor_edit_tool.h | 2 +-
pagelayout_editor/tools/pl_edit_tool.cpp | 4 ++--
pagelayout_editor/tools/pl_edit_tool.h | 2 +-
pcbnew/tools/pcb_control.cpp | 4 ++--
pcbnew/tools/pcb_control.h | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index 5c342e9bdc..44ee06abff 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -1565,7 +1565,7 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
#define HITTEST_THRESHOLD_PIXELS 5
-int SCH_EDIT_TOOL::DeleteItemCursor( const TOOL_EVENT& aEvent )
+int SCH_EDIT_TOOL::InteractiveDelete( const TOOL_EVENT& aEvent )
{
PICKER_TOOL* picker = m_toolMgr->GetTool<PICKER_TOOL>();
@@ -2747,7 +2747,7 @@ void SCH_EDIT_TOOL::setTransitions()
Go( &SCH_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorH.MakeEvent() );
Go( &SCH_EDIT_TOOL::Swap, EE_ACTIONS::swap.MakeEvent() );
Go( &SCH_EDIT_TOOL::DoDelete, ACTIONS::doDelete.MakeEvent() );
- Go( &SCH_EDIT_TOOL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
+ Go( &SCH_EDIT_TOOL::InteractiveDelete, ACTIONS::deleteTool.MakeEvent() );
Go( &SCH_EDIT_TOOL::Properties, EE_ACTIONS::properties.MakeEvent() );
Go( &SCH_EDIT_TOOL::EditField, EE_ACTIONS::editReference.MakeEvent() );
diff --git a/eeschema/tools/sch_edit_tool.h b/eeschema/tools/sch_edit_tool.h
index a357c3851c..2585526700 100644
--- a/eeschema/tools/sch_edit_tool.h
+++ b/eeschema/tools/sch_edit_tool.h
@@ -78,7 +78,7 @@ public:
int DoDelete( const TOOL_EVENT& aEvent );
///< Run the deletion tool.
- int DeleteItemCursor( const TOOL_EVENT& aEvent );
+ int InteractiveDelete( const TOOL_EVENT& aEvent );
/// Drag and drop
int DdAppendFile( const TOOL_EVENT& aEvent );
diff --git a/eeschema/tools/symbol_editor_edit_tool.cpp b/eeschema/tools/symbol_editor_edit_tool.cpp
index af25d4a37c..02d2bbed6c 100644
--- a/eeschema/tools/symbol_editor_edit_tool.cpp
+++ b/eeschema/tools/symbol_editor_edit_tool.cpp
@@ -333,7 +333,7 @@ int SYMBOL_EDITOR_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
#define HITTEST_THRESHOLD_PIXELS 5
-int SYMBOL_EDITOR_EDIT_TOOL::DeleteItemCursor( const TOOL_EVENT& aEvent )
+int SYMBOL_EDITOR_EDIT_TOOL::InteractiveDelete( const TOOL_EVENT& aEvent )
{
PICKER_TOOL* picker = m_toolMgr->GetTool<PICKER_TOOL>();
@@ -891,7 +891,7 @@ void SYMBOL_EDITOR_EDIT_TOOL::setTransitions()
Go( &SYMBOL_EDITOR_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorV.MakeEvent() );
Go( &SYMBOL_EDITOR_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorH.MakeEvent() );
Go( &SYMBOL_EDITOR_EDIT_TOOL::DoDelete, ACTIONS::doDelete.MakeEvent() );
- Go( &SYMBOL_EDITOR_EDIT_TOOL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
+ Go( &SYMBOL_EDITOR_EDIT_TOOL::InteractiveDelete, ACTIONS::deleteTool.MakeEvent() );
Go( &SYMBOL_EDITOR_EDIT_TOOL::Properties, EE_ACTIONS::properties.MakeEvent() );
Go( &SYMBOL_EDITOR_EDIT_TOOL::Properties, EE_ACTIONS::symbolProperties.MakeEvent() );
diff --git a/eeschema/tools/symbol_editor_edit_tool.h b/eeschema/tools/symbol_editor_edit_tool.h
index 9947727727..2314f4a174 100644
--- a/eeschema/tools/symbol_editor_edit_tool.h
+++ b/eeschema/tools/symbol_editor_edit_tool.h
@@ -62,7 +62,7 @@ public:
int DoDelete( const TOOL_EVENT& aEvent );
///< Run the deletion tool.
- int DeleteItemCursor( const TOOL_EVENT& aEvent );
+ int InteractiveDelete( const TOOL_EVENT& aEvent );
private:
void editShapeProperties( LIB_SHAPE* aShape );
diff --git a/pagelayout_editor/tools/pl_edit_tool.cpp b/pagelayout_editor/tools/pl_edit_tool.cpp
index c5e13a8226..421171d52f 100644
--- a/pagelayout_editor/tools/pl_edit_tool.cpp
+++ b/pagelayout_editor/tools/pl_edit_tool.cpp
@@ -410,7 +410,7 @@ int PL_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
#define HITTEST_THRESHOLD_PIXELS 5
-int PL_EDIT_TOOL::DeleteItemCursor( const TOOL_EVENT& aEvent )
+int PL_EDIT_TOOL::InteractiveDelete( const TOOL_EVENT& aEvent )
{
PICKER_TOOL* picker = m_toolMgr->GetTool<PICKER_TOOL>();
@@ -583,5 +583,5 @@ void PL_EDIT_TOOL::setTransitions()
Go( &PL_EDIT_TOOL::Paste, ACTIONS::paste.MakeEvent() );
Go( &PL_EDIT_TOOL::DoDelete, ACTIONS::doDelete.MakeEvent() );
- Go( &PL_EDIT_TOOL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
+ Go( &PL_EDIT_TOOL::InteractiveDelete, ACTIONS::deleteTool.MakeEvent() );
}
diff --git a/pagelayout_editor/tools/pl_edit_tool.h b/pagelayout_editor/tools/pl_edit_tool.h
index bffe1c19b4..6c6fef05ca 100644
--- a/pagelayout_editor/tools/pl_edit_tool.h
+++ b/pagelayout_editor/tools/pl_edit_tool.h
@@ -63,7 +63,7 @@ public:
int DoDelete( const TOOL_EVENT& aEvent );
///< Run the deletion tool.
- int DeleteItemCursor( const TOOL_EVENT& aEvent );
+ int InteractiveDelete( const TOOL_EVENT& aEvent );
private:
void moveItem( DS_DATA_ITEM* aItem, const VECTOR2I& aDelta );
diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp
index f1acb79f48..08de25b42b 100644
--- a/pcbnew/tools/pcb_control.cpp
+++ b/pcbnew/tools/pcb_control.cpp
@@ -593,7 +593,7 @@ int PCB_CONTROL::GridResetOrigin( const TOOL_EVENT& aEvent )
#define HITTEST_THRESHOLD_PIXELS 5
-int PCB_CONTROL::DeleteItemCursor( const TOOL_EVENT& aEvent )
+int PCB_CONTROL::InteractiveDelete( const TOOL_EVENT& aEvent )
{
if( m_isFootprintEditor && !m_frame->GetBoard()->GetFirstFootprint() )
return 0;
@@ -1707,7 +1707,7 @@ void PCB_CONTROL::setTransitions()
Go( &PCB_CONTROL::SnapModeFeedback, PCB_EVENTS::SnappingModeChangedByKeyEvent );
// Miscellaneous
- Go( &PCB_CONTROL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
+ Go( &PCB_CONTROL::InteractiveDelete, ACTIONS::deleteTool.MakeEvent() );
// Append control
Go( &PCB_CONTROL::AppendBoardFromFile, PCB_ACTIONS::appendBoard.MakeEvent() );
diff --git a/pcbnew/tools/pcb_control.h b/pcbnew/tools/pcb_control.h
index 152879504c..ad746dfa97 100644
--- a/pcbnew/tools/pcb_control.h
+++ b/pcbnew/tools/pcb_control.h
@@ -96,7 +96,7 @@ public:
int SnapModeFeedback( const TOOL_EVENT& aEvent );
// Miscellaneous
- int DeleteItemCursor( const TOOL_EVENT& aEvent );
+ int InteractiveDelete( const TOOL_EVENT& aEvent );
int Paste( const TOOL_EVENT& aEvent );
int AppendBoardFromFile( const TOOL_EVENT& aEvent );
int AppendBoard( PLUGIN& pi, wxString& fileName );