C++11 tidying.

[dcpomatic.git] / src / wx / about_dialog.cc

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index ab090c1c87c04877233035a7722093913c62a131..73c569282621c11f8c1a167e999e703ac972bcda 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -38,8 +38,8 @@ using std::vector;
 AboutDialog::AboutDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("About DCP-o-matic"))
 {
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+       auto sizer = new wxBoxSizer (wxVERTICAL);
 
        wxFont title_font (*wxNORMAL_FONT);
        title_font.SetPointSize (title_font.GetPointSize() + 12);
@@ -51,7 +51,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        wxFont version_font (*wxNORMAL_FONT);
        version_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-       wxStaticText* t = new StaticText (this, _("DCP-o-matic"));
+       auto t = new StaticText (this, _("DCP-o-matic"));
        t->SetFont (title_font);
        sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16));
 
@@ -74,7 +74,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8));
 
-       wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
+       auto h = new wxHyperlinkCtrl (
                this, wxID_ANY,
                wxT ("dcpomatic.com"),
                wxT ("https://dcpomatic.com")
@@ -84,7 +84,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        t = new StaticText (
                this,
-               _("(C) 2012-2020 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+               _("(C) 2012-2021 Carl Hetherington, Terrence Meiczinger\n Ole Laursen"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
 
@@ -97,8 +97,6 @@ AboutDialog::AboutDialog (wxWindow* parent)
        written_by.Add (wxT ("Terrence Meiczinger"));
        written_by.Add (wxT ("Mart Jansink"));
        written_by.Add (wxT ("Ole Laursen"));
-       written_by.Add (wxT ("Brecht Sanders"));
-       written_by.Add (wxT ("Jianguo Huang"));
        add_section (_("Written by"), written_by);
 
        wxArrayString with_help_from;
@@ -107,6 +105,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        with_help_from.Add (wxT ("Carsten Kurz"));
        with_help_from.Add (wxT ("Gérald Maruccia"));
        with_help_from.Add (wxT ("Julian van Mil"));
+       with_help_from.Add (wxT ("Lilian Lefranc"));
        add_section (_("With help from"), with_help_from);
 
        wxArrayString translated_by;
@@ -130,6 +129,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Carsten Kurz"));
        translated_by.Add (wxT ("Lilian Lefranc"));
        translated_by.Add (wxT ("Gérald Maruccia"));
+       translated_by.Add (wxT ("Mattias Mattsson"));
        translated_by.Add (wxT ("Mike Mazur"));
        translated_by.Add (wxT ("Rob van Nieuwkerk"));
        translated_by.Add (wxT ("Anders Uhl Pedersen"));
@@ -179,6 +179,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Steve Guttag"));
        tested_by.Add (wxT ("Patrick Haderer"));
        tested_by.Add (wxT ("Bill Hamell"));
+       tested_by.Add (wxT ("Groet Han"));
        tested_by.Add (wxT ("Jonathan Jensen"));
        tested_by.Add (wxT ("Thierry Journet"));
        tested_by.Add (wxT ("Markus Kalb"));
@@ -238,14 +239,14 @@ AboutDialog::AboutDialog (wxWindow* parent)
 void
 AboutDialog::add_section (wxString name, wxArrayString credits)
 {
-       static bool first = true;
+       static auto first = true;
        int const N = 4;
 
-       wxScrolledWindow* panel = new wxScrolledWindow (_notebook);
+       auto panel = new wxScrolledWindow (_notebook);
        panel->SetMaxSize (wxSize (-1, 380));
        panel->EnableScrolling (false, true);
        panel->SetScrollRate (0, 32);
-       wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto overall_sizer = new wxBoxSizer (wxHORIZONTAL);
 
        vector<wxSizer*> sizers;