Merge lp:~mandel/location-service/add-auto-formatting into lp:location-service/trunk

[Manuel de la Peña]

Add the autoformatting used in the diff projects from the team.

Add the autoformatting used in the diff projects from the team.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/location-service-ci/362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/362/rebuild

review: Approve (continuous-integration)

[lp:~mandel/location-service/add-auto-formatting]

185. By Manuel de la Peña on 2015-04-23

Run the autoformatting code.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/location-service-ci/363/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/363/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/location-service/add-auto-formatting]

186. By Manuel de la Peña on 2015-04-23

Reverted the format changes and added the missing _clang_format file.

187. By Manuel de la Peña on 2015-04-23

Add missin astyle file.

188. By Manuel de la Peña on 2015-04-23

Performed style rule.

189. By Manuel de la Peña on 2015-04-23

Revert style changes.

190. By Manuel de la Peña on 2015-04-23

Merged with trunk.

191. By Manuel de la Peña on 2015-04-23

Ran format job.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/location-service-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/365/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

[Ricardo Salveti (rsalveti)]

I'd like to put this landing on hold until we sort out the remaining critical issues with location-service (and make it reliable).

Landing a big cosmetic change creates a huge pain later on when tracing back changes and bisecting problems, for really no benefit. While I understand it's good to have a code style pattern, at this point I feel it could end up creating more problems for us.

We can land this once we're more comfortable with the codebase.

review: Disapprove (code, wait a bit more to land.)

Unmerged revisions

191. By Manuel de la Peña on 2015-04-23

Ran format job.

190. By Manuel de la Peña on 2015-04-23

Merged with trunk.

189. By Manuel de la Peña on 2015-04-23

Revert style changes.

188. By Manuel de la Peña on 2015-04-23

Performed style rule.

187. By Manuel de la Peña on 2015-04-23

Add missin astyle file.

186. By Manuel de la Peña on 2015-04-23

Reverted the format changes and added the missing _clang_format file.

185. By Manuel de la Peña on 2015-04-23

Run the autoformatting code.

184. By Manuel de la Peña on 2015-04-23

Add auto-formatting shared between diff projects from the team.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-18 23:06:08 +0000
+++ CMakeLists.txt	2015-04-23 17:23:49 +0000
@@ -54,6 +54,41 @@
     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
 endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
 
+
+#
+# Code style fixer. We put the code through astyle first because it makes some fixes that
+# clang-format won't do (such as "char *p" -> "char* p"). But astyle messes up other things
+# (particularly lambdas and assembly-style comments), which clang-format does right.
+# So, we run clang-format after running astyle, which undoes the damage done by astyle
+# without reverting desirable astyle fixes.
+#
+
+find_program(ASTYLE_COMMAND NAMES astyle)
+if (NOT ASTYLE_COMMAND)
+  message(WARNING "Cannot find astyle: formatcode target will not be available")
+else()
+  # astyle 2.03 creates DOS line endings, so we need to fix its output
+  find_program(DOS2UNIX_COMMAND NAMES dos2unix)
+  if (NOT DOS2UNIX_COMMAND)
+    message(WARNING "Cannot find dos2unix: formatcode target will not be available")
+  else()
+    find_program(CLANG_FORMAT_COMMAND NAMES clang-format-3.6 clang-format-3.5)
+    if (NOT CLANG_FORMAT_COMMAND)
+      message(WARNING "Cannot find clang-format >= clang-format-3.5: formatcode target will not be available")
+    endif()
+  endif()
+endif()
+
+if (ASTYLE_COMMAND AND DOS2UNIX_COMMAND AND CLANG_FORMAT_COMMAND)
+  add_subdirectory(tools)
+  add_custom_target(
+    format
+    ${CMAKE_BINARY_DIR}/tools/formatcode ${CMAKE_SOURCE_DIR}/src ${ASTYLE_COMMAND} ${CLANG_FORMAT_COMMAND}
+    COMMAND ${CMAKE_BINARY_DIR}/tools/formatcode ${CMAKE_SOURCE_DIR}/include ${ASTYLE_COMMAND} ${CLANG_FORMAT_COMMAND}
+    COMMAND ${CMAKE_BINARY_DIR}/tools/formatcode ${CMAKE_SOURCE_DIR}/tests ${ASTYLE_COMMAND} ${CLANG_FORMAT_COMMAND}
+  )
+endif()
+
 include_directories(
   ${Boost_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
 
=== added file '_clang-format'
--- _clang-format	1970-01-01 00:00:00 +0000
+++ _clang-format	2015-04-23 17:23:49 +0000
@@ -0,0 +1,48 @@
+---
+AccessModifierOffset: -4
+AlignEscapedNewlinesLeft: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackParameters: false
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit:     120
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerBinding: true
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+IndentFunctionDeclarationAfterType: true
+IndentWidth:     4
+Language:        Cpp
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 100
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerBindsToType: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+
 
=== added file 'astyle-config'
--- astyle-config	1970-01-01 00:00:00 +0000
+++ astyle-config	2015-04-23 17:23:49 +0000
@@ -0,0 +1,44 @@
+# Options for formatting code with astyle.
+#
+# This helps to make code match the style guide.
+# 
+# Use like this:
+# 
+#     astyle --options=astyle-config mfile.h myfile.cpp
+# 
+# Occasionally, astyle does something silly (particularly with lambdas), so it's
+# still necessary to scan the changes for things that are wrong.
+# But, for most files, it does a good job.
+# 
+# Please consider using this before checking code in for review. Code reviews shouldn't
+# have to deal with layout issues, they are just a distraction. It's better to be able
+# to focus on semantics in a code review, with style issues out of the way.
+
+--formatted
+--style=allman
+--min-conditional-indent=2
+--indent-switches
+--max-instatement-indent=120
+--pad-header
+--align-pointer=type
+--align-reference=type
+--add-brackets
+--convert-tabs
+--close-templates
+--max-code-length=120
+
+# --pad-oper
+#
+# Commented out for now. It changes
+#
+#     for (int i=0; i<10; ++i)
+# to
+#     for (int i = 0; i < 10; ++i)
+#
+# Unfortunately, it also messes with rvalue references:
+#
+#     ResourcePtr& operator=(ResourcePtr&& r);
+#
+# becomes:
+#
+#     ResourcePtr& operator=(ResourcePtr && r);
 
=== modified file 'include/location_service/com/ubuntu/location/accuracy.h'
--- include/location_service/com/ubuntu/location/accuracy.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/accuracy.h	2015-04-23 17:23:49 +0000
@@ -34,12 +34,12 @@
     postalcode,
     street,
     detailed,
-    
+
     best = detailed,
     worst = country
 };
 
-template<typename T>
+template <typename T>
 struct AccuracyTraits
 {
     static AccuracyLevel classify(const T& instance);
@@ -47,14 +47,20 @@
     static T worst();
 };
 
-template<typename T>
+template <typename T>
 struct Accuracy
 {
     typedef typename T::Unit Unit;
     typedef typename T::Quantity Quantity;
 
-    static Accuracy<T> best() { return AccuracyTraits<T>::best(); }
-    static Accuracy<T> worst() { return AccuracyTraits<T>::worst(); }
+    static Accuracy<T> best()
+    {
+        return AccuracyTraits<T>::best();
+    }
+    static Accuracy<T> worst()
+    {
+        return AccuracyTraits<T>::worst();
+    }
 
     AccuracyLevel classify() const
     {
@@ -64,15 +70,14 @@
     T value;
 };
 
-template<typename T>
+template <typename T>
 inline std::ostream& operator<<(std::ostream& out, const Accuracy<T>& update)
 {
     out << "Accuracy(" << update.value << ")";
     return out;
 }
-
-}
-}
-}
-
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_ACCURACY_H_
+}
+}
+}
+
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_ACCURACY_H_
 
=== modified file 'include/location_service/com/ubuntu/location/clock.h'
--- include/location_service/com/ubuntu/location/clock.h	2013-12-16 12:37:07 +0000
+++ include/location_service/com/ubuntu/location/clock.h	2015-04-23 17:23:49 +0000
@@ -66,4 +66,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CLOCK_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CLOCK_H_
 
=== modified file 'include/location_service/com/ubuntu/location/codec.h'
--- include/location_service/com/ubuntu/location/codec.h	2014-09-12 15:04:21 +0000
+++ include/location_service/com/ubuntu/location/codec.h	2015-04-23 17:23:49 +0000
@@ -38,7 +38,7 @@
 {
 namespace helper
 {
-template<typename T>
+template <typename T>
 struct TypeMapper<com::ubuntu::location::units::Quantity<T>>
 {
     constexpr static ArgumentType type_value()
@@ -63,7 +63,7 @@
 };
 }
 
-template<typename T>
+template <typename T>
 struct Codec<com::ubuntu::location::Optional<T>>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Optional<T>& in)
@@ -71,7 +71,9 @@
         bool has_value{in};
         Codec<bool>::encode_argument(writer, has_value);
         if (has_value)
+        {
             Codec<typename com::ubuntu::location::Optional<T>::value_type>::encode_argument(writer, *in);
+        }
     }
 
     static void decode_argument(Message::Reader& reader, com::ubuntu::location::Optional<T>& in)
@@ -83,14 +85,15 @@
             typename com::ubuntu::location::Optional<T>::value_type value;
             Codec<typename com::ubuntu::location::Optional<T>::value_type>::decode_argument(reader, value);
             in = value;
-        } else
+        }
+        else
         {
             in.reset();
         }
     }
 };
 
-template<typename T>
+template <typename T>
 struct Codec<com::ubuntu::location::units::Quantity<T>>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::units::Quantity<T>& in)
@@ -106,8 +109,8 @@
     }
 };
 
-template<typename T, typename U>
-struct Codec<com::ubuntu::location::wgs84::Coordinate<T,U>>
+template <typename T, typename U>
+struct Codec<com::ubuntu::location::wgs84::Coordinate<T, U>>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::wgs84::Coordinate<T, U>& in)
     {
@@ -120,7 +123,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::Position>
 {
     typedef com::ubuntu::location::Position::Accuracy::Horizontal HorizontalAccuracy;
@@ -130,7 +133,8 @@
     {
         Codec<com::ubuntu::location::wgs84::Latitude>::encode_argument(writer, in.latitude);
         Codec<com::ubuntu::location::wgs84::Longitude>::encode_argument(writer, in.longitude);
-        Codec<com::ubuntu::location::Optional<com::ubuntu::location::wgs84::Altitude>>::encode_argument(writer, in.altitude);
+        Codec<com::ubuntu::location::Optional<com::ubuntu::location::wgs84::Altitude>>::encode_argument(writer,
+                                                                                                        in.altitude);
 
         Codec<com::ubuntu::location::Optional<HorizontalAccuracy>>::encode_argument(writer, in.accuracy.horizontal);
         Codec<com::ubuntu::location::Optional<VerticalAccuracy>>::encode_argument(writer, in.accuracy.vertical);
@@ -140,17 +144,17 @@
     {
         Codec<com::ubuntu::location::wgs84::Latitude>::decode_argument(reader, in.latitude);
         Codec<com::ubuntu::location::wgs84::Longitude>::decode_argument(reader, in.longitude);
-        Codec<com::ubuntu::location::Optional<com::ubuntu::location::wgs84::Altitude>>::decode_argument(reader, in.altitude);
+        Codec<com::ubuntu::location::Optional<com::ubuntu::location::wgs84::Altitude>>::decode_argument(reader,
+                                                                                                        in.altitude);
 
         Codec<com::ubuntu::location::Optional<HorizontalAccuracy>>::decode_argument(reader, in.accuracy.horizontal);
         Codec<com::ubuntu::location::Optional<VerticalAccuracy>>::decode_argument(reader, in.accuracy.vertical);
     }
 };
 
-
 namespace helper
 {
-template<>
+template <>
 struct TypeMapper<com::ubuntu::location::SpaceVehicle::Key>
 {
     constexpr static ArgumentType type_value()
@@ -169,12 +173,11 @@
     static std::string signature()
     {
         static const std::string s =
-                helper::TypeMapper<std::uint32_t>::signature() +
-                helper::TypeMapper<std::uint32_t>::signature();
+            helper::TypeMapper<std::uint32_t>::signature() + helper::TypeMapper<std::uint32_t>::signature();
         return s;
     }
 };
-template<>
+template <>
 struct TypeMapper<com::ubuntu::location::SpaceVehicle>
 {
     constexpr static ArgumentType type_value()
@@ -194,20 +197,20 @@
     {
         std::string s =
             DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
-                helper::TypeMapper<com::ubuntu::location::SpaceVehicle::Key>::signature() +
-                helper::TypeMapper<float>::signature() +
-                helper::TypeMapper<bool>::signature() +
-                helper::TypeMapper<bool>::signature() +
-                helper::TypeMapper<bool>::signature() +
-                helper::TypeMapper<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::signature() +
-                helper::TypeMapper<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::signature() +
+            helper::TypeMapper<com::ubuntu::location::SpaceVehicle::Key>::signature() +
+            helper::TypeMapper<float>::signature() + helper::TypeMapper<bool>::signature() +
+            helper::TypeMapper<bool>::signature() + helper::TypeMapper<bool>::signature() +
+            helper::TypeMapper<
+                com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::signature() +
+            helper::TypeMapper<
+                com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::signature() +
             DBUS_STRUCT_END_CHAR_AS_STRING;
         return s;
     }
 };
 }
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::SpaceVehicle::Key>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::SpaceVehicle::Key& in)
@@ -223,7 +226,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::SpaceVehicle>
 {
     inline static void encode_argument(Message::Writer& writer, const com::ubuntu::location::SpaceVehicle& in)
@@ -235,8 +238,10 @@
         sub.push_boolean(in.has_almanac_data);
         sub.push_boolean(in.has_ephimeris_data);
         sub.push_boolean(in.used_in_fix);
-        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::encode_argument(sub, in.azimuth);
-        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::encode_argument(sub, in.elevation);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::encode_argument(
+            sub, in.azimuth);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::encode_argument(
+            sub, in.elevation);
 
         writer.close_structure(std::move(sub));
     }
@@ -250,14 +255,16 @@
         in.has_almanac_data = sub.pop_boolean();
         in.has_ephimeris_data = sub.pop_boolean();
         in.used_in_fix = sub.pop_boolean();
-        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::decode_argument(sub, in.azimuth);
-        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::decode_argument(sub, in.elevation);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::decode_argument(
+            sub, in.azimuth);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::decode_argument(
+            sub, in.elevation);
     }
 };
 
 namespace helper
 {
-template<>
+template <>
 struct TypeMapper<std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>>
 {
     constexpr static ArgumentType type_value()
@@ -275,20 +282,23 @@
 
     static std::string signature()
     {
-        static const std::string s = DBUS_TYPE_ARRAY_AS_STRING + TypeMapper<com::ubuntu::location::SpaceVehicle>::signature();
+        static const std::string s =
+            DBUS_TYPE_ARRAY_AS_STRING + TypeMapper<com::ubuntu::location::SpaceVehicle>::signature();
         return s;
     }
 };
 }
-template<>
+template <>
 struct Codec<std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>>
 {
-    inline static void encode_argument(Message::Writer& writer, const std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>& arg)
+    inline static void encode_argument(
+        Message::Writer& writer,
+        const std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>& arg)
     {
         types::Signature signature(helper::TypeMapper<com::ubuntu::location::SpaceVehicle>::signature());
         auto sub = writer.open_array(signature);
 
-        for(const auto& element : arg)
+        for (const auto& element : arg)
         {
             Codec<com::ubuntu::location::SpaceVehicle>::encode_argument(sub, element.second);
         }
@@ -296,7 +306,9 @@
         writer.close_array(std::move(sub));
     }
 
-    inline static void decode_argument(Message::Reader& reader, std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>& out)
+    inline static void decode_argument(
+        Message::Reader& reader,
+        std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>& out)
     {
         auto sub = reader.pop_array();
         while (sub.type() != ArgumentType::invalid)
@@ -308,7 +320,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::Criteria>
 {
     typedef com::ubuntu::location::units::Quantity<com::ubuntu::location::units::Length> HorizontalAccuracy;
@@ -343,7 +355,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::Provider::Features>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Provider::Features& in)
@@ -357,7 +369,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::Provider::Requirements>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Provider::Requirements& in)
@@ -371,7 +383,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::WifiAndCellIdReportingState>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::WifiAndCellIdReportingState& in)
@@ -387,7 +399,7 @@
 
 namespace helper
 {
-template<typename T>
+template <typename T>
 struct TypeMapper<com::ubuntu::location::Update<T>>
 {
     constexpr static ArgumentType type_value()
@@ -405,15 +417,13 @@
 
     static std::string signature()
     {
-        static const std::string s =
-                helper::TypeMapper<T>::signature() +
-                helper::TypeMapper<uint64_t>::signature();
+        static const std::string s = helper::TypeMapper<T>::signature() + helper::TypeMapper<uint64_t>::signature();
         return s;
     }
 };
 }
 
-template<typename T>
+template <typename T>
 struct Codec<com::ubuntu::location::Update<T>>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Update<T>& in)
@@ -426,9 +436,9 @@
     {
         Codec<T>::decode_argument(reader, in.value);
         in.when = com::ubuntu::location::Clock::Timestamp(com::ubuntu::location::Clock::Duration(reader.pop_int64()));
-    }    
+    }
 };
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CODEC_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CODEC_H_
 
=== modified file 'include/location_service/com/ubuntu/location/configuration.h'
--- include/location_service/com/ubuntu/location/configuration.h	2013-05-29 06:04:02 +0000
+++ include/location_service/com/ubuntu/location/configuration.h	2015-04-23 17:23:49 +0000
@@ -31,4 +31,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONFIGURATION_H_ 
 \ No newline at end of file
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONFIGURATION_H_
 \ No newline at end of file
 
=== modified file 'include/location_service/com/ubuntu/location/connectivity/bounded_integer.h'
--- include/location_service/com/ubuntu/location/connectivity/bounded_integer.h	2014-06-10 11:53:01 +0000
+++ include/location_service/com/ubuntu/location/connectivity/bounded_integer.h	2015-04-23 17:23:49 +0000
@@ -33,7 +33,7 @@
  * @brief A helper class to handle bounded integer values, with an optional domain
  * for tagging domain-specific types.
  */
-template<typename Tag, int min, int max, int inv = min-1>
+template <typename Tag, int min, int max, int inv = min - 1>
 class BoundedInteger
 {
 public:
@@ -79,16 +79,14 @@
         // Capping to [0,1]
         percent = std::min<float>(1., std::max<float>(0., percent));
 
-        return BoundedInteger<Tag, min, max, inv>
-        {
-            static_cast<int>(minimum() + percent * range())
-        };
+        return BoundedInteger<Tag, min, max, inv>{static_cast<int>(minimum() + percent * range())};
     }
 
     /**
      * @brief Constructs an invalid instance.
      */
-    inline BoundedInteger() : value(min-1)
+    inline BoundedInteger()
+        : value(min - 1)
     {
     }
 
@@ -97,19 +95,20 @@
      * @param value The raw value.
      * @throw std::runtime_error if value is not in [min, max].
      */
-    inline explicit BoundedInteger(int value) : value(value)
+    inline explicit BoundedInteger(int value)
+        : value(value)
     {
         if (value < min || value > max)
-            throw std::runtime_error(
-                    std::to_string(value) + " is not in " + "[" +
-                    std::to_string(min) + ", " + std::to_string(max) + "]");
+            throw std::runtime_error(std::to_string(value) + " is not in " + "[" + std::to_string(min) + ", " +
+                                     std::to_string(max) + "]");
     }
 
     /**
      * @brief Copy c'tor.
      * @param rhs The instance to copy from.
      */
-    inline BoundedInteger(const BoundedInteger<Tag, min, max, inv>& rhs) : value(rhs.value)
+    inline BoundedInteger(const BoundedInteger<Tag, min, max, inv>& rhs)
+        : value(rhs.value)
     {
     }
 
@@ -169,9 +168,8 @@
     inline void set(int new_value)
     {
         if (new_value < min || new_value > max)
-            throw std::runtime_error(
-                    std::to_string(new_value) + " is not in " + "[" +
-                    std::to_string(min) + ", " + std::to_string(max) + "]");
+            throw std::runtime_error(std::to_string(new_value) + " is not in " + "[" + std::to_string(min) + ", " +
+                                     std::to_string(max) + "]");
 
         value = new_value;
     }
@@ -193,7 +191,9 @@
         out << bi.value;
 
         if (!bi.is_valid())
+        {
             out << " -> invalid";
+        }
 
         return out;
     }
@@ -206,4 +206,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/connectivity/manager.h'
--- include/location_service/com/ubuntu/location/connectivity/manager.h	2014-07-10 16:44:26 +0000
+++ include/location_service/com/ubuntu/location/connectivity/manager.h	2015-04-23 17:23:49 +0000
@@ -106,8 +106,7 @@
         struct ConnectivityManagementNotSupported : public std::runtime_error
         {
             ConnectivityManagementNotSupported()
-                : std::runtime_error(
-                      "Underlying platform does not provide support for connectivity mgmt.")
+                : std::runtime_error("Underlying platform does not provide support for connectivity mgmt.")
             {
             }
         };
@@ -154,7 +153,6 @@
       */
     virtual const core::Property<bool>& is_wwan_hardware_enabled() const = 0;
 
-
     /**
      * @brief Returns a getable/observable property that describes the characteristics
      * of the active network connection.
@@ -230,4 +228,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_MANAGER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_MANAGER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/connectivity/radio_cell.h'
--- include/location_service/com/ubuntu/location/connectivity/radio_cell.h	2014-06-10 11:53:01 +0000
+++ include/location_service/com/ubuntu/location/connectivity/radio_cell.h	2015-04-23 17:23:49 +0000
@@ -50,35 +50,53 @@
     };
 
     /** @cond */
-    struct Mcc {};
-    struct Mnc {};
-    struct Lac {};
-    struct Id {};
-    struct Psc {};
-    struct Pid {};
-    struct Rss {};
-    struct Asu {};
-    struct Ta {};
+    struct Mcc
+    {
+    };
+    struct Mnc
+    {
+    };
+    struct Lac
+    {
+    };
+    struct Id
+    {
+    };
+    struct Psc
+    {
+    };
+    struct Pid
+    {
+    };
+    struct Rss
+    {
+    };
+    struct Asu
+    {
+    };
+    struct Ta
+    {
+    };
 
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using MobileCountryCode = BoundedInteger<Mcc, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using MobileNetworkCode = BoundedInteger<Mnc, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using LocationAreaCode = BoundedInteger<Lac, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using TrackingAreaCode = BoundedInteger<Lac, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using CellId = BoundedInteger<Id, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using PrimaryScramblingCode = BoundedInteger<Psc, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using PhysicalId = BoundedInteger<Pid, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using ReceivedSignalStrength = BoundedInteger<Rss, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using ArbitraryStrengthUnit = BoundedInteger<Asu, min, max, invalid>;
-    template<int min, int max, int invalid = min-1>
+    template <int min, int max, int invalid = min - 1>
     using TimingAdvance = BoundedInteger<Ta, min, max, invalid>;
     /** @endcond */
 
@@ -86,41 +104,16 @@
     struct Gsm
     {
         /** 3-digit Mobile Country Code, 0..999, INT_MAX if unknown */
-        typedef MobileCountryCode
-        <
-            0,
-            999,
-            std::numeric_limits<int>::max()
-        > MCC;
+        typedef MobileCountryCode<0, 999, std::numeric_limits<int>::max()> MCC;
         /** 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
-        typedef MobileNetworkCode
-        <
-            0,
-            999,
-            std::numeric_limits<int>::max()
-        > MNC;
+        typedef MobileNetworkCode<0, 999, std::numeric_limits<int>::max()> MNC;
         /** 16-bit Location Area Code, 0..65535, INT_MAX if unknown  */
-        typedef LocationAreaCode
-        <
-            0,
-            65535,
-            std::numeric_limits<int>::max()
-        > LAC;
+        typedef LocationAreaCode<0, 65535, std::numeric_limits<int>::max()> LAC;
         /** 16-bit GSM Cell Identity described in TS 27.007, 0..65535, INT_MAX if unknown  */
-        typedef CellId
-        <
-            0,
-            65535,
-            std::numeric_limits<int>::max()
-        > ID;
+        typedef CellId<0, 65535, std::numeric_limits<int>::max()> ID;
 
         /** Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
-        typedef ArbitraryStrengthUnit
-        <
-            0,
-            31,
-            99
-        > SignalStrength;
+        typedef ArbitraryStrengthUnit<0, 31, 99> SignalStrength;
 
         MCC mobile_country_code;
         MNC mobile_network_code;
@@ -133,40 +126,15 @@
     struct Umts
     {
         /** 3-digit Mobile Country Code, 0..999, INT_MAX if unknown */
-        typedef MobileCountryCode
-        <
-            0,
-            999,
-            std::numeric_limits<int>::max()
-        > MCC;
+        typedef MobileCountryCode<0, 999, std::numeric_limits<int>::max()> MCC;
         /** 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
-        typedef MobileNetworkCode
-        <
-            0,
-            999,
-            std::numeric_limits<int>::max()
-        > MNC;
+        typedef MobileNetworkCode<0, 999, std::numeric_limits<int>::max()> MNC;
         /** 16-bit Location Area Code, 0..65535, INT_MAX if unknown  */
-        typedef LocationAreaCode
-        <
-            0,
-            65535,
-            std::numeric_limits<int>::max()
-        > LAC;
+        typedef LocationAreaCode<0, 65535, std::numeric_limits<int>::max()> LAC;
         /** 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown  */
-        typedef CellId
-        <
-            0,
-            268435455,
-            std::numeric_limits<int>::max()
-        > ID;
+        typedef CellId<0, 268435455, std::numeric_limits<int>::max()> ID;
         /** Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
-        typedef ArbitraryStrengthUnit
-        <
-            0,
-            31,
-            99
-        > SignalStrength;
+        typedef ArbitraryStrengthUnit<0, 31, 99> SignalStrength;
 
         MCC mobile_country_code;
         MNC mobile_network_code;
@@ -179,47 +147,17 @@
     struct Lte
     {
         /** 3-digit Mobile Country Code, 0..999, INT_MAX if unknown */
-        typedef MobileCountryCode
-        <
-            0,
-            999,
-            std::numeric_limits<int>::max()
-        > MCC;
+        typedef MobileCountryCode<0, 999, std::numeric_limits<int>::max()> MCC;
         /** 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
-        typedef MobileNetworkCode
-        <
-            0,
-            999,
-            std::numeric_limits<int>::max()
-        > MNC;
+        typedef MobileNetworkCode<0, 999, std::numeric_limits<int>::max()> MNC;
         /** 16-bit Tracking Area Code, 0..65535, INT_MAX if unknown  */
-        typedef TrackingAreaCode
-        <
-            0,
-            65535,
-            std::numeric_limits<int>::max()
-        > TAC;
+        typedef TrackingAreaCode<0, 65535, std::numeric_limits<int>::max()> TAC;
         /** 28-bit Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown  */
-        typedef CellId
-        <
-            0,
-            268435455,
-            std::numeric_limits<int>::max()
-        > ID;
+        typedef CellId<0, 268435455, std::numeric_limits<int>::max()> ID;
         /** Physical cell id, 0..503, INT_MAX if unknown */
-        typedef PhysicalId
-        <
-            0,
-            503,
-            std::numeric_limits<int>::max()
-        > PID;
+        typedef PhysicalId<0, 503, std::numeric_limits<int>::max()> PID;
         /** Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
-        typedef ArbitraryStrengthUnit
-        <
-            0,
-            31,
-            99
-        > SignalStrength;
+        typedef ArbitraryStrengthUnit<0, 31, 99> SignalStrength;
 
         MCC mobile_country_code;
         MNC mobile_network_code;
@@ -279,5 +217,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_RADIO_CELL_H_
-
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_RADIO_CELL_H_
 
=== modified file 'include/location_service/com/ubuntu/location/connectivity/wireless_network.h'
--- include/location_service/com/ubuntu/location/connectivity/wireless_network.h	2014-06-10 09:08:10 +0000
+++ include/location_service/com/ubuntu/location/connectivity/wireless_network.h	2015-04-23 17:23:49 +0000
@@ -52,27 +52,21 @@
     struct Tag
     {
         /** @brief Tags a frequency measurement for a wireless network. */
-        struct Frequency {};
+        struct Frequency
+        {
+        };
         /** @brief Tags the signal strength of a wireless network. */
-        struct SignalStrength {};
+        struct SignalStrength
+        {
+        };
     };
     /** @endcond */
 
     /** Frequency that an individual AP operates on. */
-    typedef BoundedInteger
-    <
-        Tag::Frequency,
-        2412,
-        5825
-    > Frequency;
+    typedef BoundedInteger<Tag::Frequency, 2412, 5825> Frequency;
 
     /** Strength of signal for an individual AP. */
-    typedef BoundedInteger
-    <
-        Tag::SignalStrength,
-        0,
-        100
-    > SignalStrength;
+    typedef BoundedInteger<Tag::SignalStrength, 0, 100> SignalStrength;
 
     /** @cond */
     WirelessNetwork() = default;
@@ -114,4 +108,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_WIRELESS_NETWORK_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_WIRELESS_NETWORK_H_
 
=== modified file 'include/location_service/com/ubuntu/location/criteria.h'
--- include/location_service/com/ubuntu/location/criteria.h	2014-01-12 18:03:12 +0000
+++ include/location_service/com/ubuntu/location/criteria.h	2015-04-23 17:23:49 +0000
@@ -42,18 +42,22 @@
 
     struct Requires
     {
-        bool position = true; ///< The client needs position measurements.
-        bool altitude = false; ///< The client needs altitude measurements.
-        bool velocity = false; ///< The client needs velocity measurments.
-        bool heading = false; ///< The client needs heading measurements.
+        bool position = true;   ///< The client needs position measurements.
+        bool altitude = false;  ///< The client needs altitude measurements.
+        bool velocity = false;  ///< The client needs velocity measurments.
+        bool heading = false;   ///< The client needs heading measurements.
     } requires = Requires{};
 
     struct Accuracy
     {
-        units::Quantity<units::Length> horizontal = 3000 * units::Meters; ///< The client requires measurements of at least this horizontal accuracy.
-        Optional<units::Quantity<units::Length>> vertical; ///< The client requires measurements of at least this vertical accuracy.
-        Optional<units::Quantity<units::Velocity>> velocity; ///< The client requires measurements of at least this velocity accuracy.
-        Optional<units::Quantity<units::PlaneAngle>> heading; ///< The client requires measurements of at least this heading accuracy.
+        units::Quantity<units::Length> horizontal =
+            3000 * units::Meters;  ///< The client requires measurements of at least this horizontal accuracy.
+        Optional<units::Quantity<units::Length>> vertical;     ///< The client requires measurements of at least this
+                                                               ///vertical accuracy.
+        Optional<units::Quantity<units::Velocity>> velocity;   ///< The client requires measurements of at least this
+                                                               ///velocity accuracy.
+        Optional<units::Quantity<units::PlaneAngle>> heading;  ///< The client requires measurements of at least this
+                                                               ///heading accuracy.
     } accuracy = Accuracy{};
 };
 
@@ -65,4 +69,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CRITERIA_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CRITERIA_H_
 
=== modified file 'include/location_service/com/ubuntu/location/default_provider_selection_policy.h'
--- include/location_service/com/ubuntu/location/default_provider_selection_policy.h	2013-12-14 09:10:29 +0000
+++ include/location_service/com/ubuntu/location/default_provider_selection_policy.h	2015-04-23 17:23:49 +0000
@@ -31,25 +31,18 @@
 public:
     DefaultProviderSelectionPolicy();
     ~DefaultProviderSelectionPolicy() noexcept;
-    
-    ProviderSelection determine_provider_selection_for_criteria(
-        const Criteria& criteria,
-        const ProviderEnumerator& enumerator);
-
-    Provider::Ptr determine_position_updates_provider(
-        const Criteria& criteria,
-        const ProviderEnumerator& enumerator);
-
-    Provider::Ptr determine_heading_updates_provider(
-        const Criteria& criteria,
-        const ProviderEnumerator& enumerator);
-
-    Provider::Ptr determine_velocity_updates_provider(
-        const Criteria& criteria,
-        const ProviderEnumerator& enumerator);
+
+    ProviderSelection determine_provider_selection_for_criteria(const Criteria& criteria,
+                                                                const ProviderEnumerator& enumerator);
+
+    Provider::Ptr determine_position_updates_provider(const Criteria& criteria, const ProviderEnumerator& enumerator);
+
+    Provider::Ptr determine_heading_updates_provider(const Criteria& criteria, const ProviderEnumerator& enumerator);
+
+    Provider::Ptr determine_velocity_updates_provider(const Criteria& criteria, const ProviderEnumerator& enumerator);
 };
 }
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_DEFAULT_PROVIDER_SELECTION_POLICY_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_DEFAULT_PROVIDER_SELECTION_POLICY_H_
 
=== modified file 'include/location_service/com/ubuntu/location/heading.h'
--- include/location_service/com/ubuntu/location/heading.h	2013-12-12 14:36:32 +0000
+++ include/location_service/com/ubuntu/location/heading.h	2015-04-23 17:23:49 +0000
@@ -32,4 +32,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_HEADING_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_HEADING_H_
 
=== modified file 'include/location_service/com/ubuntu/location/init_and_shutdown.h'
--- include/location_service/com/ubuntu/location/init_and_shutdown.h	2013-05-29 09:21:16 +0000
+++ include/location_service/com/ubuntu/location/init_and_shutdown.h	2015-04-23 17:23:49 +0000
@@ -33,4 +33,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_INIT_AND_SHUTDOWN_H_
 \ No newline at end of file
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_INIT_AND_SHUTDOWN_H_
 \ No newline at end of file
 
=== modified file 'include/location_service/com/ubuntu/location/logging.h'
--- include/location_service/com/ubuntu/location/logging.h	2014-06-20 07:40:34 +0000
+++ include/location_service/com/ubuntu/location/logging.h	2015-04-23 17:23:49 +0000
@@ -21,5 +21,4 @@
 #include <glog/logging.h>
 #include <glog/vlog_is_on.h>
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_LOGGING_H_
-
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_LOGGING_H_
 
