use KPluginInfo instead of PackageMetadata

package.cpp

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

package.h

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

packagestructure.cpp

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

packagestructure.h

@@ -25,10 +25,10 @@
 
 #include <kgenericfactory.h>
 #include <klocale.h>
+#include <kplugininfo.h>
 #include <ksharedptr.h>
 
 #include <plasma/version.h>
-#include "packagemetadata.h"
 
 class KConfigBase;
 
@@ -309,7 +309,7 @@ public:
     /**
       * @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.