X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Fdatetime.h;h=5f9e8c65706394f102cec45aa9c437d9db363864;hb=3fd9d04e84cdd72aabe8f9878f9e8ff006275bb6;hp=807b16cf7f81beed52a4d1c0b3f6d3fdc5837faf;hpb=1d05ea78e94897160f978f6103c5f4acf7fb43d3;p=libs%2Fcore.git

diff --git a/source/time/datetime.h b/source/time/datetime.h
index 807b16c..5f9e8c6 100644
--- a/source/time/datetime.h
+++ b/source/time/datetime.h
@@ -2,8 +2,9 @@
 #ifndef MSP_TIME_DATETIME_H_
 #define MSP_TIME_DATETIME_H_
 
-#include <stdint.h>
 #include <string>
+#include "timezone.h"
+#include "types.h"
 
 namespace Msp {
 namespace Time {
@@ -24,22 +25,27 @@ class DateTime
 {
 public:
 	DateTime(const TimeStamp &);
-	DateTime(int32_t, uint8_t, uint8_t);
-	DateTime(int32_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
-	DateTime(int32_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint32_t);
+	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);
 	
-	int32_t  get_year() const   { return year; }
-	uint8_t  get_month() const  { return month; }
-	uint8_t  get_mday() const   { return mday; }
-	uint8_t  get_hour() const   { return hour; }
-	uint8_t  get_minute() const { return minute; }
-	uint8_t  get_second() const { return second; }
-	uint32_t get_usec() const   { return usec; }
+	int           get_year() const   { return year; }
+	unsigned char get_month() const  { return month; }
+	unsigned char get_mday() const   { return mday; }
+	unsigned char get_hour() const   { return hour; }
+	unsigned char get_minute() const { return minute; }
+	unsigned char get_second() const { return second; }
+	unsigned      get_usec() const   { return usec; }
 
-	void add_days(int32_t);
+	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,16 +57,20 @@ public:
 	int cmp(const DateTime &) const;
 	TimeStamp get_timestamp() const;
 	std::string format(const std::string &) const;
+	std::string format_rfc3339() const;
 private:
-	int32_t year;
-	uint8_t month;
-	uint8_t mday;
-	uint8_t hour;
-	uint8_t minute;
-	uint8_t second;
-	uint32_t usec;
+	int           year;
+	unsigned char month;
+	unsigned char mday;
+	unsigned char hour;
+	unsigned char minute;
+	unsigned char second;
+	unsigned      usec;
+	TimeZone      zone;
 
-	void add_raw(int64_t);
+	void init(const TimeStamp &);
+	void init(int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned);
+	void add_raw(RawTime);
 	void normalize();
 	void validate() const;
 };