From ef8cf2d12b301b12c16ad72e693cca7e794aa80c Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Sun, 2 Jul 2023 18:13:35 +0100
Subject: [PATCH] Avoid inheriting for POSITIONING_TOOLS_MENU

This only uses the public interface of CONDITIONAL_MENU,
so we can just make on of those and save declaring a wrapper
type.
---
 pcbnew/tools/edit_tool.cpp | 33 +++++++++++++++++----------------
 pcbnew/tools/edit_tool.h   |  7 -------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 30a7c8d8e2..01b33892bf 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -84,32 +84,33 @@ void EDIT_TOOL::Reset( RESET_REASON aReason )
     m_statusPopup = std::make_unique<STATUS_TEXT_POPUP>( getEditFrame<PCB_BASE_EDIT_FRAME>() );
 }
 
-
-POSITIONING_TOOLS_MENU::POSITIONING_TOOLS_MENU( TOOL_INTERACTIVE* aTool ) :
-        CONDITIONAL_MENU( aTool )
+static std::shared_ptr<CONDITIONAL_MENU> makePositioningToolsMenu( TOOL_INTERACTIVE* aTool )
 {
-    SetIcon( BITMAPS::special_tools );
-    SetTitle( _( "Positioning Tools" ) );
+    auto menu = std::make_shared<CONDITIONAL_MENU>( aTool );
 
-    auto notMovingCondition =
-            []( const SELECTION& aSelection )
-            {
-                return aSelection.Empty() || !aSelection.Front()->IsMoving();
-            };
+    menu->SetIcon( BITMAPS::special_tools );
+    menu->SetTitle( _( "Positioning Tools" ) );
 
-    AddItem( PCB_ACTIONS::moveExact,         SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
-    AddItem( PCB_ACTIONS::moveWithReference, SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
-    AddItem( PCB_ACTIONS::copyWithReference, SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
-    AddItem( PCB_ACTIONS::positionRelative,  SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
-}
+    auto notMovingCondition = []( const SELECTION& aSelection )
+    {
+        return aSelection.Empty() || !aSelection.Front()->IsMoving();
+    };
 
+    // clang-format off
+    menu->AddItem( PCB_ACTIONS::moveExact,         SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
+    menu->AddItem( PCB_ACTIONS::moveWithReference, SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
+    menu->AddItem( PCB_ACTIONS::copyWithReference, SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
+    menu->AddItem( PCB_ACTIONS::positionRelative,  SELECTION_CONDITIONS::NotEmpty && notMovingCondition );
+    // clang-format on
+    return menu;
+};
 
 bool EDIT_TOOL::Init()
 {
     // Find the selection tool, so they can cooperate
     m_selectionTool = m_toolMgr->GetTool<PCB_SELECTION_TOOL>();
 
-    auto positioningToolsSubMenu = std::make_shared<POSITIONING_TOOLS_MENU>( this );
+    std::shared_ptr<CONDITIONAL_MENU> positioningToolsSubMenu = makePositioningToolsMenu( this );
     m_selectionTool->GetToolMenu().RegisterSubMenu( positioningToolsSubMenu );
 
     auto propertiesCondition =
diff --git a/pcbnew/tools/edit_tool.h b/pcbnew/tools/edit_tool.h
index b5ae56c7ff..556d54daff 100644
--- a/pcbnew/tools/edit_tool.h
+++ b/pcbnew/tools/edit_tool.h
@@ -45,19 +45,12 @@ namespace KIGFX::PREVIEW
 }
 
 
-class POSITIONING_TOOLS_MENU : public CONDITIONAL_MENU
-{
-public:
-    POSITIONING_TOOLS_MENU( TOOL_INTERACTIVE* aTool );
-};
-
 /**
  * The interactive edit tool.
  *
  * Allows one to move, rotate, flip and change properties of items selected using the
  * pcbnew.InteractiveSelection tool.
  */
-
 class EDIT_TOOL : public PCB_TOOL_BASE
 {
 public: