Merge lp://staging/~thomas-voss/location-service/simplify-namespaces into lp://staging/location-service

CMakeLists.txt (+3/-3)
data/ubuntu-location-service.pc.in (+0/-1)
debian/control (+5/-5)
debian/libubuntu-location-service-dev.install (+1/-1)
examples/service/client.cpp (+10/-13)
examples/service/program_options.h (+0/-5)
examples/service/service.cpp (+21/-23)
examples/standalone/connectivity/connectivity.cpp (+1/-1)
include/CMakeLists.txt (+2/-2)
include/location/accuracy.h (+3/-9)
include/location/clock.h (+3/-9)
include/location/codec.h (+140/-140)
include/location/configuration.h (+3/-9)
include/location/connectivity/bounded_integer.h (+3/-3)
include/location/connectivity/manager.h (+5/-5)
include/location/connectivity/radio_cell.h (+4/-4)
include/location/connectivity/wireless_network.h (+4/-4)
include/location/criteria.h (+7/-13)
include/location/default_provider_selection_policy.h (+6/-12)
include/location/fusion_provider.h (+8/-14)
include/location/fusion_provider_selection_policy.h (+6/-12)
include/location/heading.h (+6/-12)
include/location/init_and_shutdown.h (+3/-9)
include/location/logging.h (+3/-3)
include/location/newer_or_more_accurate_update_selector.h (+7/-12)
include/location/newer_update_selector.h (+6/-12)
include/location/optional.h (+3/-9)
include/location/position.h (+10/-15)
include/location/provider.h (+10/-16)
include/location/provider_enumerator.h (+3/-9)
include/location/provider_factory.h (+8/-14)
include/location/provider_selection.h (+4/-10)
include/location/provider_selection_policy.h (+5/-11)
include/location/providers/remote/interface.h (+16/-21)
include/location/providers/remote/skeleton.h (+5/-10)
include/location/providers/remote/stub.h (+5/-10)
include/location/proxy_provider.h (+5/-11)
include/location/satellite_based_positioning_state.h (+3/-9)
include/location/service/configuration.h (+8/-14)
include/location/service/default_permission_manager.h (+5/-10)
include/location/service/interface.h (+19/-25)
include/location/service/permission_manager.h (+4/-9)
include/location/service/session/implementation.h (+7/-13)
include/location/service/session/interface.h (+8/-14)
include/location/service/session/skeleton.h (+12/-18)
include/location/service/session/stub.h (+12/-17)
include/location/service/skeleton.h (+9/-14)
include/location/service/state.h (+5/-5)
include/location/service/stub.h (+6/-11)
include/location/space_vehicle.h (+4/-10)
include/location/units/units.h (+3/-9)
include/location/update.h (+4/-10)
include/location/update_selector.h (+8/-13)
include/location/velocity.h (+6/-12)
include/location/wgs84/altitude.h (+8/-13)
include/location/wgs84/coordinate.h (+5/-10)
include/location/wgs84/latitude.h (+6/-11)
include/location/wgs84/longitude.h (+6/-11)
include/location/wifi_and_cell_reporting_state.h (+3/-9)
src/CMakeLists.txt (+1/-1)
src/location/CMakeLists.txt (+4/-8)
src/location/boost_ptree_settings.cpp (+2/-4)
src/location/boost_ptree_settings.h (+4/-10)
src/location/connectivity/cached_radio_cell.cpp (+3/-3)
src/location/connectivity/cached_radio_cell.h (+1/-1)
src/location/connectivity/cached_wireless_network.cpp (+1/-1)
src/location/connectivity/cached_wireless_network.h (+2/-2)
src/location/connectivity/dummy_connectivity_manager.h (+1/-1)
src/location/connectivity/manager.cpp (+1/-1)
src/location/connectivity/nm.h (+3/-3)
src/location/connectivity/ofono.h (+4/-4)
src/location/connectivity/ofono_nm_connectivity_manager.cpp (+1/-1)
src/location/connectivity/ofono_nm_connectivity_manager.h (+3/-3)
src/location/connectivity/radio_cell.cpp (+20/-22)
src/location/connectivity/wireless_network.cpp (+6/-8)
src/location/criteria.cpp (+5/-5)
src/location/default_permission_manager.cpp (+2/-2)
src/location/default_provider_selection_policy.cpp (+28/-30)
src/location/engine.cpp (+36/-38)
src/location/engine.h (+14/-20)
src/location/fusion_provider.cpp (+34/-37)
src/location/fusion_provider_selection_policy.cpp (+3/-5)
src/location/init_and_shutdown.cpp (+4/-10)
src/location/non_selecting_provider_selection_policy.cpp (+3/-5)
src/location/non_selecting_provider_selection_policy.h (+6/-12)
src/location/position.cpp (+23/-25)
src/location/provider.cpp (+63/-65)
src/location/provider_factory.cpp (+16/-18)
src/location/providers/config.cpp (+21/-23)
src/location/providers/dummy/delayed_provider.cpp (+2/-3)
src/location/providers/dummy/delayed_provider.h (+4/-9)
src/location/providers/dummy/provider.cpp (+2/-3)
src/location/providers/dummy/provider.h (+9/-14)
src/location/providers/geoclue/CMakeLists.txt (+4/-4)
src/location/providers/geoclue/geoclue.h (+3/-3)
src/location/providers/geoclue/provider.cpp (+30/-33)
src/location/providers/geoclue/provider.h (+7/-12)
src/location/providers/gps/CMakeLists.txt (+3/-3)
src/location/providers/gps/android_hardware_abstraction_layer.cpp (+8/-18)
src/location/providers/gps/android_hardware_abstraction_layer.h (+7/-7)
src/location/providers/gps/hardware_abstraction_layer.cpp (+2/-2)
src/location/providers/gps/hardware_abstraction_layer.h (+8/-14)
src/location/providers/gps/net_cpp_gps_xtra_downloader.h (+5/-5)
src/location/providers/gps/null_gps_xtra_downloader.h (+6/-6)
src/location/providers/gps/provider.cpp (+24/-26)
src/location/providers/gps/provider.h (+7/-12)
src/location/providers/gps/sntp_client.cpp (+2/-3)
src/location/providers/gps/sntp_client.h (+6/-6)
src/location/providers/gps/sntp_reference_time_source.cpp (+4/-5)
src/location/providers/gps/sntp_reference_time_source.h (+10/-10)
src/location/providers/remote/provider.cpp (+8/-8)
src/location/providers/remote/provider.h (+12/-17)
src/location/providers/remote/skeleton.cpp (+2/-3)
src/location/providers/remote/stub.cpp (+2/-3)
src/location/providers/skyhook/CMakeLists.txt (+5/-5)
src/location/providers/skyhook/provider.cpp (+6/-6)
src/location/providers/skyhook/provider.h (+7/-12)
src/location/proxy_provider.cpp (+12/-15)
src/location/satellite_based_positioning_state.cpp (+1/-3)
src/location/service/config.h.in (+3/-9)
src/location/service/daemon.cpp (+16/-17)
src/location/service/daemon.h (+9/-15)
src/location/service/daemon_cli_main.cpp (+1/-3)
src/location/service/daemon_main.cpp (+0/-2)
src/location/service/dbus_connection_factory.h (+3/-9)
src/location/service/default_configuration.cpp (+26/-29)
src/location/service/default_configuration.h (+7/-13)
src/location/service/default_permission_manager.cpp (+6/-9)
src/location/service/demultiplexing_reporter.cpp (+8/-11)
src/location/service/demultiplexing_reporter.h (+10/-10)
src/location/service/harvester.cpp (+7/-9)
src/location/service/harvester.h (+11/-17)
src/location/service/ichnaea_reporter.cpp (+9/-11)
src/location/service/ichnaea_reporter.h (+10/-10)
src/location/service/implementation.cpp (+29/-32)
src/location/service/implementation.h (+8/-13)
src/location/service/program_options.h (+2/-7)
src/location/service/provider_daemon.cpp (+10/-12)
src/location/service/provider_daemon.h (+7/-13)
src/location/service/provider_daemon_main.cpp (+1/-3)
src/location/service/runtime.cpp (+11/-13)
src/location/service/runtime.h (+3/-9)
src/location/service/runtime_tests.cpp (+7/-8)
src/location/service/runtime_tests.h (+4/-9)
src/location/service/session/implementation.cpp (+11/-16)
src/location/service/session/interface.cpp (+12/-16)
src/location/service/session/interface_p.h (+26/-26)
src/location/service/session/skeleton.cpp (+26/-30)
src/location/service/session/stub.cpp (+22/-26)
src/location/service/skeleton.cpp (+74/-78)
src/location/service/state.cpp (+13/-15)
src/location/service/stub.cpp (+32/-36)
src/location/service/trust_store_permission_manager.cpp (+13/-16)
src/location/service/trust_store_permission_manager.h (+4/-10)
src/location/set_name_for_thread.cpp (+1/-1)
src/location/set_name_for_thread.h (+3/-9)
src/location/settings.cpp (+1/-3)
src/location/settings.h (+3/-9)
src/location/state_tracking_provider.h (+4/-10)
src/location/time_based_update_policy.cpp (+0/-7)
src/location/time_based_update_policy.h (+0/-6)
src/location/time_since_boot.cpp (+8/-10)
src/location/time_since_boot.h (+0/-6)
src/location/update_policy.h (+4/-10)
src/location/wifi_and_cell_reporting_state.cpp (+1/-3)
src/location_service/CMakeLists.txt (+0/-1)
src/location_service/com/CMakeLists.txt (+0/-1)
src/location_service/com/ubuntu/CMakeLists.txt (+0/-1)
symbols.map (+6/-0)
tests/acceptance_tests.cpp (+31/-31)
tests/boost_ptree_settings_test.cpp (+1/-3)
tests/bug_1447110.cpp (+1/-3)
tests/connectivity_manager_test.cpp (+52/-53)
tests/controller_test.cpp (+11/-11)
tests/criteria_test.cpp (+1/-3)
tests/daemon_and_cli_tests.cpp (+4/-6)
tests/default_permission_manager_test.cpp (+9/-9)
tests/delayed_service_test.cpp (+12/-13)
tests/demultiplexing_reporter_test.cpp (+3/-6)
tests/dummy_provider_tests.cpp (+2/-2)
tests/engine_test.cpp (+3/-5)
tests/espoo_provider_test.cpp (+32/-33)
tests/geoclue_provider_test.cpp (+5/-5)
tests/gps_provider_test.cpp (+14/-15)
tests/harvester_test.cpp (+3/-5)
tests/heading_test.cpp (+9/-9)
tests/ichnaea_reporter_test.cpp (+23/-25)
tests/mock_connectivity_manager.h (+1/-1)
tests/mock_engine.h (+9/-9)
tests/mock_event_consumer.h (+3/-3)
tests/mock_event_receiver.h (+1/-3)
tests/mock_network_manager.h (+1/-1)
tests/mock_ofono.h (+1/-1)
tests/mock_provider.h (+13/-13)
tests/mock_reporter.h (+3/-3)
tests/null_provider_selection_policy.h (+9/-9)
tests/position_test.cpp (+3/-3)
tests/provider_factory_test.cpp (+2/-2)
tests/provider_selection_policy_test.cpp (+5/-5)
tests/provider_test.cpp (+22/-22)
tests/remote_provider_test.cpp (+11/-11)
tests/remote_providerd_test.cpp (+10/-12)
tests/runtime_test.cpp (+2/-2)
tests/session_test.cpp (+28/-28)
tests/sntp_client_test.cpp (+2/-3)
tests/state_tracking_provider_test.cpp (+14/-14)
tests/test_main.cpp (+1/-1)
tests/time_based_update_policy_test.cpp (+21/-21)
tests/trust_store_permission_manager_test.cpp (+3/-4)
tests/wgs84_test.cpp (+41/-41)