From 807409d41f8b1a4435ee1cf7ddc3d1a1b9116799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 31 Jan 2022 20:24:18 +0100 Subject: Move stuff from calp/util to hnh/util. This is the first (major) step in splitting the generally useful items into its own library. --- module/vcomponent/base.scm | 2 +- module/vcomponent/control.scm | 2 +- module/vcomponent/datetime.scm | 2 +- module/vcomponent/datetime/output.scm | 4 ++-- module/vcomponent/duration.scm | 4 ++-- module/vcomponent/formats/common/types.scm | 4 ++-- module/vcomponent/formats/ical/output.scm | 4 ++-- module/vcomponent/formats/ical/parse.scm | 4 ++-- module/vcomponent/formats/ical/types.scm | 4 ++-- module/vcomponent/formats/vdir/parse.scm | 4 ++-- module/vcomponent/formats/vdir/save-delete.scm | 6 +++--- module/vcomponent/formats/xcal/output.scm | 4 ++-- module/vcomponent/formats/xcal/parse.scm | 4 ++-- module/vcomponent/formats/xcal/types.scm | 2 +- module/vcomponent/geo.scm | 2 +- module/vcomponent/recurrence/display.scm | 2 +- module/vcomponent/recurrence/generate.scm | 4 ++-- module/vcomponent/recurrence/internal.scm | 2 +- module/vcomponent/recurrence/parse.scm | 4 ++-- module/vcomponent/util/control.scm | 2 +- module/vcomponent/util/describe.scm | 2 +- module/vcomponent/util/instance.scm | 2 +- module/vcomponent/util/instance/methods.scm | 2 +- module/vcomponent/util/parse-cal-path.scm | 2 +- module/vcomponent/util/search.scm | 2 +- 25 files changed, 38 insertions(+), 38 deletions(-) (limited to 'module/vcomponent') diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm index 66e6534f..579382ae 100644 --- a/module/vcomponent/base.scm +++ b/module/vcomponent/base.scm @@ -1,5 +1,5 @@ (define-module (vcomponent base) - :use-module (calp util) + :use-module (hnh util) :use-module (srfi srfi-1) :use-module (srfi srfi-9) :use-module (srfi srfi-9 gnu) diff --git a/module/vcomponent/control.scm b/module/vcomponent/control.scm index 4cb6c708..586dd4a3 100644 --- a/module/vcomponent/control.scm +++ b/module/vcomponent/control.scm @@ -1,5 +1,5 @@ (define-module (vcomponent util control) - #:use-module (calp util) + #:use-module (hnh util) #:use-module (vcomponent) #:export (with-replaced-properties)) diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm index ca4f90e9..bb4fe50e 100644 --- a/module/vcomponent/datetime.scm +++ b/module/vcomponent/datetime.scm @@ -4,7 +4,7 @@ #:use-module (datetime) #:use-module (datetime timespec) #:use-module (datetime zic) - #:use-module (calp util) + #:use-module (hnh util) :use-module (ice-9 curried-definitions) diff --git a/module/vcomponent/datetime/output.scm b/module/vcomponent/datetime/output.scm index 1b377a7c..fa662286 100644 --- a/module/vcomponent/datetime/output.scm +++ b/module/vcomponent/datetime/output.scm @@ -1,7 +1,7 @@ (define-module (vcomponent datetime output) - :use-module (calp util) + :use-module (hnh util) :use-module (calp util config) - :use-module (calp util exceptions) + :use-module (hnh util exceptions) :use-module (datetime) :use-module (vcomponent base) :use-module (text util) diff --git a/module/vcomponent/duration.scm b/module/vcomponent/duration.scm index 7591a880..786675b8 100644 --- a/module/vcomponent/duration.scm +++ b/module/vcomponent/duration.scm @@ -1,6 +1,6 @@ (define-module (vcomponent duration) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (datetime) :use-module (ice-9 peg) :use-module (ice-9 match) diff --git a/module/vcomponent/formats/common/types.scm b/module/vcomponent/formats/common/types.scm index 87425c01..efe17f36 100644 --- a/module/vcomponent/formats/common/types.scm +++ b/module/vcomponent/formats/common/types.scm @@ -1,6 +1,6 @@ (define-module (vcomponent formats common types) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (base64) :use-module (datetime) :use-module (srfi srfi-9 gnu) diff --git a/module/vcomponent/formats/ical/output.scm b/module/vcomponent/formats/ical/output.scm index 9efac3c4..fba8bffc 100644 --- a/module/vcomponent/formats/ical/output.scm +++ b/module/vcomponent/formats/ical/output.scm @@ -1,6 +1,6 @@ (define-module (vcomponent formats ical output) - :use-module (calp util exceptions) - :use-module (calp util) + :use-module (hnh util exceptions) + :use-module (hnh util) :use-module (datetime) :use-module (datetime zic) :use-module ((datetime instance) :select (zoneinfo)) diff --git a/module/vcomponent/formats/ical/parse.scm b/module/vcomponent/formats/ical/parse.scm index d76044a3..34812a2c 100644 --- a/module/vcomponent/formats/ical/parse.scm +++ b/module/vcomponent/formats/ical/parse.scm @@ -1,7 +1,7 @@ (define-module (vcomponent formats ical parse) :use-module ((ice-9 rdelim) :select (read-line)) - :use-module (calp util exceptions) - :use-module (calp util) + :use-module (hnh util exceptions) + :use-module (hnh util) :use-module (datetime) :use-module (srfi srfi-1) :use-module (srfi srfi-26) diff --git a/module/vcomponent/formats/ical/types.scm b/module/vcomponent/formats/ical/types.scm index d063ca8f..39b3b1e3 100644 --- a/module/vcomponent/formats/ical/types.scm +++ b/module/vcomponent/formats/ical/types.scm @@ -1,7 +1,7 @@ ;; see (vcomponent parse types) (define-module (vcomponent formats ical types) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (base64) :use-module (datetime) :use-module (datetime timespec)) diff --git a/module/vcomponent/formats/vdir/parse.scm b/module/vcomponent/formats/vdir/parse.scm index f3810887..20b89026 100644 --- a/module/vcomponent/formats/vdir/parse.scm +++ b/module/vcomponent/formats/vdir/parse.scm @@ -11,8 +11,8 @@ :use-module ((ice-9 rdelim) :select (read-line)) :use-module ((ice-9 ftw) :select (scandir ftw)) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (vcomponent base) :use-module (vcomponent formats ical parse) diff --git a/module/vcomponent/formats/vdir/save-delete.scm b/module/vcomponent/formats/vdir/save-delete.scm index 1c70dabf..73725b2c 100644 --- a/module/vcomponent/formats/vdir/save-delete.scm +++ b/module/vcomponent/formats/vdir/save-delete.scm @@ -10,11 +10,11 @@ ;;; Code: (define-module (vcomponent formats vdir save-delete) - :use-module (calp util) - :use-module ((calp util exceptions) :select (assert)) + :use-module (hnh util) + :use-module ((hnh util exceptions) :select (assert)) :use-module (vcomponent formats ical output) :use-module (vcomponent) - :use-module ((calp util io) :select (with-atomic-output-to-file)) + :use-module ((hnh util io) :select (with-atomic-output-to-file)) ) diff --git a/module/vcomponent/formats/xcal/output.scm b/module/vcomponent/formats/xcal/output.scm index e2cada83..81fab41c 100644 --- a/module/vcomponent/formats/xcal/output.scm +++ b/module/vcomponent/formats/xcal/output.scm @@ -1,6 +1,6 @@ (define-module (vcomponent formats xcal output) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (vcomponent) :use-module (vcomponent geo) :use-module (vcomponent formats xcal types) diff --git a/module/vcomponent/formats/xcal/parse.scm b/module/vcomponent/formats/xcal/parse.scm index e84f380e..7dee8d67 100644 --- a/module/vcomponent/formats/xcal/parse.scm +++ b/module/vcomponent/formats/xcal/parse.scm @@ -1,6 +1,6 @@ (define-module (vcomponent formats xcal parse) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (base64) :use-module (ice-9 match) :use-module (sxml match) diff --git a/module/vcomponent/formats/xcal/types.scm b/module/vcomponent/formats/xcal/types.scm index 34c7c40d..05fbc8c6 100644 --- a/module/vcomponent/formats/xcal/types.scm +++ b/module/vcomponent/formats/xcal/types.scm @@ -1,5 +1,5 @@ (define-module (vcomponent formats xcal types) - :use-module (calp util) + :use-module (hnh util) :use-module (vcomponent formats ical types) :use-module (datetime) ) diff --git a/module/vcomponent/geo.scm b/module/vcomponent/geo.scm index ac370a6c..27b2cbae 100644 --- a/module/vcomponent/geo.scm +++ b/module/vcomponent/geo.scm @@ -1,5 +1,5 @@ (define-module (vcomponent geo) - :use-module (calp util) + :use-module (hnh util) :use-module (srfi srfi-9 gnu)) (define-immutable-record-type diff --git a/module/vcomponent/recurrence/display.scm b/module/vcomponent/recurrence/display.scm index b13e955e..f5ce1c57 100644 --- a/module/vcomponent/recurrence/display.scm +++ b/module/vcomponent/recurrence/display.scm @@ -6,7 +6,7 @@ ;;; Code: (define-module (vcomponent recurrence display) - :use-module (calp util) + :use-module (hnh util) :use-module (vcomponent recurrence internal) :use-module (text util) :use-module (text numbers sv) diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index 1d262202..b498e033 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -1,6 +1,6 @@ (define-module (vcomponent recurrence generate) - :use-module (calp util) - :use-module (calp util exceptions) + :use-module (hnh util) + :use-module (hnh util exceptions) :use-module (srfi srfi-1) :use-module (srfi srfi-26) :use-module (srfi srfi-41) diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm index a57dfd65..b4f09d92 100644 --- a/module/vcomponent/recurrence/internal.scm +++ b/module/vcomponent/recurrence/internal.scm @@ -5,7 +5,7 @@ #:use-module ((vcomponent base) :select (prop)) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) - #:use-module (calp util) + #:use-module (hnh util) ) ;; EXDATE is also a property linked to recurense rules diff --git a/module/vcomponent/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm index a1bf3eaa..3477f6d4 100644 --- a/module/vcomponent/recurrence/parse.scm +++ b/module/vcomponent/recurrence/parse.scm @@ -7,8 +7,8 @@ #:use-module (datetime) #:use-module (srfi srfi-26) #:use-module (vcomponent recurrence internal) - #:use-module (calp util) - #:use-module (calp util exceptions) + #:use-module (hnh util) + #:use-module (hnh util exceptions) #:use-module (ice-9 match)) diff --git a/module/vcomponent/util/control.scm b/module/vcomponent/util/control.scm index 4cb6c708..586dd4a3 100644 --- a/module/vcomponent/util/control.scm +++ b/module/vcomponent/util/control.scm @@ -1,5 +1,5 @@ (define-module (vcomponent util control) - #:use-module (calp util) + #:use-module (hnh util) #:use-module (vcomponent) #:export (with-replaced-properties)) diff --git a/module/vcomponent/util/describe.scm b/module/vcomponent/util/describe.scm index 5c3afd30..0c3ab27c 100644 --- a/module/vcomponent/util/describe.scm +++ b/module/vcomponent/util/describe.scm @@ -1,5 +1,5 @@ (define-module (vcomponent util describe) - :use-module (calp util) + :use-module (hnh util) :use-module (vcomponent base) :use-module (text util)) diff --git a/module/vcomponent/util/instance.scm b/module/vcomponent/util/instance.scm index 15c020b1..6e1e765f 100644 --- a/module/vcomponent/util/instance.scm +++ b/module/vcomponent/util/instance.scm @@ -1,5 +1,5 @@ (define-module (vcomponent util instance) - :use-module (calp util) + :use-module (hnh util) :use-module ((calp util config) :select (get-config)) :use-module ((oop goops) :select (make)) :export (global-event-object) diff --git a/module/vcomponent/util/instance/methods.scm b/module/vcomponent/util/instance/methods.scm index 37aef3bc..120ab2fe 100644 --- a/module/vcomponent/util/instance/methods.scm +++ b/module/vcomponent/util/instance/methods.scm @@ -1,5 +1,5 @@ (define-module (vcomponent util instance methods) - :use-module (calp util) + :use-module (hnh util) :use-module (srfi srfi-1) :use-module (srfi srfi-41) :use-module (srfi srfi-41 util) diff --git a/module/vcomponent/util/parse-cal-path.scm b/module/vcomponent/util/parse-cal-path.scm index 94c0c6ed..11a32064 100644 --- a/module/vcomponent/util/parse-cal-path.scm +++ b/module/vcomponent/util/parse-cal-path.scm @@ -1,5 +1,5 @@ (define-module (vcomponent util parse-cal-path) - :use-module (calp util) + :use-module (hnh util) :use-module ((calp util time) :select (report-time!)) :use-module (vcomponent base) :use-module ((vcomponent formats ical parse) diff --git a/module/vcomponent/util/search.scm b/module/vcomponent/util/search.scm index fb395022..61e81eb5 100644 --- a/module/vcomponent/util/search.scm +++ b/module/vcomponent/util/search.scm @@ -25,7 +25,7 @@ ;;; Code: (define-module (vcomponent util search) - :use-module (calp util) + :use-module (hnh util) :use-module (srfi srfi-1) :use-module (srfi srfi-9) :use-module (srfi srfi-41) -- cgit v1.2.3