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

List:       kde-commits
Subject:    KDE/kdelibs/nepomuk
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2010-11-16 19:27:52
Message-ID: 20101116192752.4FC5BAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197846 by sebsauer:

revert r1196242 (compile kdelibs-trunk with KDE4.5@suse11.3 kdesupport) cause it's \
fixed now in r1197457 and r1197455. Thanks to Romain Perier for fixing \
min_soprano_version :)


 M  +0 -7      query/query.cpp  
 M  +0 -3      types/entity.cpp  


--- trunk/KDE/kdelibs/nepomuk/query/query.cpp #1197845:1197846
@@ -43,7 +43,6 @@
 #include <QtCore/QVariant>
 #include <QtCore/QTextStream>
 
-#include <Soprano/Version>
 #include <Soprano/Node>
 #include <Soprano/Model>
 #include <Soprano/QueryResultIterator>
@@ -516,16 +515,10 @@
     // type term itself
     QString userVisibilityRestriction;
     if( !d->m_isFileQuery && !containsResourceTypeTerm(term) && \
                !(queryFlags()&NoResultRestrictions) ) {
-#if SOPRANO_IS_VERSION(2,5,62)
         userVisibilityRestriction = QString::fromLatin1( "?r a %1 . %1 %2 %3 . " )
                                     .arg( qbd.uniqueVarName(),
                                           \
                Soprano::Node::resourceToN3(Soprano::Vocabulary::NAO::userVisible()),
                                           Soprano::Node::literalToN3(true) );
-#else
-        userVisibilityRestriction = QString::fromLatin1( "?r a %1 . %1 %2 . " )
-                                    .arg( qbd.uniqueVarName(),
-                                          Soprano::Node::literalToN3(true) );
-#endif
     }
 
     // build the core of the query - the part that never changes
--- trunk/KDE/kdelibs/nepomuk/types/entity.cpp #1197845:1197846
@@ -24,7 +24,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QMutexLocker>
 
-#include <Soprano/Version>
 #include <Soprano/QueryResultIterator>
 #include <Soprano/Model>
 #include <Soprano/Vocabulary/NRL>
@@ -100,11 +99,9 @@
             icon = KIcon( value.toString() );
         }
 
-#if SOPRANO_IS_VERSION(2,5,62)
         else if ( property == Soprano::Vocabulary::NAO::userVisible() ) {
             userVisible = value.literal().toBool();
         }
-#endif
 
         else {
             addProperty( property, value );


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