=== modified file 'include/location_service/com/ubuntu/location/optional.h'
--- include/location_service/com/ubuntu/location/optional.h	2013-12-12 14:36:32 +0000
+++ include/location_service/com/ubuntu/location/optional.h	2015-04-23 17:23:49 +0000
@@ -26,10 +26,10 @@
 {
 namespace location
 {
-template<typename T>
+template <typename T>
 using Optional = boost::optional<T>;
 }
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_OPTIONAL_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_OPTIONAL_H_
 
=== modified file 'include/location_service/com/ubuntu/location/position.h'
--- include/location_service/com/ubuntu/location/position.h	2014-06-17 08:06:08 +0000
+++ include/location_service/com/ubuntu/location/position.h	2015-04-23 17:23:49 +0000
@@ -50,8 +50,15 @@
     Position() = default;
     Position(const wgs84::Latitude&, const wgs84::Longitude&);
     Position(const wgs84::Latitude&, const wgs84::Longitude&, const wgs84::Altitude&);
-    Position(const wgs84::Latitude&, const wgs84::Longitude&, const wgs84::Altitude&, const units::Quantity<units::Length>& hor_acc);
-    Position(const wgs84::Latitude&, const wgs84::Longitude&, const wgs84::Altitude&, const units::Quantity<units::Length>& hor_acc, const units::Quantity<units::Length>& ver_acc);
+    Position(const wgs84::Latitude&,
+             const wgs84::Longitude&,
+             const wgs84::Altitude&,
+             const units::Quantity<units::Length>& hor_acc);
+    Position(const wgs84::Latitude&,
+             const wgs84::Longitude&,
+             const wgs84::Altitude&,
+             const units::Quantity<units::Length>& hor_acc,
+             const units::Quantity<units::Length>& ver_acc);
 
     bool operator==(const Position& rhs) const;
     bool operator!=(const Position& rhs) const;
@@ -68,4 +75,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_POSITION_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_POSITION_H_
 
=== modified file 'include/location_service/com/ubuntu/location/provider.h'
--- include/location_service/com/ubuntu/location/provider.h	2015-01-21 20:13:28 +0000
+++ include/location_service/com/ubuntu/location/provider.h	2015-04-23 17:23:49 +0000
@@ -52,22 +52,22 @@
      */
     enum class Features : std::size_t
     {
-        none = 0, ///< The provider does not support any feature.
-        position = 1 << 0, ///< The provider features position updates.
-        velocity = 1 << 1, ///< The provider features velocity updates.
-        heading = 1 << 2 ///< The provider features heading updates.
-    };    
+        none = 0,           ///< The provider does not support any feature.
+        position = 1 << 0,  ///< The provider features position updates.
+        velocity = 1 << 1,  ///< The provider features velocity updates.
+        heading = 1 << 2    ///< The provider features heading updates.
+    };
 
     /**
      * @brief Enumerates the requirements of a provider implementation.
      */
     enum class Requirements : std::size_t
     {
-        none = 0, ///< The provider does not require anything.
-        satellites = 1 << 0, ///< The provider requires satellites to be visible.
-        cell_network = 1 << 1, ///< The provider requires a cell-network to work correctly.
-        data_network = 1 << 2, ///< The provider requires a data-network to work correctly.
-        monetary_spending = 1 << 3 ///< Using the provider results in monetary cost.
+        none = 0,                   ///< The provider does not require anything.
+        satellites = 1 << 0,        ///< The provider requires satellites to be visible.
+        cell_network = 1 << 1,      ///< The provider requires a cell-network to work correctly.
+        data_network = 1 << 2,      ///< The provider requires a data-network to work correctly.
+        monetary_spending = 1 << 3  ///< Using the provider results in monetary cost.
     };
 
     /**
@@ -80,11 +80,11 @@
     class Controller
     {
     public:
-        typedef std::shared_ptr<Controller> Ptr; 
+        typedef std::shared_ptr<Controller> Ptr;
 
         virtual ~Controller() = default;
         Controller(const Controller&) = delete;
-        Controller& operator=(const Controller&) = delete;        
+        Controller& operator=(const Controller&) = delete;
 
         /**
          * @brief disable switches the provider to a disabled state, such that subsequent
@@ -234,9 +234,7 @@
     virtual void on_reference_heading_updated(const Update<Heading>& heading);
 
 protected:
-    explicit Provider(
-        const Features& features = Features::none,
-        const Requirements& requirements = Requirements::none);
+    explicit Provider(const Features& features = Features::none, const Requirements& requirements = Requirements::none);
 
     virtual Updates& mutable_updates();
 
@@ -289,4 +287,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/provider_enumerator.h'
--- include/location_service/com/ubuntu/location/provider_enumerator.h	2013-12-14 09:10:29 +0000
+++ include/location_service/com/ubuntu/location/provider_enumerator.h	2015-04-23 17:23:49 +0000
@@ -46,4 +46,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_ENUMERATOR_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_ENUMERATOR_H_
 
=== modified file 'include/location_service/com/ubuntu/location/provider_factory.h'
--- include/location_service/com/ubuntu/location/provider_factory.h	2014-10-27 21:58:16 +0000
+++ include/location_service/com/ubuntu/location/provider_factory.h	2015-04-23 17:23:49 +0000
@@ -37,7 +37,7 @@
 
 class ProviderFactory
 {
-  public:
+public:
     typedef com::ubuntu::location::Configuration Configuration;
     typedef std::function<Provider::Ptr(const Configuration&)> Factory;
 
@@ -50,13 +50,15 @@
     // by calling the factory and passing it the given config. Please note that the name
     // can be decorated with @ for distinguishing providers of the same type but different configs.
     // Eg.:
-    // --provider=remote::Provider@espoo --remote::Provider@espoo::name="com.ubuntu.espoo.service.Provider" --remote::Provider@espoo::path="/com/ubuntu/espoo/service/Provider"
-    // --provider=remote::Provider@gps --remote::Provider@gps::name="com.ubuntu.android.gps.Provider" --remote::Provider@gps::path="/com/ubuntu/android/gps/Provider"
+    // --provider=remote::Provider@espoo --remote::Provider@espoo::name="com.ubuntu.espoo.service.Provider"
+    // --remote::Provider@espoo::path="/com/ubuntu/espoo/service/Provider"
+    // --provider=remote::Provider@gps --remote::Provider@gps::name="com.ubuntu.android.gps.Provider"
+    // --remote::Provider@gps::path="/com/ubuntu/android/gps/Provider"
     Provider::Ptr create_provider_for_name_with_config(const std::string& name, const Configuration& config);
 
     void enumerate(const std::function<void(const std::string&, const Factory&)>& enumerator);
 
-  private:
+private:
     ProviderFactory() = default;
     ~ProviderFactory() = default;
 
@@ -70,4 +72,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_FACTORY_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_FACTORY_H_
 
=== modified file 'include/location_service/com/ubuntu/location/provider_selection.h'
--- include/location_service/com/ubuntu/location/provider_selection.h	2013-12-14 09:10:29 +0000
+++ include/location_service/com/ubuntu/location/provider_selection.h	2015-04-23 17:23:49 +0000
@@ -35,11 +35,17 @@
         Provider::Features flags = Provider::Features::none;
 
         if (position_updates_provider)
+        {
             flags = flags | Provider::Features::position;
+        }
         if (heading_updates_provider)
+        {
             flags = flags | Provider::Features::heading;
-        if(velocity_updates_provider)
+        }
+        if (velocity_updates_provider)
+        {
             flags = flags | Provider::Features::velocity;
+        }
 
         return flags;
     }
@@ -52,11 +58,11 @@
 inline bool operator==(const ProviderSelection& lhs, const ProviderSelection& rhs)
 {
     return lhs.position_updates_provider == rhs.position_updates_provider &&
-            lhs.heading_updates_provider == rhs.heading_updates_provider &&
-            lhs.velocity_updates_provider == rhs.velocity_updates_provider;
+           lhs.heading_updates_provider == rhs.heading_updates_provider &&
+           lhs.velocity_updates_provider == rhs.velocity_updates_provider;
 }
 }
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_H_
 
=== modified file 'include/location_service/com/ubuntu/location/provider_selection_policy.h'
--- include/location_service/com/ubuntu/location/provider_selection_policy.h	2014-06-20 07:40:34 +0000
+++ include/location_service/com/ubuntu/location/provider_selection_policy.h	2015-04-23 17:23:49 +0000
@@ -43,9 +43,8 @@
     ProviderSelectionPolicy& operator=(const ProviderSelectionPolicy&) = delete;
     virtual ~ProviderSelectionPolicy() = default;
 
-    virtual ProviderSelection determine_provider_selection_for_criteria(
-            const Criteria& criteria,
-            const ProviderEnumerator& enumerator) = 0;
+    virtual ProviderSelection determine_provider_selection_for_criteria(const Criteria& criteria,
+                                                                        const ProviderEnumerator& enumerator) = 0;
 
 protected:
     ProviderSelectionPolicy() = default;
@@ -54,4 +53,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_POLICY_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_POLICY_H_
 
=== modified file 'include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h'
--- include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h	2014-02-03 13:52:21 +0000
+++ include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h	2015-04-23 17:23:49 +0000
@@ -43,13 +43,10 @@
 
     friend std::ostream& operator<<(std::ostream& out, const Status& status)
     {
-        static std::map<Status, std::string> lut =
-        {
-            {Status::error, "error"},
-            {Status::unavailable, "unavailable"},
-            {Status::acquiring, "acquiring"},
-            {Status::available, "available"}
-        };
+        static std::map<Status, std::string> lut = {{Status::error, "error"},
+                                                    {Status::unavailable, "unavailable"},
+                                                    {Status::acquiring, "acquiring"},
+                                                    {Status::available, "available"}};
 
         return out << lut[status];
     }
@@ -62,7 +59,10 @@
         }
         typedef Geoclue Interface;
         typedef std::tuple<std::string, std::string> ResultType;
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+        inline static const std::chrono::milliseconds default_timeout()
+        {
+            return std::chrono::seconds{1};
+        }
     };
 
     struct GetStatus
@@ -73,7 +73,10 @@
         }
         typedef Geoclue Interface;
         typedef int32_t ResultType;
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+        inline static const std::chrono::milliseconds default_timeout()
+        {
+            return std::chrono::seconds{1};
+        }
     };
 
     struct AddReference
@@ -84,7 +87,10 @@
         }
         typedef Geoclue Interface;
         typedef void ResultType;
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+        inline static const std::chrono::milliseconds default_timeout()
+        {
+            return std::chrono::seconds{1};
+        }
     };
 
     struct RemoveReference
@@ -95,7 +101,10 @@
         }
         typedef Geoclue Interface;
         typedef void ResultType;
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+        inline static const std::chrono::milliseconds default_timeout()
+        {
+            return std::chrono::seconds{1};
+        }
     };
 
     struct Address
@@ -107,8 +116,13 @@
                 return "GetAddress";
             }
             typedef Address Interface;
-            typedef std::tuple<int32_t, std::map<std::string, std::string>, dbus::types::Struct<std::tuple<int32_t, double, double>>> ResultType;
-            inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+            typedef std::tuple<int32_t,
+                               std::map<std::string, std::string>,
+                               dbus::types::Struct<std::tuple<int32_t, double, double>>> ResultType;
+            inline static const std::chrono::milliseconds default_timeout()
+            {
+                return std::chrono::seconds{1};
+            }
         };
 
         struct Signals
@@ -120,7 +134,9 @@
                     return "PositionChanged";
                 };
                 typedef Address Interface;
-                typedef std::tuple<int32_t, std::map<std::string, std::string>, dbus::types::Struct<std::tuple<int32_t, double, double>>> ArgumentType;
+                typedef std::tuple<int32_t,
+                                   std::map<std::string, std::string>,
+                                   dbus::types::Struct<std::tuple<int32_t, double, double>>> ArgumentType;
             };
         };
     };
@@ -146,8 +162,16 @@
                 return "GetPosition";
             }
             typedef Position Interface;
-            typedef std::tuple<int32_t, int32_t, double, double, double, dbus::types::Struct<std::tuple<int32_t, double, double>>> ResultType;
-            inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+            typedef std::tuple<int32_t,
+                               int32_t,
+                               double,
+                               double,
+                               double,
+                               dbus::types::Struct<std::tuple<int32_t, double, double>>> ResultType;
+            inline static const std::chrono::milliseconds default_timeout()
+            {
+                return std::chrono::seconds{1};
+            }
         };
 
         struct Signals
@@ -159,7 +183,12 @@
                     return "PositionChanged";
                 };
                 typedef Position Interface;
-                typedef std::tuple<int32_t, int32_t, double, double, double, dbus::types::Struct<std::tuple<int32_t, double, double>>> ArgumentType;
+                typedef std::tuple<int32_t,
+                                   int32_t,
+                                   double,
+                                   double,
+                                   double,
+                                   dbus::types::Struct<std::tuple<int32_t, double, double>>> ArgumentType;
             };
         };
     };
@@ -186,7 +215,10 @@
             }
             typedef Velocity Interface;
             typedef std::tuple<int32_t, int32_t, double, double, double> ResultType;
-            inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+            inline static const std::chrono::milliseconds default_timeout()
+            {
+                return std::chrono::seconds{1};
+            }
         };
         struct Signals
         {
@@ -211,7 +243,7 @@
 {
 namespace traits
 {
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue>
 {
     inline static const std::string& interface_name()
@@ -221,7 +253,7 @@
     }
 };
 
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue::Address>
 {
     inline static const std::string& interface_name()
@@ -231,7 +263,7 @@
     }
 };
 
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue::Position>
 {
     inline static const std::string& interface_name()
@@ -241,7 +273,7 @@
     }
 };
 
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue::Velocity>
 {
     inline static const std::string& interface_name()
@@ -254,4 +286,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_GEOCLUE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_GEOCLUE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/providers/geoclue/provider.h'
--- include/location_service/com/ubuntu/location/providers/geoclue/provider.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/providers/geoclue/provider.h	2015-04-23 17:23:49 +0000
@@ -33,13 +33,19 @@
 {
 class Provider : public com::ubuntu::location::Provider
 {
-  public:
+public:
     static Provider::Ptr create_instance(const ProviderFactory::Configuration&);
 
     struct Configuration
     {
-        static std::string key_name() { return "name"; }
-        static std::string key_path() { return "path"; }
+        static std::string key_name()
+        {
+            return "name";
+        }
+        static std::string key_path()
+        {
+            return "path";
+        }
         std::string name;
         std::string path;
 
@@ -61,7 +67,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates();
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };
@@ -70,4 +76,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/providers/remote/interface.h'
--- include/location_service/com/ubuntu/location/providers/remote/interface.h	2015-01-21 20:04:56 +0000
+++ include/location_service/com/ubuntu/location/providers/remote/interface.h	2015-04-23 17:23:49 +0000
@@ -99,26 +99,20 @@
         // Creates a new skeleton instance and installs the interface
         // com::ubuntu::remote::Interface on it.
         Skeleton(const core::dbus::Object::Ptr& object)
-            : object{object},
-              properties
-              {
-                  object->get_property<Properties::HasPosition>(),
-                  object->get_property<Properties::HasVelocity>(),
-                  object->get_property<Properties::HasHeading>(),
-                  object->get_property<Properties::RequiresSatellites>(),
-                  object->get_property<Properties::RequiresCellNetwork>(),
-                  object->get_property<Properties::RequiresDataNetwork>(),
-                  object->get_property<Properties::RequiresMonetarySpending>(),
-                  object->get_property<Properties::ArePositionUpdatesRunning>(),
-                  object->get_property<Properties::AreHeadingUpdatesRunning>(),
-                  object->get_property<Properties::AreVelocityUpdatesRunning>()
-              },
-              signals
-              {
-                  object->get_signal<Signals::PositionChanged>(),
-                  object->get_signal<Signals::HeadingChanged>(),
-                  object->get_signal<Signals::VelocityChanged>()
-              }
+            : object{object}
+            , properties{object->get_property<Properties::HasPosition>(),
+                         object->get_property<Properties::HasVelocity>(),
+                         object->get_property<Properties::HasHeading>(),
+                         object->get_property<Properties::RequiresSatellites>(),
+                         object->get_property<Properties::RequiresCellNetwork>(),
+                         object->get_property<Properties::RequiresDataNetwork>(),
+                         object->get_property<Properties::RequiresMonetarySpending>(),
+                         object->get_property<Properties::ArePositionUpdatesRunning>(),
+                         object->get_property<Properties::AreHeadingUpdatesRunning>(),
+                         object->get_property<Properties::AreVelocityUpdatesRunning>()}
+            , signals{object->get_signal<Signals::PositionChanged>(),
+                      object->get_signal<Signals::HeadingChanged>(),
+                      object->get_signal<Signals::VelocityChanged>()}
         {
         }
 
@@ -141,20 +135,14 @@
         // All known signals.
         struct
         {
-            std::shared_ptr<core::dbus::Signal<
-                Signals::PositionChanged,
-                Signals::PositionChanged::ArgumentType
-            >> position_changed;
-
-            std::shared_ptr<core::dbus::Signal<
-                Signals::HeadingChanged,
-                Signals::HeadingChanged::ArgumentType
-            >> heading_changed;
-
-            std::shared_ptr<core::dbus::Signal<
-                Signals::VelocityChanged,
-                Signals::VelocityChanged::ArgumentType
-            >> velocity_changed;
+            std::shared_ptr<core::dbus::Signal<Signals::PositionChanged, Signals::PositionChanged::ArgumentType>>
+                position_changed;
+
+            std::shared_ptr<core::dbus::Signal<Signals::HeadingChanged, Signals::HeadingChanged::ArgumentType>>
+                heading_changed;
+
+            std::shared_ptr<core::dbus::Signal<Signals::VelocityChanged, Signals::VelocityChanged::ArgumentType>>
+                velocity_changed;
         } signals;
     };
 
@@ -163,26 +151,20 @@
         // Creates a new skeleton instance and installs the interface
         // com::ubuntu::remote::Interface on it.
         Stub(const core::dbus::Object::Ptr& object)
-            : object{object},
-              properties
-              {
-                  object->get_property<Properties::HasPosition>(),
-                  object->get_property<Properties::HasVelocity>(),
-                  object->get_property<Properties::HasHeading>(),
-                  object->get_property<Properties::RequiresSatellites>(),
-                  object->get_property<Properties::RequiresCellNetwork>(),
-                  object->get_property<Properties::RequiresDataNetwork>(),
-                  object->get_property<Properties::RequiresMonetarySpending>(),
-                  object->get_property<Properties::ArePositionUpdatesRunning>(),
-                  object->get_property<Properties::AreHeadingUpdatesRunning>(),
-                  object->get_property<Properties::AreVelocityUpdatesRunning>()
-              },
-              signals
-              {
-                  object->get_signal<Signals::PositionChanged>(),
-                  object->get_signal<Signals::HeadingChanged>(),
-                  object->get_signal<Signals::VelocityChanged>()
-              }
+            : object{object}
+            , properties{object->get_property<Properties::HasPosition>(),
+                         object->get_property<Properties::HasVelocity>(),
+                         object->get_property<Properties::HasHeading>(),
+                         object->get_property<Properties::RequiresSatellites>(),
+                         object->get_property<Properties::RequiresCellNetwork>(),
+                         object->get_property<Properties::RequiresDataNetwork>(),
+                         object->get_property<Properties::RequiresMonetarySpending>(),
+                         object->get_property<Properties::ArePositionUpdatesRunning>(),
+                         object->get_property<Properties::AreHeadingUpdatesRunning>(),
+                         object->get_property<Properties::AreVelocityUpdatesRunning>()}
+            , signals{object->get_signal<Signals::PositionChanged>(),
+                      object->get_signal<Signals::HeadingChanged>(),
+                      object->get_signal<Signals::VelocityChanged>()}
         {
         }
 
@@ -205,27 +187,20 @@
         // All known signals.
         struct
         {
-            std::shared_ptr<core::dbus::Signal<
-                Signals::PositionChanged,
-                Signals::PositionChanged::ArgumentType
-            >> position_changed;
-
-            std::shared_ptr<core::dbus::Signal<
-                Signals::HeadingChanged,
-                Signals::HeadingChanged::ArgumentType
-            >> heading_changed;
-
-            std::shared_ptr<core::dbus::Signal<
-                Signals::VelocityChanged,
-                Signals::VelocityChanged::ArgumentType
-            >> velocity_changed;
+            std::shared_ptr<core::dbus::Signal<Signals::PositionChanged, Signals::PositionChanged::ArgumentType>>
+                position_changed;
+
+            std::shared_ptr<core::dbus::Signal<Signals::HeadingChanged, Signals::HeadingChanged::ArgumentType>>
+                heading_changed;
+
+            std::shared_ptr<core::dbus::Signal<Signals::VelocityChanged, Signals::VelocityChanged::ArgumentType>>
+                velocity_changed;
         } signals;
     };
-
 };
 }
 }
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE_INTERFACE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE_INTERFACE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/providers/remote/skeleton.h'
--- include/location_service/com/ubuntu/location/providers/remote/skeleton.h	2014-09-12 13:11:42 +0000
+++ include/location_service/com/ubuntu/location/providers/remote/skeleton.h	2015-04-23 17:23:49 +0000
@@ -20,10 +20,14 @@
 
 #include <com/ubuntu/location/provider.h>
 
-namespace core { namespace dbus {
+namespace core
+{
+namespace dbus
+{
 class Bus;
 class Object;
-}}
+}
+}
 
 namespace com
 {
@@ -56,4 +60,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE_SKELETON_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE_SKELETON_H_
 
=== modified file 'include/location_service/com/ubuntu/location/providers/remote/stub.h'
--- include/location_service/com/ubuntu/location/providers/remote/stub.h	2014-09-12 13:11:42 +0000
+++ include/location_service/com/ubuntu/location/providers/remote/stub.h	2015-04-23 17:23:49 +0000
@@ -20,10 +20,14 @@
 
 #include <com/ubuntu/location/provider.h>
 
-namespace core { namespace dbus {
+namespace core
+{
+namespace dbus
+{
 class Bus;
 class Object;
-}}
+}
+}
 
 namespace com
 {
@@ -52,4 +56,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE_STUB_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE_STUB_H_
 
=== modified file 'include/location_service/com/ubuntu/location/providers/skyhook/provider.h'
--- include/location_service/com/ubuntu/location/providers/skyhook/provider.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/providers/skyhook/provider.h	2015-04-23 17:23:49 +0000
@@ -35,17 +35,26 @@
 {
 class Provider : public com::ubuntu::location::Provider
 {
-  public:
+public:
     static Provider::Ptr create_instance(const ProviderFactory::Configuration& config);
-    
+
     static const Provider::FeatureFlags& default_feature_flags();
     static const Provider::RequirementFlags& default_requirement_flags();
 
     struct Configuration
     {
-        static std::string key_username() { return "username"; }
-        static std::string key_realm() { return "realm"; }
-        static std::string key_period() { return "period"; }
+        static std::string key_username()
+        {
+            return "username";
+        }
+        static std::string key_realm()
+        {
+            return "realm";
+        }
+        static std::string key_period()
+        {
+            return "period";
+        }
 
         std::string user_name;
         std::string realm;
@@ -68,7 +77,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates();
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };
@@ -77,4 +86,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_SKYHOOK_PROVIDER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_SKYHOOK_PROVIDER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/proxy_provider.h'
--- include/location_service/com/ubuntu/location/proxy_provider.h	2014-06-20 07:40:34 +0000
+++ include/location_service/com/ubuntu/location/proxy_provider.h	2015-04-23 17:23:49 +0000
@@ -46,7 +46,7 @@
 
     virtual void start_heading_updates();
     virtual void stop_heading_updates();
-    
+
 private:
     ProviderSelection providers;
 
@@ -61,4 +61,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROXY_PROVIDER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROXY_PROVIDER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/satellite_based_positioning_state.h'
--- include/location_service/com/ubuntu/location/satellite_based_positioning_state.h	2014-11-14 11:26:45 +0000
+++ include/location_service/com/ubuntu/location/satellite_based_positioning_state.h	2015-04-23 17:23:49 +0000
@@ -32,8 +32,8 @@
  */
 enum class SatelliteBasedPositioningState
 {
-    on, ///< Satellite assisted positioning is on.
-    off ///< Satellite assisted positioning is off.
+    on,  ///< Satellite assisted positioning is on.
+    off  ///< Satellite assisted positioning is off.
 };
 
 /** @brief Pretty prints the given state to the given stream. */
