diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-01-08 16:25:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-09 11:54:16 +0100 |
| commit | 12d1abf033654727d6ab6278087ff7cfc65d63f6 (patch) | |
| tree | b920b3c3614fc91a1cb2a220972042e6318a6fd4 /src/wx/screens_panel.cc | |
| parent | ad41d2dd987ffcd2068d9fbf4273108c9f796762 (diff) | |
Move ScopeGuard into libdcp.
Diffstat (limited to 'src/wx/screens_panel.cc')
| -rw-r--r-- | src/wx/screens_panel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 721f4f4cc..d3b1db77d 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -27,9 +27,9 @@ #include "wx_util.h" #include "lib/cinema.h" #include "lib/config.h" -#include "lib/scope_guard.h" #include "lib/screen.h" #include "lib/timer.h" +#include <dcp/scope_guard.h> using std::cout; @@ -258,7 +258,7 @@ ScreensPanel::add_cinema_clicked () try { _ignore_cinemas_changed = true; - ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; + dcp::ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; Config::instance()->add_cinema(cinema); } catch (FileError& e) { error_dialog(GetParent(), _("Could not write cinema details to the cinemas.xml file. Check that the location of cinemas.xml is valid in DCP-o-matic's preferences."), std_to_wx(e.what())); @@ -355,7 +355,7 @@ ScreensPanel::remove_cinema_clicked () for (auto const& cinema: cinemas_to_remove) { _ignore_cinemas_changed = true; - ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; + dcp::ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; for (auto screen: cinema->screens()) { _checked_screens.erase(screen); } @@ -717,7 +717,7 @@ bool ScreensPanel::notify_cinemas_changed() { _ignore_cinemas_changed = true; - ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; + dcp::ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; try { Config::instance()->changed(Config::CINEMAS); |