Switch to unified view

a/libupnpp/device.hxx b/libupnpp/device.hxx
...
...
76
private:
76
private:
77
    const std::string& serviceType(const std::string& serviceId);
77
    const std::string& serviceType(const std::string& serviceId);
78
            
78
            
79
    LibUPnP *m_lib;
79
    LibUPnP *m_lib;
80
    std::string m_deviceId;
80
    std::string m_deviceId;
81
    // We keep the services in a map for easy access from id and in a
82
    // vector for ordered walking while fetching status. Order is
83
    // determine by addService() call sequence.
81
    std::unordered_map<std::string, UpnpService*> m_services;
84
    std::unordered_map<std::string, UpnpService*> m_servicemap;
85
    std::vector<std::string> m_serviceids;
82
    std::unordered_map<std::string, soapfun> m_calls;
86
    std::unordered_map<std::string, soapfun> m_calls;
83
87
84
    static unordered_map<std::string, UpnpDevice *> o_devices;
88
    static unordered_map<std::string, UpnpDevice *> o_devices;
85
89
86
    /* Static callback for libupnp. This looks up the appropriate
90
    /* Static callback for libupnp. This looks up the appropriate