diff options
author | Iain Lane <iain.lane@canonical.com> | 2015-09-01 10:52:13 +0100 |
---|---|---|
committer | Iain Lane <iain.lane@canonical.com> | 2015-09-01 10:52:13 +0100 |
commit | a3937830bf656d5a8e2f368757b947cef0c8b1de (patch) | |
tree | 7a965b3f4a2cf3c1ba3fd4c701cfb75e8ed397e8 /include | |
parent | f016debfbaac39f509f5947b098c141a03a3b65f (diff) | |
download | ayatana-indicator-datetime-a3937830bf656d5a8e2f368757b947cef0c8b1de.tar.gz ayatana-indicator-datetime-a3937830bf656d5a8e2f368757b947cef0c8b1de.tar.bz2 ayatana-indicator-datetime-a3937830bf656d5a8e2f368757b947cef0c8b1de.zip |
Rename FileTimezone to TimedatedTimezone
Diffstat (limited to 'include')
-rw-r--r-- | include/datetime/timezone-timedated.h (renamed from include/datetime/timezone-file.h) | 16 | ||||
-rw-r--r-- | include/datetime/timezones-live.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/datetime/timezone-file.h b/include/datetime/timezone-timedated.h index 05dc7b0..3df9a3e 100644 --- a/include/datetime/timezone-file.h +++ b/include/datetime/timezone-timedated.h @@ -17,8 +17,8 @@ * Charles Kerr <charles.kerr@canonical.com> */ -#ifndef INDICATOR_DATETIME_FILE_TIMEZONE_H -#define INDICATOR_DATETIME_FILE_TIMEZONE_H +#ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H +#define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H #include <datetime/timezone.h> // base class @@ -31,11 +31,11 @@ namespace datetime { /** * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone */ -class FileTimezone: public Timezone +class TimedatedTimezone: public Timezone { public: - FileTimezone(); - ~FileTimezone(); + TimedatedTimezone(); + ~TimedatedTimezone(); private: class Impl; @@ -43,12 +43,12 @@ private: std::unique_ptr<Impl> impl; // we have pointers in here, so disable copying - FileTimezone(const FileTimezone&) =delete; - FileTimezone& operator=(const FileTimezone&) =delete; + TimedatedTimezone(const TimedatedTimezone&) =delete; + TimedatedTimezone& operator=(const TimedatedTimezone&) =delete; }; } // namespace datetime } // namespace indicator } // namespace unity -#endif // INDICATOR_DATETIME_FILE_TIMEZONE_H +#endif // INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index 49d9120..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,7 +32,7 @@ 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 @@ -44,7 +44,7 @@ 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; }; |