No-op; variable renaming.

8 files changed, 26 insertions, 26 deletions

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 2e9fe43fe..3cf9f23dc 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -78,9 +78,9 @@ ContentMenu::~ContentMenu ()
 }
 
 void
-ContentMenu::popup (weak_ptr<Film> f, ContentList c, TimelineContentViewList v, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList v, wxPoint p)
 {
-	_film = f;
+	_film = film;
 	_content = c;
 	_views = v;
 	_repeat->Enable (!_content.empty ());
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index a6d013434..8bb251251 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -48,9 +48,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f, FilmViewer* viewer)
+ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
 	: _timeline_dialog (0)
-	, _film (f)
+	, _film (film)
 	, _generally_sensitive (true)
 {
 	_panel = new wxPanel (n);
@@ -365,9 +365,9 @@ ContentPanel::setup_sensitivity ()
 }
 
 void
-ContentPanel::set_film (shared_ptr<Film> f)
+ContentPanel::set_film (shared_ptr<Film> film)
 {
-	_film = f;
+	_film = film;
 
 	film_changed (Film::CONTENT);
 	film_changed (Film::AUDIO_CHANNELS);
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index d48ee26c1..bb7353a9b 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -43,7 +43,7 @@ public:
 		return _film;
 	}
 
-	void set_film (boost::shared_ptr<Film> f);
+	void set_film (boost::shared_ptr<Film>);
 	void set_general_sensitivity (bool s);
 	void set_selection (boost::weak_ptr<Content>);
 
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 0a7f3c810..11db3466f 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -48,9 +48,9 @@ using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
 
-DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
+DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 	: _audio_dialog (0)
-	, _film (f)
+	, _film (film)
 	, _generally_sensitive (true)
 {
 	_panel = new wxPanel (n);
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 82fae2e9b..ce3791faa 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -99,15 +99,15 @@ FilmEditor::film_content_changed (int property)
 
 /** Sets the Film that we are editing */
 void
-FilmEditor::set_film (shared_ptr<Film> f)
+FilmEditor::set_film (shared_ptr<Film> film)
 {
-	set_general_sensitivity (f != 0);
+	set_general_sensitivity (film != 0);
 
-	if (_film == f) {
+	if (_film == film) {
 		return;
 	}
 	
-	_film = f;
+	_film = film;
 
 	_content_panel->set_film (_film);
 	_dcp_panel->set_film (_film);
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 07c64886e..a9b0907a1 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -120,13 +120,13 @@ FilmViewer::FilmViewer (wxWindow* p)
 }
 
 void
-FilmViewer::set_film (shared_ptr<Film> f)
+FilmViewer::set_film (shared_ptr<Film> film)
 {
-	if (_film == f) {
+	if (_film == film) {
 		return;
 	}
 
-	_film = f;
+	_film = film;
 
 	_frame.reset ();
 	
@@ -138,7 +138,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	}
 
 	try {
-		_player.reset (new Player (f));
+		_player.reset (new Player (_film));
 	} catch (bad_alloc) {
 		error_dialog (this, _("There is not enough free memory to do that."));
 		_film.reset ();
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index d27597143..40f1f3377 100644
--- 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 ();
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 3929cf1c2..8c8692aa1 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -101,15 +101,15 @@ Timeline::film_changed (Film::Property p)
 void
 Timeline::recreate_views ()
 {
-	shared_ptr<const Film> fl = _film.lock ();
-	if (!fl) {
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
 		return;
 	}
 
 	_views.clear ();
 	_views.push_back (_time_axis_view);
 
-	ContentList content = fl->content ();
+	ContentList content = film->content ();
 
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 		if (dynamic_pointer_cast<VideoContent> (*i)) {