aboutsummaryrefslogtreecommitdiff
path: root/include/datetime
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-04-12 12:05:11 -0500
committerRobert Tari <robert@tari.in>2021-07-06 00:42:27 +0200
commit6c96dc57eff3f64155c913e1b011da5f5a6887fb (patch)
treea02b50a80464dbeef5fcb9055b7936e1d5f44640 /include/datetime
parentad95b394c94c9ba958d54c5243f376e7854683b8 (diff)
downloadayatana-indicator-datetime-6c96dc57eff3f64155c913e1b011da5f5a6887fb.tar.gz
ayatana-indicator-datetime-6c96dc57eff3f64155c913e1b011da5f5a6887fb.tar.bz2
ayatana-indicator-datetime-6c96dc57eff3f64155c913e1b011da5f5a6887fb.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.h5
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;
};