diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2016-04-12 12:05:11 -0500 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-29 14:37:39 +0200 |
commit | d50e6b5cd520143b833ac5f0b55173980d130c14 (patch) | |
tree | 2cce325fd66b3247a482dda187f4d12ab1d37dd1 /include/datetime | |
parent | 3cd2c8e20343ef4b4efe7a34daba72f9af23205d (diff) | |
download | ayatana-indicator-datetime-d50e6b5cd520143b833ac5f0b55173980d130c14.tar.gz ayatana-indicator-datetime-d50e6b5cd520143b833ac5f0b55173980d130c14.tar.bz2 ayatana-indicator-datetime-d50e6b5cd520143b833ac5f0b55173980d130c14.zip |
in LiveTimezones, pass the primary timezone to it on construction. We used to create it implicitly but can't do that anymore now that TimedatedTimezone takes its own ctor argument.
Diffstat (limited to 'include/datetime')
-rw-r--r-- | include/datetime/timezones-live.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index e722576..8b8b5fa 100644 --- a/include/datetime/timezones-live.h +++ b/include/datetime/timezones-live.h @@ -23,7 +23,6 @@ #include <datetime/settings.h> #include <datetime/timezones.h> #include <datetime/timezone-geoclue.h> -#include <datetime/timezone-timedated.h> #include <memory> // shared_ptr<> @@ -38,13 +37,13 @@ namespace datetime { class LiveTimezones: public Timezones { public: - LiveTimezones(const std::shared_ptr<const Settings>& settings); + LiveTimezones(const std::shared_ptr<const Settings>& settings, const std::shared_ptr<Timezone>& primary_timezone); private: void update_geolocation(); void update_timezones(); - TimedatedTimezone m_file; + std::shared_ptr<Timezone> m_primary_timezone; std::shared_ptr<const Settings> m_settings; std::shared_ptr<GeoclueTimezone> m_geo; }; |