Cleanup modules.

Primarly this moves all vcompenent input and output code to clearly
labeled modules, instead of being spread out. At the same time it also
removes a handfull of unused procedures.

2 files changed, 6 insertions, 5 deletions

diff --git a/module/vcomponent/instance.scm b/module/vcomponent/util/instance.scm
index 206d7f19..15c020b1 100644
--- a/module/vcomponent/instance.scm
+++ b/module/vcomponent/util/instance.scm
@@ -1,4 +1,4 @@
-(define-module (vcomponent instance)
+(define-module (vcomponent util instance)
   :use-module (calp util)
   :use-module ((calp util config) :select (get-config))
   :use-module ((oop goops) :select (make))
@@ -12,11 +12,11 @@
 ;; TODO this is loaded on compile, meaning that Guile's auto-compiler may
 ;; evaluate this to early.
 (define-once global-event-object
-  (make (@@ (vcomponent instance methods) <events>)
+  (make (@@ (vcomponent util instance methods) <events>)
     calendar-files: (get-config 'calendar-files)))
 
 (define-public (reload)
-  (let ((new-value (make (@@ (vcomponent instance methods) <events>)
+  (let ((new-value (make (@@ (vcomponent util instance methods) <events>)
                      calendar-files: (get-config 'calendar-files))))
     (display "Reload done\n" (current-error-port))
     (set! global-event-object new-value)))
diff --git a/module/vcomponent/instance/methods.scm b/module/vcomponent/util/instance/methods.scm
index 414587a9..37aef3bc 100644
--- a/module/vcomponent/instance/methods.scm
+++ b/module/vcomponent/util/instance/methods.scm
@@ -1,11 +1,12 @@
-(define-module (vcomponent instance methods)
+(define-module (vcomponent util instance methods)
   :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
   :use-module (datetime)
   :use-module (vcomponent base)
-  :use-module (vcomponent parse)
+  ;; :use-module (vcomponent parse)
+  :use-module ((vcomponent util parse-cal-path) :select (parse-cal-path))
   :use-module ((vcomponent recurrence) :select (generate-recurrence-set repeating?))
   :use-module ((vcomponent datetime) :select (ev-time<?))
   :use-module (oop goops)