@@ -44,4 +44,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SATELLITE_BASED_POSITIONING_STATE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SATELLITE_BASED_POSITIONING_STATE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/configuration.h'
--- include/location_service/com/ubuntu/location/service/configuration.h	2014-11-14 11:33:05 +0000
+++ include/location_service/com/ubuntu/location/service/configuration.h	2015-04-23 17:23:49 +0000
@@ -41,10 +41,9 @@
     Configuration(const Configuration&) = delete;
     Configuration& operator=(const Configuration&) = delete;
 
-    virtual std::shared_ptr<Engine> the_engine(
-    	const std::set<Provider::Ptr>& provider_set,
-        const ProviderSelectionPolicy::Ptr& provider_selection_policy) = 0;
-    
+    virtual std::shared_ptr<Engine> the_engine(const std::set<Provider::Ptr>& provider_set,
+                                               const ProviderSelectionPolicy::Ptr& provider_selection_policy) = 0;
+
     virtual ProviderSelectionPolicy::Ptr the_provider_selection_policy() = 0;
     virtual std::set<Provider::Ptr> the_provider_set() = 0;
     virtual PermissionManager::Ptr the_permission_manager() = 0;
@@ -57,4 +56,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_CONFIGURATION_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_CONFIGURATION_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/default_permission_manager.h'
--- include/location_service/com/ubuntu/location/service/default_permission_manager.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/service/default_permission_manager.h	2015-04-23 17:23:49 +0000
@@ -33,17 +33,15 @@
 {
 class DefaultPermissionManager : public PermissionManager
 {
-  public:
+public:
     typedef std::shared_ptr<DefaultPermissionManager> Ptr;
 
     DefaultPermissionManager();
     ~DefaultPermissionManager() noexcept;
-    
-    Result check_permission_for_credentials(
-    	const Criteria&,
-        const Credentials& credentials);
-
-  private:
+
+    Result check_permission_for_credentials(const Criteria&, const Credentials& credentials);
+
+private:
     pid_t pid;
     uid_t uid;
 };
@@ -51,4 +49,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/interface.h'
--- include/location_service/com/ubuntu/location/service/interface.h	2014-08-01 15:59:25 +0000
+++ include/location_service/com/ubuntu/location/service/interface.h	2015-04-23 17:23:49 +0000
@@ -45,7 +45,7 @@
  */
 class Interface
 {
-  protected:
+protected:
     struct Errors
     {
         struct InsufficientPermissions
@@ -70,10 +70,7 @@
 
         inline static const std::string& name()
         {
-            static const std::string s
-            {
-                "CreateSessionForCriteria"
-            };
+            static const std::string s{"CreateSessionForCriteria"};
             return s;
         }
 
@@ -91,10 +88,7 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "DoesSatelliteBasedPositioning"
-                };
+                static const std::string s{"DoesSatelliteBasedPositioning"};
                 return s;
             }
 
@@ -108,10 +102,7 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "DoesReportCellAndWifiIds"
-                };
+                static const std::string s{"DoesReportCellAndWifiIds"};
                 return s;
             }
 
@@ -125,10 +116,7 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "IsOnline"
-                };
+                static const std::string s{"IsOnline"};
                 return s;
             }
 
@@ -142,10 +130,7 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "VisibleSpaceVehicles"
-                };
+                static const std::string s{"VisibleSpaceVehicles"};
                 return s;
             }
 
@@ -159,7 +144,7 @@
 
     Interface() = default;
 
-  public:
+public:
     typedef std::shared_ptr<Interface> Ptr;
 
     /**
@@ -222,15 +207,12 @@
 {
 namespace traits
 {
-template<>
+template <>
 struct Service<com::ubuntu::location::service::Interface>
 {
     static const std::string& interface_name()
     {
-        static const std::string s
-        {
-            "com.ubuntu.location.Service"
-        };
+        static const std::string s{"com.ubuntu.location.Service"};
         return s;
     }
 };
@@ -240,4 +222,4 @@
 
 #include <com/ubuntu/location/codec.h>
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_INTERFACE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_INTERFACE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/permission_manager.h'
--- include/location_service/com/ubuntu/location/service/permission_manager.h	2014-06-23 04:57:59 +0000
+++ include/location_service/com/ubuntu/location/service/permission_manager.h	2015-04-23 17:23:49 +0000
@@ -53,8 +53,8 @@
      */
     enum class Result
     {
-        granted, ///< The app is allowed to access the location service.
-        rejected ///< The app is not allowed to access the location service.
+        granted,  ///< The app is allowed to access the location service.
+        rejected  ///< The app is not allowed to access the location service.
     };
 
     virtual ~PermissionManager() = default;
@@ -67,10 +67,8 @@
      * @param credentials The credentials identifying the remote peer.
      * @return Result::granted if the remote peer is allowed to access the location service, Result::rejected otherwise.
      */
-    virtual Result check_permission_for_credentials(
-        const Criteria& criteria,
-        const Credentials& credentials) = 0;
-    
+    virtual Result check_permission_for_credentials(const Criteria& criteria, const Credentials& credentials) = 0;
+
 protected:
     PermissionManager() = default;
 };
@@ -78,4 +76,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PERMISSION_MANAGER_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PERMISSION_MANAGER_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/session/implementation.h'
--- include/location_service/com/ubuntu/location/service/session/implementation.h	2014-02-03 13:52:21 +0000
+++ include/location_service/com/ubuntu/location/service/session/implementation.h	2015-04-23 17:23:49 +0000
@@ -36,7 +36,7 @@
 {
 class Implementation : public Interface
 {
-  public:
+public:
     Implementation(const Provider::Ptr& provider);
     Implementation(const Implementation&) = delete;
     virtual ~Implementation() noexcept;
@@ -51,7 +51,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates() noexcept;
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };
@@ -61,4 +61,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_IMPLEMENTATION_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_IMPLEMENTATION_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/session/interface.h'
--- include/location_service/com/ubuntu/location/service/session/interface.h	2014-05-19 09:55:25 +0000
+++ include/location_service/com/ubuntu/location/service/session/interface.h	2015-04-23 17:23:49 +0000
@@ -70,8 +70,8 @@
          */
         enum class Status
         {
-            enabled, ///< Updates are enabled and delivered to this session.
-            disabled ///< Updates are disabled and not delivered to this session.
+            enabled,  ///< Updates are enabled and delivered to this session.
+            disabled  ///< Updates are disabled and not delivered to this session.
         };
 
         /**
@@ -114,7 +114,7 @@
      */
     virtual Updates& updates();
 
-protected:    
+protected:
     Interface();
 
 private:
@@ -127,4 +127,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_INTERFACE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_INTERFACE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/session/skeleton.h'
--- include/location_service/com/ubuntu/location/service/session/skeleton.h	2014-08-01 12:51:25 +0000
+++ include/location_service/com/ubuntu/location/service/session/skeleton.h	2015-04-23 17:23:49 +0000
@@ -119,4 +119,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_SKELETON_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_SKELETON_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/session/stub.h'
--- include/location_service/com/ubuntu/location/service/session/stub.h	2014-02-03 13:52:21 +0000
+++ include/location_service/com/ubuntu/location/service/session/stub.h	2015-04-23 17:23:49 +0000
@@ -42,10 +42,8 @@
 {
 class Stub : public core::dbus::Stub<Interface>
 {
-  public:
-    Stub(
-        const core::dbus::Bus::Ptr& bus,
-        const core::dbus::types::ObjectPath& session_path);
+public:
+    Stub(const core::dbus::Bus::Ptr& bus, const core::dbus::types::ObjectPath& session_path);
     Stub(const Stub&) = delete;
     virtual ~Stub() noexcept;
     Stub& operator=(const Stub&) = delete;
@@ -61,7 +59,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates() noexcept;
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };
@@ -70,4 +68,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_STUB_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_STUB_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/skeleton.h'
--- include/location_service/com/ubuntu/location/service/skeleton.h	2015-02-13 13:19:18 +0000
+++ include/location_service/com/ubuntu/location/service/skeleton.h	2015-04-23 17:23:49 +0000
@@ -38,9 +38,8 @@
 {
 namespace service
 {
-class Skeleton
-        : public core::dbus::Skeleton<com::ubuntu::location::service::Interface>,
-          public std::enable_shared_from_this<Skeleton>
+class Skeleton : public core::dbus::Skeleton<com::ubuntu::location::service::Interface>,
+                 public std::enable_shared_from_this<Skeleton>
 {
 public:
     typedef std::shared_ptr<Skeleton> Ptr;
@@ -123,10 +122,9 @@
 
     // Tries to register the given session under the given path in the session store.
     // Returns true iff the session has been added to the store.
-    bool add_to_session_store_for_path(
-            const core::dbus::types::ObjectPath& path,
-            std::unique_ptr<core::dbus::ServiceWatcher> watcher,
-            const session::Interface::Ptr& session);
+    bool add_to_session_store_for_path(const core::dbus::types::ObjectPath& path,
+                                       std::unique_ptr<core::dbus::ServiceWatcher> watcher,
+                                       const session::Interface::Ptr& session);
 
     // Removes the session with the given path from the session store.
     void remove_from_session_store_for_path(const core::dbus::types::ObjectPath& path);
@@ -145,19 +143,19 @@
     // The skeleton object representing com.ubuntu.location.service.Interface on the bus.
     core::dbus::Object::Ptr object;
     // We emit property changes manually.
-    core::dbus::Signal
-    <
-        core::dbus::interfaces::Properties::Signals::PropertiesChanged,
-        core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType
-    >::Ptr properties_changed;
+    core::dbus::Signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged,
+                       core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType>::Ptr
+        properties_changed;
 
     // DBus properties as exposed on the bus for com.ubuntu.location.service.Interface
     struct
     {
-        std::shared_ptr< core::dbus::Property<Interface::Properties::DoesSatelliteBasedPositioning> > does_satellite_based_positioning;
-        std::shared_ptr< core::dbus::Property<Interface::Properties::DoesReportCellAndWifiIds> > does_report_cell_and_wifi_ids;
-        std::shared_ptr< core::dbus::Property<Interface::Properties::IsOnline> > is_online;
-        std::shared_ptr< core::dbus::Property<Interface::Properties::VisibleSpaceVehicles> > visible_space_vehicles;
+        std::shared_ptr<core::dbus::Property<Interface::Properties::DoesSatelliteBasedPositioning>>
+            does_satellite_based_positioning;
+        std::shared_ptr<core::dbus::Property<Interface::Properties::DoesReportCellAndWifiIds>>
+            does_report_cell_and_wifi_ids;
+        std::shared_ptr<core::dbus::Property<Interface::Properties::IsOnline>> is_online;
+        std::shared_ptr<core::dbus::Property<Interface::Properties::VisibleSpaceVehicles>> visible_space_vehicles;
     } properties;
     // We sign up to property changes here, to be able to report them to the bus
     struct
@@ -181,4 +179,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SKELETON_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SKELETON_H_
 
=== modified file 'include/location_service/com/ubuntu/location/service/stub.h'
--- include/location_service/com/ubuntu/location/service/stub.h	2014-02-03 13:52:21 +0000
+++ include/location_service/com/ubuntu/location/service/stub.h	2015-04-23 17:23:49 +0000
@@ -33,7 +33,7 @@
 {
 class Stub : public core::dbus::Stub<Interface>
 {
-  public:
+public:
     Stub(const dbus::Bus::Ptr& connection);
     Stub(const Stub&) = delete;
     Stub& operator=(const Stub&) = delete;
@@ -42,10 +42,10 @@
     session::Interface::Ptr create_session_for_criteria(const Criteria& criteria);
     core::Property<bool>& does_satellite_based_positioning();
     core::Property<bool>& does_report_cell_and_wifi_ids();
-    core::Property<bool>& is_online();    
+    core::Property<bool>& is_online();
     core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles();
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };
@@ -53,4 +53,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_STUB_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_STUB_H_
 
=== modified file 'include/location_service/com/ubuntu/location/space_vehicle.h'
--- include/location_service/com/ubuntu/location/space_vehicle.h	2014-05-20 07:26:03 +0000
+++ include/location_service/com/ubuntu/location/space_vehicle.h	2015-04-23 17:23:49 +0000
@@ -38,21 +38,23 @@
     /** @brief Enumerates all known space-vehicle types. */
     enum class Type
     {
-        unknown, ///< Unknown (and thus invalid) type.
-        beidou, ///< People's Republic of China's regional system, currently limited to Asia and the West Pacific
-        galileo, ///< A global system being developed by the European Union and other partner countries, planned to be operational by 2014 (and fully deployed by 2019).
-        glonass, ///< Russia's global navigation system. Fully operational worldwide.
-        gps, ///< Fully operational worldwide.
-        compass, ///< People's Republic of China's global system, planned to be operational by 2020.
-        irnss, ///< India's regional navigation system, planned to be operational by 2014, covering India and Northern Indian Ocean.
-        qzss ///< Japanese regional system covering Asia and Oceania.
-    };    
+        unknown,  ///< Unknown (and thus invalid) type.
+        beidou,   ///< People's Republic of China's regional system, currently limited to Asia and the West Pacific
+        galileo,  ///< A global system being developed by the European Union and other partner countries, planned to be
+                  ///operational by 2014 (and fully deployed by 2019).
+        glonass,  ///< Russia's global navigation system. Fully operational worldwide.
+        gps,      ///< Fully operational worldwide.
+        compass,  ///< People's Republic of China's global system, planned to be operational by 2020.
+        irnss,  ///< India's regional navigation system, planned to be operational by 2014, covering India and Northern
+                ///Indian Ocean.
+        qzss    ///< Japanese regional system covering Asia and Oceania.
+    };
 
     /** @brief Uniquely identifies a space vehicle, given its type and its id. */
     struct Key
     {
-        Type type = Type::unknown; ///< The positioning system this vehicle belongs to.
-        Id id = 0; ///< Unique id of the space vehicle.
+        Type type = Type::unknown;  ///< The positioning system this vehicle belongs to.
+        Id id = 0;                  ///< Unique id of the space vehicle.
 
         inline bool operator==(const SpaceVehicle::Key& rhs) const
         {
@@ -62,7 +64,9 @@
         inline bool operator<(const SpaceVehicle::Key& rhs) const
         {
             if (type != rhs.type)
+            {
                 return type < rhs.type;
+            }
 
             return id < rhs.id;
         }
@@ -70,12 +74,9 @@
 
     inline bool operator==(const SpaceVehicle& rhs) const
     {
-        return key == rhs.key &&
-                has_almanac_data == rhs.has_almanac_data &&
-                has_ephimeris_data == rhs.has_ephimeris_data &&
-                used_in_fix == rhs.used_in_fix &&
-                units::roughly_equals(azimuth, rhs.azimuth) &&
-                units::roughly_equals(elevation, rhs.elevation);
+        return key == rhs.key && has_almanac_data == rhs.has_almanac_data &&
+               has_ephimeris_data == rhs.has_ephimeris_data && used_in_fix == rhs.used_in_fix &&
+               units::roughly_equals(azimuth, rhs.azimuth) && units::roughly_equals(elevation, rhs.elevation);
     }
 
     inline bool operator<(const SpaceVehicle& rhs) const
@@ -83,28 +84,25 @@
         return key < rhs.key;
     }
 
-    Key key; ///< Unique key identifying an instance.
-    float snr = -std::numeric_limits<float>::max(); ///< Signal to noise ratio;
-    bool has_almanac_data = false; ///< Almanac data available for this vehicle.
-    bool has_ephimeris_data = false; ///< Ephimeris data is available for this vehicle.
-    bool used_in_fix = false;  ///< This vehicle has been used to obtain a fix.
-    units::Quantity<units::PlaneAngle> azimuth; ///< Azimuth of SV.
-    units::Quantity<units::PlaneAngle> elevation; ///< Elevation of SV.
+    Key key;                                         ///< Unique key identifying an instance.
+    float snr = -std::numeric_limits<float>::max();  ///< Signal to noise ratio;
+    bool has_almanac_data = false;                   ///< Almanac data available for this vehicle.
+    bool has_ephimeris_data = false;                 ///< Ephimeris data is available for this vehicle.
+    bool used_in_fix = false;                        ///< This vehicle has been used to obtain a fix.
+    units::Quantity<units::PlaneAngle> azimuth;      ///< Azimuth of SV.
+    units::Quantity<units::PlaneAngle> elevation;    ///< Elevation of SV.
 };
 
 inline std::ostream& operator<<(std::ostream& out, const SpaceVehicle& sv)
 {
-    static const std::map<SpaceVehicle::Type, std::string> lut =
-    {
-        {SpaceVehicle::Type::unknown, "unknown"},
-        {SpaceVehicle::Type::beidou, "beidou"},
-        {SpaceVehicle::Type::galileo, "galileo"},
-        {SpaceVehicle::Type::glonass, "glonass"},
-        {SpaceVehicle::Type::gps, "gps"},
-        {SpaceVehicle::Type::compass, "compass"},
-        {SpaceVehicle::Type::irnss, "irnss"},
-        {SpaceVehicle::Type::qzss, "qzss" }
-    };
+    static const std::map<SpaceVehicle::Type, std::string> lut = {{SpaceVehicle::Type::unknown, "unknown"},
+                                                                  {SpaceVehicle::Type::beidou, "beidou"},
+                                                                  {SpaceVehicle::Type::galileo, "galileo"},
+                                                                  {SpaceVehicle::Type::glonass, "glonass"},
+                                                                  {SpaceVehicle::Type::gps, "gps"},
+                                                                  {SpaceVehicle::Type::compass, "compass"},
+                                                                  {SpaceVehicle::Type::irnss, "irnss"},
+                                                                  {SpaceVehicle::Type::qzss, "qzss"}};
     return out << "("
                << "type: " << lut.at(sv.key.type) << ", "
                << "prn: " << sv.key.id << ", "
@@ -113,11 +111,10 @@
                << "has_ephimeris_data: " << sv.has_ephimeris_data << ", "
                << "used_in_fix: " << sv.used_in_fix << ", "
                << "azimuth: " << sv.azimuth << ", "
-               << "elevation: " << sv.elevation
-               << ")";
+               << "elevation: " << sv.elevation << ")";
 }
 }
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SPACE_VEHICLE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SPACE_VEHICLE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/units/units.h'
--- include/location_service/com/ubuntu/location/units/units.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/units/units.h	2015-04-23 17:23:49 +0000
@@ -49,7 +49,7 @@
 static const Velocity MeterPerSecond;
 static const Velocity MetersPerSecond;
 
-template<typename Unit>
+template <typename Unit>
 using Quantity = boost::units::quantity<Unit, double>;
 
 typedef boost::units::si::dimensionless Dimensionless;
@@ -58,15 +58,14 @@
 using boost::units::cos;
 using boost::units::atan2;
 
-template<typename Unit>
+template <typename Unit>
 inline bool roughly_equals(const Quantity<Unit>& lhs, const Quantity<Unit>& rhs)
 {
-    return std::fabs(lhs.value()-rhs.value()) <= std::numeric_limits<double>::epsilon();
-}
-}
-}
-}
-}
-
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_UNITS_UNITS_H_
-
+    return std::fabs(lhs.value() - rhs.value()) <= std::numeric_limits<double>::epsilon();
+}
+}
+}
+}
+}
+
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_UNITS_UNITS_H_
 
