appletdata:provide storageId

--in case any consumer wants to use that info

app/data/appletdata.cpp

@@ -32,7 +32,8 @@ Applet::Applet(Applet &&o)
     : Generic(o),
       isSelected(o.isSelected),
       description(o.description),
-      icon(o.icon)
+      icon(o.icon),
+      storageId(o.storageId)
 {
 }
 
@@ -40,7 +41,8 @@ Applet::Applet(const Applet &o)
     : Generic(o),
       isSelected(o.isSelected),
       description(o.description),
-      icon(o.icon)
+      icon(o.icon),
+      storageId(o.storageId)
 {
 }
 
@@ -51,6 +53,7 @@ Applet &Applet::operator=(const Applet &rhs)
     description = rhs.description;
     isSelected = rhs.isSelected;
     icon = rhs.icon;
+    storageId = rhs.storageId;
 
     return (*this);
 }
@@ -62,6 +65,7 @@ Applet &Applet::operator=(Applet &&rhs)
     description = rhs.description;
     isSelected = rhs.isSelected;
     icon = rhs.icon;
+    storageId = rhs.storageId;
 
     return (*this);
 }
@@ -72,7 +76,8 @@ bool Applet::operator==(const Applet &rhs) const
             && (name == rhs.name)
             && (description == rhs.description)
             && (icon == rhs.icon)
-            && (isSelected == rhs.isSelected);
+            && (isSelected == rhs.isSelected)
+            && (storageId == rhs.storageId);
 }
 
 bool  Applet::operator!=(const Applet &rhs) const

app/data/appletdata.h

@@ -43,6 +43,7 @@ public:
     bool isSelected;
     QString description;
     QString icon;
+    QString storageId;
 
     bool isInstalled() const;
     bool isValid() const;

app/layouts/storage.cpp

@@ -877,7 +877,10 @@ bool Storage::hasDifferentAppletsWithSameId(const Layout::GenericLayout *layout,
 
                 Data::ErrorInformation errorinfo;
                 errorinfo.containment = metadata(containment->pluginMetaData().pluginId());
+                errorinfo.containment.storageId = cid;
                 errorinfo.applet = metadata(applet->pluginMetaData().pluginId());
+                errorinfo.applet.storageId = aid;
+
                 error.information << errorinfo;
             }
         }
@@ -907,7 +910,10 @@ bool Storage::hasDifferentAppletsWithSameId(const Layout::GenericLayout *layout,
 
                 Data::ErrorInformation errorinfo;
                 errorinfo.containment = metadata(containmentsEntries.group(cid).readEntry("plugin", ""));
+                errorinfo.containment.storageId = cid;
                 errorinfo.applet = metadata(containmentsEntries.group(cid).group("Applets").group(aid).readEntry("plugin", ""));
+                errorinfo.applet.storageId = aid;
+
                 error.information << errorinfo;
             }
         }
@@ -937,6 +943,7 @@ bool Storage::hasOrphanedSubContainments(const Layout::GenericLayout *layout, Da
 
             Data::ErrorInformation errorinfo;
             errorinfo.containment = metadata(containment->pluginMetaData().pluginId());
+            errorinfo.containment.storageId = cid;
             warning.information << errorinfo;
         }
     } else { // inactive layout
@@ -950,6 +957,7 @@ bool Storage::hasOrphanedSubContainments(const Layout::GenericLayout *layout, Da
 
             Data::ErrorInformation errorinfo;
             errorinfo.containment = metadata(containmentsEntries.group(cid).readEntry("plugin", ""));
+            errorinfo.containment.storageId = cid;
             warning.information << errorinfo;
         }
     }