From: Carl Hetherington <cth@carlh.net>
Date: Thu, 19 Dec 2013 19:21:50 +0000 (+0000)
Subject: Fix erroneous rename.
X-Git-Tag: v2.0.48~922^2~41
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=f434d010e13ddf834a552be8833abb6f89767fe8;p=dcpomatic.git

Fix erroneous rename.
---

diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index a20a08b07..69a7e3aa9 100644
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -31,14 +31,14 @@
 using namespace std;
 
 /** @param n Name to use when giving output */
-PeriodDCPTimer::PeriodDCPTimer (string n)
+PeriodTimer::PeriodTimer (string n)
 	: _name (n)
 {
 	gettimeofday (&_start, 0);
 }
 
-/** Destroy PeriodDCPTimer and output the time elapsed since its construction */
-PeriodDCPTimer::~PeriodDCPTimer ()
+/** Destroy PeriodTimer and output the time elapsed since its construction */
+PeriodTimer::~PeriodTimer ()
 {
 	struct timeval stop;
 	gettimeofday (&stop, 0);
@@ -48,7 +48,7 @@ PeriodDCPTimer::~PeriodDCPTimer ()
 /** @param n Name to use when giving output.
  *  @param s Initial state.
  */
-StateDCPTimer::StateDCPTimer (string n, string s)
+StateTimer::StateTimer (string n, string s)
 	: _name (n)
 {
 	struct timeval t;
@@ -59,7 +59,7 @@ StateDCPTimer::StateDCPTimer (string n, string s)
 
 /** @param s New state that the caller is in */
 void
-StateDCPTimer::set_state (string s)
+StateTimer::set_state (string s)
 {
 	double const last = _time;
 	struct timeval t;
@@ -74,8 +74,8 @@ StateDCPTimer::set_state (string s)
 	_state = s;
 }
 
-/** Destroy StateDCPTimer and generate a summary of the state timings on cout */
-StateDCPTimer::~StateDCPTimer ()
+/** Destroy StateTimer and generate a summary of the state timings on cout */
+StateTimer::~StateTimer ()
 {
 	if (_state.empty ()) {
 		return;
diff --git a/src/lib/timer.h b/src/lib/timer.h
index 8ec392aa6..4a5aa12de 100644
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -29,16 +29,16 @@
 #include <map>
 #include <sys/time.h>
 
-/** @class PeriodDCPTimer
+/** @class PeriodTimer
  *  @brief A class to allow timing of a period within the caller.
  *
  *  On destruction, it will output the time since its construction.
  */
-class PeriodDCPTimer
+class PeriodTimer
 {
 public:
-	PeriodDCPTimer (std::string n);
-	~PeriodDCPTimer ();
+	PeriodTimer (std::string n);
+	~PeriodTimer ();
 	
 private:
 
@@ -48,19 +48,19 @@ private:
 	struct timeval _start;
 };
 
-/** @class StateDCPTimer
+/** @class StateTimer
  *  @brief A class to allow measurement of the amount of time a program
  *  spends in one of a set of states.
  *
  *  Once constructed, the caller can call set_state() whenever
- *  its state changes.	When StateDCPTimer is destroyed, it will
+ *  its state changes.	When StateTimer is destroyed, it will
  *  output (to cout) a summary of the time spent in each state.
  */
-class StateDCPTimer
+class StateTimer
 {
 public:
-	StateDCPTimer (std::string n, std::string s);
-	~StateDCPTimer ();
+	StateTimer (std::string n, std::string s);
+	~StateTimer ();
 
 	void set_state (std::string s);