=== modified file 'include/location_service/com/ubuntu/location/update.h'
--- include/location_service/com/ubuntu/location/update.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/update.h	2015-04-23 17:23:49 +0000
@@ -32,7 +32,7 @@
  * @brief Templated class that wraps a value and timestamp.
  * @tparam T The contained value.
  */
-template<typename T>
+template <typename T>
 struct Update
 {
     /**
@@ -40,9 +40,9 @@
       * @param [in] value The value delivered with this update.
       * @param [in] when The timestamp when the value was measured.
       */
-    inline Update(const T& value = T{},
-           const Clock::Timestamp& when = Clock::now())
-        : value{value}, when{when}
+    inline Update(const T& value = T{}, const Clock::Timestamp& when = Clock::now())
+        : value{value}
+        , when{when}
     {
     }
 
@@ -78,15 +78,14 @@
  * @param out The stream to write to.
  * @param update The value to be printed.
  */
-template<typename T>
+template <typename T>
 inline std::ostream& operator<<(std::ostream& out, const Update<T>& update)
 {
     out << "Update(" << update.value << ", " << update.when.time_since_epoch().count() << ")";
     return out;
 }
-
-}
-}
-}
-
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_UPDATE_H_
+}
+}
+}
+
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_UPDATE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/velocity.h'
--- include/location_service/com/ubuntu/location/velocity.h	2014-06-20 07:40:34 +0000
+++ include/location_service/com/ubuntu/location/velocity.h	2015-04-23 17:23:49 +0000
@@ -32,4 +32,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_VELOCITY_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_VELOCITY_H_
 
=== modified file 'include/location_service/com/ubuntu/location/wgs84/altitude.h'
--- include/location_service/com/ubuntu/location/wgs84/altitude.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/wgs84/altitude.h	2015-04-23 17:23:49 +0000
@@ -35,13 +35,15 @@
 }
 typedef Coordinate<tag::Altitude, units::Length> Altitude;
 
-template<>
+template <>
 struct CoordinateTraits<Altitude>
 {
-    static void check_and_throw_if_invalid(const typename Altitude::Quantity&) {}
+    static void check_and_throw_if_invalid(const typename Altitude::Quantity&)
+    {
+    }
 };
 }
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_ALTITUDE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_ALTITUDE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/wgs84/coordinate.h'
--- include/location_service/com/ubuntu/location/wgs84/coordinate.h	2013-12-12 14:36:32 +0000
+++ include/location_service/com/ubuntu/location/wgs84/coordinate.h	2015-04-23 17:23:49 +0000
@@ -30,7 +30,7 @@
 {
 namespace wgs84
 {
-template<typename Coordinate>
+template <typename Coordinate>
 struct CoordinateTraits
 {
     static void check_and_throw_if_invalid(const typename Coordinate::Quantity& coordinate)
@@ -38,7 +38,7 @@
     }
 };
 
-template<typename Tag, typename UnitType>
+template <typename Tag, typename UnitType>
 class Coordinate
 {
 public:
@@ -48,15 +48,15 @@
     explicit Coordinate(const Quantity& value = Quantity())
         : value(value)
     {
-        CoordinateTraits<Coordinate<Tag,UnitType>>::check_and_throw_if_invalid(value);
+        CoordinateTraits<Coordinate<Tag, UnitType>>::check_and_throw_if_invalid(value);
     }
 
-    bool operator==(const Coordinate<Tag,UnitType>& rhs) const
+    bool operator==(const Coordinate<Tag, UnitType>& rhs) const
     {
         return value == rhs.value;
     }
 
-    bool operator!=(const Coordinate<Tag,UnitType>& rhs) const
+    bool operator!=(const Coordinate<Tag, UnitType>& rhs) const
     {
         return value != rhs.value;
     }
@@ -64,14 +64,14 @@
     Quantity value;
 };
 
-template<typename T, typename U>
-Coordinate<T,U> operator-(const Coordinate<T,U>& lhs, const Coordinate<T,U>& rhs)
+template <typename T, typename U>
+Coordinate<T, U> operator-(const Coordinate<T, U>& lhs, const Coordinate<T, U>& rhs)
 {
-    return Coordinate<T,U> {rhs.value - lhs.value};
+    return Coordinate<T, U>{rhs.value - lhs.value};
 }
 
-template<typename T, typename U>
-std::ostream& operator<<(std::ostream& out, const Coordinate<T,U>& coord)
+template <typename T, typename U>
+std::ostream& operator<<(std::ostream& out, const Coordinate<T, U>& coord)
 {
     out << "Coordinate(" << coord.value << ")";
     return out;
@@ -80,4 +80,4 @@
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_COORDINATE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_COORDINATE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/wgs84/latitude.h'
--- include/location_service/com/ubuntu/location/wgs84/latitude.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/wgs84/latitude.h	2015-04-23 17:23:49 +0000
@@ -37,7 +37,7 @@
 }
 typedef Coordinate<tag::Latitude, units::PlaneAngle> Latitude;
 
-template<>
+template <>
 struct CoordinateTraits<Latitude>
 {
     static double min()
@@ -52,13 +52,17 @@
     static void check_and_throw_if_invalid(const typename Latitude::Quantity& coordinate)
     {
         if (coordinate.value() < min())
+        {
             throw std::out_of_range(u8"Latitude(coordinate.value() < min())");
+        }
         if (coordinate.value() > max())
+        {
             throw std::out_of_range(u8"Latitude(coordinate.value() > max())");
+        }
     }
 };
 }
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LATITUDE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LATITUDE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/wgs84/longitude.h'
--- include/location_service/com/ubuntu/location/wgs84/longitude.h	2013-12-10 09:42:54 +0000
+++ include/location_service/com/ubuntu/location/wgs84/longitude.h	2015-04-23 17:23:49 +0000
@@ -37,7 +37,7 @@
 }
 typedef Coordinate<tag::Longitude, units::PlaneAngle> Longitude;
 
-template<>
+template <>
 struct CoordinateTraits<Longitude>
 {
     static double min()
@@ -52,13 +52,17 @@
     static void check_and_throw_if_invalid(const typename Longitude::Quantity& coordinate)
     {
         if (coordinate.value() < min())
+        {
             throw std::out_of_range(u8"Longitude(coordinate.value() < min())");
+        }
         if (coordinate.value() > max())
+        {
             throw std::out_of_range(u8"Longitude(coordinate.value() > max())");
+        }
     }
 };
 }
 }
 }
 }
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LATITUDE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LATITUDE_H_
 
