Move search handlers to std::shared_ptr.

common/widgets/search_pane.cpp

@@ -143,9 +143,6 @@ SEARCH_PANE::~SEARCH_PANE()
     m_frame->Unbind( EDA_LANG_CHANGED, &SEARCH_PANE::OnLanguageChange, this );
     Unbind( wxEVT_CHAR_HOOK, &SEARCH_PANE::OnCharHook, this );
 
-    for( SEARCH_HANDLER* handler : m_handlers )
-        delete handler;
-
     m_handlers.clear();
 
     delete m_menu;
@@ -171,7 +168,7 @@ void SEARCH_PANE::OnLanguageChange( wxCommandEvent& aEvent )
 }
 
 
-void SEARCH_PANE::AddSearcher( SEARCH_HANDLER* aHandler )
+void SEARCH_PANE::AddSearcher( const std::shared_ptr<SEARCH_HANDLER>& aHandler )
 {
     SEARCH_PANE_TAB* tab = new SEARCH_PANE_TAB( aHandler, m_notebook );
 

common/widgets/search_pane_tab.cpp

@@ -25,11 +25,10 @@
 #include <wx/wupdlock.h>
 #include <core/kicad_algo.h>
 
-SEARCH_PANE_LISTVIEW::SEARCH_PANE_LISTVIEW( SEARCH_HANDLER* handler, wxWindow* parent,
-                                            wxWindowID winid, const wxPoint& pos,
-                                            const wxSize& size ) :
+SEARCH_PANE_LISTVIEW::SEARCH_PANE_LISTVIEW( const std::shared_ptr<SEARCH_HANDLER>& aHandler, wxWindow* parent,
+                                            wxWindowID winid, const wxPoint& pos, const wxSize& size ) :
         wxListView( parent, winid, pos, size, wxLC_REPORT | wxLC_VIRTUAL ),
-        m_handler( handler ),
+        m_handler( aHandler ),
         m_sortCol( -1 ),
         m_sortAscending( true ),
         m_selectionDirty( false )
@@ -294,14 +293,14 @@ wxString SEARCH_PANE_LISTVIEW::OnGetItemText( long item, long column ) const
 }
 
 
-SEARCH_PANE_TAB::SEARCH_PANE_TAB( SEARCH_HANDLER* handler, wxWindow* parent, wxWindowID aId,
+SEARCH_PANE_TAB::SEARCH_PANE_TAB( const std::shared_ptr<SEARCH_HANDLER>& aHandler, wxWindow* parent, wxWindowID aId,
                                   const wxPoint& aLocation, const wxSize& aSize ) :
         wxPanel( parent, aId, aLocation, aSize ),
-        m_handler( handler )
+        m_handler( aHandler )
 {
     wxBoxSizer* sizer = new wxBoxSizer( wxVERTICAL );
 
-    m_listView = new SEARCH_PANE_LISTVIEW( handler, this );
+    m_listView = new SEARCH_PANE_LISTVIEW( aHandler, this );
     sizer->Add( m_listView, 5, wxRIGHT | wxBOTTOM | wxEXPAND, 1 );
 
     SetSizer( sizer );

eeschema/widgets/sch_search_pane.cpp

@@ -46,11 +46,11 @@ SCH_SEARCH_PANE::SCH_SEARCH_PANE( SCH_EDIT_FRAME* aFrame ) :
     SetFont( infoFont );
     m_notebook->SetFont( infoFont );
 
-    AddSearcher( new SYMBOL_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new POWER_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new TEXT_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new LABEL_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new GROUP_SEARCH_HANDLER( aFrame ) );
+    AddSearcher( std::make_shared<SYMBOL_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<POWER_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<TEXT_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<LABEL_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<GROUP_SEARCH_HANDLER>( aFrame ) );
 }
 
 

include/widgets/search_pane.h

@@ -73,7 +73,7 @@ public:
     SEARCH_PANE( const SEARCH_PANE& ) = delete;
     SEARCH_PANE& operator=( const SEARCH_PANE& ) = delete;
 
-    void AddSearcher( SEARCH_HANDLER* aHandler );
+    void AddSearcher( const std::shared_ptr<SEARCH_HANDLER>& aHandler );
     void OnSearchTextEntry( wxCommandEvent& aEvent ) override;
     void OnNotebookPageChanged( wxBookCtrlEvent& aEvent ) override;
 
@@ -89,11 +89,11 @@ protected:
     void             OnClosed( wxAuiManagerEvent& aEvent );
 
 private:
-    std::vector<SEARCH_HANDLER*>  m_handlers;       // We own these.
-    std::vector<SEARCH_PANE_TAB*> m_tabs;           // No ownership.
-    wxString                      m_lastQuery;
-    EDA_DRAW_FRAME*               m_frame;
-    ACTION_MENU*                  m_menu;
+    std::vector<std::shared_ptr<SEARCH_HANDLER>> m_handlers;
+    std::vector<SEARCH_PANE_TAB*>                m_tabs;
+    wxString                                     m_lastQuery;
+    EDA_DRAW_FRAME*                              m_frame;
+    ACTION_MENU*                                 m_menu;
 };
 
 #endif

include/widgets/search_pane_tab.h

@@ -31,9 +31,8 @@ class SEARCH_HANDLER;
 class SEARCH_PANE_LISTVIEW : public wxListView
 {
 public:
-    SEARCH_PANE_LISTVIEW( SEARCH_HANDLER* handler,
-                          wxWindow* parent, wxWindowID winid = wxID_ANY,
-                          const wxPoint& pos = wxDefaultPosition,
+    SEARCH_PANE_LISTVIEW( const std::shared_ptr<SEARCH_HANDLER>& aHandler, wxWindow* parent,
+                          wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize );
 
     virtual ~SEARCH_PANE_LISTVIEW();
@@ -54,29 +53,28 @@ protected:
     void GetSelectRowsList( std::vector<long>& aSelectedList );
 
 private:
-    SEARCH_HANDLER*       m_handler;
-    int                   m_sortCol;
-    bool                  m_sortAscending;
-    bool                  m_selectionDirty;
+    std::shared_ptr<SEARCH_HANDLER> m_handler;
+    int                             m_sortCol;
+    bool                            m_sortAscending;
+    bool                            m_selectionDirty;
 };
 
 
 class SEARCH_PANE_TAB : public wxPanel
 {
 public:
-    SEARCH_PANE_TAB( SEARCH_HANDLER* handler, wxWindow* parent, wxWindowID aId = wxID_ANY,
-                     const wxPoint& aLocation = wxDefaultPosition,
-                     const wxSize&  aSize = wxDefaultSize );
+    SEARCH_PANE_TAB( const std::shared_ptr<SEARCH_HANDLER>& aHandler, wxWindow* parent, wxWindowID aId = wxID_ANY,
+                     const wxPoint& aLocation = wxDefaultPosition, const wxSize&  aSize = wxDefaultSize );
 
     void Search( wxString& query );
     void Clear();
     void RefreshColumnNames();
 
-    SEARCH_HANDLER* GetSearchHandler() const { return m_handler; }
+    std::shared_ptr<SEARCH_HANDLER> GetSearchHandler() const { return m_handler; }
 
 private:
-    SEARCH_PANE_LISTVIEW* m_listView;
-    SEARCH_HANDLER*       m_handler;
+    SEARCH_PANE_LISTVIEW*           m_listView;
+    std::shared_ptr<SEARCH_HANDLER> m_handler;
 };
 
 #endif

pcbnew/widgets/pcb_search_pane.cpp

@@ -41,12 +41,12 @@ PCB_SEARCH_PANE::PCB_SEARCH_PANE( PCB_EDIT_FRAME* aFrame ) :
     SetFont( infoFont );
     m_notebook->SetFont( infoFont );
 
-    AddSearcher( new FOOTPRINT_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new ZONE_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new NETS_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new RATSNEST_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new TEXT_SEARCH_HANDLER( aFrame ) );
-    AddSearcher( new GROUP_SEARCH_HANDLER( aFrame ) );
+    AddSearcher( std::make_shared<FOOTPRINT_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<ZONE_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<NETS_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<RATSNEST_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<TEXT_SEARCH_HANDLER>( aFrame ) );
+    AddSearcher( std::make_shared<GROUP_SEARCH_HANDLER>( aFrame ) );
 }