diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2015-10-05 13:06:35 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2015-10-05 13:06:35 -0500 |
commit | 55ec6e57ee6ec5930b2ec74ececde52ead16f935 (patch) | |
tree | 7c23970516b3faeb0d70ecaa95888d5dfd959aa0 /include/datetime/timezones-live.h | |
parent | 645e1ade17334468583a0227cf685940ce6043aa (diff) | |
parent | 3f3445ae0c7c47f3351bccbb4e653c875da89f85 (diff) | |
download | ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.tar.gz ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.tar.bz2 ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.zip |
sync with trunk
Diffstat (limited to 'include/datetime/timezones-live.h')
-rw-r--r-- | include/datetime/timezones-live.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index ca4ef31..b9d78a5 100644 --- a/include/datetime/timezones-live.h +++ b/include/datetime/timezones-live.h @@ -22,8 +22,8 @@ #include <datetime/settings.h> #include <datetime/timezones.h> -#include <datetime/timezone-file.h> #include <datetime/timezone-geoclue.h> +#include <datetime/timezone-timedated.h> #include <memory> // shared_ptr<> @@ -32,19 +32,19 @@ namespace indicator { namespace datetime { /** - * \brief #Timezones object that uses a #FileTimezone and #GeoclueTimezone + * \brief #Timezones object that uses a #TimedatedTimezone and #GeoclueTimezone * to detect what timezone we're in */ class LiveTimezones: public Timezones { public: - LiveTimezones(const std::shared_ptr<const Settings>& settings, const std::string& filename); + LiveTimezones(const std::shared_ptr<const Settings>& settings); private: void update_geolocation(); void update_timezones(); - FileTimezone m_file; + TimedatedTimezone m_file; std::shared_ptr<const Settings> m_settings; std::shared_ptr<GeoclueTimezone> m_geo; }; |