=== modified file 'include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h'
--- include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h	2014-11-14 11:26:45 +0000
+++ include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h	2015-04-23 17:23:49 +0000
@@ -28,8 +28,8 @@
 {
 enum class WifiAndCellIdReportingState
 {
-    on, ///< Wifi and Cell Ids might be reported to online location services.
-    off ///< Wifi and Cell Ids are _not_ reported. This is the default value.
+    on,  ///< Wifi and Cell Ids might be reported to online location services.
+    off  ///< Wifi and Cell Ids are _not_ reported. This is the default value.
 };
 
 /** @brief Pretty prints the given state to the given stream. */
@@ -40,4 +40,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WIFI_AND_CELL_REPORTING_STATE_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WIFI_AND_CELL_REPORTING_STATE_H_
 
=== modified file 'src/location_service/com/ubuntu/location/boost_ptree_settings.cpp'
--- src/location_service/com/ubuntu/location/boost_ptree_settings.cpp	2015-01-14 13:41:54 +0000
+++ src/location_service/com/ubuntu/location/boost_ptree_settings.cpp	2015-04-23 17:23:49 +0000
@@ -25,7 +25,8 @@
 namespace location = com::ubuntu::location;
 
 // Creates a new instance, reading values from the given filename.
-location::BoostPtreeSettings::BoostPtreeSettings(const std::string& fn) : fn{fn}
+location::BoostPtreeSettings::BoostPtreeSettings(const std::string& fn)
+    : fn{fn}
 {
     try
     {
@@ -52,7 +53,7 @@
 
 // Returns true iff a value is known for the given key.
 bool location::BoostPtreeSettings::has_value_for_key(const std::string& key) const
-{    
+{
     return tree.count(key) > 0;
 }
 
 
=== modified file 'src/location_service/com/ubuntu/location/boost_ptree_settings.h'
--- src/location_service/com/ubuntu/location/boost_ptree_settings.h	2014-11-14 19:24:45 +0000
+++ src/location_service/com/ubuntu/location/boost_ptree_settings.h	2015-04-23 17:23:49 +0000
@@ -59,4 +59,4 @@
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_BOOST_PTREE_SETTINGS_H_
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_BOOST_PTREE_SETTINGS_H_
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp	2014-11-10 12:31:47 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp	2015-04-23 17:23:49 +0000
@@ -24,15 +24,14 @@
 {
 // We use this for debugging purposes.
 const bool also_apply_cell_change_heuristics_to_gsm_cells =
-    core::posix::this_process::env::get(
-            "COM_UBUNTU_LOCATION_CONNECTIVITY_DATA_CELL_FOR_GSM_TOO",
-            "false") == "true";
+    core::posix::this_process::env::get("COM_UBUNTU_LOCATION_CONNECTIVITY_DATA_CELL_FOR_GSM_TOO", "false") == "true";
 
 std::int64_t timeout_in_seconds()
 {
     auto value = core::posix::this_process::env::get("COM_UBUNTU_LOCATION_CONNECTIVITY_DATA_CELL_TIMEOUT", "60");
     std::stringstream ss(value);
-    std::uint64_t result; ss >> result;
+    std::uint64_t result;
+    ss >> result;
 
     return result;
 }
@@ -50,65 +49,56 @@
 
 const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type>& detail::CachedRadioCell::type_lut()
 {
-    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type> lut
-    {
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::gsm(),
-            com::ubuntu::location::connectivity::RadioCell::Type::gsm
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::lte(),
-            com::ubuntu::location::connectivity::RadioCell::Type::lte
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::umts(),
-            com::ubuntu::location::connectivity::RadioCell::Type::umts
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::edge(),
-            com::ubuntu::location::connectivity::RadioCell::Type::gsm
-        },
-        {
-            org::Ofono::Manager::Modem::NetworkRegistration::Technology::hspa(),
-            com::ubuntu::location::connectivity::RadioCell::Type::umts
-        },
-        {std::string(), com::ubuntu::location::connectivity::RadioCell::Type::unknown}
-    };
+    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type> lut{
+        {org::Ofono::Manager::Modem::NetworkRegistration::Technology::gsm(),
+         com::ubuntu::location::connectivity::RadioCell::Type::gsm},
+        {org::Ofono::Manager::Modem::NetworkRegistration::Technology::lte(),
+         com::ubuntu::location::connectivity::RadioCell::Type::lte},
+        {org::Ofono::Manager::Modem::NetworkRegistration::Technology::umts(),
+         com::ubuntu::location::connectivity::RadioCell::Type::umts},
+        {org::Ofono::Manager::Modem::NetworkRegistration::Technology::edge(),
+         com::ubuntu::location::connectivity::RadioCell::Type::gsm},
+        {org::Ofono::Manager::Modem::NetworkRegistration::Technology::hspa(),
+         com::ubuntu::location::connectivity::RadioCell::Type::umts},
+        {std::string(), com::ubuntu::location::connectivity::RadioCell::Type::unknown}};
 
     return lut;
 }
 
-detail::CachedRadioCell::CellChangeHeuristics::CellChangeHeuristics(
-        boost::asio::io_service& io_service,
-        bool needed)
-    : needed(needed),
-      io_service(io_service),
-      invalidation_timer(io_service),
-      valid(true)
+detail::CachedRadioCell::CellChangeHeuristics::CellChangeHeuristics(boost::asio::io_service& io_service, bool needed)
+    : needed(needed)
+    , io_service(io_service)
+    , invalidation_timer(io_service)
+    , valid(true)
 {
 }
 
 detail::CachedRadioCell::CachedRadioCell(const org::Ofono::Manager::Modem& modem, boost::asio::io_service& io_service)
-    : RadioCell(),      
-      cell_change_heuristics(io_service, is_running_on_problematic_modem_firmware(modem)),
-      roaming(false),
-      radio_type(Type::gsm),
-      modem(modem),
-      detail{}
+    : RadioCell()
+    , cell_change_heuristics(io_service, is_running_on_problematic_modem_firmware(modem))
+    , roaming(false)
+    , radio_type(Type::gsm)
+    , modem(modem)
+    , detail{}
 {
     auto status = query_status();
     radio_type = query_technology();
 
-    connections.network_registration_properties_changed = modem.network_registration.signals.property_changed->connect([this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-    {
-        on_network_registration_property_changed(tuple);
-    });
+    connections.network_registration_properties_changed = modem.network_registration.signals.property_changed->connect(
+        [this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
+        {
+            on_network_registration_property_changed(tuple);
+        });
 
     if (not is_registered_or_roaming(status))
+    {
         return;
+    }
 
     if (radio_type == com::ubuntu::location::connectivity::RadioCell::Type::unknown)
+    {
         return;
+    }
 
     auto lac = query_lac();
     auto mcc = query_mcc();
@@ -116,53 +106,47 @@
     auto cell_id = query_cid();
     auto strength = query_strength();
 
-    switch(radio_type)
-    {
-    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-    {
-        com::ubuntu::location::connectivity::RadioCell::Gsm gsm
-        {
-            com::ubuntu::location::connectivity::RadioCell::Gsm::MCC{mcc},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::MNC{mnc},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::LAC{lac},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::ID{cell_id},
-            com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(strength/100.f)
-        };
-        VLOG(1) << gsm;
-        detail.gsm = gsm;
-        break;
-    }
-    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-    {
-        com::ubuntu::location::connectivity::RadioCell::Lte lte
-        {
-            com::ubuntu::location::connectivity::RadioCell::Lte::MCC{mcc},
-            com::ubuntu::location::connectivity::RadioCell::Lte::MNC{mnc},
-            com::ubuntu::location::connectivity::RadioCell::Lte::TAC{lac},
-            com::ubuntu::location::connectivity::RadioCell::Lte::ID{cell_id},
-            com::ubuntu::location::connectivity::RadioCell::Lte::PID{},
-            com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(strength/100.f)
-        };
-        VLOG(1) << lte;
-        detail.lte = lte;
-        break;
-    }
-    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-    {
-        com::ubuntu::location::connectivity::RadioCell::Umts umts
-        {
-            com::ubuntu::location::connectivity::RadioCell::Umts::MCC{mcc},
-            com::ubuntu::location::connectivity::RadioCell::Umts::MNC{mnc},
-            com::ubuntu::location::connectivity::RadioCell::Umts::LAC{lac},
-            com::ubuntu::location::connectivity::RadioCell::Umts::ID{cell_id},
-            com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(strength/100.f)
-        };
-        VLOG(1) << umts;
-        detail.umts = umts;
-        break;
-    }
-    default:
-        break;
+    switch (radio_type)
+    {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+        {
+            com::ubuntu::location::connectivity::RadioCell::Gsm gsm{
+                com::ubuntu::location::connectivity::RadioCell::Gsm::MCC{mcc},
+                com::ubuntu::location::connectivity::RadioCell::Gsm::MNC{mnc},
+                com::ubuntu::location::connectivity::RadioCell::Gsm::LAC{lac},
+                com::ubuntu::location::connectivity::RadioCell::Gsm::ID{cell_id},
+                com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(strength / 100.f)};
+            VLOG(1) << gsm;
+            detail.gsm = gsm;
+            break;
+        }
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+        {
+            com::ubuntu::location::connectivity::RadioCell::Lte lte{
+                com::ubuntu::location::connectivity::RadioCell::Lte::MCC{mcc},
+                com::ubuntu::location::connectivity::RadioCell::Lte::MNC{mnc},
+                com::ubuntu::location::connectivity::RadioCell::Lte::TAC{lac},
+                com::ubuntu::location::connectivity::RadioCell::Lte::ID{cell_id},
+                com::ubuntu::location::connectivity::RadioCell::Lte::PID{},
+                com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(strength / 100.f)};
+            VLOG(1) << lte;
+            detail.lte = lte;
+            break;
+        }
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+        {
+            com::ubuntu::location::connectivity::RadioCell::Umts umts{
+                com::ubuntu::location::connectivity::RadioCell::Umts::MCC{mcc},
+                com::ubuntu::location::connectivity::RadioCell::Umts::MNC{mnc},
+                com::ubuntu::location::connectivity::RadioCell::Umts::LAC{lac},
+                com::ubuntu::location::connectivity::RadioCell::Umts::ID{cell_id},
+                com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(strength / 100.f)};
+            VLOG(1) << umts;
+            detail.umts = umts;
+            break;
+        }
+        default:
+            break;
     }
 
     roaming = status == org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::roaming;
@@ -172,7 +156,8 @@
 
 detail::CachedRadioCell::~CachedRadioCell()
 {
-    modem.network_registration.signals.property_changed->disconnect(connections.network_registration_properties_changed);
+    modem.network_registration.signals.property_changed->disconnect(
+        connections.network_registration_properties_changed);
 }
 
 const core::Property<bool>& detail::CachedRadioCell::is_roaming() const
@@ -198,7 +183,9 @@
 const com::ubuntu::location::connectivity::RadioCell::Gsm& detail::CachedRadioCell::gsm() const
 {
     if (radio_type != com::ubuntu::location::connectivity::RadioCell::Type::gsm)
+    {
         throw std::runtime_error("Bad access to unset network type.");
+    }
 
     return detail.gsm;
 }
@@ -206,7 +193,9 @@
 const com::ubuntu::location::connectivity::RadioCell::Umts& detail::CachedRadioCell::umts() const
 {
     if (radio_type != RadioCell::Type::umts)
+    {
         throw std::runtime_error("Bad access to unset network type.");
+    }
 
     return detail.umts;
 }
@@ -214,14 +203,18 @@
 const com::ubuntu::location::connectivity::RadioCell::Lte& detail::CachedRadioCell::lte() const
 {
     if (radio_type != RadioCell::Type::lte)
+    {
         throw std::runtime_error("Bad access to unset network type.");
+    }
 
     return detail.lte;
 }
 
-void detail::CachedRadioCell::on_network_registration_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple)
+void detail::CachedRadioCell::on_network_registration_property_changed(
+    const std::tuple<std::string, core::dbus::types::Variant>& tuple)
 {
-    VLOG(10) << "Property changed on modem " << modem.object->path() << " for network registration: " << std::get<0>(tuple);
+    VLOG(10) << "Property changed on modem " << modem.object->path()
+             << " for network registration: " << std::get<0>(tuple);
 
     const auto& key = std::get<0>(tuple);
     const auto& variant = std::get<1>(tuple);
@@ -232,9 +225,7 @@
     {
         did_cell_identity_change = true;
 
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType
-                >();
+        auto value = variant.as<org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType>();
 
         auto it = type_lut().find(value);
 
@@ -251,251 +242,254 @@
         }
 
         if (radio_type == it->second)
+        {
             return;
+        }
 
-        switch(radio_type)
+        switch (radio_type)
         {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            switch(it->second)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.location_area_code = detail.gsm.location_area_code;
-                detail.umts.mobile_network_code = detail.gsm.mobile_network_code;
-                detail.umts.mobile_country_code = detail.gsm.mobile_country_code;
-                detail.umts.strength.reset();
-                detail.umts.id.reset();
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.tracking_area_code = detail.gsm.location_area_code;
-                detail.lte.mobile_network_code = detail.gsm.mobile_network_code;
-                detail.lte.mobile_country_code = detail.gsm.mobile_country_code;
-                detail.lte.strength.reset();
-                detail.lte.id.reset();
-                break;
-            default:
-                break;
-            }
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            switch(it->second)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.location_area_code = detail.umts.location_area_code;
-                detail.gsm.mobile_network_code = detail.umts.mobile_network_code;
-                detail.gsm.mobile_country_code = detail.umts.mobile_country_code;
-                detail.gsm.strength.reset();
-                detail.gsm.id.reset();
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.tracking_area_code = detail.umts.location_area_code;
-                detail.lte.mobile_network_code = detail.umts.mobile_network_code;
-                detail.lte.mobile_country_code = detail.umts.mobile_country_code;
-                detail.lte.strength.reset();
-                detail.lte.id.reset();
-                break;
-            default:
-                break;
-            }
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            switch(it->second)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.location_area_code = detail.lte.tracking_area_code;
-                detail.gsm.mobile_network_code = detail.lte.mobile_network_code;
-                detail.gsm.mobile_country_code = detail.lte.mobile_country_code;
-                detail.gsm.strength.reset();
-                detail.gsm.id.reset();
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.location_area_code = detail.lte.tracking_area_code;
-                detail.umts.mobile_network_code = detail.lte.mobile_network_code;
-                detail.umts.mobile_country_code = detail.lte.mobile_country_code;
-                detail.umts.strength.reset();
-                detail.umts.id.reset();
-                break;
-            default:
-                break;
-            }
-        default:
-            // We take the default path here, specifically for cases where
-            // we started out with Technology::unknown.
-            break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                switch (it->second)
+                {
+                    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                        detail.umts.location_area_code = detail.gsm.location_area_code;
+                        detail.umts.mobile_network_code = detail.gsm.mobile_network_code;
+                        detail.umts.mobile_country_code = detail.gsm.mobile_country_code;
+                        detail.umts.strength.reset();
+                        detail.umts.id.reset();
+                        break;
+                    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                        detail.lte.tracking_area_code = detail.gsm.location_area_code;
+                        detail.lte.mobile_network_code = detail.gsm.mobile_network_code;
+                        detail.lte.mobile_country_code = detail.gsm.mobile_country_code;
+                        detail.lte.strength.reset();
+                        detail.lte.id.reset();
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                switch (it->second)
+                {
+                    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                        detail.gsm.location_area_code = detail.umts.location_area_code;
+                        detail.gsm.mobile_network_code = detail.umts.mobile_network_code;
+                        detail.gsm.mobile_country_code = detail.umts.mobile_country_code;
+                        detail.gsm.strength.reset();
+                        detail.gsm.id.reset();
+                        break;
+                    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                        detail.lte.tracking_area_code = detail.umts.location_area_code;
+                        detail.lte.mobile_network_code = detail.umts.mobile_network_code;
+                        detail.lte.mobile_country_code = detail.umts.mobile_country_code;
+                        detail.lte.strength.reset();
+                        detail.lte.id.reset();
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                switch (it->second)
+                {
+                    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                        detail.gsm.location_area_code = detail.lte.tracking_area_code;
+                        detail.gsm.mobile_network_code = detail.lte.mobile_network_code;
+                        detail.gsm.mobile_country_code = detail.lte.mobile_country_code;
+                        detail.gsm.strength.reset();
+                        detail.gsm.id.reset();
+                        break;
+                    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                        detail.umts.location_area_code = detail.lte.tracking_area_code;
+                        detail.umts.mobile_network_code = detail.lte.mobile_network_code;
+                        detail.umts.mobile_country_code = detail.lte.mobile_country_code;
+                        detail.umts.strength.reset();
+                        detail.umts.id.reset();
+                        break;
+                    default:
+                        break;
+                }
+            default:
+                // We take the default path here, specifically for cases where
+                // we started out with Technology::unknown.
+                break;
         };
 
         radio_type = it->second;
 
         if (cell_change_heuristics.valid.get())
+        {
             on_changed();
+        }
     }
 
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::CellId::name())
     {
         did_cell_identity_change = true;
 
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::CellId::ValueType
-                >();
+        auto value = variant.as<org::Ofono::Manager::Modem::NetworkRegistration::CellId::ValueType>();
 
-        switch(radio_type)
+        switch (radio_type)
         {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.id.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.id.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.id.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.id.set(value);
+                VLOG(1) << detail.gsm;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.id.set(value);
+                VLOG(1) << detail.umts;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.id.set(value);
+                VLOG(1) << detail.lte;
+                break;
+            default:
+                break;
         };
 
         if (cell_change_heuristics.valid.get())
+        {
             on_changed();
+        }
     }
 
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::name())
     {
         did_cell_identity_change = true;
 
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::ValueType
-                >();
-        switch(radio_type)
+        auto value = variant.as<org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::ValueType>();
+        switch (radio_type)
         {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.location_area_code.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.location_area_code.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.tracking_area_code.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.location_area_code.set(value);
+                VLOG(1) << detail.gsm;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.location_area_code.set(value);
+                VLOG(1) << detail.umts;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.tracking_area_code.set(value);
+                VLOG(1) << detail.lte;
+                break;
+            default:
+                break;
         };
 
         if (cell_change_heuristics.valid.get())
+        {
             on_changed();
+        }
     }
 
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::name())
     {
         did_cell_identity_change = true;
 
-        std::stringstream ss
-        {
-            variant.as<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::ValueType
-            >()
-        };
-        int value{-1}; ss >> value;
+        std::stringstream ss{
+            variant.as<org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::ValueType>()};
+        int value{-1};
+        ss >> value;
 
-        switch(radio_type)
+        switch (radio_type)
         {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.mobile_country_code.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.mobile_country_code.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.mobile_country_code.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.mobile_country_code.set(value);
+                VLOG(1) << detail.gsm;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.mobile_country_code.set(value);
+                VLOG(1) << detail.umts;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.mobile_country_code.set(value);
+                VLOG(1) << detail.lte;
+                break;
+            default:
+                break;
         };
 
         if (cell_change_heuristics.valid.get())
+        {
             on_changed();
+        }
     }
 
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::name())
     {
         did_cell_identity_change = true;
 
-        std::stringstream ss
-        {
-            variant.as<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::ValueType
-            >()
-        };
-        int value{-1}; ss >> value;
+        std::stringstream ss{
+            variant.as<org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::ValueType>()};
+        int value{-1};
+        ss >> value;
 
-        switch(radio_type)
+        switch (radio_type)
         {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.mobile_network_code.set(value);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.mobile_network_code.set(value);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.mobile_network_code.set(value);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.mobile_network_code.set(value);
+                VLOG(1) << detail.gsm;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.mobile_network_code.set(value);
+                VLOG(1) << detail.umts;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.mobile_network_code.set(value);
+                VLOG(1) << detail.lte;
+                break;
+            default:
+                break;
         };
 
         if (cell_change_heuristics.valid.get())
+        {
             on_changed();
+        }
     }
 
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::Strength::name())
     {
-        auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Strength::ValueType
-                >();
+        auto value = variant.as<org::Ofono::Manager::Modem::NetworkRegistration::Strength::ValueType>();
 
-        switch(radio_type)
+        switch (radio_type)
         {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            detail.gsm.strength
-                    = com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(value/100.f);
-            VLOG(1) << detail.gsm;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            detail.umts.strength
-                    = com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(value/100.f);
-            VLOG(1) << detail.umts;
-            break;
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            detail.lte.strength
-                    = com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(value/100.f);
-            VLOG(1) << detail.lte;
-            break;
-        default:
-            break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.strength =
+                    com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(value / 100.f);
+                VLOG(1) << detail.gsm;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.strength =
+                    com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(value / 100.f);
+                VLOG(1) << detail.umts;
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.strength =
+                    com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(value / 100.f);
+                VLOG(1) << detail.lte;
+                break;
+            default:
+                break;
         };
 
         if (cell_change_heuristics.valid.get())
+        {
             on_changed();
+        }
     }
 
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::Status::name())
     {
-        roaming =
-                variant.as<org::Ofono::Manager::Modem::NetworkRegistration::Status::ValueType>() ==
-                org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming;
+        roaming = variant.as<org::Ofono::Manager::Modem::NetworkRegistration::Status::ValueType>() ==
+                  org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming;
     }
 
     if (did_cell_identity_change)
+    {
         execute_cell_change_heuristics_if_appropriate();
+    }
 }
 
 void detail::CachedRadioCell::execute_cell_change_heuristics_if_appropriate()
@@ -504,9 +498,9 @@
     // whenever the cell identity changes, we start a timer and invalidate the
     // cell to account for situations where the underlying modem firmware does not
     // report cell changes when on a 3G data connection.
-    if (cell_change_heuristics.needed && // Only carry out this step if it is actually required
+    if (cell_change_heuristics.needed &&  // Only carry out this step if it is actually required
         (radio_type == com::ubuntu::location::connectivity::RadioCell::Type::umts ||
-         also_apply_cell_change_heuristics_to_gsm_cells)) // and if it's a 3G cell.
+         also_apply_cell_change_heuristics_to_gsm_cells))  // and if it's a 3G cell.
     {
         static const boost::posix_time::seconds timeout{timeout_in_seconds()};
 
@@ -514,10 +508,12 @@
 
         cell_change_heuristics.invalidation_timer.expires_from_now(timeout);
         cell_change_heuristics.invalidation_timer.async_wait([this](boost::system::error_code ec)
-        {
-            if (not ec)
-                cell_change_heuristics.valid = false;
-        });
+                                                             {
+                                                                 if (not ec)
+                                                                 {
+                                                                     cell_change_heuristics.valid = false;
+                                                                 }
+                                                             });
 
         cell_change_heuristics.valid = is_cell_details_valid();
     }
@@ -526,32 +522,42 @@
 // Queries the status from the Ofono NetworkRegistration.
 org::Ofono::Manager::Modem::NetworkRegistration::Status::Value detail::CachedRadioCell::query_status()
 {
-    auto status =
-            modem.network_registration.get
-            <
-                org::Ofono::Manager::Modem::NetworkRegistration::Status
-            >();
+    auto status = modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::Status>();
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::unregistered)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unregistered;
+    }
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::registered)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::registered;
+    }
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::searching)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::searching;
+    }
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::denied)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::denied;
+    }
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::unknown)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unknown;
+    }
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::unregistered)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unregistered;
+    }
 
     if (status == org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming)
+    {
         return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::roaming;
+    }
 
     return org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::unknown;
 }
@@ -559,15 +565,14 @@
 // Queries the technology from the Ofono NetworkRegistration.
 com::ubuntu::location::connectivity::RadioCell::Type detail::CachedRadioCell::query_technology()
 {
-    auto technology =
-            modem.network_registration.get<
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology
-            >();
+    auto technology = modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::Technology>();
 
     auto it = type_lut().find(technology);
 
     if (it == type_lut().end())
+    {
         return com::ubuntu::location::connectivity::RadioCell::Type::unknown;
+    }
 
     return it->second;
 }
@@ -575,60 +580,44 @@
 // Queries the cell id from the Ofono NetworkRegistration.
 int detail::CachedRadioCell::query_cid()
 {
-    return modem.network_registration.get
-    <
-        org::Ofono::Manager::Modem::NetworkRegistration::CellId
-    >();
+    return modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::CellId>();
 }
 
 // Queries the location area code from the Ofono NetworkRegistration.
 std::uint16_t detail::CachedRadioCell::query_lac()
 {
-    return modem.network_registration.get
-    <
-        org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode
-    >();
+    return modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode>();
 }
 
 // Queries the mobile network code from the Ofono NetworkRegistration.
 int detail::CachedRadioCell::query_mnc()
 {
-    std::stringstream ssmnc
-    {
-        modem.network_registration.get
-        <
-            org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode
-        >()
-    };
-    int mnc{0}; ssmnc >> mnc;
+    std::stringstream ssmnc{
+        modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode>()};
+    int mnc{0};
+    ssmnc >> mnc;
     return mnc;
 }
 
 // Queries the mobile country code from the Ofono NetworkRegistration.
 int detail::CachedRadioCell::query_mcc()
 {
-    std::stringstream ssmcc
-    {
-        modem.network_registration.get
-        <
-            org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode
-        >()
-    };
-    int mcc{0}; ssmcc >> mcc;
+    std::stringstream ssmcc{
+        modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode>()};
+    int mcc{0};
+    ssmcc >> mcc;
     return mcc;
 }
 
 // Queries the signal strength from the Ofono NetworkRegistration.
 std::int8_t detail::CachedRadioCell::query_strength()
 {
-    return modem.network_registration.get
-    <
-        org::Ofono::Manager::Modem::NetworkRegistration::Strength
-    >();
+    return modem.network_registration.get<org::Ofono::Manager::Modem::NetworkRegistration::Strength>();
 }
 
 // Returns true iff status is either roaming or registered.
