From bd71371beda1b81e5664d6bb5ccdd4634fb52588 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Mon, 28 Feb 2022 20:30:57 +0100 Subject: Migrate to std::shared_ptr --- src/base_tab/BaseTab.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/base_tab/BaseTab.cpp') diff --git a/src/base_tab/BaseTab.cpp b/src/base_tab/BaseTab.cpp index fd94ef8..730db84 100644 --- a/src/base_tab/BaseTab.cpp +++ b/src/base_tab/BaseTab.cpp @@ -24,10 +24,6 @@ BaseTab::BaseTab(wxFrame *parent, std::string base_file) LoadFile(); } -BaseTab::~BaseTab() { - delete base; -} - void BaseTab::OnImport(wxCommandEvent &event) { AppendGameDialog *dia = new AppendGameDialog(this, base); dia->ShowModal(); @@ -53,7 +49,7 @@ void BaseTab::OnDelete(wxCommandEvent &event) { } void BaseTab::OnSave(wxCommandEvent &event) { - std::vector new_games_bases; + std::vector> new_games_bases; std::vector> new_games; new_games.insert( new_games.end(), edited.begin(), @@ -67,7 +63,7 @@ void BaseTab::OnSave(wxCommandEvent &event) { void BaseTab::OnOpenGame(wxListEvent &event) { wxLogDebug("Open!"); long id = std::stoi(event.GetItem().GetText().ToStdString()); - std::shared_ptr *g =new std::shared_ptr(base->GetGame(id)); + std::shared_ptr *g = new std::shared_ptr(base->GetGame(id)); if (g != NULL) { edited.push_back(*g); deleted.push_back(id); @@ -102,7 +98,7 @@ void BaseTab::LoadFile() { wxFileName file(base_file); wxString ext = file.GetExt().Lower(); if (ext == "pgn") { - base = new PGNGameBase(base_file); + base = std::shared_ptr(new PGNGameBase(base_file)); SetLabel(file.GetName() + "(PGN)"); } -- cgit v1.2.3