← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libkdepim/addresseelineedit.h

  • 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:
libkdepim/addresseelineedit.h
54
54
  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
55
55
}
56
56
 
57
 
namespace Nepomuk {
 
57
namespace Nepomuk2 {
58
58
  namespace Query {
59
59
    class Result;
60
60
  }
194
194
    Q_PRIVATE_SLOT( d, void slotEditCompletionOrder() )
195
195
    Q_PRIVATE_SLOT( d, void slotUserCancelled( const QString & ) )
196
196
    Q_PRIVATE_SLOT( d, void slotAkonadiSearchResult( KJob * ) )
 
197
    Q_PRIVATE_SLOT( d, void slotAkonadiSearchDbResult( KJob * ) )
197
198
    Q_PRIVATE_SLOT( d, void slotAkonadiCollectionsReceived( const Akonadi::Collection::List & ) )
198
 
#ifndef KDEPIM_NO_NEPOMUK
199
 
    Q_PRIVATE_SLOT( d, void slotNepomukHits( const QList<Nepomuk::Query::Result>& ) )
 
199
    Q_PRIVATE_SLOT( d, void slotNepomukHits( const QList<Nepomuk2::Query::Result>& ) )
200
200
    Q_PRIVATE_SLOT( d, void slotNepomukSearchFinished() )
201
 
#endif
202
201
    //@endcond
203
202
};
204
203