No-op: remove all trailing whitespace.

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

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index d275971437fd508f6332f70b84442c73d60d3cff..36c9eb6c8e54f4ddefc311a19b5620d124c58a04 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -30,9 +30,9 @@
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> f)
+HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film)
        : wxDialog (parent, wxID_ANY, _("Hints"))
-       , _film (f)
+       , _film (film)
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
        _text = new wxRichTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (400, 300), wxRE_READONLY);
@@ -49,10 +49,10 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> f)
 
        _text->GetCaret()->Hide ();
 
-       boost::shared_ptr<Film> film = _film.lock ();
-       if (film) {
-               _film_changed_connection = film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
-               _film_content_changed_connection = film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
+       boost::shared_ptr<Film> locked_film = _film.lock ();
+       if (locked_film) {
+               _film_changed_connection = locked_film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
+               _film_content_changed_connection = locked_film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
        }
 
        film_changed ();
@@ -63,14 +63,14 @@ HintsDialog::film_changed ()
 {
        _text->Clear ();
        bool hint = false;
-       
+
        boost::shared_ptr<Film> film = _film.lock ();
        if (!film) {
                return;
        }
 
        ContentList content = film->content ();
-       
+
        _text->BeginStandardBullet (N_("standard/circle"), 1, 50);
 
        bool big_font_files = false;
@@ -132,7 +132,7 @@ HintsDialog::film_changed ()
                _text->WriteText (_("All of your content is at 1.85:1 or narrower but your DCP's container is Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) frame.  You may prefer to set your DCP's container to Flat (1.85:1) in the \"DCP\" tab."));
                _text->Newline ();
        }
-       
+
        if (film->video_frame_rate() != 24 && film->video_frame_rate() != 48) {
                hint = true;
                _text->WriteText (wxString::Format (_("Your DCP frame rate (%d fps) may cause problems in a few (mostly older) projectors.  Use 24 or 48 frames per second to be on the safe side."), film->video_frame_rate()));