1 files changed, 17 insertions, 17 deletions
diff --git a/src/Date.cpp b/src/Date.cpp
index 2430184..214220b 100644
--- a/src/Date.cpp
+++ b/src/Date.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <plist/Date.h>
 
 namespace PList
@@ -32,45 +32,45 @@ Date::Date(plist_t node, Node* parent) : Node(node, parent)
 {
 }
 
-Date::Date(PList::Date& d) : Node(PLIST_DATE)
+Date::Date(const PList::Date& d) : Node(PLIST_DATE)
 {
-    timeval t = d.GetValue();
-    plist_set_date_val(_node, t.tv_sec, t.tv_usec);
+    int64_t t = d.GetValue();
+    plist_set_unix_date_val(_node, t);
 }
 
-Date& Date::operator=(PList::Date& d)
+Date& Date::operator=(const PList::Date& d)
 {
+    if (this == &d) return *this;
+
     plist_free(_node);
     _node = plist_copy(d.GetPlist());
     return *this;
 }
 
-Date::Date(timeval t) : Node(PLIST_DATE)
+Date::Date(int64_t t) : Node(PLIST_DATE)
 {
-    plist_set_date_val(_node, t.tv_sec, t.tv_usec);
+    plist_set_unix_date_val(_node, t);
 }
 
 Date::~Date()
 {
 }
 
-Node* Date::Clone()
+Node* Date::Clone() const
 {
     return new Date(*this);
 }
 
-void Date::SetValue(timeval t)
+void Date::SetValue(int64_t t)
 {
-    plist_set_date_val(_node, t.tv_sec, t.tv_usec);
+    plist_set_unix_date_val(_node, t);
 }
 
-timeval Date::GetValue()
+int64_t Date::GetValue() const
 {
-    int32_t tv_sec = 0;
-    int32_t tv_usec = 0;
-    plist_get_date_val(_node, &tv_sec, &tv_usec);
-    timeval t = {tv_sec, tv_usec};
-    return t;
+    int64_t sec = 0;
+    plist_get_unix_date_val(_node, &sec);
+    return sec;
 }
 
-};
+}  // namespace PList