From 15a383a7b027d281dcdaa85a43eb3563031366bf Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 2 Sep 2014 10:35:27 -0500
Subject: add SnoozePlanner, AggregatePlanner

---
 include/datetime/planner-aggregate.h | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 include/datetime/planner-aggregate.h

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

diff --git a/include/datetime/planner-aggregate.h b/include/datetime/planner-aggregate.h
new file mode 100644
index 0000000..eeca9b7
--- /dev/null
+++ b/include/datetime/planner-aggregate.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_PLANNER_AGGREGATE_H
+#define INDICATOR_DATETIME_PLANNER_AGGREGATE_H
+
+#include <datetime/planner.h>
+
+#include <memory>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * \brief Aggregates one or more Planners
+ */
+class AggregatePlanner: public Planner
+{
+public:
+    AggregatePlanner();
+    virtual ~AggregatePlanner();
+    void add(const std::shared_ptr<Planner>&);
+
+    core::Property<std::vector<Appointment>>& appointments();
+
+protected:
+    class Impl;
+    std::unique_ptr<Impl> impl;
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_PLANNER_AGGREGATE_H
-- 
cgit v1.2.3


From a209741aaf8d0ece778e1e2b9e5a8d1632339ad2 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 2 Sep 2014 23:37:02 -0500
Subject: use the 'override' keyword in the new planner class declarations

---
 include/datetime/planner-aggregate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/include/datetime/planner-aggregate.h b/include/datetime/planner-aggregate.h
index eeca9b7..892e71a 100644
--- a/include/datetime/planner-aggregate.h
+++ b/include/datetime/planner-aggregate.h
@@ -38,7 +38,7 @@ public:
     virtual ~AggregatePlanner();
     void add(const std::shared_ptr<Planner>&);
 
-    core::Property<std::vector<Appointment>>& appointments();
+    core::Property<std::vector<Appointment>>& appointments() override;
 
 protected:
     class Impl;
-- 
cgit v1.2.3