From a3937830bf656d5a8e2f368757b947cef0c8b1de Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Tue, 1 Sep 2015 10:52:13 +0100
Subject: Rename FileTimezone to TimedatedTimezone

---
 include/datetime/timezone-file.h      | 54 -----------------------------------
 include/datetime/timezone-timedated.h | 54 +++++++++++++++++++++++++++++++++++
 include/datetime/timezones-live.h     |  6 ++--
 3 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 include/datetime/timezone-file.h
 create mode 100644 include/datetime/timezone-timedated.h

(limited to 'include/datetime')

diff --git a/include/datetime/timezone-file.h b/include/datetime/timezone-file.h
deleted file mode 100644
index 05dc7b0..0000000
--- a/include/datetime/timezone-file.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- */
-
-#ifndef INDICATOR_DATETIME_FILE_TIMEZONE_H
-#define INDICATOR_DATETIME_FILE_TIMEZONE_H
-
-#include <datetime/timezone.h> // base class
-
-#include <string> // std::string
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone
- */
-class FileTimezone: public Timezone
-{
-public:
-    FileTimezone();
-    ~FileTimezone();
-
-private:
-    class Impl;
-    friend Impl;
-    std::unique_ptr<Impl> impl;
-
-    // we have pointers in here, so disable copying
-    FileTimezone(const FileTimezone&) =delete;
-    FileTimezone& operator=(const FileTimezone&) =delete;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_FILE_TIMEZONE_H
diff --git a/include/datetime/timezone-timedated.h b/include/datetime/timezone-timedated.h
new file mode 100644
index 0000000..3df9a3e
--- /dev/null
+++ b/include/datetime/timezone-timedated.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H
+#define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H
+
+#include <datetime/timezone.h> // base class
+
+#include <string> // std::string
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone
+ */
+class TimedatedTimezone: public Timezone
+{
+public:
+    TimedatedTimezone();
+    ~TimedatedTimezone();
+
+private:
+    class Impl;
+    friend Impl;
+    std::unique_ptr<Impl> impl;
+
+    // we have pointers in here, so disable copying
+    TimedatedTimezone(const TimedatedTimezone&) =delete;
+    TimedatedTimezone& operator=(const TimedatedTimezone&) =delete;
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#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;
 };
-- 
cgit v1.2.3