← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdepim/vivid

« back to all changes in this revision

Viewing changes to messagelist/core/filter.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Rohan Garg, Scott Kitterman
  • Date: 2012-11-21 13:12:36 UTC
  • mfrom: (0.2.33)
  • Revision ID: package-import@ubuntu.com-20121121131236-32ijw9a2txrar80k
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release

[ Rohan Garg ]
* Add nepomuk-core-dev to build-deps

[ Scott Kitterman ]
* Add new package, libpimcommon4
  - Add libpimcommon4.install
  - Add to debian/control, including kdepim-dbg and kdepim-dev depends
  - Add to kdepim-dev.install
* Remove usr/bin/backupmail and related files from kmail.install as they are
  not provided by upstream anymore
* Add usr/bin/pimsettingexporter and related files to kmail.install
* Add libnepomukwidgets-dev to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
messagelist/core/filter.cpp
21
21
#include "core/filter.h"
22
22
#include "core/messageitem.h"
23
23
 
24
 
#include <KDE/Nepomuk/Query/AndTerm>
25
 
#include <KDE/Nepomuk/Query/ComparisonTerm>
26
 
#include <KDE/Nepomuk/Query/LiteralTerm>
27
 
#include <KDE/Nepomuk/Query/QueryServiceClient>
28
 
#include <KDE/Nepomuk/Query/ResourceTerm>
29
 
#include <KDE/Nepomuk/Vocabulary/NIE>
 
24
#include <Nepomuk2/Query/AndTerm>
 
25
#include <Nepomuk2/Query/ComparisonTerm>
 
26
#include <Nepomuk2/Query/LiteralTerm>
 
27
#include <Nepomuk2/Query/QueryServiceClient>
 
28
#include <Nepomuk2/Query/ResourceTerm>
 
29
#include <Nepomuk2/Vocabulary/NIE>
30
30
 
31
31
#include <ontologies/nie.h>
32
32
#include <ontologies/nmo.h>
36
36
using namespace MessageList::Core;
37
37
 
38
38
Filter::Filter()
39
 
  : mQueryClient( new Nepomuk::Query::QueryServiceClient( this ) )
 
39
  : mQueryClient( new Nepomuk2::Query::QueryServiceClient( this ) )
40
40
{
41
 
  connect( mQueryClient, SIGNAL(newEntries(QList<Nepomuk::Query::Result>)),
42
 
           this, SLOT(newEntries(QList<Nepomuk::Query::Result>)) );
 
41
  connect( mQueryClient, SIGNAL(newEntries(QList<Nepomuk2::Query::Result>)),
 
42
           this, SLOT(newEntries(QList<Nepomuk2::Query::Result>)) );
43
43
  connect( mQueryClient, SIGNAL(finishedListing()),
44
44
           this, SLOT(finishedListing()) );
45
45
}
132
132
    mQueryClient->close();
133
133
    return;
134
134
  }
135
 
  const Nepomuk::Resource parentResource( mCurrentFolder );
 
135
  const Nepomuk2::Resource parentResource( mCurrentFolder );
136
136
  if( !parentResource.exists() ) {
137
137
     mQueryClient->close();
138
138
     return;
139
139
  }
140
 
  const Nepomuk::Query::ComparisonTerm isChildTerm( Nepomuk::Vocabulary::NIE::isPartOf(), Nepomuk::Query::ResourceTerm( parentResource ) );
 
140
  const Nepomuk2::Query::ComparisonTerm isChildTerm( Nepomuk2::Vocabulary::NIE::isPartOf(), Nepomuk2::Query::ResourceTerm( parentResource ) );
141
141
 
142
 
  const Nepomuk::Query::ComparisonTerm bodyTerm(
 
142
  const Nepomuk2::Query::ComparisonTerm bodyTerm(
143
143
      Vocabulary::NMO::plainTextMessageContent(),
144
 
      Nepomuk::Query::LiteralTerm( QString::fromLatin1( "\'%1\'" ).arg( mSearchString ) ),
145
 
      Nepomuk::Query::ComparisonTerm::Contains );
146
 
 
147
 
  const Nepomuk::Query::AndTerm andTerm( isChildTerm, bodyTerm );
148
 
 
149
 
  Nepomuk::Query::Query query( andTerm );
150
 
  query.setRequestProperties( QList<Nepomuk::Query::Query::RequestProperty>() << Nepomuk::Types::Property( Akonadi::ItemSearchJob::akonadiItemIdUri() ) );
 
144
      Nepomuk2::Query::LiteralTerm( QString::fromLatin1( "\'%1\'" ).arg( mSearchString ) ),
 
145
      Nepomuk2::Query::ComparisonTerm::Contains );
 
146
 
 
147
  const Nepomuk2::Query::AndTerm andTerm( isChildTerm, bodyTerm );
 
148
 
 
149
  Nepomuk2::Query::Query query( andTerm );
 
150
  query.setRequestProperties( QList<Nepomuk2::Query::Query::RequestProperty>() << Nepomuk2::Types::Property( Akonadi::ItemSearchJob::akonadiItemIdUri() ) );
151
151
 
152
152
  mMatchingItemIds.clear();
153
153
  mQueryClient->close();
157
157
  }
158
158
}
159
159
 
160
 
void Filter::newEntries( const QList<Nepomuk::Query::Result> &entries )
 
160
void Filter::newEntries( const QList<Nepomuk2::Query::Result> &entries )
161
161
{
162
 
  Q_FOREACH( const Nepomuk::Query::Result &result, entries ) {
 
162
  Q_FOREACH( const Nepomuk2::Query::Result &result, entries ) {
163
163
    const Soprano::Node &property = result.requestProperty( Akonadi::ItemSearchJob::akonadiItemIdUri() );
164
164
    if ( !(property.isValid() && property.isLiteral() && property.literal().isString()) ) {
165
165
      continue;