~thomas-voss/location-service/enable-gnd-messages

« back to all changes in this revision

Viewing changes to src/location/service/state.cpp

Committer: Thomas Voß
Date: 2016-06-26 21:17:03 UTC
mto: This revision was merged to the branch mainline in revision 259.
Revision ID: thomas.voss@canonical.com-20160626211703-aptpytiwrjdr1snn

Simplify namespaces.

files removed:
include/location_service

include/location_service/com

include/location_service/com/ubuntu

src/location_service

src/location_service/CMakeLists.txt

src/location_service/com

src/location_service/com/CMakeLists.txt

src/location_service/com/ubuntu

src/location_service/com/ubuntu/CMakeLists.txt

files renamed:
include/location_service/com/ubuntu/location/ => include/location/

src/location_service/com/ubuntu/location/ => src/location/

files modified:
CMakeLists.txt

data/ubuntu-location-service.pc.in

examples/service/client.cpp

examples/service/program_options.h

examples/service/service.cpp

examples/standalone/connectivity/connectivity.cpp

include/CMakeLists.txt

include/location/accuracy.h

include/location/clock.h

include/location/codec.h

include/location/configuration.h

include/location/connectivity/bounded_integer.h

include/location/connectivity/manager.h

include/location/connectivity/radio_cell.h

include/location/connectivity/wireless_network.h

include/location/criteria.h

include/location/default_provider_selection_policy.h

include/location/fusion_provider.h

include/location/fusion_provider_selection_policy.h

include/location/heading.h

include/location/init_and_shutdown.h

include/location/logging.h

include/location/newer_or_more_accurate_update_selector.h

include/location/newer_update_selector.h

include/location/optional.h

include/location/position.h

include/location/provider.h

include/location/provider_enumerator.h

include/location/provider_factory.h

include/location/provider_selection.h

include/location/provider_selection_policy.h

include/location/providers/remote/interface.h

include/location/providers/remote/skeleton.h

include/location/providers/remote/stub.h

include/location/proxy_provider.h

include/location/satellite_based_positioning_state.h

include/location/service/configuration.h

include/location/service/default_permission_manager.h

include/location/service/interface.h

include/location/service/permission_manager.h

include/location/service/session/implementation.h

include/location/service/session/interface.h

include/location/service/session/skeleton.h

include/location/service/session/stub.h

include/location/service/skeleton.h

include/location/service/state.h

include/location/service/stub.h

include/location/space_vehicle.h

include/location/units/units.h

include/location/update.h

include/location/update_selector.h

include/location/velocity.h

include/location/wgs84/altitude.h

include/location/wgs84/coordinate.h

include/location/wgs84/latitude.h

include/location/wgs84/longitude.h

include/location/wifi_and_cell_reporting_state.h

src/CMakeLists.txt

src/location/boost_ptree_settings.cpp

src/location/boost_ptree_settings.h

src/location/connectivity/cached_radio_cell.cpp

src/location/connectivity/cached_radio_cell.h

src/location/connectivity/cached_wireless_network.cpp

src/location/connectivity/cached_wireless_network.h

src/location/connectivity/dummy_connectivity_manager.h

src/location/connectivity/manager.cpp

src/location/connectivity/ofono.h

src/location/connectivity/ofono_nm_connectivity_manager.cpp

src/location/connectivity/ofono_nm_connectivity_manager.h

src/location/connectivity/radio_cell.cpp

src/location/connectivity/wireless_network.cpp

src/location/criteria.cpp

src/location/default_permission_manager.cpp

src/location/default_provider_selection_policy.cpp

src/location/engine.cpp

src/location/engine.h

src/location/fusion_provider.cpp

src/location/fusion_provider_selection_policy.cpp

src/location/init_and_shutdown.cpp

src/location/non_selecting_provider_selection_policy.cpp

src/location/non_selecting_provider_selection_policy.h

src/location/position.cpp

src/location/provider.cpp

src/location/provider_factory.cpp

src/location/providers/config.cpp

src/location/providers/dummy/delayed_provider.cpp

src/location/providers/dummy/delayed_provider.h

src/location/providers/dummy/provider.cpp

src/location/providers/dummy/provider.h

src/location/providers/geoclue/geoclue.h

src/location/providers/geoclue/provider.cpp

src/location/providers/geoclue/provider.h

src/location/providers/gps/android_hardware_abstraction_layer.cpp

src/location/providers/gps/android_hardware_abstraction_layer.h

src/location/providers/gps/hardware_abstraction_layer.cpp

src/location/providers/gps/hardware_abstraction_layer.h

src/location/providers/gps/net_cpp_gps_xtra_downloader.h

src/location/providers/gps/null_gps_xtra_downloader.h

src/location/providers/gps/provider.cpp

src/location/providers/gps/provider.h

src/location/providers/gps/sntp_client.cpp

src/location/providers/gps/sntp_client.h

src/location/providers/gps/sntp_reference_time_source.cpp

src/location/providers/gps/sntp_reference_time_source.h

src/location/providers/remote/provider.cpp

src/location/providers/remote/provider.h

src/location/providers/remote/skeleton.cpp

src/location/providers/remote/stub.cpp

src/location/providers/skyhook/provider.cpp

src/location/providers/skyhook/provider.h

src/location/proxy_provider.cpp

src/location/satellite_based_positioning_state.cpp

src/location/service/config.h.in

