diff options
-rw-r--r-- | include/datetime/clock.h | 9 | ||||
-rw-r--r-- | include/datetime/timezones.h | 7 | ||||
-rw-r--r-- | src/clock-live.cpp | 1 | ||||
-rw-r--r-- | src/clock.cpp | 5 |
4 files changed, 11 insertions, 11 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: diff --git a/src/clock-live.cpp b/src/clock-live.cpp index 1fadfe8..25623ae 100644 --- a/src/clock-live.cpp +++ b/src/clock-live.cpp @@ -18,6 +18,7 @@ */ #include <datetime/clock.h> +#include <datetime/timezones.h> namespace unity { namespace indicator { diff --git a/src/clock.cpp b/src/clock.cpp index f3f5d70..7c3b8c7 100644 --- a/src/clock.cpp +++ b/src/clock.cpp @@ -34,11 +34,6 @@ Clock::Clock(): m_cancellable(g_cancellable_new()) { g_bus_get(G_BUS_TYPE_SYSTEM, m_cancellable, onSystemBusReady, this); - - timezones.changed().connect([this](const std::set<std::string>& timezones){ - g_message ("timezones changed... new count is %d", (int)timezones.size()); - skewDetected(); - }); } Clock::~Clock() |