← Back to branch summary

~ubuntu-branches/ubuntu/utopic/nepomuk-core/utopic

« back to all changes in this revision

Viewing changes to services/queryservice/folder.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-07-26 22:43:09 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120726224309-pf2v1e78ee7uljjp
Tags: 4:4.9.0a-0ubuntu1
* Use direct build-depends versions rather than kde-sc-dev-latest
* New upstream release
* New symbols, rename libnepomukcore4 to libnepomukcore4abi and enable Debian ABI manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/queryservice/folder.cpp
151
151
 
152
152
    QSet<Result> newResults;
153
153
    Q_FOREACH( const Result& result, results ) {
154
 
        if ( !m_results.contains( result.resource().resourceUri() ) ) {
 
154
        if ( !m_results.contains( result.resource().uri() ) ) {
155
155
            newResults.insert( result );
156
156
        }
157
157
    }
158
158
 
159
159
    Q_FOREACH(const Result& result, results) {
160
 
        if ( !m_newResults.contains( result.resource().resourceUri() ) ) {
161
 
            m_newResults.insert(result.resource().resourceUri(), result);
 
160
        if ( !m_newResults.contains( result.resource().uri() ) ) {
 
161
            m_newResults.insert(result.resource().uri(), result);
162
162
        }
163
163
    }
164
164
 
180
180
 
181
181
    // legacy removed results
182
182
    foreach( const Result& result, m_results ) {
183
 
        if ( !m_newResults.contains( result.resource().resourceUri() ) ) {
 
183
        if ( !m_newResults.contains( result.resource().uri() ) ) {
184
184
            removedResults << result;
185
 
            emit entriesRemoved( QList<QUrl>() << KUrl(result.resource().resourceUri()).url() );
 
185
            emit entriesRemoved( QList<QUrl>() << KUrl(result.resource().uri()).url() );
186
186
        }
187
187
    }
188
188
 
278
278
uint Nepomuk2::Query::qHash( const Result& result )
279
279
{
280
280
    // we only use this to ensure that we do not emit duplicates
281
 
    return qHash(result.resource().resourceUri());
 
281
    return qHash(result.resource().uri());
282
282
}
283
283
 
284
284
#include "folder.moc"