aboutsummaryrefslogtreecommitdiff
path: root/include/datetime
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-22 11:29:10 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-22 11:29:10 -0600
commit9ea8a269f3c984901e721e8bb0c796942bffb082 (patch)
tree3ec2a86283275b4e35071ea44d16d55907736980 /include/datetime
parent08b1cfd6bc97cae18b916d97a03781986e7421fe (diff)
downloadayatana-indicator-datetime-9ea8a269f3c984901e721e8bb0c796942bffb082.tar.gz
ayatana-indicator-datetime-9ea8a269f3c984901e721e8bb0c796942bffb082.tar.bz2
ayatana-indicator-datetime-9ea8a269f3c984901e721e8bb0c796942bffb082.zip
Remove the Timezones property from Clock; it's only needed by the subclass LiveClock
Diffstat (limited to 'include/datetime')
-rw-r--r--include/datetime/clock.h9
-rw-r--r--include/datetime/timezones.h7
2 files changed, 10 insertions, 6 deletions
diff --git a/include/datetime/clock.h b/include/datetime/clock.h
index ffaf4f8..9e87082 100644
--- a/include/datetime/clock.h
+++ b/include/datetime/clock.h
@@ -21,15 +21,13 @@
#define INDICATOR_DATETIME_CLOCK_H
#include <datetime/date-time.h>
-#include <datetime/timezones.h>
#include <core/property.h>
#include <core/signal.h>
-#include <gio/gio.h>
+#include <gio/gio.h> // GDBusConnection
-#include <set>
-#include <string>
+#include <memory> // std::shared_ptr, std::unique_ptr
namespace unity {
namespace indicator {
@@ -46,7 +44,6 @@ class Clock
public:
virtual ~Clock();
virtual DateTime localtime() const =0;
- core::Property<std::set<std::string>> timezones;
core::Signal<> skewDetected;
core::Signal<> dateChanged;
@@ -70,6 +67,8 @@ private:
****
***/
+class Timezones;
+
/**
* \brief A live clock that provides the actual system time.
*
diff --git a/include/datetime/timezones.h b/include/datetime/timezones.h
index 10c4e97..d2842af 100644
--- a/include/datetime/timezones.h
+++ b/include/datetime/timezones.h
@@ -28,7 +28,12 @@ namespace unity {
namespace indicator {
namespace datetime {
-/** \brief Aggregates one or more timezone detectors and decides which to give precedence to */
+/**
+ * \brief Helper class which aggregates one or more timezones
+ *
+ * @see LiveClock
+ * @see SettingsLocations
+ */
class Timezones
{
public: