BOOST_FOREACH.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index a563863590f30896c54756bc7884eeb12f3003b6..bcef19f59bf608f8442242694d7b09802c543d7e 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -50,7 +50,6 @@
 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
 #include "wx/html_dialog.h"
-#include "wx/initial_setup_dialog.h"
 #include "wx/send_i18n_dialog.h"
 #include "wx/i18n_hook.h"
 #include "lib/film.h"
@@ -104,7 +103,6 @@ DCPOMATIC_ENABLE_WARNINGS
 #endif
 #include <boost/filesystem.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <fstream>
@@ -125,8 +123,8 @@ using std::map;
 using std::make_pair;
 using std::list;
 using std::exception;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using boost::function;
 using boost::is_any_of;
@@ -446,7 +444,7 @@ public:
                                );
                }
 
-               BOOST_FOREACH (string i, notes) {
+               for (auto i: notes) {
                        error_dialog (0, std_to_wx(i));
                }
 
@@ -688,7 +686,7 @@ private:
 
                PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty());
                if (d->ShowModal() == wxID_OK) {
-                       BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) {
+                       for (auto i: _film_editor->content_panel()->selected()) {
                                if (d->video() && i->video) {
                                        DCPOMATIC_ASSERT (_clipboard->video);
                                        i->video->take_settings_from (_clipboard->video);
@@ -986,11 +984,7 @@ private:
                        shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
                        job->set_encoder (
                                shared_ptr<FFmpegEncoder> (
-                                       new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                                                          , optional<dcp::Key>(), optional<string>()
-#endif
-                                               )
+                                       new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf())
                                        )
                                );
                        JobManager::instance()->add (job);
@@ -1514,7 +1508,7 @@ private:
        }
 
        FilmEditor* _film_editor;
-       boost::shared_ptr<FilmViewer> _film_viewer;
+       std::shared_ptr<FilmViewer> _film_viewer;
        StandardControls* _controls;
        VideoWaveformDialog* _video_waveform_dialog;
        SystemInformationDialog* _system_information_dialog;
@@ -1620,13 +1614,6 @@ private:
                        _frame->Maximize ();
                        close_splash ();
 
-                       if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
-                               InitialSetupDialog* d = new InitialSetupDialog ();
-                               d->ShowModal ();
-                               d->Destroy ();
-                               Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
-                       }
-
                        if (running_32_on_64 ()) {
                                NagDialog::maybe_nag (
                                        _frame, Config::NAG_32_ON_64,
@@ -1650,7 +1637,7 @@ private:
                        if (!_film_to_create.empty ()) {
                                _frame->new_film (_film_to_create, optional<string> ());
                                if (!_content_to_add.empty ()) {
-                                       BOOST_FOREACH (shared_ptr<Content> i, content_factory(_content_to_add)) {
+                                       for (auto i: content_factory(_content_to_add)) {
                                                _frame->film()->examine_and_add_content (i);
                                        }
                                }