use NFO URI to check whether the width and height should be merged as one label

svn path=/trunk/KDE/kdebase/apps/; revision=1096542

diff --git a/src/panels/information/kloadmetadatathread.cpp b/src/panels/information/kloadmetadatathread.cpp
index 0239503bec6a09ddb256bbc4c8cba05573735924..eeb9f51468dd78b11c228d531fdb0f153c8ef73c 100644 (file)
--- a/src/panels/information/kloadmetadatathread.cpp
+++ b/src/panels/information/kloadmetadatathread.cpp
@@ -107,7 +107,7 @@ void KLoadMetaDataThread::run()
                 Nepomuk::Types::Property prop(it.key());
                 if (settings.readEntry(prop.name(), true)) {
                     Item item;
-                    item.name = prop.name();
+                    item.name = prop.uri().toString();
                     item.label = nfo.translation(prop.uri());
                     item.value = formatValue(it.value());
                     m_items.append(item);

diff --git a/src/panels/information/kmetadatawidget.cpp b/src/panels/information/kmetadatawidget.cpp
index 4d28126373c378aced7d8fde7bd6e15931e2ba82..8d66dfadcaea24b33a6e1e4bf423425d26b3c219 100644 (file)
--- a/src/panels/information/kmetadatawidget.cpp
+++ b/src/panels/information/kmetadatawidget.cpp
@@ -499,18 +499,18 @@ QList<KLoadMetaDataThread::Item>
     KLoadMetaDataThread::Item height;
 
     foreach (const KLoadMetaDataThread::Item& item, items) {
-        if (item.name == "width") {
+        if (item.name == QLatin1String("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#width")) {
             width = item;
-        } else if (item.name == "height") {
+        } else if (item.name == QLatin1String("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#height")) {
             height = item;
         } else {
             // insert the item sorted by the label
             int pos = 0;
-            while ( mergedItems.count() > pos &&
-                    mergedItems[pos].label < item.label ) {
+            while ((mergedItems.count() > pos) &&
+                   (mergedItems[pos].label < item.label)) {
                 ++pos;
             }
-            mergedItems.insert( pos, item );
+            mergedItems.insert(pos, item);
         }
     }