No-op; variable renaming.

4 files changed, 22 insertions, 22 deletions

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 1aa41967a..797af8736 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -57,11 +57,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
 	boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
-	shared_ptr<Film> f (new Film (p.string ()));
-	f->read_metadata ();
-	BOOST_CHECK (!f->cpls().empty());
+	shared_ptr<Film> film (new Film (p.string ()));
+	film->read_metadata ();
+	BOOST_CHECK (!film->cpls().empty());
 
-	p /= f->dcp_name();
+	p /= film->dcp_name();
 	boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
 	while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
 		++i;
@@ -71,5 +71,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 		boost::filesystem::remove (i->path ());
 	}
 	
-	BOOST_CHECK (f->cpls().empty());
+	BOOST_CHECK (film->cpls().empty());
 }
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 90f81deb6..851fffb3f 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -35,18 +35,18 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
-	shared_ptr<Film> f = new_test_film ("film_metadata_test");
+	shared_ptr<Film> film = new_test_film ("film_metadata_test");
 	boost::filesystem::path dir = test_film_dir ("film_metadata_test");
 
-	f->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
-	BOOST_CHECK (f->container() == Ratio::from_id ("185"));
-	BOOST_CHECK (f->dcp_content_type() == 0);
+	film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
+	BOOST_CHECK (film->container() == Ratio::from_id ("185"));
+	BOOST_CHECK (film->dcp_content_type() == 0);
 
-	f->set_name ("fred");
-	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f->set_container (Ratio::from_id ("185"));
-	f->set_j2k_bandwidth (200000000);
-	f->write_metadata ();
+	film->set_name ("fred");
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_j2k_bandwidth (200000000);
+	film->write_metadata ();
 
 	list<string> ignore;
 	ignore.push_back ("Key");
diff --git a/test/job_test.cc b/test/job_test.cc
index c1b66d4e0..5a554145b 100644
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@ using boost::shared_ptr;
 class TestJob : public Job
 {
 public:
-	TestJob (shared_ptr<Film> f)
-		: Job (f)
+	TestJob (shared_ptr<Film> film)
+		: Job (film)
 	{
 
 	}
@@ -66,10 +66,10 @@ public:
 
 BOOST_AUTO_TEST_CASE (job_manager_test)
 {
-	shared_ptr<Film> f;
+	shared_ptr<Film> film;
 
 	/* Single job */
-	shared_ptr<TestJob> a (new TestJob (f));
+	shared_ptr<TestJob> a (new TestJob (film));
 
 	JobManager::instance()->add (a);
 	dcpomatic_sleep (1);
diff --git a/test/test.cc b/test/test.cc
index f325aacbc..bdd17e6a1 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -107,9 +107,9 @@ new_test_film (string name)
 		boost::filesystem::remove_all (p);
 	}
 	
-	shared_ptr<Film> f = shared_ptr<Film> (new Film (p.string()));
-	f->write_metadata ();
-	return f;
+	shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+	film->write_metadata ();
+	return film;
 }
 
 void