Merge lp:~thomas-voss/location-service/unify-source-code-formatting into lp:location-service/trunk

[Thomas Voß]

Unify source code formatting.

Unify source code formatting.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

172. By Thomas Voß on 2015-02-03

Unify source code formatting.

=== modified file '_clang-format'
--- _clang-format	2015-02-03 09:10:02 +0000
+++ _clang-format	2015-02-03 09:10:02 +0000
@@ -5,7 +5,7 @@
 AlignEscapedNewlinesLeft: false
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All

=== 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-02-03 09:10:02 +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,7 +47,7 @@
     static T worst();
 };
 
-template<typename T>
+template <typename T>
 struct Accuracy
 {
     typedef typename T::Unit Unit;
@@ -64,13 +64,12 @@
     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;
 }
-
 }
 }
 }

=== 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-02-03 09:10:02 +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)
@@ -83,14 +83,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 +107,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 +121,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::Position>
 {
     typedef com::ubuntu::location::Position::Accuracy::Horizontal HorizontalAccuracy;
@@ -147,10 +148,9 @@
     }
 };
 
-
 namespace helper
 {
-template<>
+template <>
 struct TypeMapper<com::ubuntu::location::SpaceVehicle::Key>
 {
     constexpr static ArgumentType type_value()
@@ -169,12 +169,12 @@
     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 +194,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 +223,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::SpaceVehicle>
 {
     inline static void encode_argument(Message::Writer& writer, const com::ubuntu::location::SpaceVehicle& in)
@@ -257,7 +257,7 @@
 
 namespace helper
 {
-template<>
+template <>
 struct TypeMapper<std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>>
 {
     constexpr static ArgumentType type_value()
@@ -280,7 +280,7 @@
     }
 };
 }
-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)
@@ -288,7 +288,7 @@
         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);
         }
@@ -308,7 +308,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::Criteria>
 {
     typedef com::ubuntu::location::units::Quantity<com::ubuntu::location::units::Length> HorizontalAccuracy;
@@ -343,7 +343,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 +357,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 +371,7 @@
     }
 };
 
-template<>
+template <>
 struct Codec<com::ubuntu::location::WifiAndCellIdReportingState>
 {
     static void encode_argument(Message::Writer& writer, const com::ubuntu::location::WifiAndCellIdReportingState& in)
@@ -387,7 +387,7 @@
 
 namespace helper
 {
-template<typename T>
+template <typename T>
 struct TypeMapper<com::ubuntu::location::Update<T>>
 {
     constexpr static ArgumentType type_value()
@@ -406,14 +406,14 @@
     static std::string signature()
     {
         static const std::string s =
-                helper::TypeMapper<T>::signature() +
-                helper::TypeMapper<uint64_t>::signature();
+            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,7 +426,7 @@
     {
         Codec<T>::decode_argument(reader, in.value);
         in.when = com::ubuntu::location::Clock::Timestamp(com::ubuntu::location::Clock::Duration(reader.pop_int64()));
-    }    
+    }
 };
 }
 }

=== 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-02-03 09:10:02 +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-02-03 09:10:02 +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)
     {
     }
 
@@ -101,8 +99,8 @@
     {
         if (value < min || value > max)
             throw std::runtime_error(
-                    std::to_string(value) + " is not in " + "[" +
-                    std::to_string(min) + ", " + std::to_string(max) + "]");
+                std::to_string(value) + " is not in " + "[" +
+                std::to_string(min) + ", " + std::to_string(max) + "]");
     }
 
     /**
@@ -170,8 +168,8 @@
     {
         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) + "]");
+                std::to_string(new_value) + " is not in " + "[" +
+                std::to_string(min) + ", " + std::to_string(max) + "]");
 
         value = new_value;
     }

=== 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-02-03 09:10:02 +0000
@@ -154,7 +154,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.

=== 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-02-03 09:10:02 +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,31 @@
     struct Gsm
     {
         /** 3-digit Mobile Country Code, 0..999, INT_MAX if unknown */
-        typedef MobileCountryCode
-        <
+        typedef MobileCountryCode<
             0,
             999,
-            std::numeric_limits<int>::max()
-        > MCC;
+            std::numeric_limits<int>::max()> MCC;
         /** 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
-        typedef MobileNetworkCode
-        <
+        typedef MobileNetworkCode<
             0,
             999,
-            std::numeric_limits<int>::max()
-        > MNC;
+            std::numeric_limits<int>::max()> MNC;
         /** 16-bit Location Area Code, 0..65535, INT_MAX if unknown  */
-        typedef LocationAreaCode
-        <
+        typedef LocationAreaCode<
             0,
             65535,
-            std::numeric_limits<int>::max()
-        > LAC;
+            std::numeric_limits<int>::max()> LAC;
         /** 16-bit GSM Cell Identity described in TS 27.007, 0..65535, INT_MAX if unknown  */
-        typedef CellId
-        <
+        typedef CellId<
             0,
             65535,
-            std::numeric_limits<int>::max()
-        > ID;
+            std::numeric_limits<int>::max()> ID;
 
         /** Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
-        typedef ArbitraryStrengthUnit
-        <
+        typedef ArbitraryStrengthUnit<
             0,
             31,
-            99
-        > SignalStrength;
+            99> SignalStrength;
 
         MCC mobile_country_code;
         MNC mobile_network_code;
@@ -133,40 +141,30 @@
     struct Umts
     {
         /** 3-digit Mobile Country Code, 0..999, INT_MAX if unknown */
-        typedef MobileCountryCode
-        <
+        typedef MobileCountryCode<
             0,
             999,
-            std::numeric_limits<int>::max()
-        > MCC;
+            std::numeric_limits<int>::max()> MCC;
         /** 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
-        typedef MobileNetworkCode
-        <
+        typedef MobileNetworkCode<
             0,
             999,
-            std::numeric_limits<int>::max()
-        > MNC;
+            std::numeric_limits<int>::max()> MNC;
         /** 16-bit Location Area Code, 0..65535, INT_MAX if unknown  */
-        typedef LocationAreaCode
-        <
+        typedef LocationAreaCode<
             0,
             65535,
-            std::numeric_limits<int>::max()
-        > LAC;
+            std::numeric_limits<int>::max()> LAC;
         /** 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown  */
-        typedef CellId
-        <
+        typedef CellId<
             0,
             268435455,
-            std::numeric_limits<int>::max()
-        > ID;
+            std::numeric_limits<int>::max()> ID;
         /** Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
-        typedef ArbitraryStrengthUnit
-        <
+        typedef ArbitraryStrengthUnit<
             0,
             31,
-            99
-        > SignalStrength;
+            99> SignalStrength;
 
         MCC mobile_country_code;
         MNC mobile_network_code;
@@ -179,47 +177,35 @@
     struct Lte
     {
         /** 3-digit Mobile Country Code, 0..999, INT_MAX if unknown */
-        typedef MobileCountryCode
-        <
+        typedef MobileCountryCode<
             0,
             999,
-            std::numeric_limits<int>::max()
-        > MCC;
+            std::numeric_limits<int>::max()> MCC;
         /** 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
-        typedef MobileNetworkCode
-        <
+        typedef MobileNetworkCode<
             0,
             999,
-            std::numeric_limits<int>::max()
-        > MNC;
+            std::numeric_limits<int>::max()> MNC;
         /** 16-bit Tracking Area Code, 0..65535, INT_MAX if unknown  */
-        typedef TrackingAreaCode
-        <
+        typedef TrackingAreaCode<
             0,
             65535,
-            std::numeric_limits<int>::max()
-        > TAC;
+            std::numeric_limits<int>::max()> TAC;
         /** 28-bit Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown  */
-        typedef CellId
-        <
+        typedef CellId<
             0,
             268435455,
-            std::numeric_limits<int>::max()
-        > ID;
+            std::numeric_limits<int>::max()> ID;
         /** Physical cell id, 0..503, INT_MAX if unknown */
-        typedef PhysicalId
-        <
+        typedef PhysicalId<
             0,
             503,
-            std::numeric_limits<int>::max()
-        > PID;
+            std::numeric_limits<int>::max()> PID;
         /** Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
-        typedef ArbitraryStrengthUnit
-        <
+        typedef ArbitraryStrengthUnit<
             0,
             31,
-            99
-        > SignalStrength;
+            99> SignalStrength;
 
         MCC mobile_country_code;
         MNC mobile_network_code;
@@ -280,4 +266,3 @@
 }
 
 #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-02-03 09:10:02 +0000
@@ -52,27 +52,27 @@
     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
-    <
+    typedef BoundedInteger<
         Tag::Frequency,
         2412,
-        5825
-    > Frequency;
+        5825> Frequency;
 
     /** Strength of signal for an individual AP. */
-    typedef BoundedInteger
-    <
+    typedef BoundedInteger<
         Tag::SignalStrength,
         0,
-        100
-    > SignalStrength;
+        100> SignalStrength;
 
     /** @cond */
     WirelessNetwork() = default;

=== 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-02-03 09:10:02 +0000
@@ -42,18 +42,18 @@
 
     struct Requires
     {
-        bool position = true; ///< The client needs position 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.
+        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.
+        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{};
 };
 

=== 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-02-03 09:10:02 +0000
@@ -31,7 +31,7 @@
 public:
     DefaultProviderSelectionPolicy();
     ~DefaultProviderSelectionPolicy() noexcept;
-    
+
     ProviderSelection determine_provider_selection_for_criteria(
         const Criteria& criteria,
         const ProviderEnumerator& enumerator);

=== 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-02-03 09:10:02 +0000
@@ -22,4 +22,3 @@
 #include <glog/vlog_is_on.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-02-03 09:10:02 +0000
@@ -26,7 +26,7 @@
 {
 namespace location
 {
-template<typename T>
+template <typename T>
 using Optional = boost::optional<T>;
 }
 }

=== 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-02-03 09:10:02 +0000
@@ -52,21 +52,21 @@
      */
     enum class Features : std::size_t
     {
-        none = 0, ///< The provider does not support any feature.
+        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.
-    };    
+        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.
+        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

=== 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-02-03 09:10:02 +0000
@@ -37,7 +37,7 @@
 
 class ProviderFactory
 {
-  public:
+public:
     typedef com::ubuntu::location::Configuration Configuration;
     typedef std::function<Provider::Ptr(const Configuration&)> Factory;
 
@@ -56,7 +56,7 @@
 
     void enumerate(const std::function<void(const std::string&, const Factory&)>& enumerator);
 
-  private:
+private:
     ProviderFactory() = default;
     ~ProviderFactory() = default;
 

=== 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-02-03 09:10:02 +0000
@@ -38,7 +38,7 @@
             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,8 +52,8 @@
 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;
 }
 }
 }

=== 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-02-03 09:10:02 +0000
@@ -44,8 +44,8 @@
     virtual ~ProviderSelectionPolicy() = default;
 
     virtual ProviderSelection determine_provider_selection_for_criteria(
-            const Criteria& criteria,
-            const ProviderEnumerator& enumerator) = 0;
+        const Criteria& criteria,
+        const ProviderEnumerator& enumerator) = 0;
 
 protected:
     ProviderSelectionPolicy() = default;

=== 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-02-03 09:10:02 +0000
@@ -44,12 +44,11 @@
     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"}
-        };
+            {
+             {Status::error, "error"},
+             {Status::unavailable, "unavailable"},
+             {Status::acquiring, "acquiring"},
+             {Status::available, "available"}};
 
         return out << lut[status];
     }
@@ -211,7 +210,7 @@
 {
 namespace traits
 {
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue>
 {
     inline static const std::string& interface_name()
@@ -221,7 +220,7 @@
     }
 };
 
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue::Address>
 {
     inline static const std::string& interface_name()
@@ -231,7 +230,7 @@
     }
 };
 
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue::Position>
 {
     inline static const std::string& interface_name()
@@ -241,7 +240,7 @@
     }
 };
 
-template<>
+template <>
 struct Service<org::freedesktop::Geoclue::Velocity>
 {
     inline static const std::string& interface_name()

=== 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-02-03 09:10:02 +0000
@@ -33,7 +33,7 @@
 {
 class Provider : public com::ubuntu::location::Provider
 {
-  public:
+public:
     static Provider::Ptr create_instance(const ProviderFactory::Configuration&);
 
     struct Configuration
@@ -61,7 +61,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates();
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };

=== 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-02-03 09:10:02 +0000
@@ -100,8 +100,7 @@
         // com::ubuntu::remote::Interface on it.
         Skeleton(const core::dbus::Object::Ptr& object)
             : object{object},
-              properties
-              {
+              properties{
                   object->get_property<Properties::HasPosition>(),
                   object->get_property<Properties::HasVelocity>(),
                   object->get_property<Properties::HasHeading>(),
@@ -111,14 +110,11 @@
                   object->get_property<Properties::RequiresMonetarySpending>(),
                   object->get_property<Properties::ArePositionUpdatesRunning>(),
                   object->get_property<Properties::AreHeadingUpdatesRunning>(),
-                  object->get_property<Properties::AreVelocityUpdatesRunning>()
-              },
-              signals
-              {
+                  object->get_property<Properties::AreVelocityUpdatesRunning>()},
+              signals{
                   object->get_signal<Signals::PositionChanged>(),
                   object->get_signal<Signals::HeadingChanged>(),
-                  object->get_signal<Signals::VelocityChanged>()
-              }
+                  object->get_signal<Signals::VelocityChanged>()}
         {
         }
 
@@ -143,18 +139,15 @@
         {
             std::shared_ptr<core::dbus::Signal<
                 Signals::PositionChanged,
-                Signals::PositionChanged::ArgumentType
-            >> position_changed;
+                Signals::PositionChanged::ArgumentType>> position_changed;
 
             std::shared_ptr<core::dbus::Signal<
                 Signals::HeadingChanged,
-                Signals::HeadingChanged::ArgumentType
-            >> heading_changed;
+                Signals::HeadingChanged::ArgumentType>> heading_changed;
 
             std::shared_ptr<core::dbus::Signal<
                 Signals::VelocityChanged,
-                Signals::VelocityChanged::ArgumentType
-            >> velocity_changed;
+                Signals::VelocityChanged::ArgumentType>> velocity_changed;
         } signals;
     };
 
@@ -164,8 +157,7 @@
         // com::ubuntu::remote::Interface on it.
         Stub(const core::dbus::Object::Ptr& object)
             : object{object},
-              properties
-              {
+              properties{
                   object->get_property<Properties::HasPosition>(),
                   object->get_property<Properties::HasVelocity>(),
                   object->get_property<Properties::HasHeading>(),
@@ -175,14 +167,11 @@
                   object->get_property<Properties::RequiresMonetarySpending>(),
                   object->get_property<Properties::ArePositionUpdatesRunning>(),
                   object->get_property<Properties::AreHeadingUpdatesRunning>(),
-                  object->get_property<Properties::AreVelocityUpdatesRunning>()
-              },
-              signals
-              {
+                  object->get_property<Properties::AreVelocityUpdatesRunning>()},
+              signals{
                   object->get_signal<Signals::PositionChanged>(),
                   object->get_signal<Signals::HeadingChanged>(),
-                  object->get_signal<Signals::VelocityChanged>()
-              }
+                  object->get_signal<Signals::VelocityChanged>()}
         {
         }
 
@@ -207,21 +196,17 @@
         {
             std::shared_ptr<core::dbus::Signal<
                 Signals::PositionChanged,
-                Signals::PositionChanged::ArgumentType
-            >> position_changed;
+                Signals::PositionChanged::ArgumentType>> position_changed;
 
             std::shared_ptr<core::dbus::Signal<
                 Signals::HeadingChanged,
-                Signals::HeadingChanged::ArgumentType
-            >> heading_changed;
+                Signals::HeadingChanged::ArgumentType>> heading_changed;
 
             std::shared_ptr<core::dbus::Signal<
                 Signals::VelocityChanged,
-                Signals::VelocityChanged::ArgumentType
-            >> velocity_changed;
+                Signals::VelocityChanged::ArgumentType>> velocity_changed;
         } signals;
     };
-
 };
 }
 }

=== 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-02-03 09:10:02 +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
 {

=== 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-02-03 09:10:02 +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
 {

=== 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-02-03 09:10:02 +0000
@@ -35,9 +35,9 @@
 {
 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();
 
@@ -68,7 +68,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates();
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };

=== 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-02-03 09:10:02 +0000
@@ -46,7 +46,7 @@
 
     virtual void start_heading_updates();
     virtual void stop_heading_updates();
-    
+
 private:
     ProviderSelection providers;
 

=== 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-02-03 09:10:02 +0000
@@ -42,9 +42,9 @@
     Configuration& operator=(const Configuration&) = delete;
 
     virtual std::shared_ptr<Engine> the_engine(
-    	const std::set<Provider::Ptr>& provider_set,
+        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;

=== 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-02-03 09:10:02 +0000
@@ -33,17 +33,17 @@
 {
 class DefaultPermissionManager : public PermissionManager
 {
-  public:
+public:
     typedef std::shared_ptr<DefaultPermissionManager> Ptr;
 
     DefaultPermissionManager();
     ~DefaultPermissionManager() noexcept;
-    
+
     Result check_permission_for_credentials(
-    	const Criteria&,
+        const Criteria&,
         const Credentials& credentials);
 
-  private:
+private:
     pid_t pid;
     uid_t uid;
 };

=== 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-02-03 09:10:02 +0000
@@ -45,7 +45,7 @@
  */
 class Interface
 {
-  protected:
+protected:
     struct Errors
     {
         struct InsufficientPermissions
@@ -70,10 +70,8 @@
 
         inline static const std::string& name()
         {
-            static const std::string s
-            {
-                "CreateSessionForCriteria"
-            };
+            static const std::string s{
+                "CreateSessionForCriteria"};
             return s;
         }
 
@@ -91,10 +89,8 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "DoesSatelliteBasedPositioning"
-                };
+                static const std::string s{
+                    "DoesSatelliteBasedPositioning"};
                 return s;
             }
 
@@ -108,10 +104,8 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "DoesReportCellAndWifiIds"
-                };
+                static const std::string s{
+                    "DoesReportCellAndWifiIds"};
                 return s;
             }
 
@@ -125,10 +119,8 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "IsOnline"
-                };
+                static const std::string s{
+                    "IsOnline"};
                 return s;
             }
 
@@ -142,10 +134,8 @@
         {
             inline static const std::string& name()
             {
-                static const std::string s
-                {
-                    "VisibleSpaceVehicles"
-                };
+                static const std::string s{
+                    "VisibleSpaceVehicles"};
                 return s;
             }
 
@@ -159,7 +149,7 @@
 
     Interface() = default;
 
-  public:
+public:
     typedef std::shared_ptr<Interface> Ptr;
 
     /**
@@ -222,15 +212,13 @@
 {
 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;
     }
 };

=== 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-02-03 09:10:02 +0000
@@ -70,7 +70,7 @@
     virtual Result check_permission_for_credentials(
         const Criteria& criteria,
         const Credentials& credentials) = 0;
-    
+
 protected:
     PermissionManager() = default;
 };

=== 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-02-03 09:10:02 +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;
 };

=== 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-02-03 09:10:02 +0000
@@ -114,7 +114,7 @@
      */
     virtual Updates& updates();
 
-protected:    
+protected:
     Interface();
 
 private:

=== 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-02-03 09:10:02 +0000
@@ -42,7 +42,7 @@
 {
 class Stub : public core::dbus::Stub<Interface>
 {
-  public:
+public:
     Stub(
         const core::dbus::Bus::Ptr& bus,
         const core::dbus::types::ObjectPath& session_path);
@@ -61,7 +61,7 @@
     virtual void start_heading_updates();
     virtual void stop_heading_updates() noexcept;
 
-  private:
+private:
     struct Private;
     std::unique_ptr<Private> d;
 };

=== modified file 'include/location_service/com/ubuntu/location/service/skeleton.h'
--- include/location_service/com/ubuntu/location/service/skeleton.h	2014-08-11 10:21:08 +0000
+++ include/location_service/com/ubuntu/location/service/skeleton.h	2015-02-03 09:10:02 +0000
@@ -38,8 +38,8 @@
 namespace service
 {
 class Skeleton
-        : public core::dbus::Skeleton<com::ubuntu::location::service::Interface>,
-          public std::enable_shared_from_this<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,8 +123,8 @@
     // 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,
-            const session::Interface::Ptr& session);
+        const core::dbus::types::ObjectPath& path,
+        const session::Interface::Ptr& session);
 
     // Called whenever the value of the respective property changes.
     void on_does_satellite_based_positioning_changed(bool value);
@@ -138,19 +138,17 @@
     // 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::Signal<
         core::dbus::interfaces::Properties::Signals::PropertiesChanged,
-        core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType
-    >::Ptr properties_changed;
+        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

=== 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-02-03 09:10:02 +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;
 };

=== 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-02-03 09:10:02 +0000
@@ -39,20 +39,20 @@
     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
+        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.
+        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.
-    };    
+        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.
+        Id id = 0;                 ///< Unique id of the space vehicle.
 
         inline bool operator==(const SpaceVehicle::Key& rhs) const
         {
@@ -71,11 +71,11 @@
     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);
+               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 +83,27 @@
         return key < rhs.key;
     }
 
-    Key key; ///< Unique key identifying an instance.
+    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.
+    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" }
-    };
+        {
+         {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 << ", "

=== 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-02-03 09:10:02 +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,10 +58,10 @@
 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();
+    return std::fabs(lhs.value() - rhs.value()) <= std::numeric_limits<double>::epsilon();
 }
 }
 }
@@ -69,4 +69,3 @@
 }
 
 #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-02-03 09:10:02 +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
 {
     /**
@@ -41,7 +41,7 @@
       * @param [in] when The timestamp when the value was measured.
       */
     inline Update(const T& value = T{},
-           const Clock::Timestamp& when = Clock::now())
+                  const Clock::Timestamp& when = Clock::now())
         : value{value}, when{when}
     {
     }
@@ -78,13 +78,12 @@
  * @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;
 }
-
 }
 }
 }

=== 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-02-03 09:10:02 +0000
@@ -35,7 +35,7 @@
 }
 typedef Coordinate<tag::Altitude, units::Length> Altitude;
 
-template<>
+template <>
 struct CoordinateTraits<Altitude>
 {
     static void check_and_throw_if_invalid(const typename Altitude::Quantity&) {}

=== 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-02-03 09:10:02 +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;

=== 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-02-03 09:10:02 +0000
@@ -37,7 +37,7 @@
 }
 typedef Coordinate<tag::Latitude, units::PlaneAngle> Latitude;
 
-template<>
+template <>
 struct CoordinateTraits<Latitude>
 {
     static double min()

=== 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-02-03 09:10:02 +0000
@@ -37,7 +37,7 @@
 }
 typedef Coordinate<tag::Longitude, units::PlaneAngle> Longitude;
 
-template<>
+template <>
 struct CoordinateTraits<Longitude>
 {
     static double min()

=== 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-02-03 09:10:02 +0000
@@ -52,7 +52,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/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-02-03 09:10:02 +0000
@@ -25,14 +25,15 @@
 // 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";
+        "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,37 +51,25 @@
 
 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)
+    boost::asio::io_service& io_service,
+    bool needed)
     : needed(needed),
       io_service(io_service),
       invalidation_timer(io_service),
@@ -89,7 +78,7 @@
 }
 
 detail::CachedRadioCell::CachedRadioCell(const org::Ofono::Manager::Modem& modem, boost::asio::io_service& io_service)
-    : RadioCell(),      
+    : RadioCell(),
       cell_change_heuristics(io_service, is_running_on_problematic_modem_firmware(modem)),
       roaming(false),
       radio_type(Type::gsm),
@@ -100,9 +89,9 @@
     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);
-    });
+                                                                                                                       });
 
     if (not is_registered_or_roaming(status))
         return;
@@ -116,47 +105,41 @@
     auto cell_id = query_cid();
     auto strength = query_strength();
 
-    switch(radio_type)
+    switch (radio_type)
     {
     case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
     {
-        com::ubuntu::location::connectivity::RadioCell::Gsm 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)
-        };
+            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 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)
-        };
+            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 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)
-        };
+            com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(strength / 100.f)};
         VLOG(1) << umts;
         detail.umts = umts;
         break;
@@ -233,8 +216,7 @@
         did_cell_identity_change = true;
 
         auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType
-                >();
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType>();
 
         auto it = type_lut().find(value);
 
@@ -253,10 +235,10 @@
         if (radio_type == it->second)
             return;
 
-        switch(radio_type)
+        switch (radio_type)
         {
         case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-            switch(it->second)
+            switch (it->second)
             {
             case com::ubuntu::location::connectivity::RadioCell::Type::umts:
                 detail.umts.location_area_code = detail.gsm.location_area_code;
@@ -277,7 +259,7 @@
             }
             break;
         case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-            switch(it->second)
+            switch (it->second)
             {
             case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
                 detail.gsm.location_area_code = detail.umts.location_area_code;
@@ -298,7 +280,7 @@
             }
             break;
         case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-            switch(it->second)
+            switch (it->second)
             {
             case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
                 detail.gsm.location_area_code = detail.lte.tracking_area_code;
@@ -334,10 +316,9 @@
         did_cell_identity_change = true;
 
         auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::CellId::ValueType
-                >();
+            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);
@@ -364,9 +345,8 @@
         did_cell_identity_change = true;
 
         auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::ValueType
-                >();
-        switch(radio_type)
+            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);
@@ -392,15 +372,13 @@
     {
         did_cell_identity_change = true;
 
-        std::stringstream ss
-        {
+        std::stringstream ss{
             variant.as<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::ValueType
-            >()
-        };
-        int value{-1}; ss >> value;
+                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);
@@ -426,15 +404,13 @@
     {
         did_cell_identity_change = true;
 
-        std::stringstream ss
-        {
+        std::stringstream ss{
             variant.as<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::ValueType
-            >()
-        };
-        int value{-1}; ss >> value;
+                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);
@@ -459,24 +435,20 @@
     if (key == org::Ofono::Manager::Modem::NetworkRegistration::Strength::name())
     {
         auto value = variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Strength::ValueType
-                >();
+            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);
+            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);
+            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);
+            detail.lte.strength = com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(value / 100.f);
             VLOG(1) << detail.lte;
             break;
         default:
@@ -490,8 +462,8 @@
     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;
+            variant.as<org::Ofono::Manager::Modem::NetworkRegistration::Status::ValueType>() ==
+            org::Ofono::Manager::Modem::NetworkRegistration::Status::roaming;
     }
 
     if (did_cell_identity_change)
@@ -514,10 +486,10 @@
 
         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;
-        });
+                                                             });
 
         cell_change_heuristics.valid = is_cell_details_valid();
     }
@@ -527,10 +499,8 @@
 org::Ofono::Manager::Modem::NetworkRegistration::Status::Value detail::CachedRadioCell::query_status()
 {
     auto status =
-            modem.network_registration.get
-            <
-                org::Ofono::Manager::Modem::NetworkRegistration::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;
@@ -560,9 +530,8 @@
 com::ubuntu::location::connectivity::RadioCell::Type detail::CachedRadioCell::query_technology()
 {
     auto technology =
-            modem.network_registration.get<
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology
-            >();
+        modem.network_registration.get<
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology>();
 
     auto it = type_lut().find(technology);
 
@@ -575,56 +544,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.
@@ -637,7 +594,7 @@
 // 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;
@@ -655,11 +612,11 @@
 // 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.

=== 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-02-03 09:10:02 +0000
@@ -86,7 +86,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 +123,15 @@
     // Encapsulates all event connections that have to be cut on destruction.
     struct
     {
-        core::dbus::Signal
-        <
+        core::dbus::Signal<
             org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged,
-            org::Ofono::Manager::Modem::NetworkRegistration::PropertyChanged::ArgumentType
-        >::SubscriptionToken network_registration_properties_changed;
+            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

=== 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-02-03 09:10:02 +0000
@@ -30,10 +30,8 @@
 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)
     {
@@ -83,85 +81,67 @@
 }
 
 detail::CachedWirelessNetwork::CachedWirelessNetwork(
-        const org::freedesktop::NetworkManager::Device& device,
-        const org::freedesktop::NetworkManager::AccessPoint& ap)
+    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);
-    });
+                                              });
 }
 
 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)
-            {
+    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)
-            {
+        }},
+        {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)
-            {
+        }},
+        {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)
-            {
+        }},
+        {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)
-            {
+        }},
+        {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)
-            {
+        }},
+        {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
@@ -169,9 +149,7 @@
                         value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>()
                     }
                 };
-            }
-        }
-    };
+        }}};
 
     for (const auto& pair : dict)
     {
@@ -182,8 +160,10 @@
         // 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-02-03 09:10:02 +0000
@@ -38,8 +38,8 @@
     // 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);
+        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;

=== 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-02-03 09:10:02 +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;
@@ -54,17 +70,35 @@
     out << "[";
 
     if ((characteristics & connectivity::Characteristics::connection_goes_via_wifi) != connectivity::Characteristics::none)
-    { out << "connection_goes_via_wifi"; first = false; }
+    {
+        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; }
+    {
+        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; }
+    {
+        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; }
+    {
+        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; }
+    {
+        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_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	2014-08-22 10:49:52 +0000
+++ src/location_service/com/ubuntu/location/connectivity/nm.h	2015-02-03 09:10:02 +0000
@@ -296,12 +296,10 @@
             : service(service),
               object(object),
               device_type(object->get_property<DeviceType>()),
-              signals
-              {
+              signals{
                   object->get_signal<Wireless::Signals::ScanDone>(),
                   object->get_signal<Wireless::Signals::AccessPointAdded>(),
-                  object->get_signal<Wireless::Signals::AccessPointRemoved>()
-              }
+                  object->get_signal<Wireless::Signals::AccessPointRemoved>()}
         {
         }
 
@@ -384,10 +382,8 @@
                          const std::shared_ptr<core::dbus::Object>& object)
             : service{service},
               object{object},
-              properties
-              {
-                  object->get_property<Properties::Devices>()
-              }
+              properties{
+                  object->get_property<Properties::Devices>()}
         {
         }
 
@@ -403,7 +399,7 @@
         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;
     };
 
@@ -605,33 +601,28 @@
     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
-          {
+          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_property<Properties::WwanHardwareEnabled>()},
+          signals{
               object->get_signal<Signals::DeviceAdded>(),
               object->get_signal<Signals::DeviceRemoved>(),
               object->get_signal<Signals::PropertiesChanged>(),
-              object->get_signal<Signals::StateChanged>()
-          }
+              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>
-                >();
+            object->transact_method<
+                NetworkManager::GetDevices,
+                std::vector<core::dbus::types::ObjectPath>>();
 
         if (result.is_error())
             throw std::runtime_error(result.error().print());
@@ -648,9 +639,9 @@
     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());
@@ -659,9 +650,9 @@
         for (const auto& path : result.value())
         {
             devices.emplace_back(
-                        Device(
-                            service,
-                            service->object_for_path(path)));
+                Device(
+                    service,
+                    service->object_for_path(path)));
         }
 
         return devices;
@@ -672,13 +663,13 @@
 
     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
     {

=== 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-02-03 09:10:02 +0000
@@ -36,84 +36,33 @@
 {
 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 +70,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 +110,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 +126,514 @@
                     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;
+                };
+
+                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 GetProperties
+                {
+                    static const std::string& name()
+                    {
+                        static const std::string s{"GetProperties"};
+                        return s;
+                    }
+
+                    typedef NetworkRegistration Interface;
+                    typedef std::map<std::string, core::dbus::types::Variant> ValueType;
+
+                    static std::chrono::milliseconds default_timeout()
+                    {
+                        return std::chrono::seconds{1};
+                    }
+                };
+
+                struct PropertyChanged
+                {
+                    inline static std::string name()
+                    {
+                        return "PropertyChanged";
+                    }
+
+                    typedef NetworkRegistration 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())
+                            return typename Property::ValueType{};
+                    }
+
+                    auto it = properties.find(Property::name());
+
+                    if (it == properties.end())
+                    {
+                        VLOG(1) << "Could not find property for name " << Property::name();
                         return typename Property::ValueType{};
+                    }
+
+                    return it->second.template as<typename Property::ValueType>();
                 }
 
-                auto it = properties.find(Property::name());
+                std::shared_ptr<core::dbus::Object> object;
+                mutable GetProperties::ValueType properties;
 
-                if (it == properties.end())
+                struct
                 {
-                    VLOG(1) << "Could not find property for name " << Property::name();
-                    return typename Property::ValueType{};
-                }
+                    core::dbus::Signal<PropertyChanged, PropertyChanged::ArgumentType>::Ptr property_changed;
+                } signals;
+            };
 
-                return it->second.template as<typename Property::ValueType>();
+            Modem(const std::shared_ptr<core::dbus::Service>& service,
+                  const std::shared_ptr<core::dbus::Object>& object)
+                : service(service),
+                  object(object),
+                  signals{
+                      object->get_signal<PropertyChanged>()},
+                  network_registration{object}
+            {
             }
 
+            std::shared_ptr<core::dbus::Service> service;
             std::shared_ptr<core::dbus::Object> object;
-            mutable GetProperties::ValueType properties;
 
             struct
             {
                 core::dbus::Signal<PropertyChanged, PropertyChanged::ArgumentType>::Ptr property_changed;
             } signals;
+
+            NetworkRegistration network_registration;
         };
 
-        Modem(const std::shared_ptr<core::dbus::Service>& service,
-              const std::shared_ptr<core::dbus::Object>& object)
-            : service(service),
-              object(object),
-              signals
-              {
-                  object->get_signal<PropertyChanged>()
-              },
-              network_registration{object}
-        {
+        Manager(const core::dbus::Bus::Ptr& bus)
+            : service(core::dbus::Service::use_service<org::Ofono>(bus)),
+              object(service->object_for_path(core::dbus::types::ObjectPath("/"))),
+              signals{
+                  object->get_signal<ModemAdded>(),
+                  object->get_signal<ModemRemoved>()}
+        {
+        }
+
+        Modem modem_for_path(const core::dbus::types::ObjectPath& path) const
+        {
+            return Modem{
+                service,
+                service->object_for_path(path)};
+        }
+
+        void for_each_modem(const std::function<void(const core::dbus::types::ObjectPath&)>& functor) const
+        {
+            auto result = object->invoke_method_synchronously<GetModems, GetModems::ResultType>();
+
+            if (result.is_error())
+                throw std::runtime_error(result.error().print());
+
+            for (const auto& element : result.value())
+            {
+                functor(element.value);
+            }
         }
 
         std::shared_ptr<core::dbus::Service> service;
@@ -657,54 +641,10 @@
 
         struct
         {
-            core::dbus::Signal<PropertyChanged, PropertyChanged::ArgumentType>::Ptr property_changed;
+            std::shared_ptr<core::dbus::Signal<ModemAdded, ModemAdded::ArgumentType>> modem_added;
+            std::shared_ptr<core::dbus::Signal<ModemRemoved, ModemRemoved::ArgumentType>> modem_removed;
         } signals;
-
-        NetworkRegistration network_registration;
     };
-
-    Manager(const core::dbus::Bus::Ptr& bus)
-        : service(core::dbus::Service::use_service<org::Ofono>(bus)),
-          object(service->object_for_path(core::dbus::types::ObjectPath("/"))),
-          signals
-          {
-              object->get_signal<ModemAdded>(),
-              object->get_signal<ModemRemoved>()
-          }
-    {
-    }
-
-    Modem modem_for_path(const core::dbus::types::ObjectPath& path) const
-    {
-        return Modem
-        {
-            service,
-            service->object_for_path(path)
-        };
-    }
-
-    void for_each_modem(const std::function<void(const core::dbus::types::ObjectPath&)>& functor) const
-    {
-        auto result = object->invoke_method_synchronously<GetModems, GetModems::ResultType>();
-
-        if (result.is_error())
-            throw std::runtime_error(result.error().print());
-
-        for (const auto& element : result.value())
-        {
-            functor(element.value);
-        }
-    }
-
-    std::shared_ptr<core::dbus::Service> service;
-    std::shared_ptr<core::dbus::Object> object;
-
-    struct
-    {
-        std::shared_ptr<core::dbus::Signal<ModemAdded, ModemAdded::ArgumentType>> modem_added;
-        std::shared_ptr<core::dbus::Signal<ModemRemoved, ModemRemoved::ArgumentType>> modem_removed;
-    } signals;
-};
 };
 }
 

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-01-06 12:35:02 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-02-03 09:10:02 +0000
@@ -28,10 +28,8 @@
 {
 connectivity::State from_nm_property(std::uint32_t value)
 {
-    return connectivity::State
-    {
-        static_cast<connectivity::State>(value)
-    };
+    return connectivity::State{
+        static_cast<connectivity::State>(value)};
 }
 
 connectivity::Characteristics all_characteristics()
@@ -140,17 +138,17 @@
         // For that, we setup watching of registration changes and initialize
         // the instance later on.
         modem_manager_watcher = bus_daemon->make_service_watcher(
-                    org::Ofono::name(),
-                    core::dbus::DBus::WatchMode::registration);
+            org::Ofono::name(),
+            core::dbus::DBus::WatchMode::registration);
 
         modem_manager_watcher->service_registered().connect([this]()
-        {
+                                                            {
             VLOG(1) << org::Ofono::name() << " got registered on the bus.";
             dispatcher.service.post([this]()
             {
                 setup_radio_stack_access();
             });
-        });
+                                                            });
     }
 
     try
@@ -164,17 +162,17 @@
         // For that, we setup watching of registration changes and initialize
         // the instance later on.
         network_manager_watcher = bus_daemon->make_service_watcher(
-                    xdg::NetworkManager::name(),
-                    core::dbus::DBus::WatchMode::registration);
+            xdg::NetworkManager::name(),
+            core::dbus::DBus::WatchMode::registration);
 
         network_manager_watcher->service_registered().connect([this]()
-        {
+                                                              {
             VLOG(1) << xdg::NetworkManager::name() << " got registered on the bus.";
             dispatcher.service.post([this]()
             {
                 setup_network_stack_access();
             });
-        });
+                                                              });
     }
 }
 
@@ -191,7 +189,7 @@
     modem_manager.reset(new org::Ofono::Manager(bus));
 
     modem_manager->for_each_modem([this](const core::dbus::types::ObjectPath& path)
-    {
+                                  {
         try
         {
             on_modem_added(path);
@@ -200,10 +198,10 @@
         {
             VLOG(1) << "Exception while creating connected radio cell: " << e.what();
         }
-    });
+                                  });
 
     modem_manager->signals.modem_added->connect([this](const org::Ofono::Manager::ModemAdded::ArgumentType& arg)
-    {
+                                                {
         try
         {
             on_modem_added(std::get<0>(arg));
@@ -212,10 +210,10 @@
         {
             VLOG(1) << "Exception while adding modem: " << e.what();
         }
-    });
+                                                });
 
     modem_manager->signals.modem_removed->connect([this](const core::dbus::types::ObjectPath& path)
-    {
+                                                  {
         try
         {
             on_modem_removed(path);
@@ -224,7 +222,7 @@
         {
             VLOG(1) << "Exception while removing modem: " << e.what();
         }
-    });
+                                                  });
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_modem_added(const core::dbus::types::ObjectPath& path)
@@ -244,7 +242,7 @@
 
     // We first wire up to property changes here.
     modem_result.first->second.signals.property_changed->connect([this, path](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-    {
+                                                                 {
         const auto& key = std::get<0>(tuple); VLOG(10) << "Property changed for modem: " << key;
 
         if (org::Ofono::Manager::Modem::Properties::Interfaces::name() == key)
@@ -256,13 +254,13 @@
                 on_modem_interfaces_changed(path, interfaces);
             });
         }
-    });
+                                                                 });
 
     // And update our cache of registered cells.
     auto cell_result = cached.cells.insert(
-                std::make_pair(
-                    modem.object->path(),
-                    std::make_shared<detail::CachedRadioCell>(modem, dispatcher.service)));
+        std::make_pair(
+            modem.object->path(),
+            std::make_shared<detail::CachedRadioCell>(modem, dispatcher.service)));
 
     if (not cell_result.second)
         return;
@@ -272,7 +270,7 @@
 
     // We account for a cell becoming invalid and report it as report.
     cell_result.first->second->is_valid().changed().connect([this, wp](bool valid)
-    {
+                                                            {
         VLOG(10) << "Validity of cell changed: " << std::boolalpha << valid << std::endl;
 
         auto sp = wp.lock();
@@ -284,7 +282,7 @@
             signals.connected_cell_added(sp);
         else
             signals.connected_cell_removed(sp);
-    });
+                                                            });
 
     // Cool, we have reached here, updated all our caches and created a connected radio cell.
     // We are thus good to go and release the lock manually prior to announcing the new cell
@@ -320,12 +318,13 @@
     }
     // Inform customers of the registered cell being removed, without
     // the lock on the cache being held.
-    if (cell) signals.connected_cell_removed(cell);
+    if (cell)
+        signals.connected_cell_removed(cell);
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_modem_interfaces_changed(
-        const core::dbus::types::ObjectPath& path,
-        const std::vector<std::string>& interfaces)
+    const core::dbus::types::ObjectPath& path,
+    const std::vector<std::string>& interfaces)
 {
     std::unique_lock<std::mutex> ul(cached.guard);
 
@@ -340,9 +339,9 @@
     const bool has_cell_for_modem = itt != cached.cells.end();
 
     auto it = std::find(
-                interfaces.begin(),
-                interfaces.end(),
-                std::string{org::Ofono::Manager::Modem::Properties::Interfaces::network_registration});
+        interfaces.begin(),
+        interfaces.end(),
+        std::string{org::Ofono::Manager::Modem::Properties::Interfaces::network_registration});
     const bool modem_has_network_registration = it != interfaces.end();
 
     if (has_cell_for_modem and not modem_has_network_registration)
@@ -354,11 +353,13 @@
 
         // Cache is up to date now and we announce the removal of the cell
         // to API customers, with the lock on the cache not being held.
-        ul.unlock(); signals.connected_cell_removed(cell);
-    } else if (not has_cell_for_modem and modem_has_network_registration)
+        ul.unlock();
+        signals.connected_cell_removed(cell);
+    }
+    else if (not has_cell_for_modem and modem_has_network_registration)
     {
         dispatcher.service.post([this, path]()
-        {
+                                {
             std::unique_lock<std::mutex> ul(cached.guard);
 
             auto itm = cached.modems.find(path);
@@ -395,7 +396,7 @@
             // Cache is up to date now and we announce the new cell to
             // API customers, with the lock on the cache not being held.
             ul.unlock(); signals.connected_cell_added(cell);
-        });
+                                });
     }
 }
 
@@ -404,20 +405,20 @@
     network_manager.reset(new xdg::NetworkManager(bus));
 
     network_manager->for_each_device([this](const core::dbus::types::ObjectPath& device_path)
-    {
+                                     {
         std::unique_lock<std::mutex> ul{cached.guard};
         on_device_added(device_path, ul);
-    });
+                                     });
 
     // Query the initial connectivity state
     state.set(from_nm_property(network_manager->properties.state->get()));
     // Determine the initial connection characteristics
     active_connection_characteristics.set(
-                characteristics_for_connection(
-                    network_manager->properties.primary_connection->get()));
+        characteristics_for_connection(
+            network_manager->properties.primary_connection->get()));
 
     network_manager->signals.device_added->connect([this](const core::dbus::types::ObjectPath& path)
-    {
+                                                   {
         // We dispatch determining the connection characteristics to unblock
         // the bus here.
         dispatcher.service.post([this, path]()
@@ -425,10 +426,10 @@
             std::unique_lock<std::mutex> ul{cached.guard};
             on_device_added(path, ul);
         });
-    });
+                                                   });
 
     network_manager->signals.device_removed->connect([this](const core::dbus::types::ObjectPath& path)
-    {
+                                                     {
         // We dispatch determining the connection characteristics to unblock
         // the bus here.
         dispatcher.service.post([this, path]()
@@ -436,11 +437,11 @@
             std::unique_lock<std::mutex> ul{cached.guard};
             on_device_removed(path, ul);
         });
-    });
+                                                     });
 
     // And we wire up to property changes here
     network_manager->signals.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
-    {
+                                                         {
         for (const auto& pair : dict)
         {
             VLOG(1) << "Property has changed: " << std::endl
@@ -468,12 +469,12 @@
                 });
             }
         }
-    });
+                                                         });
 
     network_manager->signals.state_changed->connect([this](std::uint32_t s)
-    {
+                                                    {
         state.set(from_nm_property(s));
-    });
+                                                    });
 
     // Read initial properties.
     cached.is_wifi_enabled.set(network_manager->properties.is_wifi_enabled.get());
@@ -482,29 +483,29 @@
     cached.is_wwan_hardware_enabled.set(network_manager->properties.is_wwan_hardware_enabled.get());
     // And connect to changed signals.
     network_manager->properties.is_wifi_enabled->changed().connect([this](bool value)
-    {
+                                                                   {
         cached.is_wifi_enabled = value;
-    });
+                                                                   });
 
     network_manager->properties.is_wifi_hardware_enabled->changed().connect([this](bool value)
-    {
+                                                                            {
         cached.is_wifi_hardware_enabled = value;
-    });
+                                                                            });
 
     network_manager->properties.is_wwan_enabled->changed().connect([this](bool value)
-    {
+                                                                   {
         cached.is_wwan_enabled = value;
-    });
+                                                                   });
 
     network_manager->properties.is_wwan_hardware_enabled->changed().connect([this](bool value)
-    {
+                                                                            {
         cached.is_wwan_hardware_enabled = value;
-    });
+                                                                            });
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_device_added(
-        const core::dbus::types::ObjectPath& device_path,
-        std::unique_lock<std::mutex>& ul)
+    const core::dbus::types::ObjectPath& device_path,
+    std::unique_lock<std::mutex>& ul)
 {
     if (cached.wireless_devices.count(device_path) > 0)
         return;
@@ -519,7 +520,7 @@
 
         // Iterate over all currently known wifis
         it->second.for_each_access_point([this, device_path, &ul](const core::dbus::types::ObjectPath& path)
-        {
+                                         {
             try
             {
                 on_access_point_added(path, device_path, ul);
@@ -528,15 +529,15 @@
             {
                 VLOG(1) << "Error while creating ap/wifi: " << e.what();
             }
-        });
+                                         });
 
         it->second.signals.scan_done->connect([this]()
-        {
+                                              {
             signals.wireless_network_scan_finished();
-        });
+                                              });
 
         it->second.signals.ap_added->connect([this, device_path](const core::dbus::types::ObjectPath& path)
-        {
+                                             {
             try
             {
                 std::unique_lock<std::mutex> ul{cached.guard};
@@ -546,10 +547,10 @@
             {
                 VLOG(1) << "Error while creating ap/wifi: " << e.what();
             }
-        });
+                                             });
 
         it->second.signals.ap_removed->connect([this](const core::dbus::types::ObjectPath& path)
-        {
+                                               {
             try
             {
                 std::unique_lock<std::mutex> ul{cached.guard};
@@ -559,21 +560,21 @@
             {
                 VLOG(1) << "Error while removing ap/wifi: " << e.what();
             }
-        });
+                                               });
     }
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_device_removed(
-        const core::dbus::types::ObjectPath& path,
-        std::unique_lock<std::mutex>&)
+    const core::dbus::types::ObjectPath& path,
+    std::unique_lock<std::mutex>&)
 {
     cached.wireless_devices.erase(path);
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_access_point_added(
-        const core::dbus::types::ObjectPath& ap_path,
-        const core::dbus::types::ObjectPath& device_path,
-        std::unique_lock<std::mutex>& ul)
+    const core::dbus::types::ObjectPath& ap_path,
+    const core::dbus::types::ObjectPath& device_path,
+    std::unique_lock<std::mutex>& ul)
 {
     // Let's see if we have a device known for the path. We return early
     // if we do not know about the device.
@@ -581,22 +582,21 @@
     if (itd == cached.wireless_devices.end())
         return;
 
-    xdg::NetworkManager::AccessPoint ap
-    {
-        network_manager->service->add_object_for_path(ap_path)
-    };
+    xdg::NetworkManager::AccessPoint ap{
+        network_manager->service->add_object_for_path(ap_path)};
 
     auto wifi = std::make_shared<detail::CachedWirelessNetwork>(itd->second, ap);
     cached.wifis[ap_path] = wifi;
 
     // Let API consumers know that an AP appeared. The lock on the cache is
     // not held to prevent from deadlocks.
-    ul.unlock(); signals.wireless_network_added(wifi);
+    ul.unlock();
+    signals.wireless_network_added(wifi);
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_access_point_removed(
-        const core::dbus::types::ObjectPath& ap_path,
-        std::unique_lock<std::mutex>& ul)
+    const core::dbus::types::ObjectPath& ap_path,
+    std::unique_lock<std::mutex>& ul)
 {
     // Let's see if we know about the wifi. We return early if not.
     auto itw = cached.wifis.find(ap_path);
@@ -610,21 +610,18 @@
 
     // Let API consumers know that an AP disappeared. The lock on the cache is
     // not held to prevent from deadlocks.
-    ul.unlock(); signals.wireless_network_removed(wifi);
+    ul.unlock();
+    signals.wireless_network_removed(wifi);
 }
 
 connectivity::Characteristics connectivity::OfonoNmConnectivityManager::Private::characteristics_for_connection(const core::dbus::types::ObjectPath& path)
 {
-    xdg::NetworkManager::ActiveConnection ac
-    {
+    xdg::NetworkManager::ActiveConnection ac{
         network_manager->service,
-        network_manager->service->object_for_path(path)
-    };
+        network_manager->service->object_for_path(path)};
 
-    connectivity::Characteristics characteristics
-    {
-        connectivity::Characteristics::none
-    };
+    connectivity::Characteristics characteristics{
+        connectivity::Characteristics::none};
 
     // We try to enumerate all devices, and might fail if the active connection
     // went away under our feet. For that, we simply catch all possible exceptions
@@ -632,7 +629,7 @@
     try
     {
         ac.enumerate_devices([this, &characteristics](const core::dbus::types::ObjectPath& path)
-        {
+                             {
             xdg::NetworkManager::Device::Type type{xdg::NetworkManager::Device::Type::unknown};
             {
                 // We only consider cached devices and do not reach out to enumerate all of the devices
@@ -678,8 +675,9 @@
                 characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wifi;
             }
 
-        });
-    } catch(...)
+                             });
+    }
+    catch (...)
     {
         // Empty on purpose.
     }
@@ -703,10 +701,10 @@
     {
         system_bus->install_executor(executor);
 
-        worker_thread = std::move(std::thread
-        {
-            [this]() { system_bus->run(); }
-        });
+        worker_thread = std::move(std::thread{
+            [this]()
+            { system_bus->run();
+            }});
     }
 
     ~Runtime()
@@ -729,24 +727,18 @@
 {
     try
     {
-        static const std::shared_ptr<connectivity::Manager> instance
-        {
-            new connectivity::OfonoNmConnectivityManager
-            {
-                Runtime::instance().system_bus
-            }
-        };
+        static const std::shared_ptr<connectivity::Manager> instance{
+            new connectivity::OfonoNmConnectivityManager{
+                Runtime::instance().system_bus}};
 
         return instance;
     }
-    catch(...)
+    catch (...)
     {
     }
 
-    static const std::shared_ptr<connectivity::Manager> dummy_instance
-    {
-        new dummy::ConnectivityManager{}
-    };
+    static const std::shared_ptr<connectivity::Manager> dummy_instance{
+        new dummy::ConnectivityManager{}};
 
     return dummy_instance;
 }

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2014-11-10 20:12:56 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2015-02-03 09:10:02 +0000
@@ -51,7 +51,14 @@
 
 namespace dbus = core::dbus;
 
-namespace com { namespace ubuntu { namespace location { namespace connectivity {
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace connectivity
+{
 struct OfonoNmConnectivityManager : public com::ubuntu::location::connectivity::Manager
 {
     // Creates an instance of the manager, resolving services on the given bus.
@@ -98,7 +105,7 @@
         void on_device_removed(const core::dbus::types::ObjectPath& device_path, std::unique_lock<std::mutex>& ul);
         void on_access_point_added(const core::dbus::types::ObjectPath& ap_path, const core::dbus::types::ObjectPath& device_path, std::unique_lock<std::mutex>& ul);
         void on_access_point_removed(const core::dbus::types::ObjectPath& ap_path, std::unique_lock<std::mutex>& ul);
-        com::ubuntu::location::connectivity::Characteristics characteristics_for_connection(const core::dbus::types::ObjectPath& path);        
+        com::ubuntu::location::connectivity::Characteristics characteristics_for_connection(const core::dbus::types::ObjectPath& path);
 
         core::dbus::Bus::Ptr bus;
         std::shared_ptr<core::dbus::DBus> bus_daemon;
@@ -118,16 +125,14 @@
             boost::asio::io_service service;
 
             // We keep the io_service object alive until someone stops it.
-            boost::asio::io_service::work keep_alive
-            {
-                service
-            };
+            boost::asio::io_service::work keep_alive{
+                service};
 
             // And a dedicated worker thread.
-            std::thread worker
-            {
-                [this]() { service.run(); }
-            };
+            std::thread worker{
+                [this]()
+                { service.run();
+                }};
         } dispatcher;
 
         struct
@@ -162,6 +167,9 @@
         core::Property<com::ubuntu::location::connectivity::Characteristics> active_connection_characteristics;
     } d;
 };
-}}}}
+}
+}
+}
+}
 
 #endif // OFONO_NM_CONNECTIVITY_MANAGER_H_

=== modified file 'src/location_service/com/ubuntu/location/connectivity/radio_cell.cpp'
--- src/location_service/com/ubuntu/location/connectivity/radio_cell.cpp	2014-06-10 11:53:01 +0000
+++ src/location_service/com/ubuntu/location/connectivity/radio_cell.cpp	2015-02-03 09:10:02 +0000
@@ -45,10 +45,10 @@
 bool location::connectivity::operator==(const location::connectivity::RadioCell::Umts& lhs, const location::connectivity::RadioCell::Umts& rhs)
 {
     return lhs.mobile_country_code == rhs.mobile_country_code &&
-            lhs.mobile_network_code == rhs.mobile_network_code &&
-            lhs.location_area_code == rhs.location_area_code &&
-            lhs.id == rhs.id &&
-            lhs.strength == rhs.strength;
+           lhs.mobile_network_code == rhs.mobile_network_code &&
+           lhs.location_area_code == rhs.location_area_code &&
+           lhs.id == rhs.id &&
+           lhs.strength == rhs.strength;
 }
 
 std::ostream& location::connectivity::operator<<(std::ostream& out, const location::connectivity::RadioCell::Umts& umts)
@@ -67,11 +67,11 @@
                                         const location::connectivity::RadioCell::Lte& rhs)
 {
     return lhs.mobile_country_code == rhs.mobile_country_code &&
-            lhs.mobile_network_code == rhs.mobile_network_code &&
-            lhs.tracking_area_code == rhs.tracking_area_code &&
-            lhs.id == rhs.id &&
-            lhs.physical_id == rhs.physical_id &&
-            lhs.strength == rhs.strength;
+           lhs.mobile_network_code == rhs.mobile_network_code &&
+           lhs.tracking_area_code == rhs.tracking_area_code &&
+           lhs.id == rhs.id &&
+           lhs.physical_id == rhs.physical_id &&
+           lhs.strength == rhs.strength;
 }
 
 std::ostream& location::connectivity::operator<<(std::ostream& out, const location::connectivity::RadioCell::Lte& lte)
@@ -93,12 +93,16 @@
     if (lhs.type() != rhs.type())
         return false;
 
-    switch(lhs.type())
+    switch (lhs.type())
     {
-    case location::connectivity::RadioCell::Type::gsm: return lhs.gsm() == rhs.gsm();
-    case location::connectivity::RadioCell::Type::umts: return lhs.umts() == rhs.umts();
-    case location::connectivity::RadioCell::Type::lte: return lhs.lte() == rhs.lte();
-    default: return true;
+    case location::connectivity::RadioCell::Type::gsm:
+        return lhs.gsm() == rhs.gsm();
+    case location::connectivity::RadioCell::Type::umts:
+        return lhs.umts() == rhs.umts();
+    case location::connectivity::RadioCell::Type::lte:
+        return lhs.lte() == rhs.lte();
+    default:
+        return true;
     }
 
     return false;
@@ -108,10 +112,17 @@
 {
     switch (cell.type())
     {
-    case location::connectivity::RadioCell::Type::gsm: out << "gsm" << cell.gsm(); break;
-    case location::connectivity::RadioCell::Type::umts: out << "umts" << cell.umts(); break;
-    case location::connectivity::RadioCell::Type::lte: out << "lte" << cell.lte(); break;
-    case location::connectivity::RadioCell::Type::unknown: break;
+    case location::connectivity::RadioCell::Type::gsm:
+        out << "gsm" << cell.gsm();
+        break;
+    case location::connectivity::RadioCell::Type::umts:
+        out << "umts" << cell.umts();
+        break;
+    case location::connectivity::RadioCell::Type::lte:
+        out << "lte" << cell.lte();
+        break;
+    case location::connectivity::RadioCell::Type::unknown:
+        break;
     }
 
     return out;

=== modified file 'src/location_service/com/ubuntu/location/connectivity/wireless_network.cpp'
--- src/location_service/com/ubuntu/location/connectivity/wireless_network.cpp	2014-06-12 06:51:01 +0000
+++ src/location_service/com/ubuntu/location/connectivity/wireless_network.cpp	2015-02-03 09:10:02 +0000
@@ -26,9 +26,15 @@
 {
     switch (mode)
     {
-    case location::connectivity::WirelessNetwork::Mode::unknown: out << "Mode::unknown"; break;
-    case location::connectivity::WirelessNetwork::Mode::adhoc: out << "Mode::adhoc"; break;
-    case location::connectivity::WirelessNetwork::Mode::infrastructure: out << "Mode::infrastructure"; break;
+    case location::connectivity::WirelessNetwork::Mode::unknown:
+        out << "Mode::unknown";
+        break;
+    case location::connectivity::WirelessNetwork::Mode::adhoc:
+        out << "Mode::adhoc";
+        break;
+    case location::connectivity::WirelessNetwork::Mode::infrastructure:
+        out << "Mode::infrastructure";
+        break;
     }
 
     return out;

=== modified file 'src/location_service/com/ubuntu/location/criteria.cpp'
--- src/location_service/com/ubuntu/location/criteria.cpp	2014-01-12 18:03:12 +0000
+++ src/location_service/com/ubuntu/location/criteria.cpp	2015-02-03 09:10:02 +0000
@@ -49,8 +49,8 @@
 }
 
 com::ubuntu::location::Criteria com::ubuntu::location::operator+(
-        const com::ubuntu::location::Criteria& lhs,
-        const com::ubuntu::location::Criteria& rhs)
+    const com::ubuntu::location::Criteria& lhs,
+    const com::ubuntu::location::Criteria& rhs)
 {
     Criteria result{lhs};
 
@@ -68,7 +68,8 @@
         {
             result.accuracy.vertical = rhs.accuracy.vertical;
         }
-    } else
+    }
+    else
     {
         result.accuracy.vertical = rhs.accuracy.vertical;
     }
@@ -79,7 +80,8 @@
         {
             result.accuracy.velocity = rhs.accuracy.velocity;
         }
-    } else
+    }
+    else
     {
         result.accuracy.velocity = rhs.accuracy.velocity;
     }
@@ -90,7 +92,8 @@
         {
             result.accuracy.heading = rhs.accuracy.heading;
         }
