From 06f77b50a90f5c1c2a8428962b31bccc54ac29af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sat, 23 May 2020 21:52:28 +0200
Subject: Remove (vcomponent load) module.

---
 module/entry-points/ical.scm |  1 -
 module/vcomponent.scm        | 11 ++++++++---
 module/vcomponent/load.scm   | 11 -----------
 3 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 module/vcomponent/load.scm

(limited to 'module')

diff --git a/module/entry-points/ical.scm b/module/entry-points/ical.scm
index 32db38e0..0583be49 100644
--- a/module/entry-points/ical.scm
+++ b/module/entry-points/ical.scm
@@ -3,7 +3,6 @@
   :use-module (util)
   :use-module (util options)
   :use-module (output ical)
-  :use-module ((vcomponent) :select (load-calendars*))
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   :use-module (datetime util)
diff --git a/module/vcomponent.scm b/module/vcomponent.scm
index ab850963..e4a0141a 100644
--- a/module/vcomponent.scm
+++ b/module/vcomponent.scm
@@ -1,6 +1,7 @@
 (define-module (vcomponent)
   :use-module (util)
   :use-module (util app)
+  :use-module (util config)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
@@ -8,15 +9,19 @@
   :use-module (datetime util)
   :use-module (vcomponent base)
   :use-module (vcomponent parse)
-  :use-module (vcomponent load)
   :use-module ((vcomponent recurrence) :select (generate-recurrence-set repeating?))
   :use-module ((vcomponent datetime) :select (ev-time<?))
   :re-export (make-vcomponent
-              parse-cal-path parse-calendar
-              load-calendars load-calendars*))
+              parse-cal-path parse-calendar))
 
 (re-export-modules (vcomponent base))
 
+(define-config calendar-files '() ""
+  pre: list?)
+
+(define-public (load-calendars calendar-files)
+  (map parse-cal-path calendar-files))
+
 
 (define-method (init-app calendar-files)
   (setf 'calendars (load-calendars calendar-files))
diff --git a/module/vcomponent/load.scm b/module/vcomponent/load.scm
deleted file mode 100644
index f90d7d46..00000000
--- a/module/vcomponent/load.scm
+++ /dev/null
@@ -1,11 +0,0 @@
-(define-module (vcomponent load)
-  :export (load-calendars load-calendars*)
-  :use-module (util)
-  :use-module (util config)
-  :use-module ((vcomponent parse) :select (parse-cal-path)))
-
-(define-config calendar-files '() ""
-  pre: list?)
-
-(define* (load-calendars calendar-files)
-  (map parse-cal-path calendar-files))
-- 
cgit v1.2.3