From fe8c3e73b5d9147d400c2b7d2e35ebfc64fc7b9d Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 28 May 2011 16:34:54 +0300
Subject: [PATCH] Put DateTime::init functions to the correct place in .cpp
 Eliminate DateTime::validate

---
 source/time/datetime.cpp | 76 +++++++++++++++++++---------------------
 source/time/datetime.h   |  1 -
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 6617f86..13fba63 100644
--- 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 dcd0b9a..ba8049b 100644
--- 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
-- 
2.43.0