[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-11-03 3:53:12
Message-ID: 1225684392.790101.16645.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 879355 by aseigo:

collapse the construtors into one


 M  +6 -7      packagemetadata.cpp  
 M  +4 -8      packagemetadata.h  


--- trunk/KDE/kdebase/workspace/libs/plasma/packagemetadata.cpp #879354:879355
@@ -51,11 +51,6 @@
         QString api;
 };
 
-PackageMetadata::PackageMetadata()
-    : d(new PackageMetadataPrivate)
-{
-}
-
 PackageMetadata::PackageMetadata(const PackageMetadata &other)
     : d(new PackageMetadataPrivate(*other.d))
 {
@@ -105,9 +100,13 @@
 
 void PackageMetadata::read(const QString &filename)
 {
-    KConfig cfg(filename);
-    KConfigGroup config(&cfg, "Desktop Entry");
+    if (filename.isEmpty()) {
+        return;
+    }
 
+    KDesktopFile cfg(filename);
+    KConfigGroup config = cfg.desktopGroup();
+
     d->name = config.readEntry("Name", d->name);
     d->description = config.readEntry("Comment", d->description);
     d->serviceType = config.readEntry("X-KDE-ServiceTypes", d->serviceType);
--- trunk/KDE/kdebase/workspace/libs/plasma/packagemetadata.h #879354:879355
@@ -38,21 +38,17 @@
 {
 public:
     /**
-     * Default constructor
+     * Constructs a metadata object using the values in the file at path
+     *
+     * @param path path to a metadata.desktop file
      **/
-    PackageMetadata();
+    explicit PackageMetadata(const QString &path = QString());
 
     /**
      * Copy constructor
      **/
     PackageMetadata(const PackageMetadata &other);
 
-    /**
-     * Constructs a metadata object using the values in the file at path
-     *
-     * @param path path to a metadata.desktop file
-     **/
-    PackageMetadata(const QString &path);
     ~PackageMetadata();
 
     bool isValid() const;
[prev in list] [next in list] [prev in thread] [next in thread]