-bool detail::CachedRadioCell::is_registered_or_roaming(org::Ofono::Manager::Modem::NetworkRegistration::Status::Value status)
+bool detail::CachedRadioCell::is_registered_or_roaming(
+    org::Ofono::Manager::Modem::NetworkRegistration::Status::Value status)
 {
     return status == org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::registered ||
            status == org::Ofono::Manager::Modem::NetworkRegistration::Status::Value::roaming;
@@ -637,16 +626,16 @@
 // Returns true iff all the parts of the cell are populated with valid values.
 bool detail::CachedRadioCell::is_cell_details_valid()
 {
-    switch(radio_type)
+    switch (radio_type)
     {
-    case com::ubuntu::location::connectivity::RadioCell::Type::unknown:
-        return false;
-    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-        return is_gsm_valid();
-    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-        return is_umts_valid();
-    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-        return is_lte_valid();
+        case com::ubuntu::location::connectivity::RadioCell::Type::unknown:
+            return false;
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            return is_gsm_valid();
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            return is_umts_valid();
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            return is_lte_valid();
     }
 
     return false;
@@ -655,46 +644,41 @@
 // Retuns true iff the GSM cell details are valid.
 bool detail::CachedRadioCell::is_gsm_valid()
 {
-   return gsm().mobile_country_code.is_valid() &&
-          gsm().mobile_network_code.is_valid() &&
-          gsm().location_area_code.is_valid() &&
-          gsm().id.is_valid() &&
-          gsm().strength.is_valid();
+    return gsm().mobile_country_code.is_valid() && gsm().mobile_network_code.is_valid() &&
+           gsm().location_area_code.is_valid() && gsm().id.is_valid() && gsm().strength.is_valid();
 }
 
 // Returns true iff the Umts cell details are valid.
 bool detail::CachedRadioCell::is_umts_valid()
 {
-    return umts().mobile_country_code.is_valid() &&
-           umts().mobile_network_code.is_valid() &&
-           umts().location_area_code.is_valid() &&
-           umts().id.is_valid() &&
-           umts().strength.is_valid();
+    return umts().mobile_country_code.is_valid() && umts().mobile_network_code.is_valid() &&
+           umts().location_area_code.is_valid() && umts().id.is_valid() && umts().strength.is_valid();
 }
 
 // Returns true iff the Lte cell details are valid.
 bool detail::CachedRadioCell::is_lte_valid()
 {
-    return lte().mobile_country_code.is_valid() &&
-           lte().mobile_network_code.is_valid() &&
-           lte().tracking_area_code.is_valid() &&
-           lte().id.is_valid() &&
-           lte().physical_id.is_valid() &&
+    return lte().mobile_country_code.is_valid() && lte().mobile_network_code.is_valid() &&
+           lte().tracking_area_code.is_valid() && lte().id.is_valid() && lte().physical_id.is_valid() &&
            lte().strength.is_valid();
 }
 
-detail::CachedRadioCell::Detail::Detail() : none(detail::CachedRadioCell::None{})
-{
-}
-
-detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm) : gsm(gsm)
-{
-}
-
-detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts) : umts(umts)
-{
-}
-
-detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte) : lte(lte)
+detail::CachedRadioCell::Detail::Detail()
+    : none(detail::CachedRadioCell::None{})
+{
+}
+
+detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm)
+    : gsm(gsm)
+{
+}
+
+detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts)
+    : umts(umts)
+{
+}
+
+detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte)
+    : lte(lte)
 {
 }
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h'
--- src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h	2014-10-13 12:38:40 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h	2015-04-23 17:23:49 +0000
@@ -72,8 +72,7 @@
     // cell change heuristics go here.
     struct CellChangeHeuristics
     {
-        CellChangeHeuristics(boost::asio::io_service& io_service,
-                             bool needed);
+        CellChangeHeuristics(boost::asio::io_service& io_service, bool needed);
         // True if the heuristic is needed
         const bool needed;
         // The io_service for setting up timeouts.
@@ -86,7 +85,7 @@
         // Property to indicate whether the current cell is
         // still valid according to the cell change heuristics.
         core::Property<bool> valid;
-    } cell_change_heuristics;       
+    } cell_change_heuristics;
     // Executes the cell change heuristics if precondition is met.
     void execute_cell_change_heuristics_if_appropriate();
 
@@ -123,15 +122,15 @@
     // Encapsulates all event connections that have to be cut on destruction.
     struct
     {
-        core::dbus::Signal
-        <
-            org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged,
-            org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged::ArgumentType
-        >::SubscriptionToken network_registration_properties_changed;
+        core::dbus::Signal<org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged,
+                           org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged::ArgumentType>::
+            SubscriptionToken network_registration_properties_changed;
     } connections;
 
     // Marks the unset type in a variant.
-    struct None {};
+    struct None
+    {
+    };
 
     // Our custom variant handling the different known cell identity details.
     union Detail
@@ -154,4 +153,4 @@
 };
 }
 
-#endif // CACHED_RADIO_CELL_H_
+#endif  // CACHED_RADIO_CELL_H_
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2014-08-14 20:33:37 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2015-04-23 17:23:49 +0000
@@ -27,25 +27,23 @@
     return std::string(ssid.begin(), ssid.end());
 }
 
-com::ubuntu::location::connectivity::WirelessNetwork::Mode
-wifi_mode_from_ap_mode(org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType value)
+com::ubuntu::location::connectivity::WirelessNetwork::Mode wifi_mode_from_ap_mode(
+    org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType value)
 {
-    com::ubuntu::location::connectivity::WirelessNetwork::Mode mode
-    {
-        com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown
-    };
+    com::ubuntu::location::connectivity::WirelessNetwork::Mode mode{
+        com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown};
 
     switch (value)
     {
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::unknown:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown;
-        break;
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::adhoc:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::adhoc;
-        break;
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::infra:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::infrastructure;
-        break;
+        case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::unknown:
+            mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown;
+            break;
+        case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::adhoc:
+            mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::adhoc;
+            break;
+        case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::infra:
+            mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::infrastructure;
+            break;
     }
 
     return mode;
@@ -77,101 +75,76 @@
     return frequency_;
 }
 
-const core::Property<connectivity::WirelessNetwork::SignalStrength>& detail::CachedWirelessNetwork::signal_strength() const
+const core::Property<connectivity::WirelessNetwork::SignalStrength>& detail::CachedWirelessNetwork::signal_strength()
+    const
 {
     return signal_strength_;
 }
 
-detail::CachedWirelessNetwork::CachedWirelessNetwork(
-        const org::freedesktop::NetworkManager::Device& device,
-        const org::freedesktop::NetworkManager::AccessPoint& ap)
-    : device_(device),
-      access_point_(ap)
+detail::CachedWirelessNetwork::CachedWirelessNetwork(const org::freedesktop::NetworkManager::Device& device,
+                                                     const org::freedesktop::NetworkManager::AccessPoint& ap)
+    : device_(device)
+    , access_point_(ap)
 {
-    last_seen_ = std::chrono::system_clock::time_point
-    {
-        std::chrono::system_clock::duration{access_point_.last_seen->get()}
-    };
+    last_seen_ =
+        std::chrono::system_clock::time_point{std::chrono::system_clock::duration{access_point_.last_seen->get()}};
 
     bssid_ = access_point_.hw_address->get();
     ssid_ = utf8_ssid_to_string(access_point_.ssid->get());
     mode_ = wifi_mode_from_ap_mode(access_point_.mode->get());
-    frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
-    {
-        static_cast<int>(access_point_.frequency->get())
-    };
-    signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
-    {
-        static_cast<int>(access_point_.strength->get())
-    };
+    frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency{
+        static_cast<int>(access_point_.frequency->get())};
+    signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength{
+        static_cast<int>(access_point_.strength->get())};
 
     // Wire up all the connections
     access_point_.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
-    {
-        on_access_point_properties_changed(dict);
-    });
+                                              {
+                                                  on_access_point_properties_changed(dict);
+                                              });
 }
 
-void detail::CachedWirelessNetwork::on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict)
+void detail::CachedWirelessNetwork::on_access_point_properties_changed(
+    const std::map<std::string, core::dbus::types::Variant>& dict)
 {
     // We route by string
-    static const std::unordered_map<std::string, std::function<void(CachedWirelessNetwork&, const core::dbus::types::Variant&)> > lut
-    {
-        {
-            org::freedesktop::NetworkManager::AccessPoint::HwAddress::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.bssid_ = value.as<org::freedesktop::NetworkManager::AccessPoint::HwAddress::ValueType>();
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Ssid::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.ssid_ = utf8_ssid_to_string(value.as<org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType>());
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Strength::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
-                {
-                    value.as<org::freedesktop::NetworkManager::AccessPoint::Strength::ValueType>()
-                };
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Frequency::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
-                {
-                    static_cast<int>(value.as<org::freedesktop::NetworkManager::AccessPoint::Frequency::ValueType>())
-                };
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::Mode::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.mode_ = wifi_mode_from_ap_mode(value.as<org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType>());
-            }
-        },
-        {
-            org::freedesktop::NetworkManager::AccessPoint::LastSeen::name(),
-            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-            {
-                thiz.last_seen_ = std::chrono::system_clock::time_point
-                {
-                    std::chrono::system_clock::duration
-                    {
-                        value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>()
-                    }
-                };
-            }
-        }
-    };
+    static const std::unordered_map<std::string,
+                                    std::function<void(CachedWirelessNetwork&, const core::dbus::types::Variant&)>> lut{
+        {org::freedesktop::NetworkManager::AccessPoint::HwAddress::name(),
+         [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+         {
+             thiz.bssid_ = value.as<org::freedesktop::NetworkManager::AccessPoint::HwAddress::ValueType>();
+         }},
+        {org::freedesktop::NetworkManager::AccessPoint::Ssid::name(),
+         [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+         {
+             thiz.ssid_ =
+                 utf8_ssid_to_string(value.as<org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType>());
+         }},
+        {org::freedesktop::NetworkManager::AccessPoint::Strength::name(),
+         [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+         {
+             thiz.signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength{
+                 value.as<org::freedesktop::NetworkManager::AccessPoint::Strength::ValueType>()};
+         }},
+        {org::freedesktop::NetworkManager::AccessPoint::Frequency::name(),
+         [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+         {
+             thiz.frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency{
+                 static_cast<int>(value.as<org::freedesktop::NetworkManager::AccessPoint::Frequency::ValueType>())};
+         }},
+        {org::freedesktop::NetworkManager::AccessPoint::Mode::name(),
+         [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+         {
+             thiz.mode_ =
+                 wifi_mode_from_ap_mode(value.as<org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType>());
+         }},
+        {org::freedesktop::NetworkManager::AccessPoint::LastSeen::name(),
+         [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+         {
+             thiz.last_seen_ = std::chrono::system_clock::time_point{std::chrono::system_clock::duration{
+                 value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>()}};
+         }}};
 
     for (const auto& pair : dict)
     {
@@ -182,8 +155,12 @@
         // log the issue for later analysis.
         try
         {
-            if (lut.count(pair.first) > 0) lut.at(pair.first)(*this, pair.second);
-        } catch (...)
+            if (lut.count(pair.first) > 0)
+            {
+                lut.at(pair.first)(*this, pair.second);
+            }
+        }
+        catch (...)
         {
             VLOG(1) << "Exception while updating state for property change: " << pair.first;
         }
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h	2014-08-14 20:25:22 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h	2015-04-23 17:23:49 +0000
@@ -37,9 +37,8 @@
     // Constructs a new instance associated with the ap and the (remote) device
     // it belongs to. Please note that the caching nature of the class ensures that
     // ap and device stubs are kept alive.
-    CachedWirelessNetwork(
-            const org::freedesktop::NetworkManager::Device& device,
-            const org::freedesktop::NetworkManager::AccessPoint& ap);
+    CachedWirelessNetwork(const org::freedesktop::NetworkManager::Device& device,
+                          const org::freedesktop::NetworkManager::AccessPoint& ap);
 
     // Timestamp when the network became visible.
     const core::Property<std::chrono::system_clock::time_point>& last_seen() const override;
@@ -76,4 +75,4 @@
 };
 }
 
-#endif // CACHED_WIRELESS_NETWORK_H_
+#endif  // CACHED_WIRELESS_NETWORK_H_
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/dummy_connectivity_manager.h'
--- src/location_service/com/ubuntu/location/connectivity/dummy_connectivity_manager.h	2014-10-08 20:51:25 +0000
+++ src/location_service/com/ubuntu/location/connectivity/dummy_connectivity_manager.h	2015-04-23 17:23:49 +0000
@@ -50,7 +50,8 @@
         return properties.is_wwan_hardware_enabled;
     }
 
-    const core::Property<com::ubuntu::location::connectivity::Characteristics>& active_connection_characteristics() const
+    const core::Property<com::ubuntu::location::connectivity::Characteristics>& active_connection_characteristics()
+        const
     {
         return properties.active_connection_characteristics;
     }
@@ -74,7 +75,8 @@
         return sigs.wireless_network_removed;
     }
 
-    void enumerate_visible_wireless_networks(const std::function<void(const com::ubuntu::location::connectivity::WirelessNetwork::Ptr&)>&) const
+    void enumerate_visible_wireless_networks(
+        const std::function<void(const com::ubuntu::location::connectivity::WirelessNetwork::Ptr&)>&) const
     {
     }
 
@@ -88,7 +90,8 @@
         return sigs.connected_cell_removed;
     }
 
-    void enumerate_connected_radio_cells(const std::function<void(const com::ubuntu::location::connectivity::RadioCell::Ptr&)>&) const
+    void enumerate_connected_radio_cells(
+        const std::function<void(const com::ubuntu::location::connectivity::RadioCell::Ptr&)>&) const
     {
     }
 
@@ -98,7 +101,8 @@
         core::Property<bool> is_wwan_enabled{false};
         core::Property<bool> is_wifi_hardware_enabled{false};
         core::Property<bool> is_wwan_hardware_enabled{false};
-        core::Property<com::ubuntu::location::connectivity::State> state{com::ubuntu::location::connectivity::State::unknown};
+        core::Property<com::ubuntu::location::connectivity::State> state{
+            com::ubuntu::location::connectivity::State::unknown};
         core::Property<com::ubuntu::location::connectivity::Characteristics> active_connection_characteristics{};
     } properties;
 
@@ -113,4 +117,4 @@
 };
 }
 
-#endif // DUMMY_CONNECTIVITY_MANAGER_H_
+#endif  // DUMMY_CONNECTIVITY_MANAGER_H_
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/manager.cpp	2014-10-02 06:59:46 +0000
+++ src/location_service/com/ubuntu/location/connectivity/manager.cpp	2015-04-23 17:23:49 +0000
@@ -24,14 +24,30 @@
 {
     switch (state)
     {
-    case State::unknown: out << "State::unknown"; break;
-    case State::asleep: out << "State::asleep"; break;
-    case State::disconnected: out << "State::disconnected"; break;
-    case State::disconnecting: out << "State::disconnecting"; break;
-    case State::connecting: out << "State::connecting"; break;
-    case State::connected_local: out << "State::connected_local"; break;
-    case State::connected_site: out << "State::connected_site"; break;
-    case State::connected_global: out << "State::connected_global"; break;
+        case State::unknown:
+            out << "State::unknown";
+            break;
+        case State::asleep:
+            out << "State::asleep";
+            break;
+        case State::disconnected:
+            out << "State::disconnected";
+            break;
+        case State::disconnecting:
+            out << "State::disconnecting";
+            break;
+        case State::connecting:
+            out << "State::connecting";
+            break;
+        case State::connected_local:
+            out << "State::connected_local";
+            break;
+        case State::connected_site:
+            out << "State::connected_site";
+            break;
+        case State::connected_global:
+            out << "State::connected_global";
+            break;
     }
 
     return out;
@@ -53,18 +69,41 @@
 
     out << "[";
 
-    if ((characteristics & connectivity::Characteristics::connection_goes_via_wifi) != connectivity::Characteristics::none)
-    { out << "connection_goes_via_wifi"; first = false; }
-    if ((characteristics & connectivity::Characteristics::connection_goes_via_wwan) != connectivity::Characteristics::none)
-    { out << (first ? "" : ", ") << "connection_goes_via_wwan"; first = false; }
+    if ((characteristics & connectivity::Characteristics::connection_goes_via_wifi) !=
+        connectivity::Characteristics::none)
+    {
+        out << "connection_goes_via_wifi";
+        first = false;
+    }
+    if ((characteristics & connectivity::Characteristics::connection_goes_via_wwan) !=
+        connectivity::Characteristics::none)
+    {
+        out << (first ? "" : ", ") << "connection_goes_via_wwan";
+        first = false;
+    }
     if ((characteristics & connectivity::Characteristics::connection_is_roaming) != connectivity::Characteristics::none)
-    { out << (first ? "" : ", ") << "connection_is_roaming"; first = false; }
-    if ((characteristics & connectivity::Characteristics::connection_has_monetary_costs) != connectivity::Characteristics::none)
-    { out << (first ? "" : ", ") << "connection_has_monetary_costs"; first = false; }
-    if ((characteristics & connectivity::Characteristics::connection_is_bandwith_limited) != connectivity::Characteristics::none)
-    { out << (first ? "" : ", ") << "connection_is_bandwidth_limited"; first = false; }
-    if ((characteristics & connectivity::Characteristics::connection_is_volume_limited) != connectivity::Characteristics::none)
-    { out << (first ? "" : ", ") << "connection_is_volume_limited"; first = false; }
+    {
+        out << (first ? "" : ", ") << "connection_is_roaming";
+        first = false;
+    }
+    if ((characteristics & connectivity::Characteristics::connection_has_monetary_costs) !=
+        connectivity::Characteristics::none)
+    {
+        out << (first ? "" : ", ") << "connection_has_monetary_costs";
+        first = false;
+    }
+    if ((characteristics & connectivity::Characteristics::connection_is_bandwith_limited) !=
+        connectivity::Characteristics::none)
+    {
+        out << (first ? "" : ", ") << "connection_is_bandwidth_limited";
+        first = false;
+    }
+    if ((characteristics & connectivity::Characteristics::connection_is_volume_limited) !=
+        connectivity::Characteristics::none)
+    {
+        out << (first ? "" : ", ") << "connection_is_volume_limited";
+        first = false;
+    }
 
     out << "]";
     return out;
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/nm.h'
--- src/location_service/com/ubuntu/location/connectivity/nm.h	2015-02-26 10:59:22 +0000
+++ src/location_service/com/ubuntu/location/connectivity/nm.h	2015-04-23 17:23:49 +0000
@@ -151,14 +151,14 @@
         };
 
         AccessPoint(const std::shared_ptr<core::dbus::Object>& object)
-            : object(object),
-              frequency(object->get_property<Frequency>()),
-              last_seen(object->get_property<LastSeen>()),
-              mode(object->get_property<Mode>()),
-              hw_address(object->get_property<HwAddress>()),
-              ssid(object->get_property<Ssid>()),
-              strength(object->get_property<Strength>()),
-              properties_changed(object->get_signal<PropertiesChanged>())
+            : object(object)
+            , frequency(object->get_property<Frequency>())
+            , last_seen(object->get_property<LastSeen>())
+            , mode(object->get_property<Mode>())
+            , hw_address(object->get_property<HwAddress>())
+            , ssid(object->get_property<Ssid>())
+            , strength(object->get_property<Strength>())
+            , properties_changed(object->get_signal<PropertiesChanged>())
         {
         }
 
@@ -291,17 +291,13 @@
             static const bool writable = false;
         };
 
-        Device(const std::shared_ptr<core::dbus::Service>& service,
-               const std::shared_ptr<core::dbus::Object>& object)
-            : service(service),
-              object(object),
-              device_type(object->get_property<DeviceType>()),
-              signals
-              {
-                  object->get_signal<Wireless::Signals::ScanDone>(),
-                  object->get_signal<Wireless::Signals::AccessPointAdded>(),
-                  object->get_signal<Wireless::Signals::AccessPointRemoved>()
-              }
+        Device(const std::shared_ptr<core::dbus::Service>& service, const std::shared_ptr<core::dbus::Object>& object)
+            : service(service)
+            , object(object)
+            , device_type(object->get_property<DeviceType>())
+            , signals{object->get_signal<Wireless::Signals::ScanDone>(),
+                      object->get_signal<Wireless::Signals::AccessPointAdded>(),
+                      object->get_signal<Wireless::Signals::AccessPointRemoved>()}
         {
         }
 
