From a2b5c79157fa8db36d94786de1b86b756308912d Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 16 Jan 2014 16:45:40 -0600
Subject: Plug the Settings object into the State container s.t. menus and
 actions can update themselves when the user's settings change.

---
 include/datetime/state.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/datetime/state.h b/include/datetime/state.h
index a82bb4b..e735b6f 100644
--- a/include/datetime/state.h
+++ b/include/datetime/state.h
@@ -21,9 +21,10 @@
 #define INDICATOR_DATETIME_STATE_H
 
 #include <datetime/clock.h>
-#include <datetime/timezones.h>
-#include <datetime/planner.h>
 #include <datetime/locations.h>
+#include <datetime/planner.h>
+#include <datetime/settings.h>
+#include <datetime/timezones.h>
    
 #include <core/property.h>
 
@@ -47,18 +48,17 @@ namespace datetime {
  * @see Clock
  * @see Planner
  * @see Locations
+ * @see Settings
  */
 struct State
 {
-    std::shared_ptr<Timezones> timezones;
     std::shared_ptr<Clock> clock;
-    std::shared_ptr<Planner> planner;
     std::shared_ptr<Locations> locations;
+    std::shared_ptr<Planner> planner;
+    std::shared_ptr<Settings> settings;
+    std::shared_ptr<Timezones> timezones;
 
-    core::Property<bool> show_events;
-    core::Property<bool> show_clock;
     core::Property<DateTime> calendar_day;
-    core::Property<bool> show_week_numbers;
 };
 
 } // namespace datetime
-- 
cgit v1.2.3