From d3afa54144748685d12c159407194e03538e98de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 24 Aug 2020 20:34:11 +0200 Subject: Move util modules into calp module.. --- module/vcomponent/base.scm | 2 +- module/vcomponent/build.scm | 2 +- module/vcomponent/control.scm | 2 +- module/vcomponent/datetime.scm | 2 +- module/vcomponent/datetime/output.scm | 6 +++--- module/vcomponent/describe.scm | 2 +- module/vcomponent/duration.scm | 4 ++-- module/vcomponent/geo.scm | 2 +- module/vcomponent/ical/output.scm | 4 ++-- module/vcomponent/ical/parse.scm | 4 ++-- module/vcomponent/ical/types.scm | 4 ++-- module/vcomponent/instance.scm | 4 ++-- module/vcomponent/instance/methods.scm | 2 +- module/vcomponent/parse.scm | 4 ++-- module/vcomponent/parse/types.scm | 4 ++-- 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/search.scm | 2 +- module/vcomponent/vdir/parse.scm | 4 ++-- module/vcomponent/vdir/save-delete.scm | 6 +++--- module/vcomponent/xcal/output.scm | 4 ++-- module/vcomponent/xcal/parse.scm | 4 ++-- module/vcomponent/xcal/types.scm | 2 +- 25 files changed, 41 insertions(+), 41 deletions(-) (limited to 'module/vcomponent') diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm index 47815a0e..ae10fe01 100644 --- a/module/vcomponent/base.scm +++ b/module/vcomponent/base.scm @@ -1,5 +1,5 @@ (define-module (vcomponent base) - :use-module (util) + :use-module (calp util) :use-module (srfi srfi-1) :use-module (srfi srfi-9) :use-module (srfi srfi-9 gnu) diff --git a/module/vcomponent/build.scm b/module/vcomponent/build.scm index a4512819..d49844cc 100644 --- a/module/vcomponent/build.scm +++ b/module/vcomponent/build.scm @@ -9,7 +9,7 @@ ;;; Code: (define-module (vcomponent build) - :use-module (util) + :use-module (calp util) :use-module (vcomponent base) :use-module (srfi srfi-26) :use-module ((srfi srfi-88) :select (keyword->string))) diff --git a/module/vcomponent/control.scm b/module/vcomponent/control.scm index 6003c7ca..add48c28 100644 --- a/module/vcomponent/control.scm +++ b/module/vcomponent/control.scm @@ -1,5 +1,5 @@ (define-module (vcomponent control) - #:use-module (util) + #:use-module (calp util) #:use-module (vcomponent) #:export (with-replaced-properties)) diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm index faeae70a..887ae48b 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 (util) + #:use-module (calp util) :use-module (ice-9 curried-definitions) diff --git a/module/vcomponent/datetime/output.scm b/module/vcomponent/datetime/output.scm index c76f010f..1b377a7c 100644 --- a/module/vcomponent/datetime/output.scm +++ b/module/vcomponent/datetime/output.scm @@ -1,7 +1,7 @@ (define-module (vcomponent datetime output) - :use-module (util) - :use-module (util config) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util config) + :use-module (calp util exceptions) :use-module (datetime) :use-module (vcomponent base) :use-module (text util) diff --git a/module/vcomponent/describe.scm b/module/vcomponent/describe.scm index a579c245..063efa9c 100644 --- a/module/vcomponent/describe.scm +++ b/module/vcomponent/describe.scm @@ -1,5 +1,5 @@ (define-module (vcomponent describe) - :use-module (util) + :use-module (calp util) :use-module (vcomponent base) :use-module (text util)) diff --git a/module/vcomponent/duration.scm b/module/vcomponent/duration.scm index f8ef1d70..7591a880 100644 --- a/module/vcomponent/duration.scm +++ b/module/vcomponent/duration.scm @@ -1,6 +1,6 @@ (define-module (vcomponent duration) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (datetime) :use-module (ice-9 peg) :use-module (ice-9 match) diff --git a/module/vcomponent/geo.scm b/module/vcomponent/geo.scm index 2a343ed9..ac370a6c 100644 --- a/module/vcomponent/geo.scm +++ b/module/vcomponent/geo.scm @@ -1,5 +1,5 @@ (define-module (vcomponent geo) - :use-module (util) + :use-module (calp util) :use-module (srfi srfi-9 gnu)) (define-immutable-record-type diff --git a/module/vcomponent/ical/output.scm b/module/vcomponent/ical/output.scm index 75e579b8..a0816679 100644 --- a/module/vcomponent/ical/output.scm +++ b/module/vcomponent/ical/output.scm @@ -1,8 +1,8 @@ (define-module (vcomponent ical output) :use-module (ice-9 format) :use-module (ice-9 match) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (vcomponent) :use-module (vcomponent datetime) :use-module (srfi srfi-1) diff --git a/module/vcomponent/ical/parse.scm b/module/vcomponent/ical/parse.scm index 96c18952..9c555bca 100644 --- a/module/vcomponent/ical/parse.scm +++ b/module/vcomponent/ical/parse.scm @@ -1,6 +1,6 @@ (define-module (vcomponent ical parse) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module ((ice-9 rdelim) :select (read-line)) :use-module (vcomponent base) :use-module (datetime) diff --git a/module/vcomponent/ical/types.scm b/module/vcomponent/ical/types.scm index b46bb236..1ec9d0bd 100644 --- a/module/vcomponent/ical/types.scm +++ b/module/vcomponent/ical/types.scm @@ -1,7 +1,7 @@ ;; see (vcomponent parse types) (define-module (vcomponent ical types) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (base64) :use-module (datetime)) diff --git a/module/vcomponent/instance.scm b/module/vcomponent/instance.scm index 88858709..206d7f19 100644 --- a/module/vcomponent/instance.scm +++ b/module/vcomponent/instance.scm @@ -1,6 +1,6 @@ (define-module (vcomponent instance) - :use-module (util) - :use-module ((util config) :select (get-config)) + :use-module (calp util) + :use-module ((calp util config) :select (get-config)) :use-module ((oop goops) :select (make)) :export (global-event-object) ) diff --git a/module/vcomponent/instance/methods.scm b/module/vcomponent/instance/methods.scm index ea3522f9..7a193b8a 100644 --- a/module/vcomponent/instance/methods.scm +++ b/module/vcomponent/instance/methods.scm @@ -1,5 +1,5 @@ (define-module (vcomponent instance methods) - :use-module (util) + :use-module (calp util) :use-module (srfi srfi-1) :use-module (srfi srfi-41) :use-module (srfi srfi-41 util) diff --git a/module/vcomponent/parse.scm b/module/vcomponent/parse.scm index 290a8d3e..9790d1eb 100644 --- a/module/vcomponent/parse.scm +++ b/module/vcomponent/parse.scm @@ -1,8 +1,8 @@ (define-module (vcomponent parse) - :use-module (util) + :use-module (calp util) :use-module (vcomponent base) :use-module ((vcomponent vdir parse) :select (parse-vdir)) - :use-module ((util time) :select (report-time!)) + :use-module ((calp util time) :select (report-time!)) :use-module (vcomponent ical parse) :re-export (parse-calendar) diff --git a/module/vcomponent/parse/types.scm b/module/vcomponent/parse/types.scm index c12da750..ba4b2b47 100644 --- a/module/vcomponent/parse/types.scm +++ b/module/vcomponent/parse/types.scm @@ -1,6 +1,6 @@ (define-module (vcomponent parse types) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (base64) :use-module (datetime) :use-module (srfi srfi-9 gnu) diff --git a/module/vcomponent/recurrence/display.scm b/module/vcomponent/recurrence/display.scm index 1df95d0b..f9c6f1c4 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 (util) + :use-module (calp util) :use-module (vcomponent recurrence internal) :use-module (text util) :use-module (text numbers) diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index 2d9d3960..c272e907 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -1,6 +1,6 @@ (define-module (vcomponent recurrence generate) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp 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 502f588f..0c119bb6 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 (util) + #:use-module (calp 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 9019ae7e..b48e88e5 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 (util) - #:use-module (util exceptions) + #:use-module (calp util) + #:use-module (calp util exceptions) #:use-module (ice-9 match)) diff --git a/module/vcomponent/search.scm b/module/vcomponent/search.scm index 15ff0720..7d039a24 100644 --- a/module/vcomponent/search.scm +++ b/module/vcomponent/search.scm @@ -25,7 +25,7 @@ ;;; Code: (define-module (vcomponent search) - :use-module (util) + :use-module (calp util) :use-module (srfi srfi-1) :use-module (srfi srfi-9) :use-module (srfi srfi-41) diff --git a/module/vcomponent/vdir/parse.scm b/module/vcomponent/vdir/parse.scm index e2fc37a1..d251e60a 100644 --- a/module/vcomponent/vdir/parse.scm +++ b/module/vcomponent/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 (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (vcomponent base) :use-module (vcomponent ical parse) diff --git a/module/vcomponent/vdir/save-delete.scm b/module/vcomponent/vdir/save-delete.scm index 2cbe96bf..d17b595e 100644 --- a/module/vcomponent/vdir/save-delete.scm +++ b/module/vcomponent/vdir/save-delete.scm @@ -10,11 +10,11 @@ ;;; Code: (define-module (vcomponent vdir save-delete) - :use-module (util) - :use-module ((util exceptions) :select (assert)) + :use-module (calp util) + :use-module ((calp util exceptions) :select (assert)) :use-module (vcomponent ical output) :use-module (vcomponent) - :use-module ((util io) :select (with-atomic-output-to-file)) + :use-module ((calp util io) :select (with-atomic-output-to-file)) ) diff --git a/module/vcomponent/xcal/output.scm b/module/vcomponent/xcal/output.scm index ec162ec0..692b3ec2 100644 --- a/module/vcomponent/xcal/output.scm +++ b/module/vcomponent/xcal/output.scm @@ -1,6 +1,6 @@ (define-module (vcomponent xcal output) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (vcomponent) :use-module (vcomponent geo) :use-module (vcomponent xcal types) diff --git a/module/vcomponent/xcal/parse.scm b/module/vcomponent/xcal/parse.scm index a4b51b5b..26f25caa 100644 --- a/module/vcomponent/xcal/parse.scm +++ b/module/vcomponent/xcal/parse.scm @@ -1,6 +1,6 @@ (define-module (vcomponent xcal parse) - :use-module (util) - :use-module (util exceptions) + :use-module (calp util) + :use-module (calp util exceptions) :use-module (base64) :use-module (ice-9 match) :use-module (sxml match) diff --git a/module/vcomponent/xcal/types.scm b/module/vcomponent/xcal/types.scm index 30916a35..468400f4 100644 --- a/module/vcomponent/xcal/types.scm +++ b/module/vcomponent/xcal/types.scm @@ -1,5 +1,5 @@ (define-module (vcomponent xcal types) - :use-module (util) + :use-module (calp util) :use-module (vcomponent ical types) :use-module (datetime) ) -- cgit v1.2.3