From ee64bb2698adfe27e55615a8856b0e2c78ad8469 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 14 Jan 2014 23:07:10 -0600
Subject: Function: add fully-tested ActionGroups, per-profile Menus, state
 object. Form: Add code annotations/comments. Remove dead code. Use Mir style
 guide. Todo: GSettings toggles, sync with new dbus-test-runner API, get GNOME
 Panel building again

---
 src/timezones-live.cpp | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'src/timezones-live.cpp')

diff --git a/src/timezones-live.cpp b/src/timezones-live.cpp
index cb5e2bc..dc14021 100644
--- a/src/timezones-live.cpp
+++ b/src/timezones-live.cpp
@@ -24,37 +24,35 @@ namespace unity {
 namespace indicator {
 namespace datetime {
 
-LiveTimezones::LiveTimezones (const std::string& filename):
-    file_ (filename)
+LiveTimezones::LiveTimezones(const std::string& filename):
+    m_file(filename)
 {
-    file_.timezone.changed().connect([this](const std::string&){updateTimezones();});
+    m_file.timezone.changed().connect([this](const std::string&){update_timezones();});
 
-    geolocationEnabled.changed().connect([this](bool){updateGeolocation();});
-    updateGeolocation();
+    geolocation_enabled.changed().connect([this](bool){update_geolocation();});
+    update_geolocation();
 
-    updateTimezones();
+    update_timezones();
 }
 
-void
-LiveTimezones::updateGeolocation()
+void LiveTimezones::update_geolocation()
 {
-    geo_.reset();
+    m_geo.reset();
 
-    if (geolocationEnabled.get())
+    if(geolocation_enabled.get())
     {
-        GeoclueTimezone * geo = new GeoclueTimezone();
-        geo->timezone.changed().connect([this](const std::string&){updateTimezones();});
-        geo_.reset(geo);
+        auto geo = new GeoclueTimezone();
+        geo->timezone.changed().connect([this](const std::string&){update_timezones();});
+        m_geo.reset(geo);
     }
 }
 
-void
-LiveTimezones::updateTimezones()
+void LiveTimezones::update_timezones()
 {
-    const std::string a = file_.timezone.get();
-    const std::string b = geo_ ? geo_->timezone.get() : "";
+    const auto a = m_file.timezone.get();
+    const auto b = m_geo ? m_geo->timezone.get() : "";
 
-    timezone.set (a.empty() ? b : a);
+    timezone.set(a.empty() ? b : a);
 
     std::set<std::string> zones;
     if (!a.empty())
-- 
cgit v1.2.3