-    } else
+    }
+    else
     {
         result.accuracy.heading = rhs.accuracy.heading;
     }

=== modified file 'src/location_service/com/ubuntu/location/default_permission_manager.cpp'
--- src/location_service/com/ubuntu/location/default_permission_manager.cpp	2013-12-10 09:42:54 +0000
+++ src/location_service/com/ubuntu/location/default_permission_manager.cpp	2015-02-03 09:10:02 +0000
@@ -20,8 +20,8 @@
 namespace cul = com::ubuntu::location;
 
 cul::DefaultPermissionManager::DefaultPermissionManager()
-        : pid(getpid()),
-          uid(getuid())
+    : pid(getpid()),
+      uid(getuid())
 {
 }
 

=== modified file 'src/location_service/com/ubuntu/location/default_provider_selection_policy.cpp'
--- src/location_service/com/ubuntu/location/default_provider_selection_policy.cpp	2014-06-20 07:40:34 +0000
+++ src/location_service/com/ubuntu/location/default_provider_selection_policy.cpp	2015-02-03 09:10:02 +0000
@@ -28,10 +28,8 @@
     NullProvider() = default;
 };
 
-std::shared_ptr<cul::Provider> null_provider_instance
-{
-    new NullProvider{}
-};
+std::shared_ptr<cul::Provider> null_provider_instance{
+    new NullProvider{}};
 }
 
 const cul::Provider::Ptr& cul::ProviderSelectionPolicy::null_provider()
@@ -47,32 +45,30 @@
 {
 }
 
-cul::ProviderSelection 
+cul::ProviderSelection
 cul::DefaultProviderSelectionPolicy::determine_provider_selection_for_criteria(
     const cul::Criteria& criteria,
     const cul::ProviderEnumerator& enumerator)
 {
-    ProviderSelection selection
-    {
+    ProviderSelection selection{
         determine_position_updates_provider(criteria, enumerator),
         determine_heading_updates_provider(criteria, enumerator),
-        determine_velocity_updates_provider(criteria, enumerator)
-    };
-    
+        determine_velocity_updates_provider(criteria, enumerator)};
+
     return selection;
 }
 
-cul::Provider::Ptr 
+cul::Provider::Ptr
 cul::DefaultProviderSelectionPolicy::determine_position_updates_provider(
     const cul::Criteria& criteria,
     const cul::ProviderEnumerator& enumerator)
 {
-    auto less = 
-            [](const Provider::Ptr& lhs, const Provider::Ptr& rhs)
-            {
+    auto less =
+        [](const Provider::Ptr& lhs, const Provider::Ptr& rhs)
+    {
                 return
                 lhs->state_controller()->are_position_updates_running() && !rhs->state_controller()->are_position_updates_running();
-            };
+    };
 
     std::set<
         Provider::Ptr,
@@ -92,14 +88,14 @@
     const cul::Criteria& criteria,
     const cul::ProviderEnumerator& enumerator)
 {
-    auto less = 
-            [](const Provider::Ptr& lhs, const Provider::Ptr& rhs)
-            {
+    auto less =
+        [](const Provider::Ptr& lhs, const Provider::Ptr& rhs)
+    {
                 return lhs->state_controller()->are_heading_updates_running() && !rhs->state_controller()->are_heading_updates_running();
-            };
-    
+    };
+
     std::set<
-        Provider::Ptr, 
+        Provider::Ptr,
         std::function<bool(const Provider::Ptr&, const Provider::Ptr&)>> matching_providers(less);
 
     enumerator.for_each_provider(
@@ -116,14 +112,14 @@
     const cul::Criteria& criteria,
     const cul::ProviderEnumerator& enumerator)
 {
-    auto less = 
-            [](const Provider::Ptr& lhs, const Provider::Ptr& rhs)
-            {
+    auto less =
+        [](const Provider::Ptr& lhs, const Provider::Ptr& rhs)
+    {
                 return lhs->state_controller()->are_velocity_updates_running() && !rhs->state_controller()->are_velocity_updates_running();
-            };
-    
+    };
+
     std::set<
-        Provider::Ptr, 
+        Provider::Ptr,
         std::function<bool(const Provider::Ptr&, const Provider::Ptr&)>> matching_providers(less);
 
     enumerator.for_each_provider(

=== modified file 'src/location_service/com/ubuntu/location/engine.cpp'
--- src/location_service/com/ubuntu/location/engine.cpp	2015-01-25 12:44:20 +0000
+++ src/location_service/com/ubuntu/location/engine.cpp	2015-02-03 09:10:02 +0000
@@ -32,22 +32,20 @@
 
 cul::Engine::Engine(const cul::ProviderSelectionPolicy::Ptr& provider_selection_policy,
                     const cul::Settings::Ptr& settings)
-          : provider_selection_policy(provider_selection_policy),
-            settings(settings)
+    : provider_selection_policy(provider_selection_policy),
+      settings(settings)
 {
-    if (!provider_selection_policy) throw std::runtime_error
-    {
-        "Cannot construct an engine given a null ProviderSelectionPolicy"
-    };
+    if (!provider_selection_policy)
+        throw std::runtime_error{
+            "Cannot construct an engine given a null ProviderSelectionPolicy"};
 
-    if (!settings) throw std::runtime_error
-    {
-        "Cannot construct an engine given a null Settings instance"
-    };
+    if (!settings)
+        throw std::runtime_error{
+            "Cannot construct an engine given a null Settings instance"};
 
     // Setup behavior in case of configuration changes.
     configuration.satellite_based_positioning_state.changed().connect([this](const SatelliteBasedPositioningState& state)
-    {
+                                                                      {
         for_each_provider([this, state](const Provider::Ptr& provider)
         {
             if (provider->requires(cul::Provider::Requirements::satellites))
@@ -65,10 +63,10 @@
                 }
             }
         });
-    });
+                                                                      });
 
     configuration.engine_state.changed().connect([this](const Engine::Status& status)
-    {
+                                                 {
         for_each_provider([this, status](const Provider::Ptr& provider)
         {
             switch (status)
@@ -87,37 +85,37 @@
                 break;
             }
         });
-    });
+                                                 });
 
     configuration.engine_state =
-            settings->get_enum_for_key<Engine::Status>(
-                Configuration::Keys::engine_state,
-                Configuration::Defaults::engine_state);
+        settings->get_enum_for_key<Engine::Status>(
+            Configuration::Keys::engine_state,
+            Configuration::Defaults::engine_state);
 
     configuration.satellite_based_positioning_state =
-            settings->get_enum_for_key<SatelliteBasedPositioningState>(
-                Configuration::Keys::satellite_based_positioning_state,
-                Configuration::Defaults::satellite_based_positioning_state);
+        settings->get_enum_for_key<SatelliteBasedPositioningState>(
+            Configuration::Keys::satellite_based_positioning_state,
+            Configuration::Defaults::satellite_based_positioning_state);
 
     configuration.wifi_and_cell_id_reporting_state =
-            settings->get_enum_for_key<WifiAndCellIdReportingState>(
-                Configuration::Keys::wifi_and_cell_id_reporting_state,
-                Configuration::Defaults::wifi_and_cell_id_reporting_state);
+        settings->get_enum_for_key<WifiAndCellIdReportingState>(
+            Configuration::Keys::wifi_and_cell_id_reporting_state,
+            Configuration::Defaults::wifi_and_cell_id_reporting_state);
 
     configuration.engine_state.changed().connect([this](const Engine::Status& status)
-    {
+                                                 {
         Engine::settings->set_enum_for_key<Engine::Status>(Configuration::Keys::engine_state, status);
-    });
+                                                 });
 
     configuration.satellite_based_positioning_state.changed().connect([this](SatelliteBasedPositioningState state)
-    {
+                                                                      {
         Engine::settings->set_enum_for_key<SatelliteBasedPositioningState>(Configuration::Keys::satellite_based_positioning_state, state);
-    });
+                                                                      });
 
     configuration.wifi_and_cell_id_reporting_state.changed().connect([this](WifiAndCellIdReportingState state)
-    {
+                                                                     {
         Engine::settings->set_enum_for_key<WifiAndCellIdReportingState>(Configuration::Keys::wifi_and_cell_id_reporting_state, state);
-    });
+                                                                     });
 }
 
 cul::Engine::~Engine()
@@ -135,11 +133,11 @@
         configuration.wifi_and_cell_id_reporting_state);
 
     for_each_provider([](const Provider::Ptr& provider)
-    {
+                      {
         provider->state_controller()->stop_position_updates();
         provider->state_controller()->stop_heading_updates();
         provider->state_controller()->stop_velocity_updates();
-    });
+                      });
 }
 
 cul::ProviderSelection cul::Engine::determine_provider_selection_for_criteria(const cul::Criteria& criteria)
@@ -167,28 +165,28 @@
     // We wire up changes in the engine's configuration to the respective slots
     // of the provider.
     auto cp = updates.reference_location.changed().connect([provider](const cul::Update<cul::Position>& pos)
-    {
+                                                           {
         provider->on_reference_location_updated(pos);
-    });
+                                                           });
 
     auto cv = updates.reference_velocity.changed().connect([provider](const cul::Update<cul::Velocity>& velocity)
-    {
+                                                           {
         provider->on_reference_velocity_updated(velocity);
-    });
+                                                           });
 
     auto ch = updates.reference_heading.changed().connect([provider](const cul::Update<cul::Heading>& heading)
-    {
+                                                          {
         provider->on_reference_heading_updated(heading);
-    });
+                                                          });
 
     auto cr = configuration.wifi_and_cell_id_reporting_state.changed().connect([provider](cul::WifiAndCellIdReportingState state)
-    {
+                                                                               {
         provider->on_wifi_and_cell_reporting_state_changed(state);
-    });
+                                                                               });
 
     // And do the reverse: Satellite visibility updates are funneled via the engine's configuration.
     auto cs = provider->updates().svs.connect([this](const cul::Update<std::set<cul::SpaceVehicle>>& src)
-    {
+                                              {
         updates.visible_space_vehicles.update([src](std::map<cul::SpaceVehicle::Key, cul::SpaceVehicle>& dest)
         {
             for(auto& sv : src.value)
@@ -198,14 +196,14 @@
 
             return true;
         });
-    });
+                                              });
 
     // We are a bit dumb and just take any position update as new reference.
     // We should come up with a better heuristic here.
     auto cpr = provider->updates().position.connect([this](const cul::Update<cul::Position>& src)
-    {
+                                                    {
         updates.reference_location = src;
-    });
+                                                    });
 
     std::lock_guard<std::mutex> lg(guard);
     providers.emplace(provider, std::move(ProviderConnections{cp, ch, cv, cr, cs, cpr}));
