Put DateTime::init functions to the correct place in .cpp

Eliminate DateTime::validate

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 6617f862b0bdb705dd73fbb1f7b904a7e5761da1..13fba6332b25d8898abbb76066392b629aa43a19 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -77,6 +77,42 @@ DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, uns
        init(y, m, d, h, n, s, u);
 }
 
+void DateTime::init(const TimeStamp &ts)
+{
+       year = 1970;
+       month = 1;
+       mday = 1;
+       hour = 0;
+       minute = 0;
+       second = 0;
+       usec = 0;
+       add_raw(ts.raw());
+}
+
+void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
+{
+       year = y;
+       month = m;
+       mday = d;
+       hour = h;
+       minute = n;
+       second = s;
+       usec = u;
+
+       if(usec>=1000000)
+               throw InvalidParameterValue("Microseconds out of range");
+       if(second>=60)
+               throw InvalidParameterValue("Seconds out of range");
+       if(minute>=60)
+               throw InvalidParameterValue("Minutes out of range");
+       if(hour>=24)
+               throw InvalidParameterValue("Hours out of range");
+       if(month<1 || month>12)
+               throw InvalidParameterValue("Month out of range");
+       if(mday<1 || mday>month_days(year, month))
+               throw InvalidParameterValue("Day of month out of range");
+}
+
 void DateTime::add_days(int days)
 {
        int new_year = year;
@@ -272,30 +308,6 @@ string DateTime::format_rfc3339() const
        return result;
 }
 
-void DateTime::init(const TimeStamp &ts)
-{
-       year = 1970;
-       month = 1;
-       mday = 1;
-       hour = 0;
-       minute = 0;
-       second = 0;
-       usec = 0;
-       add_raw(ts.raw());
-}
-
-void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
-{
-       year = y;
-       month = m;
-       mday = d;
-       hour = h;
-       minute = n;
-       second = s;
-       usec = u;
-       validate();
-}
-
 void DateTime::add_raw(RawTime raw)
 {
        int days = static_cast<int>(raw/86400000000LL);
@@ -337,21 +349,5 @@ void DateTime::normalize()
        }
 }
 
-void DateTime::validate() const
-{
-       if(usec>=1000000)
-               throw InvalidParameterValue("Microseconds out of range");
-       if(second>=60)
-               throw InvalidParameterValue("Seconds out of range");
-       if(minute>=60)
-               throw InvalidParameterValue("Minutes out of range");
-       if(hour>=24)
-               throw InvalidParameterValue("Hours out of range");
-       if(month<1 || month>12)
-               throw InvalidParameterValue("Month out of range");
-       if(mday<1 || mday>month_days(year, month))
-               throw InvalidParameterValue("Day of month out of range");
-}
-
 } // namespace Time
 } // namespace Msp

diff --git a/source/time/datetime.h b/source/time/datetime.h
index dcd0b9a7f8f4c213030678acd7b3bc9b3d247708..ba8049bc2aad9ad6a2b794364da2478ad25466c3 100644 (file)
--- a/source/time/datetime.h
+++ b/source/time/datetime.h
@@ -82,7 +82,6 @@ public:
 private:
        void add_raw(RawTime);
        void normalize();
-       void validate() const;
 };
 
 } // namespace Time