From 3f4d409f21bbb1f79f149a5ee66dcddaa505ddb1 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sun, 9 Mar 2014 21:08:47 -0500
Subject: decouple the planner's states; need three separate sets: upcoming-now
 (for alarms in the current time), upcoming-calendar (to show events coming
 from the selected calendar date), and calendar-month (all the appointments in
 the month displayed in the menu).

---
 include/datetime/clock-watcher.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'include/datetime/clock-watcher.h')

diff --git a/include/datetime/clock-watcher.h b/include/datetime/clock-watcher.h
index e93b468..90bbb63 100644
--- a/include/datetime/clock-watcher.h
+++ b/include/datetime/clock-watcher.h
@@ -20,8 +20,9 @@
 #ifndef INDICATOR_DATETIME_CLOCK_WATCHER_H
 #define INDICATOR_DATETIME_CLOCK_WATCHER_H
 
-#include <datetime/state.h>
 #include <datetime/appointment.h>
+#include <datetime/clock.h>
+#include <datetime/planner-upcoming.h>
 
 #include <core/signal.h>
 
@@ -53,14 +54,16 @@ public:
 class ClockWatcherImpl: public ClockWatcher
 {
 public:
-    ClockWatcherImpl(const std::shared_ptr<const State>& state);
+    ClockWatcherImpl(const std::shared_ptr<Clock>& clock,
+                     const std::shared_ptr<UpcomingPlanner>& upcoming_planner);
     ~ClockWatcherImpl() =default;
     core::Signal<const Appointment&>& alarm_reached();
 
 private:
     void pulse();
     std::set<std::string> m_triggered;
-    std::shared_ptr<const State> m_state;
+    const std::shared_ptr<Clock> m_clock;
+    const std::shared_ptr<UpcomingPlanner> m_upcoming_planner;
     core::Signal<const Appointment&> m_alarm_reached;
 };
 
-- 
cgit v1.2.3