X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Fdatetime.h;h=b786798707ab4db60c61b06263499ff7080f1b9b;hp=57ca89d8280535eea94efa301f750308688f9196;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hpb=cd89068b8ebafdc0f888c1aa21498bb93b55d814

diff --git a/source/time/datetime.h b/source/time/datetime.h
index 57ca89d..b786798 100644
--- a/source/time/datetime.h
+++ b/source/time/datetime.h
@@ -1,9 +1,9 @@
-/* $Id$ */
 #ifndef MSP_TIME_DATETIME_H_
 #define MSP_TIME_DATETIME_H_
 
 #include <string>
-#include "types.h"
+#include "timezone.h"
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -22,12 +22,27 @@ TimeStamp is a better choice.
 */
 class DateTime
 {
+private:
+	int           year;
+	unsigned char month;
+	unsigned char mday;
+	unsigned char hour;
+	unsigned char minute;
+	unsigned char second;
+	unsigned      usec;
+	TimeZone      zone;
+
 public:
 	DateTime(const TimeStamp &);
+	DateTime(const TimeStamp &, const TimeZone &);
 	DateTime(int, unsigned char, unsigned char);
 	DateTime(int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char);
 	DateTime(int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned);
-	
+private:
+	void init(const TimeStamp &);
+	void init(int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned);
+
+public:
 	int           get_year() const   { return year; }
 	unsigned char get_month() const  { return month; }
 	unsigned char get_mday() const   { return mday; }
@@ -37,9 +52,13 @@ public:
 	unsigned      get_usec() const   { return usec; }
 
 	void add_days(int);
+	void set_timezone(const TimeZone &);
+	void convert_timezone(const TimeZone &);
 
 	DateTime operator+(const TimeDelta &) const;
 	DateTime &operator+=(const TimeDelta &);
+	DateTime operator-(const TimeDelta &) const;
+	DateTime &operator-=(const TimeDelta &);
 
 	bool operator==(const DateTime &d) const { return cmp(d)==0; }
 	bool operator!=(const DateTime &d) const { return cmp(d)!=0; }
@@ -51,18 +70,11 @@ public:
 	int cmp(const DateTime &) const;
 	TimeStamp get_timestamp() const;
 	std::string format(const std::string &) const;
-private:
-	int           year;
-	unsigned char month;
-	unsigned char mday;
-	unsigned char hour;
-	unsigned char minute;
-	unsigned char second;
-	unsigned      usec;
+	std::string format_rfc3339() const;
 
+private:
 	void add_raw(RawTime);
 	void normalize();
-	void validate() const;
 };
 
 } // namespace Time