alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't use PackageMetadata. instead, use a new little class: RemoteObjectDescription

Browse Source
This commit is contained in:
Aaron Seigo 2011-05-31 01:00:03 +02:00
parent 8f6b17fb0e
commit 6f2284dbd3
2 changed files with 106 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
remote/accessmanager.cpp
View File

@ -43,6 +43,75 @@
namespace Plasma
{
class RemoteObjectDescription::Private
{
public:
QString name;
QString description;
QString icon;
KUrl url;
};
RemoteObjectDescription::RemoteObjectDescription()
: d(new Private)
{
}
RemoteObjectDescription::RemoteObjectDescription(const RemoteObjectDescription &other)
: d(new Private(*other.d))
{
}
RemoteObjectDescription &RemoteObjectDescription::operator=(const RemoteObjectDescription &other)
{
*d = *other.d;
return *this;
}
void RemoteObjectDescription::setName(const QString &name)
{
d->name = name;
}
QString RemoteObjectDescription::name() const
{
return d->name;
}
void RemoteObjectDescription::setUrl(const KUrl &url)
{
d->url = url;
}
KUrl RemoteObjectDescription::url() const
{
return d->url;
}
void RemoteObjectDescription::setDescription(const QString &description)
{
d->description = description;
}
QString RemoteObjectDescription::description() const
{
return d->description;
}
void RemoteObjectDescription::setIcon(const QString &icon)
{
d->icon = icon;
}
QString RemoteObjectDescription::icon() const
{
return d->icon;
}
class AccessManagerSingleton
{
public:
@ -75,7 +144,7 @@ AccessAppletJob *AccessManager::accessRemoteApplet(const KUrl &location) const
KUrl resolvedLocation;
if (location.protocol() == "plasma+zeroconf") {
if (d->zeroconfServices.contains(location.host())) {
resolvedLocation = d->services[location.host()].remoteLocation();
resolvedLocation = d->services[location.host()].url();
} else {
kDebug() << "There's no zeroconf service with this name.";
}
@ -89,7 +158,7 @@ AccessAppletJob *AccessManager::accessRemoteApplet(const KUrl &location) const
return job;
}
QList<PackageMetadata> AccessManager::remoteApplets() const
QList<RemoteObjectDescription> AccessManager::remoteApplets() const
{
return d->services.values();
}
@ -135,7 +204,7 @@ void AccessManagerPrivate::slotAddService(DNSSD::RemoteService::Ptr service)
}
if (!services.contains(service->serviceName())) {
PackageMetadata metadata;
RemoteObjectDescription metadata;
kDebug() << "textdata = " << service->textData();
kDebug() << "hostname: " << service->hostName();
QHostAddress address = DNSSD::ServiceBrowser::resolveHostName(service->hostName());
@ -146,20 +215,20 @@ void AccessManagerPrivate::slotAddService(DNSSD::RemoteService::Ptr service)
.arg(service->port())
.arg(service->serviceName()));
if (!service->textData().isEmpty()) {
if (service->textData().isEmpty()) {
kDebug() << "no textdata?";
metadata.setName(service->serviceName());
metadata.setUrl(url);
} else {
kDebug() << "service has got textdata";
QMap<QString, QByteArray> textData = service->textData();
metadata.setName(textData["name"]);
metadata.setDescription(textData["description"]);
metadata.setIcon(textData["icon"]);
metadata.setRemoteLocation(url.prettyUrl());
} else {
kDebug() << "no textdata?";
metadata.setName(service->serviceName());
metadata.setRemoteLocation(url.prettyUrl());
metadata.setUrl(url);
}
kDebug() << "location = " << metadata.remoteLocation();
kDebug() << "location = " << metadata.url();
kDebug() << "name = " << metadata.name();
kDebug() << "description = " << metadata.name();

32
remote/accessmanager.h
View File

@ -21,7 +21,6 @@
#define PLASMA_ACCESSMANAGER_H
#include "accessappletjob.h"
#include "packagemetadata.h"
#include "plasma_export.h"
#include <QtCore/QList>
@ -50,6 +49,29 @@ class ServiceAccessJob;
*
* @since 4.4
*/
class PLASMA_EXPORT RemoteObjectDescription
{
public:
RemoteObjectDescription();
RemoteObjectDescription(const RemoteObjectDescription &other);
RemoteObjectDescription &operator=(const RemoteObjectDescription &other);
void setName(const QString &name);
QString name() const;
void setUrl(const KUrl &url);
KUrl url() const;
void setDescription(const QString &description);
QString description() const;
void setIcon(const QString &icon);
QString icon() const;
private:
class Private;
Private *d;
};
class PLASMA_EXPORT AccessManager : public QObject
{
@ -73,10 +95,10 @@ class PLASMA_EXPORT AccessManager : public QObject
/**
* @returns a list of applets that are announced on the network through zeroconf. Use the
* remoteLocation() function in PackageMetadata to obtain an url to pass to
* url() function in RemoteObjectDescription to obtain an url to pass to
* accessRemoteApplet in AccessManager if you want to access one of these applets.
*/
QList<PackageMetadata> remoteApplets() const;
QList<RemoteObjectDescription> remoteApplets() const;
/**
* @returns a list of supported protocols of urls that can be passed to accessRemoteApplet.
@ -92,12 +114,12 @@ class PLASMA_EXPORT AccessManager : public QObject
/**
* fires when a new applet is announced on the network.
*/
void remoteAppletAnnounced(Plasma::PackageMetadata metadata);
void remoteAppletAnnounced(const Plasma::RemoteObjectDescription &metadata);
/**
* fires when an announced applet disappears from the network.
*/
void remoteAppletUnannounced(Plasma::PackageMetadata metadata);
void remoteAppletUnannounced(const Plasma::RemoteObjectDescription &metadata);
private:
AccessManager();