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

List:       kde-commits
Subject:    Re: branches/KDE/4.5/kdelibs/nepomuk/query
From:       Sebastian Trüg <sebastian () trueg ! de>
Date:       2010-08-10 17:55:51
Message-ID: 4C6192A7.4050705 () trueg ! de
[Download RAW message or body]

damn, damn, damn, I screwed up with git-svn again... :(
I will fix that. sorry.

On 08/10/2010 07:31 PM, Michael Seiwert wrote:
> Hi Sebastian,
> 
> this commit somehow breaks the build.  Any idea ?
> 
> 
> [ 20%] Building CXX object nepomuk/query/CMakeFiles/nepomukquery.dir/query.o
> /home/mseiwert/src/svn/kde4/kdelibs/nepomuk/query/query.cpp: In member 
> function 'QString Nepomuk::Query::QueryPrivate::createFolderFilter(const 
> QString&, Nepomuk::Query::QueryBuilderData*) const':
> /home/mseiwert/src/svn/kde4/kdelibs/nepomuk/query/query.cpp:86:156: error: 
> cannot convert 'KUrl::DirectoryOption' to 'KUrl::AdjustPathOption' for 
> argument '2' to 'QStringList<unnamed>::urlsToStringList(const KUrl::List&, 
> KUrl::AdjustPathOption)'
> /home/mseiwert/src/svn/kde4/kdelibs/nepomuk/query/query.cpp:89:158: error: 
> cannot convert 'KUrl::DirectoryOption' to 'KUrl::AdjustPathOption' for 
> argument '2' to 'QStringList<unnamed>::urlsToStringList(const KUrl::List&, 
> KUrl::AdjustPathOption)'
> /home/mseiwert/src/svn/kde4/kdelibs/nepomuk/query/query.cpp: In member 
> function 'QString 
> Nepomuk::Query::Query::toSparqlQuery(Nepomuk::Query::Query::SparqlFlags) 
> const':
> /home/mseiwert/src/svn/kde4/kdelibs/nepomuk/query/query.cpp:374:20: error: 
> 'CreateAskQuery' was not declared in this scope
> make[2]: *** [nepomuk/query/CMakeFiles/nepomukquery.dir/query.o] Error 1
> make[1]: *** [nepomuk/query/CMakeFiles/nepomukquery.dir/all] Error 2
> make: *** [all] Error 2
> makeobj[0]: Leaving directory `/home/mseiwert/kde/build/kdelibs'
> 
> Best regards
> 
> Michael
> 
> 
> On Tuesday 10 August 2010 15:44:42 Sebastian Trueg wrote:
>> SVN commit 1161636 by trueg:
>>
>> Backport: Remove duplicates without changing the order of the terms - this
>> fixes the unit test.
>>
>>  M  +10 -7     query_p.cpp
>>
>>
>> --- branches/KDE/4.5/kdelibs/nepomuk/query/query_p.cpp #1161635:1161636
>> @@ -37,19 +37,22 @@
>>      case Nepomuk::Query::Term::And:
>>      case Nepomuk::Query::Term::Or: {
>>          QList<Nepomuk::Query::Term> subTerms = static_cast<const
>> Nepomuk::Query::GroupTerm&>( term ).subTerms(); -       
>> QSet<Nepomuk::Query::Term> newSubTerms;
>> +        QList<Nepomuk::Query::Term> newSubTerms;
>>          QList<Nepomuk::Query::Term>::const_iterator end(
>> subTerms.constEnd() ); for ( QList<Nepomuk::Query::Term>::const_iterator
>> it = subTerms.constBegin(); it != end; ++it ) {
>>              const Nepomuk::Query::Term& t = *it;
>>              Nepomuk::Query::Term ot = flattenGroupTerms( t );
>> -            if ( ot.isValid() ) {
>> +            QList<Nepomuk::Query::Term> terms;
>>                  if ( ot.type() == term.type() ) {
>> -                    newSubTerms += QSet<Nepomuk::Query::Term>::fromList(
>> static_cast<const Nepomuk::Query::GroupTerm&>( ot ).subTerms() ); +       
>>         terms = static_cast<const Nepomuk::Query::GroupTerm&>( ot
>> ).subTerms(); }
>> -                else {
>> -                    newSubTerms += ot;
>> +            else if( ot.isValid() ) {
>> +                terms += ot;
>>                  }
>> +            Q_FOREACH( const Nepomuk::Query::Term& t, terms ) {
>> +                if( !newSubTerms.contains( t ) )
>> +                    newSubTerms += t;
>>              }
>>          }
>>          if ( newSubTerms.count() == 0 )
>> @@ -57,9 +60,9 @@
>>          else if ( newSubTerms.count() == 1 )
>>              return *newSubTerms.begin();
>>          else if ( term.isAndTerm() )
>> -            return Nepomuk::Query::AndTerm( newSubTerms.toList() );
>> +            return Nepomuk::Query::AndTerm( newSubTerms );
>>          else
>> -            return Nepomuk::Query::OrTerm( newSubTerms.toList() );
>> +            return Nepomuk::Query::OrTerm( newSubTerms );
>>      }
>>
>>      case Nepomuk::Query::Term::Negation: {
> 
[prev in list] [next in list] [prev in thread] [next in thread]