From b4806214e905752617691f851717033fd3f266c2 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 24 Apr 2013 16:11:11 +0300
Subject: [PATCH 1/1] Clean up after the timedelta.h/units.h merge

Quite a few files were still including units.h, and documentation for
TimeDelta contained a reference to it.
---
 source/core/semaphore.cpp     | 1 -
 source/debug/profiler.cpp     | 1 -
 source/io/eventdispatcher.cpp | 1 -
 source/io/eventdispatcher.h   | 1 +
 source/io/poll.cpp            | 1 -
 source/time/datetime.cpp      | 1 -
 source/time/timedelta.cpp     | 1 -
 source/time/timedelta.h       | 3 +--
 source/time/timezone.cpp      | 1 -
 source/time/utils.cpp         | 1 -
 10 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/source/core/semaphore.cpp b/source/core/semaphore.cpp
index 06e8435..4bfd303 100644
--- a/source/core/semaphore.cpp
+++ b/source/core/semaphore.cpp
@@ -6,7 +6,6 @@
 #endif
 #include <msp/time/rawtime_private.h>
 #include <msp/time/timestamp.h>
-#include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "mutex_private.h"
 #include "semaphore.h"
diff --git a/source/debug/profiler.cpp b/source/debug/profiler.cpp
index 38681ed..c33aebf 100644
--- a/source/debug/profiler.cpp
+++ b/source/debug/profiler.cpp
@@ -1,5 +1,4 @@
 #include <msp/core/maputils.h>
-#include <msp/time/units.h>
 #include "profiler.h"
 #include "profilingscope.h"
 
diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index 8660b5b..3a3baa6 100644
--- a/source/io/eventdispatcher.cpp
+++ b/source/io/eventdispatcher.cpp
@@ -1,4 +1,3 @@
-#include <msp/time/units.h>
 #include "base.h"
 #include "eventdispatcher.h"
 #include "eventobject.h"
diff --git a/source/io/eventdispatcher.h b/source/io/eventdispatcher.h
index 16dd62b..04d037e 100644
--- a/source/io/eventdispatcher.h
+++ b/source/io/eventdispatcher.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
+#include <msp/time/timedelta.h>
 #include "poll.h"
 
 namespace Msp {
diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index e8c5804..a580907 100644
--- a/source/io/poll.cpp
+++ b/source/io/poll.cpp
@@ -5,7 +5,6 @@
 #endif
 #include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
-#include <msp/time/units.h>
 #include "eventobject.h"
 #include "handle.h"
 #include "handle_private.h"
diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index bf82411..c77796f 100644
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -3,7 +3,6 @@
 #include <msp/strings/format.h>
 #include "datetime.h"
 #include "timestamp.h"
-#include "units.h"
 
 using namespace std;
 
diff --git a/source/time/timedelta.cpp b/source/time/timedelta.cpp
index a4e5db1..a56e0fe 100644
--- a/source/time/timedelta.cpp
+++ b/source/time/timedelta.cpp
@@ -1,6 +1,5 @@
 #include <msp/strings/format.h>
 #include "timedelta.h"
-#include "units.h"
 
 using namespace std;
 
diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 9be491e..c73529b 100644
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -21,8 +21,7 @@ public:
 	TimeDelta(): usec(0) { }
 
 	/** Constructs a TimeDelta from a plain number.  The purpose of this is to
-	allow serialization together with the raw() function.  For creating
-	TimeDeltas with a specific length, see units.h. */
+	allow serialization together with the raw() function. */
 	explicit TimeDelta(RawTime u): usec(u) { }
 
 	/** Returns the raw number stored inside the TimeDelta.  This should only be used
diff --git a/source/time/timezone.cpp b/source/time/timezone.cpp
index a2cd7a3..7baf494 100644
--- a/source/time/timezone.cpp
+++ b/source/time/timezone.cpp
@@ -9,7 +9,6 @@
 #include <msp/core/systemerror.h>
 #include "timestamp.h"
 #include "timezone.h"
-#include "units.h"
 #include "utils.h"
 
 using namespace std;
diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index 8b57695..9c643cf 100644
--- a/source/time/utils.cpp
+++ b/source/time/utils.cpp
@@ -10,7 +10,6 @@
 #include "rawtime_private.h"
 #include "timedelta.h"
 #include "timestamp.h"
-#include "units.h"
 #include "utils.h"
 
 using namespace std;
-- 
2.43.0