[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 12:35:30
Message-ID: 20100826123530.C895DAC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1168313 by trueg:

Reverted the order in the if-else construct which is necessary since
isResource() also returns true for urls.

 M  +4 -4      variant.cpp  


--- trunk/KDE/kdelibs/nepomuk/core/variant.cpp #1168312:1168313
@@ -848,10 +848,10 @@
         return Soprano::LiteralValue( toTime() ).toString();
     else if( isDateTime() )
         return Soprano::LiteralValue( toDateTime() ).toString();
+    else if( isUrl() )
+        return toUrl().toString();
     else if( isResource() )
         return toResource().genericLabel();
-    else if( isUrl() )
-        return toUrl().toString();
     else
         return d->value.toString();
 }
@@ -1083,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]