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.

diff --git a/source/core/semaphore.cpp b/source/core/semaphore.cpp
index 06e8435c3a34212599a8ead8817d28073c4c26cc..4bfd3036e3ae0d127a195e3f014b367fb21fd208 100644 (file)
--- 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>
 #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"
 #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 38681ed9fd2d5103c685d567a88690600cda36a8..c33aebf275fb46ba1e79bedaa8c601fae5cc78b2 100644 (file)
--- a/source/debug/profiler.cpp
+++ b/source/debug/profiler.cpp
@@ -1,5 +1,4 @@
 #include <msp/core/maputils.h>
 #include <msp/core/maputils.h>

-#include <msp/time/units.h>

 #include "profiler.h"
 #include "profilingscope.h"
 
 #include "profiler.h"
 #include "profilingscope.h"
 

diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index 8660b5b29562029daef671c892a325db51dcd783..3a3baa673d1c08a4412f9a875af1a6cd086f1583 100644 (file)
--- 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"
 #include "base.h"
 #include "eventdispatcher.h"
 #include "eventobject.h"

diff --git a/source/io/eventdispatcher.h b/source/io/eventdispatcher.h
index 16dd62ba822825318574934038f11aaa58d2b9bf..04d037e29df5fe5085127a74b75a1bfe66d01ccb 100644 (file)
--- a/source/io/eventdispatcher.h
+++ b/source/io/eventdispatcher.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
 
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>

+#include <msp/time/timedelta.h>

 #include "poll.h"
 
 namespace Msp {
 #include "poll.h"
 
 namespace Msp {

diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index e8c5804b3576a2f4c42aa5c3122e1ed490e09f7f..a58090792fcb06cf9c4a2a9049159ac7324524a8 100644 (file)
--- 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>
 #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"
 #include "eventobject.h"
 #include "handle.h"
 #include "handle_private.h"

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index bf824112ac9e202a97d3f0158c42d8bc86d79286..c77796f7bc0bd8c8cd378d739fb5a458f006a491 100644 (file)
--- 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 <msp/strings/format.h>
 #include "datetime.h"
 #include "timestamp.h"

-#include "units.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/source/time/timedelta.cpp b/source/time/timedelta.cpp
index a4e5db172cf97925c2ce8bb7929c3080ec430b88..a56e0fe8a3944763240b79689a55adc3d69c9ad5 100644 (file)
--- a/source/time/timedelta.cpp
+++ b/source/time/timedelta.cpp
@@ -1,6 +1,5 @@
 #include <msp/strings/format.h>
 #include "timedelta.h"
 #include <msp/strings/format.h>
 #include "timedelta.h"

-#include "units.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 9be491ecbc762bf02046628274d0e6bb91ba445d..c73529b0e3f8a9c7ea60bdcc215ce105050643fc 100644 (file)
--- 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
        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
        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 a2cd7a3f772743c7fe9ac06fde3042fd6ab28d98..7baf4943bec4b436c479d06d4394c9004f91f2d3 100644 (file)
--- 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 <msp/core/systemerror.h>
 #include "timestamp.h"
 #include "timezone.h"

-#include "units.h"

 #include "utils.h"
 
 using namespace std;
 #include "utils.h"
 
 using namespace std;

diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index 8b57695f3343fae361a5c6e8356b42996d854da8..9c643cf8b2dec5634c703474d5b3e976a58f3346 100644 (file)
--- 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 "rawtime_private.h"
 #include "timedelta.h"
 #include "timestamp.h"

-#include "units.h"

 #include "utils.h"
 
 using namespace std;
 #include "utils.h"
 
 using namespace std;