@@ -316,10 +312,14 @@
             auto result = object->transact_method<Wireless::GetAccessPoints, ResultType>();
 
             if (result.is_error())
+            {
                 throw std::runtime_error(result.error().print());
+            }
 
             for (const auto& path : result.value())
+            {
                 f(path);
+            }
         }
 
         std::vector<AccessPoint> get_access_points() const
@@ -328,12 +328,16 @@
             auto result = object->invoke_method_synchronously<Wireless::GetAccessPoints, ResultType>();
 
             if (result.is_error())
+            {
                 throw std::runtime_error(result.error().print());
+            }
 
             std::vector<AccessPoint> aps;
 
             for (const auto& path : result.value())
+            {
                 aps.push_back(AccessPoint(service->object_for_path(path)));
+            }
 
             return aps;
         }
@@ -350,8 +354,10 @@
         struct
         {
             core::dbus::Signal<Wireless::Signals::ScanDone, Wireless::Signals::ScanDone::ArgumentType>::Ptr scan_done;
-            core::dbus::Signal<Wireless::Signals::AccessPointAdded, Wireless::Signals::AccessPointAdded::ArgumentType>::Ptr ap_added;
-            core::dbus::Signal<Wireless::Signals::AccessPointRemoved, Wireless::Signals::AccessPointRemoved::ArgumentType>::Ptr ap_removed;
+            core::dbus::Signal<Wireless::Signals::AccessPointAdded,
+                               Wireless::Signals::AccessPointAdded::ArgumentType>::Ptr ap_added;
+            core::dbus::Signal<Wireless::Signals::AccessPointRemoved,
+                               Wireless::Signals::AccessPointRemoved::ArgumentType>::Ptr ap_removed;
         } signals;
     };
 
@@ -382,12 +388,9 @@
 
         ActiveConnection(const std::shared_ptr<core::dbus::Service>& service,
                          const std::shared_ptr<core::dbus::Object>& object)
-            : service{service},
-              object{object},
-              properties
-              {
-                  object->get_property<Properties::Devices>()
-              }
+            : service{service}
+            , object{object}
+            , properties{object->get_property<Properties::Devices>()}
         {
         }
 
@@ -396,14 +399,16 @@
             auto device_paths = properties.devices->get();
 
             for (const auto& device_path : device_paths)
+            {
                 functor(device_path);
+            }
         }
 
         std::shared_ptr<core::dbus::Service> service;
         std::shared_ptr<core::dbus::Object> object;
         struct
         {
-            std::shared_ptr<core::dbus::Property<Properties::Devices> > devices;
+            std::shared_ptr<core::dbus::Property<Properties::Devices>> devices;
         } properties;
     };
 
@@ -603,41 +608,35 @@
     };
 
     NetworkManager(const core::dbus::Bus::Ptr& bus)
-        : service(core::dbus::Service::use_service<NetworkManager>(bus)),
-          object(service->object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/NetworkManager"))),
-          properties
-          {
-              object->get_property<Properties::Connectivity>(),
-              object->get_property<Properties::PrimaryConnection>(),
-              object->get_property<Properties::State>(),
-              object->get_property<Properties::WirelessEnabled>(),
-              object->get_property<Properties::WirelessHardwareEnabled>(),
-              object->get_property<Properties::WwanEnabled>(),
-              object->get_property<Properties::WwanHardwareEnabled>()
-          },
-          signals
-          {
-              object->get_signal<Signals::DeviceAdded>(),
-              object->get_signal<Signals::DeviceRemoved>(),
-              object->get_signal<Signals::PropertiesChanged>(),
-              object->get_signal<Signals::StateChanged>()
-          }
+        : service(core::dbus::Service::use_service<NetworkManager>(bus))
+        , object(service->object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/NetworkManager")))
+        , properties{object->get_property<Properties::Connectivity>(),
+                     object->get_property<Properties::PrimaryConnection>(),
+                     object->get_property<Properties::State>(),
+                     object->get_property<Properties::WirelessEnabled>(),
+                     object->get_property<Properties::WirelessHardwareEnabled>(),
+                     object->get_property<Properties::WwanEnabled>(),
+                     object->get_property<Properties::WwanHardwareEnabled>()}
+        , signals{object->get_signal<Signals::DeviceAdded>(),
+                  object->get_signal<Signals::DeviceRemoved>(),
+                  object->get_signal<Signals::PropertiesChanged>(),
+                  object->get_signal<Signals::StateChanged>()}
     {
     }
 
     void for_each_device(const std::function<void(const core::dbus::types::ObjectPath&)>& f)
     {
-        auto result =
-                object->transact_method<
-                    NetworkManager::GetDevices,
-                    std::vector<core::dbus::types::ObjectPath>
-                >();
+        auto result = object->transact_method<NetworkManager::GetDevices, std::vector<core::dbus::types::ObjectPath>>();
 
         if (result.is_error())
+        {
             throw std::runtime_error(result.error().print());
+        }
 
         for (const auto& path : result.value())
+        {
             f(path);
+        }
     }
 
     Device device_for_path(const core::dbus::types::ObjectPath& path)
@@ -648,20 +647,18 @@
     std::vector<Device> get_devices()
     {
         auto result =
-                object->invoke_method_synchronously<
-                    NetworkManager::GetDevices,
-                    std::vector<core::dbus::types::ObjectPath>>();
+            object
+                ->invoke_method_synchronously<NetworkManager::GetDevices, std::vector<core::dbus::types::ObjectPath>>();
 
         if (result.is_error())
+        {
             throw std::runtime_error(result.error().print());
+        }
 
         std::vector<Device> devices;
         for (const auto& path : result.value())
         {
-            devices.emplace_back(
-                        Device(
-                            service,
-                            service->object_for_path(path)));
+            devices.emplace_back(Device(service, service->object_for_path(path)));
         }
 
         return devices;
@@ -672,23 +669,24 @@
 
     struct
     {
-        std::shared_ptr<core::dbus::Property<Properties::Connectivity> > connectivity;
-        std::shared_ptr<core::dbus::Property<Properties::PrimaryConnection> > primary_connection;
-        std::shared_ptr<core::dbus::Property<Properties::State> > state;
-        std::shared_ptr<core::dbus::Property<Properties::WirelessEnabled> > is_wifi_enabled;
-        std::shared_ptr<core::dbus::Property<Properties::WirelessHardwareEnabled> > is_wifi_hardware_enabled;
-        std::shared_ptr<core::dbus::Property<Properties::WwanEnabled> > is_wwan_enabled;
-        std::shared_ptr<core::dbus::Property<Properties::WwanHardwareEnabled> > is_wwan_hardware_enabled;
+        std::shared_ptr<core::dbus::Property<Properties::Connectivity>> connectivity;
+        std::shared_ptr<core::dbus::Property<Properties::PrimaryConnection>> primary_connection;
+        std::shared_ptr<core::dbus::Property<Properties::State>> state;
+        std::shared_ptr<core::dbus::Property<Properties::WirelessEnabled>> is_wifi_enabled;
+        std::shared_ptr<core::dbus::Property<Properties::WirelessHardwareEnabled>> is_wifi_hardware_enabled;
+        std::shared_ptr<core::dbus::Property<Properties::WwanEnabled>> is_wwan_enabled;
+        std::shared_ptr<core::dbus::Property<Properties::WwanHardwareEnabled>> is_wwan_hardware_enabled;
     } properties;
     struct
     {
         core::dbus::Signal<Signals::DeviceAdded, Signals::DeviceAdded::ArgumentType>::Ptr device_added;
         core::dbus::Signal<Signals::DeviceRemoved, Signals::DeviceRemoved::ArgumentType>::Ptr device_removed;
-        core::dbus::Signal<Signals::PropertiesChanged, Signals::PropertiesChanged::ArgumentType>::Ptr properties_changed;
+        core::dbus::Signal<Signals::PropertiesChanged, Signals::PropertiesChanged::ArgumentType>::Ptr
+            properties_changed;
         core::dbus::Signal<Signals::StateChanged, Signals::StateChanged::ArgumentType>::Ptr state_changed;
     } signals;
 };
 }
 }
 
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_NM_H
+#endif  // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_NM_H
 
=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono.h	2015-01-06 12:35:02 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono.h	2015-04-23 17:23:49 +0000
@@ -36,84 +36,31 @@
 {
 struct Ofono
 {
-static const std::string& name()
-{
-    static const std::string s{"org.ofono"};
-    return s;
-}
-struct Manager
-{
-    typedef std::shared_ptr<Manager> Ptr;
-
     static const std::string& name()
     {
-        static const std::string s{"org.ofono.Manager"};
+        static const std::string s{"org.ofono"};
         return s;
     }
-
-    struct GetModems
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"GetModems"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::vector<
-            core::dbus::types::Struct<
-                core::dbus::types::ObjectPath
-            >
-        > ResultType;
-
-        static std::chrono::milliseconds default_timeout()
-        {
-            return std::chrono::seconds{1};
-        }
-    };
-
-    struct ModemAdded
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemAdded"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::tuple<core::dbus::types::ObjectPath, std::map<std::string, std::string>> ArgumentType;
-    };
-
-    struct ModemRemoved
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemRemoved"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef core::dbus::types::ObjectPath ArgumentType;
-    };
-
-    struct Modem
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.ofono.Modem"};
-            return s;
-        }
-
-        struct GetProperties
+    struct Manager
+    {
+        typedef std::shared_ptr<Manager> Ptr;
+
+        static const std::string& name()
+        {
+            static const std::string s{"org.ofono.Manager"};
+            return s;
+        }
+
+        struct GetModems
         {
             static const std::string& name()
             {
-                static const std::string s{"GetProperties"};
+                static const std::string s{"GetModems"};
                 return s;
             }
 
-            typedef Modem Interface;
-            typedef std::map<std::string, core::dbus::types::Variant> ValueType;
+            typedef Manager Interface;
+            typedef std::vector<core::dbus::types::Struct<core::dbus::types::ObjectPath>> ResultType;
 
             static std::chrono::milliseconds default_timeout()
             {
@@ -121,287 +68,37 @@
             }
         };
 
-        struct PropertyChanged
-        {
-            inline static std::string name()
-            {
-                return "PropertyChanged";
-            }
-
-            typedef Modem Interface;
-
-            typedef std::tuple<std::string, core::dbus::types::Variant> ArgumentType;
-        };
-
-        struct Properties
-        {
-            struct Powered
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Powered"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef bool ValueType;
-                static const bool readable = true;
-                static const bool writable = true;
-            };
-
-            struct Online
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Online"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef bool ValueType;
-                static const bool readable = true;
-                static const bool writable = true;
-            };
-
-            struct Lockdown
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Lockdown"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef bool ValueType;
-                static const bool readable = true;
-                static const bool writable = true;
-            };
-
-            struct Name
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Name"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Manufacturer
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Manufacturer"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Model
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Model"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Revision
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Revision"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Serial
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Serial"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Features
-            {
-                static constexpr const char* net{"net"};
-                static constexpr const char* rat{"rat"};
-                static constexpr const char* cbs{"cbs"};
-                static constexpr const char* sms{"sms"};
-                static constexpr const char* sim{"sim"};
-                static constexpr const char* stk{"stk"};
-                static constexpr const char* ussd{"ussd"};
-                static constexpr const char* gprs{"gprs"};
-                static constexpr const char* tty{"tty"};
-                static constexpr const char* gps{"gps"};
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Features"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::vector<std::string> ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Interfaces
-            {
-                static constexpr const char* assisted_satellite_navigation
-                {
-                    "org.ofono.AssistedSatelliteNavigation"
-                };
-                static constexpr const char* audio_settings
-                {
-                    "org.ofono.AudioSettings"
-                };
-                static constexpr const char* call_barring
-                {
-                    "org.ofono.CallBarring"
-                };
-                static constexpr const char* call_forwarding
-                {
-                    "org.ofono.CallForwarding"
-                };
-                static constexpr const char* call_meter
-                {
-                    "org.ofono.CallMeter"
-                };
-                static constexpr const char* call_settings
-                {
-                    "org.ofono.CallSettings"
-                };
-                static constexpr const char* call_volume
-                {
-                    "org.ofono.CallVolume"
-                };
-                static constexpr const char* cell_broadcast
-                {
-                    "org.ofono.CellBroadcast"
-                };
-                static constexpr const char* hands_free
-                {
-                    "org.ofono.Handsfree"
-                };
-                static constexpr const char* location_reporting
-                {
-                    "org.ofono.LocationReporting"
-                };
-                static constexpr const char* message_manager
-                {
-                    "org.ofono.MessageManager"
-                };
-                static constexpr const char* message_waiting
-                {
-                    "org.ofono.MessageWaiting"
-                };
-                static constexpr const char* network_registration
-                {
-                    "org.ofono.NetworkRegistration"
-                };
-                static constexpr const char* phonebook
-                {
-                    "org.ofono.Phonebook"
-                };
-                static constexpr const char* push_notification
-                {
-                    "org.ofono.PushNotification"
-                };
-                static constexpr const char* radio_settings
-                {
-                    "org.ofono.RadioSettings"
-                };
-                static constexpr const char* sim_manager
-                {
-                    "org.ofono.SimManager"
-                };
-                static constexpr const char* smart_messaging
-                {
-                    "org.ofono.SmartMessaging"
-                };
-                static constexpr const char* sim_toolkit
-                {
-                    "org.ofono.SimToolkit"
-                };
-                static constexpr const char* supplementary_services
-                {
-                    "org.ofono.SupplementaryServices"
-                };
-                static constexpr const char* text_telephony
-                {
-                    "org.ofono.TextTelephony"
-                };
-                static constexpr const char* voice_call_manager
-                {
-                    "org.ofono.VoiceCallManager"
-                };
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Interfaces"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::vector<std::string> ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Type
-            {
-                static constexpr const char* test{"test"};
-                static constexpr const char* hfp{"hfp"};
-                static constexpr const char* sap{"sap"};
-                static constexpr const char* hardware{"hardware"};
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Type"};
-                    return s;
-                }
-
-                typedef Modem Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-        };
-
-        struct NetworkRegistration
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"org.ofono.NetworkRegistration"};
-                return s;
-            }            
+        struct ModemAdded
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"ModemAdded"};
+                return s;
+            }
+
+            typedef Manager Interface;
+            typedef std::tuple<core::dbus::types::ObjectPath, std::map<std::string, std::string>> ArgumentType;
+        };
+
+        struct ModemRemoved
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"ModemRemoved"};
+                return s;
+            }
+
+            typedef Manager Interface;
+            typedef core::dbus::types::ObjectPath ArgumentType;
+        };
+
+        struct Modem
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"org.ofono.Modem"};
+                return s;
+            }
 
             struct GetProperties
             {
@@ -411,7 +108,7 @@
                     return s;
                 }
 
-                typedef NetworkRegistration Interface;
+                typedef Modem Interface;
                 typedef std::map<std::string, core::dbus::types::Variant> ValueType;
 
                 static std::chrono::milliseconds default_timeout()
@@ -427,229 +124,498 @@
                     return "PropertyChanged";
                 }
 
-                typedef NetworkRegistration Interface;
+                typedef Modem Interface;
 
                 typedef std::tuple<std::string, core::dbus::types::Variant> ArgumentType;
             };
 
-            struct Status
-            {
-                enum class Value
-                {
-                    unregistered,
-                    registered,
-                    searching,
-                    denied,
-                    unknown,
-                    roaming
-                };
-
-                static constexpr const char* unregistered
-                {
-                    "unregistered"
-                };
-                static constexpr const char* registered
-                {
-                    "registered"
-                };
-                static constexpr const char* searching
-                {
-                    "searching"
-                };
-                static constexpr const char* denied
-                {
-                    "denied"
-                };
-                static constexpr const char* unknown
-                {
-                    "unknown"
-                };
-                static constexpr const char* roaming
-                {
-                    "roaming"
-                };
-
-                static const char* value_to_string(Value value)
-                {
-                    switch (value)
-                    {
-                    case Value::unregistered: return unregistered;
-                    case Value::registered: return registered;
-                    case Value::searching: return searching;
-                    case Value::denied: return denied;
-                    case Value::unknown: return unknown;
-                    case Value::roaming: return roaming;
-                    }
-
-                    return nullptr;
-                }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Status"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct LocationAreaCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"LocationAreaCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint16_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct CellId
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"CellId"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint32_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileCountryCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileCountryCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileNetworkCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileNetworkCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Technology
-            {
-                static const char* gsm() { return "gsm"; }
-                static const char* edge() { return "edge"; }
-                static const char* umts() { return "umts"; }
-                static const char* hspa() { return "hspa"; }
-                static const char* lte() { return "lte"; }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Technology"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Strength
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Strength"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::int8_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            NetworkRegistration(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  signals
-                  {
-                      object->get_signal<PropertyChanged>()
-                  }
-            {
-            }
-
-            // Calling this function might fail. However, we do not throw and only log
-            // the issue for later forensics.
-            bool refresh_properties() const
-            {
-                auto result = object->invoke_method_synchronously<GetProperties, GetProperties::ValueType>();
-
-                if (result.is_error())
-                {
-                    LOG(WARNING) << "Could not refresh properties for org::Ofono::Modem::NetworkRegistration: " << result.error().print();
-                    return false;
-                }
-
-                properties = result.value();
-                return true;
-            }
-
-            template<typename Property>
-            typename Property::ValueType get(bool refresh = true) const
-            {
-                if (refresh)
-                {
-                    if (not refresh_properties())
+            struct Properties
+            {
+                struct Powered
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Powered"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef bool ValueType;
+                    static const bool readable = true;
+                    static const bool writable = true;
+                };
+
+                struct Online
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Online"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef bool ValueType;
+                    static const bool readable = true;
+                    static const bool writable = true;
+                };
+
+                struct Lockdown
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Lockdown"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef bool ValueType;
+                    static const bool readable = true;
+                    static const bool writable = true;
+                };
+
+                struct Name
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Name"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef std::string ValueType;
+                    static const bool readable = true;
+                    static const bool writable = false;
+                };
+
+                struct Manufacturer
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Manufacturer"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef std::string ValueType;
+                    static const bool readable = true;
+                    static const bool writable = false;
+                };
+
+                struct Model
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Model"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef std::string ValueType;
+                    static const bool readable = true;
+                    static const bool writable = false;
+                };
+
+                struct Revision
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Revision"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef std::string ValueType;
+                    static const bool readable = true;
+                    static const bool writable = false;
+                };
+
+                struct Serial
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"Serial"};
+                        return s;
+                    }
+
+                    typedef Modem Interface;
+                    typedef std::string ValueType;
+                    static const bool readable = true;
+                    static const bool writable = false;
+                };