[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-12 21:18:05
Message-ID: 20101112211805.BE8E3AC8A1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1196242 by sebsauer:

compile kdelibs-trunk with KDE4.5@suse11.3 kdesupport.


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


--- trunk/KDE/kdelibs/nepomuk/query/query.cpp #1196241:1196242
@@ -43,6 +43,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QTextStream>
 
+#include <Soprano/Version>
 #include <Soprano/Node>
 #include <Soprano/Model>
 #include <Soprano/QueryResultIterator>
@@ -515,10 +516,16 @@
     // 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 #1196241:1196242
@@ -24,6 +24,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QMutexLocker>
 
+#include <Soprano/Version>
 #include <Soprano/QueryResultIterator>
 #include <Soprano/Model>
 #include <Soprano/Vocabulary/NRL>
@@ -99,9 +100,11 @@
             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]