More refactoring

1 files changed, 11 insertions, 11 deletions

diff --git a/journal.h b/journal.h
index 5f1a8091..09b0b5d9 100644
--- a/journal.h
+++ b/journal.h
@@ -23,8 +23,8 @@ class transaction_t
   enum state_t { UNCLEARED, CLEARED, PENDING };
 
   entry_t *	   entry;
-  ptime		   _date;
-  ptime		   _date_eff;
+  moment_t		   _date;
+  moment_t		   _date_eff;
   account_t *	   account;
   amount_t	   amount;
   std::string      amount_expr;
@@ -67,9 +67,9 @@ class transaction_t
   }
   ~transaction_t();
 
-  ptime actual_date() const;
-  ptime effective_date() const;
-  ptime date() const {
+  moment_t actual_date() const;
+  moment_t effective_date() const;
+  moment_t date() const {
     if (use_effective_date)
       return effective_date();
     else
@@ -151,8 +151,8 @@ class entry_base_t
 class entry_t : public entry_base_t
 {
  public:
-  ptime	      _date;
-  ptime	      _date_eff;
+  moment_t	      _date;
+  moment_t	      _date_eff;
   std::string code;
   std::string payee;
 
@@ -167,15 +167,15 @@ class entry_t : public entry_base_t
     TRACE_DTOR("entry_t");
   }
 
-  ptime actual_date() const {
+  moment_t actual_date() const {
     return _date;
   }
-  ptime effective_date() const {
-    if (_date_eff.is_not_a_date_time())
+  moment_t effective_date() const {
+    if (! is_valid_moment(_date_eff))
       return _date;
     return _date_eff;
   }
-  ptime date() const {
+  moment_t date() const {
     if (transaction_t::use_effective_date)
       return effective_date();
     else