← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-proposed

« back to all changes in this revision

Viewing changes to solid/solid/backends/upnp/upnpdevice.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-07-08 00:08:34 UTC
  • mto: This revision was merged to the branch mainline in revision 247.
  • Revision ID: package-import@ubuntu.com-20110708000834-dr9a8my4iml90qe5
Tags: upstream-4.6.90
Import upstream version 4.6.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
solid/solid/backends/upnp/upnpdevice.cpp
22
22
#include "upnpmediaserver.h"
23
23
#include "upnpinternetgateway.h"
24
24
 
25
 
#include <HResourceType>
26
 
#include <HDeviceInfo>
27
 
#include <HUdn>
 
25
#include <HUpnpCore/HResourceType>
 
26
#include <HUpnpCore/HDeviceInfo>
 
27
#include <HUpnpCore/HUdn>
28
28
#include <QtCore/QUrl>
29
29
 
30
30
namespace Solid
68
68
 
69
69
static const QMap<QString, QString> typeIconMap = makeTypeIconMap();
70
70
 
71
 
UPnPDevice::UPnPDevice(const Herqq::Upnp::HDeviceProxy* device) :
 
71
UPnPDevice::UPnPDevice(const Herqq::Upnp::HClientDevice* device) :
72
72
    Solid::Ifaces::Device(),
73
73
    m_device(device),
74
74
    m_specVersion(device->info().deviceType().toString(Herqq::Upnp::HResourceType::Version)),
80
80
{
81
81
}
82
82
 
83
 
const Herqq::Upnp::HDeviceProxy* UPnPDevice::device() const
 
83
const Herqq::Upnp::HClientDevice* UPnPDevice::device() const
84
84
{
85
85
    return m_device;
86
86
}
101
101
 
102
102
QString UPnPDevice::parentUdi() const
103
103
{
104
 
    const Herqq::Upnp::HDeviceProxy* parent = device()->parentProxyDevice();
 
104
    const Herqq::Upnp::HClientDevice* parent = device()->parentDevice();
105
105
    if (parent)
106
106
    {
107
107
        Herqq::Upnp::HDeviceInfo parentInfo = parent->info();