C++11 tidying.

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 7181ad12968b7de52d1ece39ea0e105891bfe669..23aabadd83317c55ccdd41d73a3b3dd2417dec47 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -139,20 +139,9 @@ class DOMFrame : public wxFrame
 {
 public:
        DOMFrame ()
-               : wxFrame (0, -1, _("DCP-o-matic Player"))
-               , _dual_screen (0)
-               , _update_news_requested (false)
-               , _info (0)
+               : wxFrame (nullptr, -1, _("DCP-o-matic Player"))
                , _mode (Config::instance()->player_mode())
-               , _config_dialog (0)
-               , _file_menu (0)
-               , _history_items (0)
-               , _history_position (0)
-               , _history_separator (0)
-               , _system_information_dialog (0)
-               , _view_full_screen (0)
-               , _view_dual_screen (0)
-               , _main_sizer (new wxBoxSizer (wxVERTICAL))
+               , _main_sizer (new wxBoxSizer(wxVERTICAL))
        {
                dcpomatic_log = make_shared<NullLog>();
 
@@ -199,7 +188,7 @@ public:
                */
                _overall_panel = new wxPanel (this, wxID_ANY);
 
-               _viewer.reset (new FilmViewer (_overall_panel));
+               _viewer = make_shared<FilmViewer>(_overall_panel);
                if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) {
                        auto pc = new PlaylistControls (_overall_panel, _viewer);
                        _controls = pc;
@@ -255,7 +244,7 @@ public:
 
                reset_film ();
 
-               UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
+               UpdateChecker::instance()->StateChanged.connect (boost::bind(&DOMFrame::update_checker_state_changed, this));
                setup_screen ();
 
                _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1));
@@ -1038,30 +1027,30 @@ private:
                _viewer->seek (_film->length() - _viewer->one_video_frame(), true);
        }
 
-       wxFrame* _dual_screen;
-       bool _update_news_requested;
-       PlayerInformation* _info;
+       wxFrame* _dual_screen = nullptr;
+       bool _update_news_requested = false;
+       PlayerInformation* _info = nullptr;
        Config::PlayerMode _mode;
-       wxPreferencesEditor* _config_dialog;
-       wxPanel* _overall_panel;
-       wxMenu* _file_menu;
-       wxMenuItem* _view_cpl;
-       wxMenu* _cpl_menu;
-       int _history_items;
-       int _history_position;
-       wxMenuItem* _history_separator;
+       wxPreferencesEditor* _config_dialog = nullptr;
+       wxPanel* _overall_panel = nullptr;
+       wxMenu* _file_menu = nullptr;
+       wxMenuItem* _view_cpl = nullptr;
+       wxMenu* _cpl_menu = nullptr;
+       int _history_items = 0;
+       int _history_position = 0;
+       wxMenuItem* _history_separator = nullptr;
        shared_ptr<FilmViewer> _viewer;
        Controls* _controls;
-       SystemInformationDialog* _system_information_dialog;
+       SystemInformationDialog* _system_information_dialog = nullptr;
        std::shared_ptr<Film> _film;
        boost::signals2::scoped_connection _config_changed_connection;
        boost::signals2::scoped_connection _examine_job_connection;
-       wxMenuItem* _file_add_ov;
-       wxMenuItem* _file_add_kdm;
-       wxMenuItem* _tools_verify;
-       wxMenuItem* _view_full_screen;
-       wxMenuItem* _view_dual_screen;
-       wxSizer* _main_sizer;
+       wxMenuItem* _file_add_ov = nullptr;
+       wxMenuItem* _file_add_kdm = nullptr;
+       wxMenuItem* _tools_verify = nullptr;
+       wxMenuItem* _view_full_screen = nullptr;
+       wxMenuItem* _view_dual_screen = nullptr;
+       wxSizer* _main_sizer = nullptr;
        PlayerStressTester _stress;
 };
 
@@ -1106,7 +1095,6 @@ class App : public wxApp
 public:
        App ()
                : wxApp ()
-               , _frame (0)
        {
 #ifdef DCPOMATIC_LINUX
                XInitThreads ();
@@ -1117,7 +1105,7 @@ private:
 
        bool OnInit ()
        {
-               wxSplashScreen* splash = 0;
+               wxSplashScreen* splash = nullptr;
                try {
                        wxInitAllImageHandlers ();
 
@@ -1167,7 +1155,7 @@ private:
                        _frame->Maximize ();
                        if (splash) {
                                splash->Destroy ();
-                               splash = 0;
+                               splash = nullptr;
                        }
                        _frame->Show ();
 
@@ -1292,7 +1280,7 @@ private:
                message_dialog (_frame, std_to_wx (m));
        }
 
-       DOMFrame* _frame;
+       DOMFrame* _frame = nullptr;
        string _dcp_to_load;
        boost::optional<string> _stress;
 };

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 4a2184f407391b8703d76b1b4fffac6c86809618..0186417d2dbc48c65e400361aaffaee8b2296700 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -40,14 +40,14 @@ public:
        GLVideoView (FilmViewer* viewer, wxWindow* parent);
        ~GLVideoView ();
 
-       wxWindow* get () const {
+       wxWindow* get () const override {
                return _canvas;
        }
-       void update ();
-       void start ();
-       void stop ();
+       void update () override;
+       void start () override;
+       void stop () override;
 
-       NextFrameResult display_next_frame (bool);
+       NextFrameResult display_next_frame (bool) override;
 
        bool vsync_enabled () const {
                return _vsync_enabled;

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 31756b5d85eceecbe62a693a5ed524adeb6edf5f..26d1299b1d84fda12c4acad8b7c4a545820227ee 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -33,13 +33,13 @@ class SimpleVideoView : public VideoView
 public:
        SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
 
-       wxWindow* get () const {
+       wxWindow* get () const override {
                return _panel;
        }
 
-       void update ();
-       void start ();
-       NextFrameResult display_next_frame (bool non_blocking);
+       void update () override;
+       void start () override;
+       NextFrameResult display_next_frame (bool non_blocking) override;
 
 private:
        void set_image (std::shared_ptr<const Image> image) {

diff --git a/src/wx/system_information_dialog.cc b/src/wx/system_information_dialog.cc
index 7aabf1bf52cbed9bce3f3ae73f10e0332d35010d..ed93a4ab42f57e5bc7409a760b3679d4dca9af74 100644 (file)
--- a/src/wx/system_information_dialog.cc
+++ b/src/wx/system_information_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
+#include "film_viewer.h"
+#include "gl_video_view.h"
 #include "system_information_dialog.h"
 #include "wx_util.h"
-#include "gl_video_view.h"
-#include "film_viewer.h"
+
 
 #ifdef DCPOMATIC_OSX
 #include <OpenGL/glu.h>
@@ -31,10 +33,12 @@
 #include <GL/glext.h>
 #endif
 
+
 using std::string;
 using std::weak_ptr;
 using std::shared_ptr;
 
+
 SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<FilmViewer> weak_viewer)
        : TableDialog (parent, _("System information"), 2, 1, false)
 {
@@ -49,7 +53,7 @@ SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<Fil
                add (_("unknown (OpenGL not enabled in DCP-o-matic)"), false);
        } else {
                add (_("OpenGL version"), true);
-               char const * v = (char const *) glGetString (GL_VERSION);
+               auto v = reinterpret_cast<char const *>(glGetString(GL_VERSION));
                if (v) {
                        add (std_to_wx(v), false);
                } else {

diff --git a/src/wx/system_information_dialog.h b/src/wx/system_information_dialog.h
index 5b9efa2347a449e37c92e1edc1ae0fad61ff4221..49e617a6eb2b89a816125704ab129a9317fd9db2 100644 (file)
--- a/src/wx/system_information_dialog.h
+++ b/src/wx/system_information_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,9 +25,9 @@
 
 class FilmViewer;
 
+
 class SystemInformationDialog : public TableDialog
 {
 public:
        SystemInformationDialog (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
-
 };