← Back to branch summary

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

« back to all changes in this revision

Viewing changes to calendarsupport/nepomukcalendar.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:
calendarsupport/nepomukcalendar.cpp
86
86
  IncidenceFetchJob *job = new IncidenceFetchJob();
87
87
 
88
88
/*
89
 
#ifdef KDEPIM_NO_NEPOMUK
90
 
  IncidenceFetchJob *job = new IncidenceFetchJob();
91
 
#else
92
89
  IncidenceSearchJob *job = new IncidenceSearchJob();
93
90
#endif
94
91
*/
387
384
 
388
385
    IncidenceFetchJob *searchJob = qobject_cast<IncidenceFetchJob*>( job );
389
386
/*
390
 
#ifdef KDEPIM_NO_NEPOMUK
391
 
    IncidenceFetchJob *searchJob = qobject_cast<IncidenceFetchJob*>( job );
392
 
#else
393
387
    IncidenceSearchJob *searchJob = qobject_cast<IncidenceSearchJob*>( job );
394
 
#endif
395
388
*/
396
389
    const Akonadi::Item::List list = searchJob->items();
397
390
    foreach ( const Akonadi::Item &item, list ) {