← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to digikam/digikammodelcollection.h

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikammodelcollection.h
52
52
    DigikamModelCollection();
53
53
    virtual ~DigikamModelCollection();
54
54
 
55
 
    AlbumModel *getAlbumModel() const;
56
 
    TagModel *getTagModel() const;
57
 
    TagModel *getTagFilterModel() const;
58
 
    SearchModel *getSearchModel() const;
59
 
    DateAlbumModel *getDateAlbumModel() const;
 
55
    AlbumModel* getAlbumModel() const;
 
56
    TagModel* getTagModel() const;
 
57
    TagModel* getTagFilterModel() const;
 
58
    SearchModel* getSearchModel() const;
 
59
    DateAlbumModel* getDateAlbumModel() const;
60
60
 
61
61
private Q_SLOTS:
62
62
 
63
63
    void albumSettingsChanged();
64
64
 
65
65
private:
66
 
    DigikamModelCollectionPriv *d;
 
66
    DigikamModelCollectionPriv* d;
67
67
 
68
68
};
69
69