src/location/service/daemon.cpp

src/location/service/daemon.h

src/location/service/daemon_cli_main.cpp

src/location/service/daemon_main.cpp

src/location/service/dbus_connection_factory.h

src/location/service/default_configuration.cpp

src/location/service/default_configuration.h

src/location/service/default_permission_manager.cpp

src/location/service/demultiplexing_reporter.cpp

src/location/service/demultiplexing_reporter.h

src/location/service/harvester.cpp

src/location/service/harvester.h

src/location/service/ichnaea_reporter.cpp

src/location/service/ichnaea_reporter.h

src/location/service/implementation.cpp

src/location/service/implementation.h

src/location/service/program_options.h

src/location/service/provider_daemon.cpp

src/location/service/provider_daemon.h

src/location/service/provider_daemon_main.cpp

src/location/service/runtime.cpp

src/location/service/runtime.h

src/location/service/runtime_tests.cpp

src/location/service/runtime_tests.h

src/location/service/session/implementation.cpp

src/location/service/session/interface.cpp

src/location/service/session/interface_p.h

src/location/service/session/skeleton.cpp

src/location/service/session/stub.cpp

src/location/service/skeleton.cpp

src/location/service/state.cpp

src/location/service/stub.cpp

src/location/service/trust_store_permission_manager.cpp

src/location/service/trust_store_permission_manager.h

src/location/set_name_for_thread.cpp

src/location/set_name_for_thread.h

src/location/settings.cpp

src/location/settings.h

src/location/state_tracking_provider.h

src/location/time_based_update_policy.cpp

src/location/time_based_update_policy.h

src/location/time_since_boot.cpp

src/location/time_since_boot.h

src/location/update_policy.h

src/location/wifi_and_cell_reporting_state.cpp

symbols.map

tests/acceptance_tests.cpp

tests/boost_ptree_settings_test.cpp

tests/bug_1447110.cpp

tests/connectivity_manager_test.cpp

tests/controller_test.cpp

tests/criteria_test.cpp

tests/daemon_and_cli_tests.cpp

tests/default_permission_manager_test.cpp

tests/delayed_service_test.cpp

tests/demultiplexing_reporter_test.cpp

tests/dummy_provider_tests.cpp

tests/engine_test.cpp

tests/espoo_provider_test.cpp

tests/geoclue_provider_test.cpp

tests/gps_provider_test.cpp

tests/harvester_test.cpp

tests/heading_test.cpp

tests/ichnaea_reporter_test.cpp

tests/mock_connectivity_manager.h

tests/mock_engine.h

tests/mock_event_consumer.h

tests/mock_event_receiver.h

tests/mock_network_manager.h

tests/mock_ofono.h

tests/mock_provider.h

tests/mock_reporter.h

tests/null_provider_selection_policy.h

tests/position_test.cpp

tests/provider_factory_test.cpp

tests/provider_selection_policy_test.cpp

tests/provider_test.cpp

tests/remote_provider_test.cpp

tests/remote_providerd_test.cpp

tests/runtime_test.cpp

tests/session_test.cpp

tests/sntp_client_test.cpp

tests/state_tracking_provider_test.cpp

tests/test_main.cpp

tests/time_based_update_policy_test.cpp

tests/trust_store_permission_manager_test.cpp

tests/wgs84_test.cpp

Show diffs side-by-side

added added

removed removed

src/location/service/state.cpp

* Authored by: Thomas Voß <thomas.voss@canonical.com>

#include <com/ubuntu/location/service/state.h>

#include <location/service/state.h>

#include <map>

#include <type_traits>

namespace culs = com::ubuntu::location::service;

namespace

{

typedef typename std::underlying_type<culs::State>::type UT;

typedef typename std::underlying_type<location::service::State>::type UT;

typedef std::pair<std::map<culs::State, std::string>, std::map<std::string, culs::State>> Lut;

typedef std::pair<std::map<location::service::State, std::string>, std::map<std::string, location::service::State>> Lut;

const Lut& lut()

{

static const Lut instance

{

{culs::State::disabled, "disabled"},

{culs::State::enabled, "enabled"},

{culs::State::active, "active"}

{location::service::State::disabled, "disabled"},

{location::service::State::enabled, "enabled"},

{location::service::State::active, "active"}

{

{"disabled", culs::State::disabled},

{"enabled", culs::State::enabled},

{"active", culs::State::active}

{"disabled", location::service::State::disabled},

{"enabled", location::service::State::enabled},

{"active", location::service::State::active}

}

};

}

bool culs::operator==(culs::State lhs, culs::State rhs)

bool location::service::operator==(location::service::State lhs, location::service::State rhs)

{

return static_cast<UT>(lhs) == static_cast<UT>(rhs);

}

bool culs::operator!=(culs::State lhs, culs::State rhs)

bool location::service::operator!=(location::service::State lhs, location::service::State rhs)

{

return static_cast<UT>(lhs) != static_cast<UT>(rhs);

}

std::ostream& culs::operator<<(std::ostream& out, culs::State state)

std::ostream& location::service::operator<<(std::ostream& out, location::service::State state)

{

return out << lut().first.at(state);

}

std::istream& culs::operator>>(std::istream& in, culs::State& state)

std::istream& location::service::operator>>(std::istream& in, location::service::State& state)

{

std::string s; in >> s; state = lut().second.at(s);

return in;

Older »