X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=df07a08c4fd4b523ebae17e5a5df656110cd1935;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=03c07e1c89728e22a4377c568edfca1c9c2a14c4;hpb=068291b7233b01573863d7fb5eda2a82883c748d;p=dcpomatic.git diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 03c07e1c8..df07a08c4 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -25,6 +26,7 @@ #include "cinema_dialog.h" #include "screen_dialog.h" #include +#include using std::list; using std::pair; @@ -33,6 +35,7 @@ using std::map; using std::string; using std::make_pair; using boost::shared_ptr; +using boost::make_shared; using boost::optional; ScreensPanel::ScreensPanel (wxWindow* parent) @@ -148,7 +151,7 @@ ScreensPanel::add_cinema_clicked () { CinemaDialog* d = new CinemaDialog (this, _("Add Cinema")); if (d->ShowModal () == wxID_OK) { - shared_ptr c (new Cinema (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute())); + shared_ptr c = boost::make_shared (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); Config::instance()->add_cinema (c); add_cinema (c); } @@ -207,7 +210,7 @@ ScreensPanel::add_screen_clicked () return; } - shared_ptr s (new Screen (d->name(), d->recipient(), d->trusted_devices())); + shared_ptr s = boost::make_shared (d->name(), d->recipient(), d->trusted_devices()); c->add_screen (s); optional id = add_screen (c, s); if (id) {