[mod|inc|dec]date64 API rename back to date

This commit mass renames new t64 API back to the original names.

gnucash/import-export/qif-imp/qif-merge-groups.scm

@@ -129,8 +129,8 @@
                   ;; The date should be close to the same.. +/- a week.
                   (let ((date (xaccTransGetDate xtn)))
                     (xaccQueryAddDateMatchTT query
-                                             #t (decdate64 date WeekDelta)
-                                             #t (incdate64 date WeekDelta)
+                                             #t (decdate date WeekDelta)
+                                             #t (incdate date WeekDelta)
                                              QOF-QUERY-AND))
 
                   ;; For each split in the new transaction, add a

gnucash/report/business-reports/aging.scm

@@ -487,14 +487,14 @@ copying this report to a spreadsheet for use in a mail merge.")
 
 (define (make-interval-list to-date)
   (let ((begindate to-date))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
     (gnc:make-date-list begindate to-date ThirtyDayDelta)))
 
 ;; Have make-list create a stepped list, then add a date in the future for the "current" bucket
 (define (make-extended-interval-list to-date)
-    (define dayforcurrent (incdate64 to-date YearDelta)) ;; MAGIC CONSTANT
+    (define dayforcurrent (incdate to-date YearDelta)) ;; MAGIC CONSTANT
     (define oldintervalreversed (reverse (make-interval-list to-date)))		
   (reverse (cons dayforcurrent oldintervalreversed)))
 

gnucash/report/business-reports/job-report.scm

@@ -118,9 +118,9 @@
 
 (define (make-interval-list to-date)
   (let ((begindate to-date))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
     (gnc:make-date-list begindate to-date ThirtyDayDelta)))
 
 

gnucash/report/business-reports/owner-report.scm

@@ -204,14 +204,14 @@
 
 (define (make-interval-list to-date)
   (let ((begindate to-date))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
-    (set! begindate (decdate64 begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate begindate ThirtyDayDelta))
     (gnc:make-date-list begindate to-date ThirtyDayDelta)))
 
 ;; Have make-list create a stepped list, then add a date in the future for the "current" bucket 
 (define (make-extended-interval-list to-date) 
-    (define dayforcurrent (incdate64 to-date YearDelta)) ;; MAGIC CONSTANT 
+    (define dayforcurrent (incdate to-date YearDelta)) ;; MAGIC CONSTANT 
     (define oldintervalreversed (reverse (make-interval-list to-date)))          
     (reverse (cons dayforcurrent oldintervalreversed))) 
 

gnucash/report/report-system/report-collectors.scm

@@ -155,7 +155,7 @@
     (list min-date max-date dates)))
 
 (define (category-report-dates-accumulate dates)
-  (let* ((min-date (decdate64 (car (list-min-max dates <)) DayDelta))
+  (let* ((min-date (decdate (car (list-min-max dates <)) DayDelta))
          (max-date (cdr (list-min-max dates <)))
          (datepairs (reverse! (cdr (fold (lambda (next acc)
                                            (let ((prev (car acc))

libgnucash/app-utils/app-utils.scm

@@ -213,8 +213,8 @@
 (export moddatek)
 (export decdate)
 (export incdate)
-(export decdate64)
-(export incdate64)
+(export decdate)
+(export incdate)
 (export gnc:time64-le-date)
 (export gnc:time64-ge-date)
 (export gnc:make-date-interval-list)

libgnucash/app-utils/date-utilities.scm

@@ -203,7 +203,7 @@
     (else #f)))
 
 ;; Modify a date
-(define (moddate64 op adate delta)
+(define (moddate op adate delta)
   (let ((newtm (gnc-localtime adate)))
     (begin
       (set-tm:sec newtm (op (tm:sec newtm) (tm:sec delta)))
@@ -216,8 +216,8 @@
       (gnc-mktime newtm))))
 
 ;; Add or subtract time from a date
-(define (decdate64 adate delta) (moddate64 - adate delta ))
-(define (incdate64 adate delta) (moddate64 + adate delta ))
+(define (decdate adate delta) (moddate - adate delta ))
+(define (incdate adate delta) (moddate + adate delta ))
 
 ;; date-granularity comparison functions.
 
@@ -235,9 +235,9 @@
 ;; want that you'll have to write another function.
 (define (gnc:make-date-interval-list current-date end-date increment)
   (if (< current-date end-date)
-      (let ((next-date (incdate64 current-date increment)))
+      (let ((next-date (incdate current-date increment)))
         (if (< next-date end-date)
-            (cons (list current-date (decdate64 next-date SecDelta) '())
+            (cons (list current-date (decdate next-date SecDelta) '())
                   (gnc:make-date-interval-list next-date end-date increment))
             (cons (list current-date end-date '())
                   '())))
@@ -251,7 +251,7 @@
 (define (gnc:make-date-list startdate enddate incr)
   (if (< startdate enddate)
       (cons startdate
-            (gnc:make-date-list (incdate64 startdate incr)
+            (gnc:make-date-list (incdate startdate incr)
                                 enddate incr))
       (list enddate)))
 
@@ -363,10 +363,10 @@
     (gnc-mktime bdt)))
 
 (define (gnc:time64-previous-day t64)
-  (decdate64 t64 DayDelta))
+  (decdate t64 DayDelta))
 
 (define (gnc:time64-next-day t64)
-  (incdate64 t64 DayDelta))
+  (incdate t64 DayDelta))
 
 
 (define (gnc:reldate-get-symbol x) (vector-ref x 0))