← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/models/imagealbumfiltermodel.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:
libs/models/imagealbumfiltermodel.h
41
41
 
42
42
public:
43
43
 
44
 
    ImageAlbumFilterModel(QObject *parent = 0);
 
44
    ImageAlbumFilterModel(QObject* parent = 0);
45
45
    ~ImageAlbumFilterModel();
46
46
 
47
47
    virtual void setImageFilterSettings(const ImageFilterSettings& settings);
48
48
 
49
49
    void setSourceImageModel(ImageAlbumModel* model);
50
 
    ImageAlbumModel *sourceModel() const;
 
50
    ImageAlbumModel* sourceModel() const;
51
51
 
52
52
    // convenience mappers
53
53
    void prepareThumbnails(const QList<QModelIndex>& indexesToPrepare);
58
58
 
59
59
protected Q_SLOTS:
60
60
 
61
 
    void slotAlbumRenamed(Album *album);
62
 
    void slotAlbumAdded(Album *album);
63
 
    void slotAlbumAboutToBeDeleted(Album *album);
 
61
    void slotAlbumRenamed(Album* album);
 
62
    void slotAlbumAdded(Album* album);
 
63
    void slotAlbumAboutToBeDeleted(Album* album);
64
64
    void slotAlbumsCleared();
65
65
 
66
66
private:
67
67
 
68
 
    void albumChange(Album *album);
 
68
    void albumChange(Album* album);
69
69
 
70
70
    Q_DECLARE_PRIVATE(ImageAlbumFilterModel)
71
71
};