move DateTime's impl from the header to a cc file

3 files changed, 180 insertions, 102 deletions

diff --git a/include/datetime/date-time.h b/include/datetime/date-time.h
index 33f8b40..145e34e 100644
--- a/include/datetime/date-time.h
+++ b/include/datetime/date-time.h
@@ -35,107 +35,26 @@ namespace datetime {
 class DateTime
 {
 public:
-
-    explicit DateTime(GDateTime* in=nullptr) { reset(in); }
-
-    explicit DateTime(time_t t) {
-        GDateTime * gdt = g_date_time_new_from_unix_local(t);
-        reset(gdt);
-        g_date_time_unref(gdt);
-    }
-
-    static DateTime NowLocal() {
-        GDateTime * gdt = g_date_time_new_now_local();
-        DateTime dt(gdt);
-        g_date_time_unref(gdt);
-        return dt;
-    }
-
-    DateTime to_timezone(const std::string& zone) const {
-        auto gtz = g_time_zone_new(zone.c_str());
-        auto gdt = g_date_time_to_timezone(get(), gtz);
-        DateTime dt(gdt);
-        g_time_zone_unref(gtz);
-        g_date_time_unref(gdt);
-        return dt;
-    }
-
-
-    GDateTime* get() const {
-        g_assert(m_dt);
-        return m_dt.get();
-    }
-
-    GDateTime* operator()() const {
-        return get();
-    }
-
-
-    std::string format(const std::string& fmt) const {
-        auto str = g_date_time_format(get(), fmt.c_str());
-        std::string ret = str;
-        g_free(str);
-        return ret;
-    }
-
-    int day_of_month() const { return g_date_time_get_day_of_month(get()); }
-
-    int64_t to_unix() const { return g_date_time_to_unix(get()); }
-
-    int day_of_year() const { return m_dt ? g_date_time_get_day_of_year(get()) : -1; }
-
-    void reset(GDateTime* in=nullptr) {
-        if (in) {
-            auto deleter = [](GDateTime* dt){g_date_time_unref(dt);};
-            m_dt = std::shared_ptr<GDateTime>(g_date_time_ref(in), deleter);
-            g_assert(m_dt);
-        } else {
-            m_dt.reset();
-        }
-    }
-
-    DateTime& operator=(GDateTime* in) {
-        reset(in);
-        return *this;
-    }
-
-    DateTime& operator=(const DateTime& in) {
-        m_dt = in.m_dt;
-        return *this;
-    }
-
-    gint64 difference(const DateTime& that) const {
-         const auto dt = get();
-         const auto tdt = that.get();
-
-         gint64 ret;
-         if (dt && tdt)
-             ret = g_date_time_difference(dt, tdt);
-         else if (dt)
-             ret = to_unix();
-         else if (tdt)
-             ret = that.to_unix();
-         else
-             ret = 0;
-         return ret;
-    }
-
-    bool operator<(const DateTime& that) const {
-        return g_date_time_compare(get(), that.get()) < 0;
-    }
-
-    bool operator!=(const DateTime& that) const {
-        // return true if this isn't set, or if it's not equal
-        return (!m_dt) || !(*this == that);
-    }
-
-    bool operator==(const DateTime& that) const {
-         GDateTime * dt = get();
-         GDateTime * tdt = that.get();
-         if (!dt && !tdt) return true;
-         if (!dt || !tdt) return false;
-        return g_date_time_compare(get(), that.get()) == 0;
-    }
+    static DateTime NowLocal();
+    explicit DateTime(time_t t);
+    explicit DateTime(GDateTime* in=nullptr) {reset(in);}
+    DateTime& operator=(GDateTime* in) {reset(in); return *this;}
+    DateTime& operator=(const DateTime& in) {m_dt=in.m_dt; return *this; }
+    DateTime to_timezone(const std::string& zone) const;
+    void reset(GDateTime* in=nullptr);
+
+    GDateTime* get() const;
+    GDateTime* operator()() const {return get();}
+
+    std::string format(const std::string& fmt) const;
+    int day_of_month() const;
+    int64_t to_unix() const;
+    int day_of_year() const;
+    gint64 difference(const DateTime& that) const;
+
+    bool operator<(const DateTime& that) const;
+    bool operator!=(const DateTime& that) const;
+    bool operator==(const DateTime& that) const;
 
 private:
     std::shared_ptr<GDateTime> m_dt;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 976adc3..a90fcbf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,14 +16,16 @@ add_library (${SERVICE_LIB} STATIC
              actions-live.cpp
              clock.cpp
              clock-live.cpp
+             date-time.cpp
+             exporter.cpp
              formatter.cpp
              formatter-desktop.cpp
              locations.cpp
              locations-settings.cpp
              menu.cpp
              planner-eds.cpp
-             service.cpp
              settings-live.cpp
+             state-live.cpp
              timezone-file.cpp
              timezone-geoclue.cpp
              timezones-live.cpp
diff --git a/src/date-time.cpp b/src/date-time.cpp
new file mode 100644
index 0000000..3842ac0
--- /dev/null
+++ b/src/date-time.cpp
@@ -0,0 +1,157 @@
+/*
+ * 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>
+ */
+
+#include <datetime/date-time.h>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/***
+****
+***/
+
+DateTime::DateTime(time_t t)
+{
+    GDateTime * gdt = g_date_time_new_from_unix_local(t);
+    reset(gdt);
+    g_date_time_unref(gdt);
+}
+
+DateTime DateTime::NowLocal()
+{
+    GDateTime * gdt = g_date_time_new_now_local();
+    DateTime dt(gdt);
+    g_date_time_unref(gdt);
+    return dt;
+}
+
+DateTime DateTime::to_timezone(const std::string& zone) const
+{
+    auto gtz = g_time_zone_new(zone.c_str());
+    auto gdt = g_date_time_to_timezone(get(), gtz);
+    DateTime dt(gdt);
+    g_time_zone_unref(gtz);
+    g_date_time_unref(gdt);
+    return dt;
+}
+
+GDateTime* DateTime::get() const
+{
+    g_assert(m_dt);
+    return m_dt.get();
+}
+
+std::string DateTime::format(const std::string& fmt) const
+{
+    const auto str = g_date_time_format(get(), fmt.c_str());
+    std::string ret = str;
+    g_free(str);
+    return ret;
+}
+
+int DateTime::day_of_month() const
+{
+    return g_date_time_get_day_of_month(get());
+}
+
+int64_t DateTime::to_unix() const
+{
+    return g_date_time_to_unix(get());
+}
+
+int DateTime::day_of_year() const
+{
+    return m_dt ? g_date_time_get_day_of_year(get()) : -1;
+}
+
+void DateTime::reset(GDateTime* in)
+{
+    if (in)
+    {
+        auto deleter = [](GDateTime* dt){g_date_time_unref(dt);};
+        m_dt = std::shared_ptr<GDateTime>(g_date_time_ref(in), deleter);
+        g_assert(m_dt);
+    }
+    else
+    {
+        m_dt.reset();
+    }
+}
+
+#if 0
+DateTime& DateTime::operator=(GDateTime* in)
+{
+    reset(in);
+    return *this;
+}
+
+DateTime& DateTime::operator=(const DateTime& in)
+{
+    m_dt = in.m_dt;
+    return *this;
+}
+#endif
+
+gint64 DateTime::difference(const DateTime& that) const
+{
+    const auto dt = get();
+    const auto tdt = that.get();
+
+    gint64 ret;
+
+    if (dt && tdt)
+        ret = g_date_time_difference(dt, tdt);
+    else if (dt)
+        ret = to_unix();
+    else if (tdt)
+        ret = that.to_unix();
+    else
+        ret = 0;
+
+    return ret;
+}
+
+bool DateTime::operator<(const DateTime& that) const
+{
+    return g_date_time_compare(get(), that.get()) < 0;
+}
+
+bool DateTime::operator!=(const DateTime& that) const
+{
+    // return true if this isn't set, or if it's not equal
+    return (!m_dt) || !(*this == that);
+}
+
+bool DateTime::operator==(const DateTime& that) const
+{
+    GDateTime * dt = get();
+    GDateTime * tdt = that.get();
+    if (!dt && !tdt) return true;
+    if (!dt || !tdt) return false;
+    return g_date_time_compare(get(), that.get()) == 0;
+}
+
+/***
+****
+***/
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity