From f59e15185fabe2790816982116a0d56dad20e119 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 3 Feb 2016 20:14:17 -0500
Subject: [PATCH] Timer: C++11

---
 src/Timer.cpp | 17 ++++-------------
 src/Timer.h   | 14 +++++---------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/Timer.cpp b/src/Timer.cpp
index 7373ec497..0455903a5 100644
--- a/src/Timer.cpp
+++ b/src/Timer.cpp
@@ -34,11 +34,7 @@
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
-// Timer starts when the object is constructed.
 Timer::Timer ()
-: _description ("-")
-, _running (false)
-, _total (0)
 {
 }
 
@@ -46,8 +42,6 @@ Timer::Timer ()
 // Timer starts when the object is constructed with a description.
 Timer::Timer (const std::string& description)
 : _description (description)
-, _running (false)
-, _total (0)
 {
   start ();
 }
@@ -59,14 +53,11 @@ Timer::~Timer ()
   stop ();
 
   std::stringstream s;
-  s << "Timer " // No i18n
+  s << "Timer "
     << _description
     << " "
     << std::setprecision (6)
-#ifndef HAIKU
-    // Haiku fails on this - don't know why.
     << std::fixed
-#endif
     << _total / 1000000.0
     << " sec";
 
@@ -78,7 +69,7 @@ void Timer::start ()
 {
   if (!_running)
   {
-    gettimeofday (&_start, NULL);
+    gettimeofday (&_start, nullptr);
     _running = true;
   }
 }
@@ -89,7 +80,7 @@ void Timer::stop ()
   if (_running)
   {
     struct timeval end;
-    gettimeofday (&end, NULL);
+    gettimeofday (&end, nullptr);
     _running = false;
     _total += (end.tv_sec - _start.tv_sec) * 1000000
             + (end.tv_usec - _start.tv_usec);
@@ -115,7 +106,7 @@ void Timer::subtract (unsigned long value)
 unsigned long Timer::now ()
 {
   struct timeval now;
-  gettimeofday (&now, NULL);
+  gettimeofday (&now, nullptr);
   return now.tv_sec * 1000000 + now.tv_usec;
 }
 
diff --git a/src/Timer.h b/src/Timer.h
index e6c64540c..60e133799 100644
--- a/src/Timer.h
+++ b/src/Timer.h
@@ -35,10 +35,8 @@ class Timer
 {
 public:
   Timer ();
-  Timer (const std::string&);
+  explicit Timer (const std::string&);
   ~Timer ();
-  Timer (const Timer&);
-  Timer& operator= (const Timer&);
 
   void start ();
   void stop ();
@@ -48,12 +46,10 @@ public:
   static unsigned long now ();
 
 private:
-  std::string    _description;
-  bool           _running;
-  struct timeval _start;
-  unsigned long  _total;
+  std::string    _description {"-"};
+  bool           _running     {false};
+  struct timeval _start       {};
+  unsigned long  _total       {0};
 };
 
 #endif
-
-////////////////////////////////////////////////////////////////////////////////