← Back to branch summary

~ubuntu-branches/ubuntu/saucy/plasma-mobile/saucy

« back to all changes in this revision

Viewing changes to dataengines/metadata/bookmarks/bookmarksengine.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-09-17 14:08:58 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20130917140858-wv7n3z6t95iy1fs9
Tags: 1:0.5-0ubuntu1
https://launchpad.net/bugs/1227602
* New upstream release LP: #1227602
* Use epoch to sync with upstream version number
* Build-dep on libxcursor-dev
* Add kubuntu_no_contourd.diff to disable contourd from building,
  does not compile with 4.11 and not used by default
* Depend on renamed package ksplash-theme-active
* Add kubuntu_no_dirmodel.diff to prevert compile of dirmodel,
  included in kde-runtime 4.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
dataengines/metadata/bookmarks/bookmarksengine.cpp
25
25
#include <KIcon>
26
26
 
27
27
// Nepomuk
28
 
#include <Nepomuk/Resource>
29
 
#include <Nepomuk/Variant>
30
 
#include <Nepomuk/Query/ResourceTerm>
31
 
#include <Nepomuk/Query/Query>
32
 
#include <Nepomuk/Tag>
 
28
#include <Nepomuk2/Resource>
 
29
#include <Nepomuk2/Variant>
 
30
#include <Nepomuk2/Query/ResourceTerm>
 
31
#include <Nepomuk2/Query/Query>
 
32
#include <Nepomuk2/Tag>
33
33
 
34
34
// Query API
35
 
#include <nepomuk/andterm.h>
36
 
#include <nepomuk/orterm.h>
37
 
#include <nepomuk/comparisonterm.h>
38
 
#include <nepomuk/literalterm.h>
39
 
#include <nepomuk/resourcetypeterm.h>
 
35
#include <nepomuk2/andterm.h>
 
36
#include <nepomuk2/orterm.h>
 
37
#include <nepomuk2/comparisonterm.h>
 
38
#include <nepomuk2/literalterm.h>
 
39
#include <nepomuk2/resourcetypeterm.h>
40
40
 
41
41
// Own stuff
42
42
#include "bookmarksengine.h"
66
66
    if (name.startsWith(QLatin1String("add:"))) {
67
67
        //QString massagedName = name;
68
68
        QUrl url = QUrl(massagedName.remove("add:"));
69
 
        Nepomuk::Bookmark b(url);
 
69
        Nepomuk2::Bookmark b(url);
70
70
        b.setLabel(url.toString());
71
71
        b.setDescription(url.toString());
72
72
        b.setBookmarks( url.toString() );
74
74
    } else if (name.startsWith(QLatin1String("remove:"))) {
75
75
        //QString massagedName = name;
76
76
        QUrl url = QUrl(massagedName.remove("remove:"));
77
 
        Nepomuk::Resource b(url);
 
77
        Nepomuk2::Resource b(url);
78
78
        //kDebug() << "TYPE: " << b.resourceType();
79
79
        b.remove();
80
80
        //kDebug() << "Removed Bookmark:" << massagedName;
81
81
    } else {
82
 
        Nepomuk::Types::Class bookmarkClass(Nepomuk::Bookmark::resourceTypeUri());
83
 
        //Nepomuk::Types::Class bookmarkClass(Nepomuk::PersonContact::resourceTypeUri()); // for testing
84
 
        Nepomuk::Query::ResourceTypeTerm rtt(bookmarkClass);
 
82
        Nepomuk2::Types::Class bookmarkClass(Nepomuk2::Bookmark::resourceTypeUri());
 
83
        //Nepomuk2::Types::Class bookmarkClass(Nepomuk2::PersonContact::resourceTypeUri()); // for testing
 
84
        Nepomuk2::Query::ResourceTypeTerm rtt(bookmarkClass);
85
85
 
86
 
        Nepomuk::Query::Query bookmarkQuery;
 
86
        Nepomuk2::Query::Query bookmarkQuery;
87
87
        bookmarkQuery.setTerm(rtt);
88
88
 
89
89
        //kDebug() << "Query:" << bookmarkQuery.toSparqlQuery();