← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdepim/oneiric-security

« back to all changes in this revision

Viewing changes to kaddressbook/globalcontactmodel.h

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-22 18:24:40 UTC
  • mfrom: (0.2.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20101222182440-ju0oewt2kl096yii
Tags: 4:4.4.9-0ubuntu1
* New upstream release
* Readd kubuntu_02_kalarm_kstatusnotifieritem.diff inadvertently left out of
  debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
kaddressbook/globalcontactmodel.h
24
24
namespace Akonadi
25
25
{
26
26
  class ChangeRecorder;
27
 
  class ContactsTreeModel;
28
27
  class Monitor;
29
28
  class Session;
30
29
}
31
30
 
 
31
namespace AkonadiFuture
 
32
{
 
33
  class ContactsTreeModel;
 
34
}
 
35
 
32
36
/**
33
37
 * @short Provides the global model for all contacts
34
38
 *
51
55
    /**
52
56
     * Returns the item model of the global instance.
53
57
     */
54
 
    Akonadi::ContactsTreeModel* model() const;
 
58
    AkonadiFuture::ContactsTreeModel* model() const;
55
59
 
56
60
  private:
57
61
    GlobalContactModel();
60
64
 
61
65
    Akonadi::Session *mSession;
62
66
    Akonadi::ChangeRecorder *mMonitor;
63
 
    Akonadi::ContactsTreeModel *mModel;
 
67
    AkonadiFuture::ContactsTreeModel *mModel;
64
68
};
65
69
 
66
70
#endif