[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/network/networkkio/network
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2009-03-01 0:20:25
Message-ID: 1235866825.731969.7496.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 933469 by kossebau:
removed: mimetype is no longer a property of service
M +40 -41 builder/simpleitemfactory.cpp
M +0 -1 netservice.cpp
M +0 -4 netservice.h
M +1 -2 netservice_p.cpp
M +1 -4 netservice_p.h
--- trunk/playground/network/networkkio/network/builder/simpleitemfactory.cpp \
#933468:933469 @@ -31,7 +31,6 @@
struct DNSSDServiceDatum {
const char* dnssdTypeName;
const char* typeName;
- const char* mimetype;
const char* iconName;
bool isFilesystem;
const char* protocol; // KDE can forward to it
@@ -45,59 +44,59 @@
static const DNSSDServiceDatum DNSSDServiceData[] =
{
// file services
- { "_ftp._tcp", "ftp", "inode/vnd.kde.service.ftp", \
"folder-remote", true, "ftp", "path", "u", "p" },
- { "_nfs._tcp", "nfs", "inode/vnd.kde.service.nfs", \
"folder-remote", true, "nfs", "path", 0, 0 },
- { "_afpovertcp._tcp", "afpovertcp", "inode/vnd.kde.service.afpovertcp", \
"folder-remote", true, "afp", "path", 0, 0 },
- { "_smb._tcp", "smb", "inode/vnd.kde.service.smb", \
"folder-remote", true, "smb", "path", "u", "p" },
- { "_webdav._tcp", "webdav", "inode/vnd.kde.service.webdav", \
"folder-remote", true, "webdav", "path", "u", "p" },
- { "_webdavs._tcp", "webdavs", "inode/vnd.kde.service.webdavs", \
"folder-remote", true, "webdavs", "path", "u", "p" },
- { "_sftp-ssh._tcp", "sftp-ssh", "inode/vnd.kde.service.sftp-ssh", \
"folder-remote", true, "sftp", 0, "u", "p" }, + { "_ftp._tcp", \
"ftp", "folder-remote", true, "ftp", "path", "u", "p" }, + { \
"_nfs._tcp", "nfs", "folder-remote", true, "nfs", "path", 0, 0 }, \
+ { "_afpovertcp._tcp", "afpovertcp", "folder-remote", true, "afp", "path", \
0, 0 }, + { "_smb._tcp", "smb", "folder-remote", true, "smb", \
"path", "u", "p" }, + { "_webdav._tcp", "webdav", "folder-remote", true, \
"webdav", "path", "u", "p" }, + { "_webdavs._tcp", "webdavs", \
"folder-remote", true, "webdavs", "path", "u", "p" }, + { "_sftp-ssh._tcp", \
"sftp-ssh", "folder-remote", true, "sftp", 0, "u", "p" },
- { "_svn._tcp", "svn", "inode/vnd.kde.service.svn", "folder-sync", true, \
0, 0, 0, 0 },
- { "_rsync._tcp", "rsync", "inode/vnd.kde.service.rsync", "folder-sync", true, \
0, 0, 0, 0 }, + { "_svn._tcp", "svn", "folder-sync", true, 0, 0, 0, 0 },
+ { "_rsync._tcp", "rsync", "folder-sync", true, 0, 0, 0, 0 },
// email
- { "_imap._tcp", "imap", "inode/vnd.kde.service.imap", "email", false, 0, \
0, 0, 0 },
- { "_pop3._tcp", "pop3", "inode/vnd.kde.service.pop3", "email", false, \
"pop3", 0, 0, 0 }, + { "_imap._tcp", "imap", "email", false, 0, 0, 0, 0 },
+ { "_pop3._tcp", "pop3", "email", false, "pop3", 0, 0, 0 },
// shell services
- { "_ssh._tcp", "ssh", "inode/vnd.kde.service.ssh", "terminal", false, \
"ssh", 0, "u", "p" },
- { "_telnet._tcp", "telnet", "inode/vnd.kde.service.telnet", "terminal", false, \
"telnet", 0, "u", "p" },
- { "_rfb._tcp", "rfb", "inode/vnd.kde.service.rfb", "krfb", false, \
"vnc", "path", "u", "p" },
- { "_rdp._tcp", "rdp", "inode/vnd.kde.service.rdp", "krfb", false, \
"rdp", 0, 0, 0 }, + { "_ssh._tcp", "ssh", "terminal", false, "ssh", 0, \
"u", "p" }, + { "_telnet._tcp", "telnet", "terminal", false, "telnet", 0, \
"u", "p" }, + { "_rfb._tcp", "rfb", "krfb", false, "vnc", "path", \
"u", "p" }, + { "_rdp._tcp", "rdp", "krfb", false, "rdp", 0, 0, 0 },
// other standard services
- { "_ipp._tcp", "ipp", "inode/vnd.kde.service.ipp", "printer", \
false, "ipp", "path", "u", "p" },
- { "_http._tcp", "http", "inode/vnd.kde.service.http", "folder-html", \
false, "http", "path", "u", "p" },
- { "_ntp._udp", "ntp", "inode/vnd.kde.service.ntp", "xclock", \
false, 0, 0, 0, 0 },
- { "_ldap._tcp", "ldap", "inode/vnd.kde.service.ldap", \
"user-group-properties", false, "ldap", 0, 0, 0 },
- { "_pgpkey-ldap._tcp", "pgpkey-hkp", "inode/vnd.kde.service.pgpkey-hkp", \
"application-pgp-keys", false, 0, 0, 0, 0 },
- { "_pgpkey-ldap._tcp", "pgpkey-hkp", "inode/vnd.kde.service.pgpkey-hkp", \
"application-pgp-keys", false, 0, 0, 0, 0 },
- { "_pgpkey-hkp._tcp", "pgpkey-hkp", "inode/vnd.kde.service.pgpkey-hkp", \
"application-pgp-keys", false, 0, 0, 0, 0 },
- { "_pgpkey-https._tcp", "pgpkey-https", "inode/vnd.kde.service.pgpkey-https", \
"application-pgp-keys", true, "https", "path", 0, 0 }, + { "_ipp._tcp", "ipp", \
"printer", false, "ipp", "path", "u", "p" }, + { "_http._tcp", \
"http", "folder-html", false, "http", "path", "u", "p" }, + { \
"_ntp._udp", "ntp", "xclock", false, 0, 0, 0, 0 }, + { \
"_ldap._tcp", "ldap", "user-group-properties", false, "ldap", 0, 0, 0 }, + { \
"_pgpkey-ldap._tcp", "pgpkey-hkp", "application-pgp-keys", false, 0, 0, 0, 0 }, + \
{ "_pgpkey-ldap._tcp", "pgpkey-hkp", "application-pgp-keys", false, 0, 0, 0, 0 }, \
+ { "_pgpkey-hkp._tcp", "pgpkey-hkp", "application-pgp-keys", false, 0, 0, 0, \
0 }, + { "_pgpkey-https._tcp", "pgpkey-https", "application-pgp-keys", true, \
"https", "path", 0, 0 }, // presence http://www.xmpp.org/registrar/linklocal.html
// Apple
- { "_airport._tcp", "airport", "inode/vnd.kde.service.airport", \
"network-wireless", false, 0, 0, 0, 0 },
- { "_daap._tcp", "daap", "inode/vnd.kde.service.daap", \
"folder-sound", false, 0, 0, 0, 0 },
- { "_eppc._tcp", "eppc", "inode/vnd.kde.service.eppc", \
"network-connect", false, 0, 0, 0, 0 },
- { "_net-assistant._udp", "net-assistant", "inode/vnd.kde.service.net-assistant", \
"services", false, 0, 0, 0, 0 },
- { "_odisk._tcp", "odisk", "inode/vnd.kde.service.odisk", \
"media-optical", false, 0, 0, 0, 0 },
- { "_raop._tcp", "raop", "inode/vnd.kde.service.raop", \
"speaker", false, 0, 0, 0, 0 },
- { "_touch-able._tcp", "touch-able", "inode/vnd.kde.service.touch-able", \
"input-tablet", false, 0, 0, 0, 0 },
- { "_workstation._tcp", "workstation", "inode/vnd.kde.service.workstation", \
"network-workgroup", false, 0, 0, 0, 0 }, + { "_airport._tcp", "airport", \
"network-wireless", false, 0, 0, 0, 0 }, + { "_daap._tcp", "daap", \
"folder-sound", false, 0, 0, 0, 0 }, + { "_eppc._tcp", "eppc", \
"network-connect", false, 0, 0, 0, 0 }, + { "_net-assistant._udp", \
"net-assistant", "services", false, 0, 0, 0, 0 }, + { "_odisk._tcp", \
"odisk", "media-optical", false, 0, 0, 0, 0 }, + { "_raop._tcp", \
"raop", "speaker", false, 0, 0, 0, 0 }, + { "_touch-able._tcp", \
"touch-able", "input-tablet", false, 0, 0, 0, 0 }, + { \
"_workstation._tcp", "workstation", "network-workgroup", false, 0, 0, 0, 0 },
// KDE games
// TODO: http as protocol is a fake, but the KIO system currently only supports \
known protocols, so we pretend it is http
- { "_kbattleship._tcp", "kbattleship", "inode/vnd.kde.service.kbattleship", \
"kbattleship", false, "http", 0, 0, 0 },
- { "_lskat._tcp", "lskat", "inode/vnd.kde.service.lskat", \
"lskat", false, "http", 0, 0, 0 },
- { "_kfourinline._tcp", "kfourinline", "inode/vnd.kde.service.kfourinline", \
"kfourinline", false, "http", 0, 0, 0 },
- { "_ksirk._tcp", "ksirk", "inode/vnd.kde.service.ksirk", \
"ksirk", false, "http", 0, 0, 0 }, + { "_kbattleship._tcp", "kbattleship", \
"kbattleship", false, "http", 0, 0, 0 }, + { "_lskat._tcp", "lskat", \
"lskat", false, "http", 0, 0, 0 }, + { "_kfourinline._tcp", "kfourinline", \
"kfourinline", false, "http", 0, 0, 0 }, + { "_ksirk._tcp", "ksirk", \
"ksirk", false, "http", 0, 0, 0 },
// else
- { "_xmpp-server._tcp", "xmpp-server", "inode/vnd.kde.service.xmpp-server", \
"xchat", false, 0, 0, 0, 0 },
- { "_lobby._tcp", "lobby", "inode/vnd.kde.service.lobby", \
"document-edit", false, 0, 0, 0, 0 },
- { "_kakaosync._tcp", "kakao", "inode/vnd.kde.service.kakao", \
"folder-development", false, 0, 0, 0, 0 } + { "_xmpp-server._tcp", "xmpp-server", \
"xchat", false, 0, 0, 0, 0 }, + { "_lobby._tcp", "lobby", \
"document-edit", false, 0, 0, 0, 0 }, + { "_kakaosync._tcp", "kakao", \
"folder-development", false, 0, 0, 0, 0 } };
// result["_ssh._tcp"]= DNSSDNetServiceBuilder(i18n("Remote disk (fish)"), \
"fish", "service/ftp", QString(), "u", "p"); // network-server-database icon
@@ -106,7 +105,7 @@
static const int DNSSDServiceDataSize = sizeof( DNSSDServiceData ) / sizeof( \
DNSSDServiceData[0] );
-static const DNSSDServiceDatum UnknownServiceDatum = { "", "unknown", \
"inode/vnd.kde.service.unknown", "unknown", false, 0, 0, 0, 0 }; +static const \
DNSSDServiceDatum UnknownServiceDatum = { "", "unknown", "unknown", false, 0, 0, 0, 0 \
};
// TODO:
// * find out how ws (webservices, _ws._tcp), upnp (_upnp._tcp) are exactly meant to \
be used @@ -170,7 +169,7 @@
dnssdServiceType.mid( 1, dnssdServiceType.lastIndexOf('.')-1 ) :
QString::fromLatin1( serviceDatum->typeName );
result = new NetServicePrivate( dnssdService->serviceName(), \
QString::fromLatin1(serviceDatum->iconName),
- QString::fromLatin1(serviceDatum->mimetype), typeName, device, url.url() );
+ typeName, device, url.url() );
return result;
}
--- trunk/playground/network/networkkio/network/netservice.cpp #933468:933469
@@ -44,7 +44,6 @@
QString NetService::name() const { return d->name(); }
QString NetService::iconName() const { return d->iconName(); }
-QString NetService::mimetype() const { return d->mimetype(); }
QString NetService::type() const { return d->type(); }
NetDevice NetService::device() const { return d->device(); }
bool NetService::isValid() const { return !d.isNull(); }
--- trunk/playground/network/networkkio/network/netservice.h #933468:933469
@@ -39,9 +39,6 @@
friend class DNSSDNetworkBuilder;
public:
- enum Type { Unknown };//, Web, File, TextConsole, GraphicConsole, Print, \
Collaborate, BattleShip };
-
- public:
NetService();
NetService( const NetService& other );
virtual ~NetService();
@@ -49,7 +46,6 @@
public:
QString name() const;
QString iconName() const;
- QString mimetype() const; // TODO: this is only interesting for kioslave, so \
move it there QString type() const;
NetDevice device() const;
bool isValid() const;
--- trunk/playground/network/networkkio/network/netservice_p.cpp #933468:933469
@@ -26,11 +26,10 @@
// #include <QtCore/>
-NetServicePrivate::NetServicePrivate( const QString& name, const QString& iconName, \
const QString& mimetype, const QString& type, +NetServicePrivate::NetServicePrivate( \
const QString& name, const QString& iconName, const QString& type,
const NetDevice& device, const QString& url )
: mName( name )
, mIconName( iconName )
- , mMimetype( mimetype )
, mType( type )
, mDevice( device )
, mUrl( url )
--- trunk/playground/network/networkkio/network/netservice_p.h #933468:933469
@@ -34,14 +34,13 @@
class NetServicePrivate : public QSharedData
{
public:
- explicit NetServicePrivate( const QString& name, const QString& iconName, const \
QString& mimetype, const QString& type, + explicit NetServicePrivate( const \
QString& name, const QString& iconName, const QString& type,
const NetDevice& device, const QString& url );
virtual ~NetServicePrivate();
public:
const QString& name() const;
const QString& iconName() const;
- const QString& mimetype() const;
const QString& type() const;
const NetDevice& device() const;
QString url() const;
@@ -52,7 +51,6 @@
private:
QString mName;
QString mIconName;
- QString mMimetype;
QString mType;
NetDevice mDevice;
QString mUrl;
@@ -61,7 +59,6 @@
inline const QString& NetServicePrivate::name() const { return mName; }
inline const QString& NetServicePrivate::iconName() const { return mIconName; }
-inline const QString& NetServicePrivate::mimetype() const { return mMimetype; }
inline const QString& NetServicePrivate::type() const { return mType; }
inline const NetDevice& NetServicePrivate::device() const { return mDevice; }
inline QString NetServicePrivate::url() const { return mUrl; }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic