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

use KPluginInfo instead of PackageMetadata

Browse Source
This commit is contained in:
Aaron Seigo 2011-05-31 01:02:45 +02:00
parent cdaf2dd2d8
commit 273b09d3db
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package.cpp
View File

@ -44,7 +44,6 @@
#include <kzip.h> #include <kzip.h>
#include <kdebug.h> #include <kdebug.h>
#include "packagemetadata.h"
#include "private/package_p.h" #include "private/package_p.h"
#include "private/plasmoidservice_p.h" #include "private/plasmoidservice_p.h"
#include "private/service_p.h" #include "private/service_p.h"
@ -288,15 +287,6 @@ QStringList Package::entryList(const char *fileType) const
return d->structure->entryList(fileType); return d->structure->entryList(fileType);
} }
PackageMetadata Package::metadata() const
{
if (d->structure) {
return d->structure->metadata();
}
return PackageMetadata();
}
void Package::setPath(const QString &path) void Package::setPath(const QString &path)
{ {
if (d->structure) { if (d->structure) {
@ -423,8 +413,11 @@ QStringList Package::listInstalled(const QString &packageRoot) // static
foreach (const QString &sdir, dir.entryList(QDir::AllDirs | QDir::Readable)) { foreach (const QString &sdir, dir.entryList(QDir::AllDirs | QDir::Readable)) {
QString metadata = packageRoot + '/' + sdir + "/metadata.desktop"; QString metadata = packageRoot + '/' + sdir + "/metadata.desktop";
if (QFile::exists(metadata)) { if (QFile::exists(metadata)) {
PackageMetadata m(metadata); const KPluginInfo info(metadata);
packages << m.pluginName(); const QString plugin = info.pluginName();
if (!plugin.isEmpty()) {
packages << plugin;
}
} }
} }

5
package.h
View File

@ -115,11 +115,6 @@ class PLASMA_EXPORT Package
**/ **/
QStringList entryList(const char *fileType) const; QStringList entryList(const char *fileType) const;
/**
* @return the package metadata object.
*/
PackageMetadata metadata() const;
/** /**
* Sets the path to the root of this package * Sets the path to the root of this package
* @arg path and absolute path * @arg path and absolute path

11
packagestructure.cpp
View File

@ -105,7 +105,7 @@ public:
QString servicePrefix; QString servicePrefix;
QMap<QByteArray, ContentStructure> contents; QMap<QByteArray, ContentStructure> contents;
QStringList mimeTypes; QStringList mimeTypes;
PackageMetadata *metadata; KPluginInfo *metadata;
bool externalPaths; bool externalPaths;
}; };
@ -625,7 +625,7 @@ bool PackageStructure::installPackage(const QString &package, const QString &pac
return false; return false;
} }
PackageMetadata meta(metadataPath); KPluginInfo meta(metadataPath);
QString targetName = meta.pluginName(); QString targetName = meta.pluginName();
if (targetName.isEmpty()) { if (targetName.isEmpty()) {
@ -791,7 +791,6 @@ void PackageStructure::setServicePrefix(const QString &servicePrefix)
void PackageStructurePrivate::createPackageMetadata(const QString &path) void PackageStructurePrivate::createPackageMetadata(const QString &path)
{ {
delete metadata; delete metadata;
metadata = 0;
QString metadataPath(path + "/metadata.desktop"); QString metadataPath(path + "/metadata.desktop");
if (!QFile::exists(metadataPath)) { if (!QFile::exists(metadataPath)) {
@ -799,10 +798,10 @@ void PackageStructurePrivate::createPackageMetadata(const QString &path)
metadataPath.clear(); metadataPath.clear();
} }
metadata = new PackageMetadata(metadataPath); metadata = new KPluginInfo(metadataPath);
} }
PackageMetadata PackageStructure::metadata() const KPluginInfo PackageStructure::metadata() const
{ {
if (!d->metadata && !d->path.isEmpty()) { if (!d->metadata && !d->path.isEmpty()) {
QFileInfo fileInfo(d->path); QFileInfo fileInfo(d->path);
@ -836,7 +835,7 @@ PackageMetadata PackageStructure::metadata() const
} }
if (!d->metadata) { if (!d->metadata) {
d->metadata = new PackageMetadata(); d->metadata = new KPluginInfo();
} }
return *d->metadata; return *d->metadata;

4
packagestructure.h
View File

@ -25,10 +25,10 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <klocale.h> #include <klocale.h>
#include <kplugininfo.h>
#include <ksharedptr.h> #include <ksharedptr.h>
#include <plasma/version.h> #include <plasma/version.h>
#include "packagemetadata.h"
class KConfigBase; class KConfigBase;
@ -309,7 +309,7 @@ public:
/** /**
* @return the package metadata object. * @return the package metadata object.
*/ */
virtual PackageMetadata metadata() const; virtual KPluginInfo metadata() const;
/** /**
* @return true if paths/symlinks outside the package itself should be followed. * @return true if paths/symlinks outside the package itself should be followed.