@@ -231,7 +229,7 @@
         {
             enumerator(provider.first);
         }
-        catch(const std::exception& e)
+        catch (const std::exception& e)
         {
             VLOG(1) << e.what();
         }
@@ -240,7 +238,7 @@
 
 namespace std
 {
-template<>
+template <>
 struct hash<cul::Engine::Status>
 {
     std::size_t operator()(const cul::Engine::Status& s) const
@@ -253,17 +251,13 @@
 
 std::ostream& cul::operator<<(std::ostream& out, cul::Engine::Status state)
 {
-    static constexpr const char* the_unknown_state
-    {
-        "Engine::Status::unknown"
-    };
+    static constexpr const char* the_unknown_state{
+        "Engine::Status::unknown"};
 
-    static const std::unordered_map<location::Engine::Status, std::string> lut
-    {
+    static const std::unordered_map<location::Engine::Status, std::string> lut{
         {cul::Engine::Status::off, "Engine::Status::off"},
         {cul::Engine::Status::on, "Engine::Status::on"},
-        {cul::Engine::Status::active, "Engine::Status::active"}
-    };
+        {cul::Engine::Status::active, "Engine::Status::active"}};
 
     auto it = lut.find(state);
     if (it != lut.end())
@@ -277,22 +271,21 @@
 /** @brief Parses the status from the given stream. */
 std::istream& cul::operator>>(std::istream& in, cul::Engine::Status& state)
 {
-    static const std::unordered_map<std::string, cul::Engine::Status> lut
-    {
+    static const std::unordered_map<std::string, cul::Engine::Status> lut{
         {"Engine::Status::off", cul::Engine::Status::off},
         {"Engine::Status::on", cul::Engine::Status::on},
-        {"Engine::Status::active", cul::Engine::Status::active}
-    };
+        {"Engine::Status::active", cul::Engine::Status::active}};
 
-    std::string s; in >> s;
+    std::string s;
+    in >> s;
     auto it = lut.find(s);
     if (it != lut.end())
         state = it->second;
-    else throw std::runtime_error
-    {
-        "cul::operator>>(std::istream&, Engine::Status&): "
-        "Could not resolve state " + s
-    };
+    else
+        throw std::runtime_error{
+            "cul::operator>>(std::istream&, Engine::Status&): "
+            "Could not resolve state " +
+            s};
 
     return in;
 }

=== modified file 'src/location_service/com/ubuntu/location/engine.h'
--- src/location_service/com/ubuntu/location/engine.h	2015-01-14 13:41:54 +0000
+++ src/location_service/com/ubuntu/location/engine.h	2015-02-03 09:10:02 +0000
@@ -55,8 +55,8 @@
      */
     enum class Status
     {
-        off, ///< The engine is currently offline.
-        on, ///< The engine and providers are powered on but not navigating.
+        off,   ///< The engine is currently offline.
+        on,    ///< The engine and providers are powered on but not navigating.
         active ///< The engine and providers are powered on and navigating.
     };
 
@@ -69,56 +69,38 @@
         struct Keys
         {
             /** Key for persisting the SatelliteBasedPositioningState */
-            static constexpr const char* satellite_based_positioning_state
-            {
-                "Engine::SatelliteBasedPositioningState"
-            };
+            static constexpr const char* satellite_based_positioning_state{
+                "Engine::SatelliteBasedPositioningState"};
             /** Key for persisting the WifiAndCellIdReportingState */
-            static constexpr const char* wifi_and_cell_id_reporting_state
-            {
-                "Engine::WifiAndCellIdReportingState"
-            };
+            static constexpr const char* wifi_and_cell_id_reporting_state{
+                "Engine::WifiAndCellIdReportingState"};
             /** Key for persisting the Engine::Status */
-            static constexpr const char* engine_state
-            {
-                "Engine::State"
-            };
+            static constexpr const char* engine_state{
+                "Engine::State"};
         };
 
         /** Default values go here. */
         struct Defaults
         {
-            static constexpr const SatelliteBasedPositioningState satellite_based_positioning_state
-            {
-                SatelliteBasedPositioningState::on
-            };
-
-            static constexpr const WifiAndCellIdReportingState wifi_and_cell_id_reporting_state
-            {
-                WifiAndCellIdReportingState::off
-            };
-
-            static constexpr const Engine::Status engine_state
-            {
-                Engine::Status::on
-            };
-        };
-
-        /** Setable/getable/observable property for the satellite based positioning state. */
-        core::Property<SatelliteBasedPositioningState> satellite_based_positioning_state
-        {
-            Defaults::satellite_based_positioning_state
-        };
-        /** Setable/getable/observable property for the satellite based positioning state. */
-        core::Property<WifiAndCellIdReportingState> wifi_and_cell_id_reporting_state
-        {
-            Defaults::wifi_and_cell_id_reporting_state
-        };
+            static constexpr const SatelliteBasedPositioningState satellite_based_positioning_state{
+                SatelliteBasedPositioningState::on};
+
+            static constexpr const WifiAndCellIdReportingState wifi_and_cell_id_reporting_state{
+                WifiAndCellIdReportingState::off};
+
+            static constexpr const Engine::Status engine_state{
+                Engine::Status::on};
+        };
+
+        /** Setable/getable/observable property for the satellite based positioning state. */
+        core::Property<SatelliteBasedPositioningState> satellite_based_positioning_state{
+            Defaults::satellite_based_positioning_state};
+        /** Setable/getable/observable property for the satellite based positioning state. */
+        core::Property<WifiAndCellIdReportingState> wifi_and_cell_id_reporting_state{
+            Defaults::wifi_and_cell_id_reporting_state};
         /** Setable/getable/observable property for the overall engine state. */
-        core::Property<Engine::Status> engine_state
-        {
-            Defaults::engine_state
-        };
+        core::Property<Engine::Status> engine_state{
+            Defaults::engine_state};
     };
 
     /** @brief Summarizes all updates delivered via the engine. */

=== modified file 'src/location_service/com/ubuntu/location/non_selecting_provider_selection_policy.cpp'
--- src/location_service/com/ubuntu/location/non_selecting_provider_selection_policy.cpp	2014-10-28 18:28:29 +0000
+++ src/location_service/com/ubuntu/location/non_selecting_provider_selection_policy.cpp	2015-02-03 09:10:02 +0000
@@ -52,21 +52,20 @@
         for (auto provider : BagOfProviders::providers)
         {
             connections.push_back(provider->updates().position.connect([this](const location::Update<location::Position>& update)
-            {
+                                                                       {
                 mutable_updates().position(update);
-            }));
+                                                                       }));
 
             connections.push_back(provider->updates().heading.connect([this](const location::Update<location::Heading>& update)
-            {
+                                                                      {
                 mutable_updates().heading(update);
-            }));
+                                                                      }));
 
             connections.push_back(provider->updates().velocity.connect([this](const location::Update<location::Velocity>& update)
-            {
+                                                                       {
                 mutable_updates().velocity(update);
-            }));
+                                                                       }));
         }
-
     }
 
     // We always match :)
@@ -142,21 +141,20 @@
 }
 
 location::ProviderSelection location::NonSelectingProviderSelectionPolicy::determine_provider_selection_for_criteria(
-        const location::Criteria&,
-        const location::ProviderEnumerator& enumerator)
+    const location::Criteria&,
+    const location::ProviderEnumerator& enumerator)
 {
     // We put all providers in a set.
     std::set<location::Provider::Ptr> bag;
     enumerator.for_each_provider([&bag](const location::Provider::Ptr& provider)
-    {
+                                 {
         bag.insert(provider);
-    });
+                                 });
 
     auto bag_of_providers = std::make_shared<BagOfProviders>(bag);
 
     // Our bag of providers is responsible for delivering position/heading/velocity updates.
-    return location::ProviderSelection
-    {
+    return location::ProviderSelection{
         bag_of_providers, // position
         bag_of_providers, // heading
         bag_of_providers  // velocity

=== modified file 'src/location_service/com/ubuntu/location/position.cpp'
--- src/location_service/com/ubuntu/location/position.cpp	2014-06-17 08:06:08 +0000
+++ src/location_service/com/ubuntu/location/position.cpp	2015-02-03 09:10:02 +0000
@@ -23,17 +23,17 @@
 namespace cul = com::ubuntu::location;
 
 cul::Position::Position(
-        const cul::wgs84::Latitude& latitude,
-        const cul::wgs84::Longitude& longitude)
+    const cul::wgs84::Latitude& latitude,
+    const cul::wgs84::Longitude& longitude)
     : latitude(latitude),
       longitude(longitude)
 {
 }
 
 cul::Position::Position(
-        const cul::wgs84::Latitude& latitude,
-        const cul::wgs84::Longitude& longitude,
-        const cul::wgs84::Altitude& altitude)
+    const cul::wgs84::Latitude& latitude,
+    const cul::wgs84::Longitude& longitude,
+    const cul::wgs84::Altitude& altitude)
     : latitude(latitude),
       longitude(longitude),
       altitude(altitude)
@@ -62,10 +62,10 @@
 bool cul::Position::operator==(const cul::Position& rhs) const
 {
     return latitude == rhs.latitude &&
-            longitude == rhs.longitude &&
-            altitude == rhs.altitude &&
-            accuracy.horizontal == rhs.accuracy.horizontal &&
-            accuracy.vertical == rhs.accuracy.vertical;
+           longitude == rhs.longitude &&
+           altitude == rhs.altitude &&
+           accuracy.horizontal == rhs.accuracy.horizontal &&
+           accuracy.vertical == rhs.accuracy.vertical;
 }