← Back to branch summary

~thomas-voss/location-service/flatten

« back to all changes in this revision

Viewing changes to src/location_service/com/ubuntu/location/providers/config.cpp

  • Committer: thomas-voss
  • Date: 2015-02-03 12:21:33 UTC
  • Revision ID: thomas.voss@canonical.com-20150203122133-660kjot28cz7dx6m
Adjust namespace to core::location for all classes not in com::ubuntu::location::connectivity.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/location_service/com/ubuntu/location/providers/config.cpp
22
22
 
23
23
#include <map>
24
24
 
25
 
namespace cul = com::ubuntu::location;
 
25
namespace cul = core::location;
26
26
 
27
27
namespace
28
28
{
30
30
{
31
31
    FactoryInjector(const std::string& name, const std::function<cul::Provider::Ptr(const cul::ProviderFactory::Configuration&)>& f)
32
32
    {
33
 
        com::ubuntu::location::ProviderFactory::instance().add_factory_for_name(name, f);
 
33
        core::location::ProviderFactory::instance().add_factory_for_name(name, f);
34
34
    }
35
35
};
36
36
}
37
37
 
38
38
static FactoryInjector dummy_injector{
39
39
    "dummy::Provider",
40
 
    com::ubuntu::location::providers::dummy::Provider::create_instance};
 
40
    core::location::providers::dummy::Provider::create_instance};
41
41
 
42
42
#include <com/ubuntu/location/providers/remote/provider.h>
43
43
static FactoryInjector remote_injector{
44
44
    "remote::Provider",
45
 
    com::ubuntu::location::providers::remote::Provider::Stub::create_instance};
 
45
    core::location::providers::remote::Provider::Stub::create_instance};
46
46
 
47
47
#if defined(COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GEOCLUE)
48
48
#include <com/ubuntu/location/providers/geoclue/provider.h>
49
49
static FactoryInjector geoclue_injector{
50
50
    "geoclue::Provider",
51
 
    com::ubuntu::location::providers::geoclue::Provider::create_instance};
 
51
    core::location::providers::geoclue::Provider::create_instance};
52
52
#endif // COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GEOCLUE
53
53
 
54
54
#if defined(COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GPS)
55
55
#include <com/ubuntu/location/providers/gps/provider.h>
56
56
static FactoryInjector gps_injector{
57
57
    "gps::Provider",
58
 
    com::ubuntu::location::providers::gps::Provider::create_instance};
 
58
    core::location::providers::gps::Provider::create_instance};
59
59
#endif // COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GPS
60
60
 
61
61
#if defined(COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_SKYHOOK)
62
62
#include <com/ubuntu/location/providers/skyhook/provider.h>
63
63
static FactoryInjector skyhook_injector{
64
64
    "skyhook::Provider",
65
 
    com::ubuntu::location::providers::skyhook::Provider::create_instance};
 
65
    core::location::providers::skyhook::Provider::create_instance};
66
66
#endif // COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_SKYHOOK