Merge lp://staging/~mandel/location-service/add-auto-formatting into lp://staging/location-service/trunk
Proposed by
Manuel de la Peña
| Status: | Approved |
|---|---|
| Approved by: | Thomas Voß |
| Approved revision: | 191 |
| Proposed branch: | lp://staging/~mandel/location-service/add-auto-formatting |
| Merge into: | lp://staging/location-service/trunk |
| Diff against target: |
30592 lines (+11828/-10771) 162 files modified
CMakeLists.txt (+35/-0) _clang-format (+48/-0) astyle-config (+44/-0) include/location_service/com/ubuntu/location/accuracy.h (+17/-12) include/location_service/com/ubuntu/location/clock.h (+1/-1) include/location_service/com/ubuntu/location/codec.h (+54/-44) include/location_service/com/ubuntu/location/configuration.h (+1/-1) include/location_service/com/ubuntu/location/connectivity/bounded_integer.h (+15/-15) include/location_service/com/ubuntu/location/connectivity/manager.h (+2/-4) include/location_service/com/ubuntu/location/connectivity/radio_cell.h (+54/-117) include/location_service/com/ubuntu/location/connectivity/wireless_network.h (+9/-15) include/location_service/com/ubuntu/location/criteria.h (+13/-9) include/location_service/com/ubuntu/location/default_provider_selection_policy.h (+10/-17) include/location_service/com/ubuntu/location/heading.h (+1/-1) include/location_service/com/ubuntu/location/init_and_shutdown.h (+1/-1) include/location_service/com/ubuntu/location/logging.h (+1/-2) include/location_service/com/ubuntu/location/optional.h (+2/-2) include/location_service/com/ubuntu/location/position.h (+10/-3) include/location_service/com/ubuntu/location/provider.h (+14/-16) include/location_service/com/ubuntu/location/provider_enumerator.h (+1/-1) include/location_service/com/ubuntu/location/provider_factory.h (+7/-5) include/location_service/com/ubuntu/location/provider_selection.h (+10/-4) include/location_service/com/ubuntu/location/provider_selection_policy.h (+3/-4) include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h (+55/-23) include/location_service/com/ubuntu/location/providers/geoclue/provider.h (+11/-5) include/location_service/com/ubuntu/location/providers/remote/interface.h (+45/-70) include/location_service/com/ubuntu/location/providers/remote/skeleton.h (+7/-3) include/location_service/com/ubuntu/location/providers/remote/stub.h (+7/-3) include/location_service/com/ubuntu/location/providers/skyhook/provider.h (+16/-7) include/location_service/com/ubuntu/location/proxy_provider.h (+2/-2) include/location_service/com/ubuntu/location/satellite_based_positioning_state.h (+3/-3) include/location_service/com/ubuntu/location/service/configuration.h (+4/-5) include/location_service/com/ubuntu/location/service/default_permission_manager.h (+6/-8) include/location_service/com/ubuntu/location/service/interface.h (+10/-28) include/location_service/com/ubuntu/location/service/permission_manager.h (+5/-7) include/location_service/com/ubuntu/location/service/session/implementation.h (+3/-3) include/location_service/com/ubuntu/location/service/session/interface.h (+4/-4) include/location_service/com/ubuntu/location/service/session/skeleton.h (+1/-1) include/location_service/com/ubuntu/location/service/session/stub.h (+4/-6) include/location_service/com/ubuntu/location/service/skeleton.h (+15/-17) include/location_service/com/ubuntu/location/service/stub.h (+4/-4) include/location_service/com/ubuntu/location/space_vehicle.h (+35/-38) include/location_service/com/ubuntu/location/units/units.h (+10/-11) include/location_service/com/ubuntu/location/update.h (+10/-11) include/location_service/com/ubuntu/location/velocity.h (+1/-1) include/location_service/com/ubuntu/location/wgs84/altitude.h (+5/-3) include/location_service/com/ubuntu/location/wgs84/coordinate.h (+11/-11) include/location_service/com/ubuntu/location/wgs84/latitude.h (+6/-2) include/location_service/com/ubuntu/location/wgs84/longitude.h (+6/-2) include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h (+3/-3) src/location_service/com/ubuntu/location/boost_ptree_settings.cpp (+3/-2) src/location_service/com/ubuntu/location/boost_ptree_settings.h (+1/-1) src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp (+334/-350) src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h (+9/-10) src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp (+73/-96) src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h (+3/-4) src/location_service/com/ubuntu/location/connectivity/dummy_connectivity_manager.h (+9/-5) src/location_service/com/ubuntu/location/connectivity/manager.cpp (+58/-19) src/location_service/com/ubuntu/location/connectivity/nm.h (+66/-68) src/location_service/com/ubuntu/location/connectivity/ofono.h (+522/-600) src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp (+390/-348) src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h (+54/-39) src/location_service/com/ubuntu/location/connectivity/radio_cell.cpp (+31/-26) src/location_service/com/ubuntu/location/connectivity/wireless_network.cpp (+10/-5) src/location_service/com/ubuntu/location/criteria.cpp (+24/-6) src/location_service/com/ubuntu/location/default_permission_manager.cpp (+6/-5) src/location_service/com/ubuntu/location/default_provider_selection_policy.cpp (+56/-72) src/location_service/com/ubuntu/location/engine.cpp (+156/-145) src/location_service/com/ubuntu/location/engine.h (+24/-48) src/location_service/com/ubuntu/location/non_selecting_provider_selection_policy.cpp (+50/-33) src/location_service/com/ubuntu/location/non_selecting_provider_selection_policy.h (+1/-1) src/location_service/com/ubuntu/location/position.cpp (+27/-22) src/location_service/com/ubuntu/location/provider.cpp (+43/-15) src/location_service/com/ubuntu/location/provider_factory.cpp (+8/-15) src/location_service/com/ubuntu/location/providers/config.cpp (+14/-29) src/location_service/com/ubuntu/location/providers/dummy/provider.cpp (+54/-68) src/location_service/com/ubuntu/location/providers/dummy/provider.h (+16/-58) src/location_service/com/ubuntu/location/providers/geoclue/provider.cpp (+77/-90) src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp (+153/-168) src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h (+25/-22) src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.h (+3/-3) src/location_service/com/ubuntu/location/providers/gps/net_cpp_gps_xtra_downloader.h (+26/-11) src/location_service/com/ubuntu/location/providers/gps/null_gps_xtra_downloader.h (+19/-3) src/location_service/com/ubuntu/location/providers/gps/provider.cpp (+16/-17) src/location_service/com/ubuntu/location/providers/gps/provider.h (+6/-5) src/location_service/com/ubuntu/location/providers/remote/provider.cpp (+378/-319) src/location_service/com/ubuntu/location/providers/remote/provider.h (+1/-1) src/location_service/com/ubuntu/location/providers/remote/skeleton.cpp (+2/-1) src/location_service/com/ubuntu/location/providers/skyhook/provider.cpp (+43/-45) src/location_service/com/ubuntu/location/proxy_provider.cpp (+16/-21) src/location_service/com/ubuntu/location/satellite_based_positioning_state.cpp (+19/-19) src/location_service/com/ubuntu/location/service/daemon.cpp (+210/-215) src/location_service/com/ubuntu/location/service/daemon.h (+9/-21) src/location_service/com/ubuntu/location/service/daemon_cli_main.cpp (+4/-2) src/location_service/com/ubuntu/location/service/daemon_main.cpp (+4/-2) src/location_service/com/ubuntu/location/service/dbus_connection_factory.h (+2/-5) src/location_service/com/ubuntu/location/service/default_configuration.cpp (+3/-3) src/location_service/com/ubuntu/location/service/default_configuration.h (+5/-6) src/location_service/com/ubuntu/location/service/default_permission_manager.cpp (+6/-5) src/location_service/com/ubuntu/location/service/demultiplexing_reporter.cpp (+12/-8) src/location_service/com/ubuntu/location/service/demultiplexing_reporter.h (+13/-3) src/location_service/com/ubuntu/location/service/harvester.cpp (+20/-12) src/location_service/com/ubuntu/location/service/harvester.h (+1/-2) src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp (+149/-118) src/location_service/com/ubuntu/location/service/ichnaea_reporter.h (+23/-28) src/location_service/com/ubuntu/location/service/implementation.cpp (+69/-90) src/location_service/com/ubuntu/location/service/implementation.h (+2/-2) src/location_service/com/ubuntu/location/service/program_options.h (+51/-50) src/location_service/com/ubuntu/location/service/provider_daemon.cpp (+49/-60) src/location_service/com/ubuntu/location/service/provider_daemon.h (+1/-1) src/location_service/com/ubuntu/location/service/provider_daemon_main.cpp (+2/-4) src/location_service/com/ubuntu/location/service/runtime_tests.cpp (+43/-36) src/location_service/com/ubuntu/location/service/runtime_tests.h (+1/-1) src/location_service/com/ubuntu/location/service/session/implementation.cpp (+50/-55) src/location_service/com/ubuntu/location/service/session/interface.cpp (+2/-1) src/location_service/com/ubuntu/location/service/session/interface_p.h (+48/-51) src/location_service/com/ubuntu/location/service/session/skeleton.cpp (+91/-85) src/location_service/com/ubuntu/location/service/session/stub.cpp (+96/-85) src/location_service/com/ubuntu/location/service/skeleton.cpp (+83/-127) src/location_service/com/ubuntu/location/service/stub.cpp (+19/-17) src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp (+42/-52) src/location_service/com/ubuntu/location/service/trust_store_permission_manager.h (+3/-4) src/location_service/com/ubuntu/location/set_name_for_thread.h (+1/-1) src/location_service/com/ubuntu/location/settings.cpp (+2/-0) src/location_service/com/ubuntu/location/settings.h (+24/-13) src/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.cpp (+19/-19) tests/acceptance_tests.cpp (+272/-309) tests/connectivity_manager_test.cpp (+133/-114) tests/controller_test.cpp (+11/-21) tests/daemon_and_cli_tests.cpp (+48/-71) tests/default_permission_manager_test.cpp (+2/-3) tests/demultiplexing_reporter_test.cpp (+6/-10) tests/did_finish_successfully.h (+5/-1) tests/dummy_provider_tests.cpp (+11/-16) tests/engine_test.cpp (+50/-67) tests/espoo_provider_test.cpp (+143/-137) tests/geoclue_provider_test.cpp (+2/-3) tests/gps_provider_test.cpp (+139/-188) tests/harvester_test.cpp (+9/-25) tests/heading_test.cpp (+7/-6) tests/ichnaea_reporter_test.cpp (+41/-83) tests/mock_connectivity_manager.h (+15/-16) tests/mock_event_consumer.h (+17/-17) tests/mock_network_manager.h (+81/-77) tests/mock_ofono.h (+82/-51) tests/mock_provider.h (+11/-6) tests/mock_reporter.h (+4/-5) tests/mongoose.c (+5311/-4272) tests/mongoose.h (+105/-96) tests/null_provider_selection_policy.h (+6/-11) tests/position_test.cpp (+11/-19) tests/provider_factory_test.cpp (+13/-11) tests/provider_selection_policy_test.cpp (+51/-59) tests/provider_test.cpp (+66/-45) tests/remote_provider_test.cpp (+199/-214) tests/remote_providerd_test.cpp (+120/-116) tests/session_test.cpp (+37/-25) tests/trust_store_permission_manager_test.cpp (+47/-53) tests/web_server.h (+21/-19) tests/wgs84_test.cpp (+57/-51) tools/CMakeLists.txt (+1/-0) tools/formatcode.in (+67/-0) |
| To merge this branch: | bzr merge lp://staging/~mandel/location-service/add-auto-formatting |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Salveti (community) | code, wait a bit more to land. | Disapprove | |
| Thomas Voß (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Add the autoformatting used in the diff projects from the team.
Description of the change
Add the autoformatting used in the diff projects from the team.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Ricardo Salveti (rsalveti) wrote | # |
review:
Disapprove
(code, wait a bit more to land.)
Unmerged revisions
- 191. By Manuel de la Peña
-
Ran format job.
- 190. By Manuel de la Peña
-
Merged with trunk.
- 189. By Manuel de la Peña
-
Revert style changes.
- 188. By Manuel de la Peña
-
Performed style rule.
- 187. By Manuel de la Peña
-
Add missin astyle file.
- 186. By Manuel de la Peña
-
Reverted the format changes and added the missing _clang_format file.
- 185. By Manuel de la Peña
-
Run the autoformatting code.
- 184. By Manuel de la Peña
-
Add auto-formatting shared between diff projects from the team.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:184
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://