From 082e4bd08f946c8f7dd2e05c7fc26dfefdc7e15f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 19 Mar 2022 19:21:19 +0100 Subject: [PATCH] Now we don't need _cinemas and _screens any more. --- src/wx/screens_panel.cc | 4 ---- src/wx/screens_panel.h | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index abddd2826..fbff896ca 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -152,7 +152,6 @@ ScreensPanel::add_cinema (shared_ptr cinema, wxTreeListItem previous) auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name)); - _cinemas.push_back(make_pair(id, cinema)); _item_to_cinema[id] = cinema; _cinema_to_item[cinema] = id; @@ -174,7 +173,6 @@ ScreensPanel::add_screen (shared_ptr cinema, shared_ptr screen) auto id = _targets->AppendItem(*item, std_to_wx(screen->name)); - _screens.push_back(make_pair(id, screen)); _item_to_screen[id] = screen; _screen_to_item[screen] = id; @@ -467,8 +465,6 @@ void ScreensPanel::search_changed () { _targets->DeleteAllItems (); - _cinemas.clear (); - _screens.clear (); _item_to_cinema.clear (); _cinema_to_item.clear (); diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index bf68870a6..e3c7023df 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -70,9 +70,6 @@ private: void setup_cinema_checked_state (wxTreeListItem screen); int compare (std::string const& utf8_a, std::string const& utf8_b); - typedef std::vector>> Cinemas; - typedef std::vector>> Screens; - std::shared_ptr item_to_cinema (wxTreeListItem item) const; std::shared_ptr item_to_screen (wxTreeListItem item) const; boost::optional cinema_to_item (std::shared_ptr cinema) const; @@ -87,9 +84,6 @@ private: wxButton* _edit_screen; wxButton* _remove_screen; - Cinemas _cinemas; - Screens _screens; - /* We want to be able to search (and so remove selected things from the view) * but not deselect them, so we maintain lists of selected cinemas and screens. */ -- 2.30.2