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

List:       kde-commits
Subject:    KDE/kdelibs/nepomuk/core
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-08-26 11:50:39
Message-ID: 20100826115039.2F2D8AC867 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1168287 by trueg:

Return Resource::genericLabel() as Variant::toString() instead of a simple
string representation of the URI.

 M  +5 -12     variant.cpp  


--- trunk/KDE/kdelibs/nepomuk/core/variant.cpp #1168286:1168287
@@ -848,20 +848,13 @@
         return Soprano::LiteralValue( toTime() ).toString();
     else if( isDateTime() )
         return Soprano::LiteralValue( toDateTime() ).toString();
+    else if( isResource() )
+        return toResource().genericLabel();
     else if( isUrl() )
         return toUrl().toString();
-    else if( isResource() ) {
-        Resource r = toResource();
-        if( !r.resourceUri().isEmpty() )
-            return r.resourceUri().toString();
-        else if( !r.identifiers().isEmpty() )
-            return r.identifiers().first();
         else
-            return QString();
+        return d->value.toString();
     }
-    else
-        return d->value.value<QString>();
-}
 
 
 QDate Nepomuk::Variant::toDate() const
@@ -1090,10 +1083,10 @@
         return convertToStringList<QTime>( toTimeList() );
     else if( isDateTimeList() )
         return convertToStringList<QDateTime>( toDateTimeList() );
-    else if( isUrlList() )
-        return convertToStringList<QUrl>( toUrlList() );
     else if( isResourceList() )
         return convertToStringList<Resource>( toResourceList() );
+    else if( isUrlList() )
+        return convertToStringList<QUrl>( toUrlList() );
     else
         return d->value.value<QStringList>();
 }
[prev in list] [next in list] [prev in thread] [next in thread]