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/planner.h | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'include/datetime/planner.h')

diff --git a/include/datetime/planner.h b/include/datetime/planner.h
index 376a31f..e6ef927 100644
--- a/include/datetime/planner.h
+++ b/include/datetime/planner.h
@@ -32,41 +32,16 @@ namespace indicator {
 namespace datetime {
 
 /**
- * \brief Simple appointment book
- *
- * @see EdsPlanner
- * @see State
+ * \brief Simple collection of appointments
  */
 class Planner
 {
 public:
     virtual ~Planner() =default;
-
-    /**
-     * \brief Timestamp used to determine the appointments in the `upcoming' and `this_month' properties.
-     * Setting this value will cause the planner to re-query its backend and
-     * update the `upcoming' and `this_month' properties.
-     */
-    core::Property<DateTime> time;
-
-    /**
-     * \brief The next few appointments that follow the time specified in the time property.
-     */
-    core::Property<std::vector<Appointment>> upcoming;
-
-    /**
-     * \brief The appointments that occur in the same month as the time property
-     */
-    core::Property<std::vector<Appointment>> this_month;
+    virtual core::Property<std::vector<Appointment>>& appointments() =0;
 
 protected:
     Planner() =default;
-
-private:
-
-    // disable copying
-    Planner(const Planner&) =delete;
-    Planner& operator=(const Planner&) =delete;
 };
 
 } // namespace datetime
-- 
cgit v1.2.3