Switch to unified view

a/libupnpp/device/device.hxx b/libupnpp/device/device.hxx
...
...
24
24
25
namespace UPnPProvider {
25
namespace UPnPProvider {
26
26
27
class UpnpService;
27
class UpnpService;
28
28
29
typedef function<int (const SoapArgs&, SoapData&)> soapfun;
29
typedef function<int (const UPnPP::SoapArgs&, UPnPP::SoapData&)> soapfun;
30
30
31
/** Define a virtual interface to link libupnp operations to a device 
31
/** Define a virtual interface to link libupnp operations to a device 
32
 * implementation 
32
 * implementation 
33
 */
33
 */
34
class UpnpDevice {
34
class UpnpDevice {
...
...
83
    bool ok() {return m_lib != 0;}
83
    bool ok() {return m_lib != 0;}
84
84
85
private:
85
private:
86
    const std::string& serviceType(const std::string& serviceId);
86
    const std::string& serviceType(const std::string& serviceId);
87
            
87
            
88
    LibUPnP *m_lib;
88
    UPnPP::LibUPnP *m_lib;
89
    std::string m_deviceId;
89
    std::string m_deviceId;
90
    // We keep the services in a map for easy access from id and in a
90
    // We keep the services in a map for easy access from id and in a
91
    // vector for ordered walking while fetching status. Order is
91
    // vector for ordered walking while fetching status. Order is
92
    // determine by addService() call sequence.
92
    // determine by addService() call sequence.
93
    std::unordered_map<std::string, UpnpService*> m_servicemap;
93
    std::unordered_map<std::string, UpnpService*> m_servicemap;