X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fjob_test.cc;h=8728b7312137bbbdde15dcb56c2879303c0f93db;hp=2022a8ddadf0ab5d464244b7b0124d6d1294f45b;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad

diff --git a/test/job_test.cc b/test/job_test.cc
index 2022a8dda..8728b7312 100644
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -32,8 +33,8 @@ using boost::shared_ptr;
 class TestJob : public Job
 {
 public:
-	TestJob (shared_ptr<Film> f)
-		: Job (f)
+	TestJob (shared_ptr<Film> film)
+		: Job (film)
 	{
 
 	}
@@ -48,7 +49,7 @@ public:
 
 	void run ()
 	{
-		while (1) {
+		while (true) {
 			if (finished ()) {
 				return;
 			}
@@ -66,10 +67,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);