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

« back to all changes in this revision

Viewing changes to libs/models/imagealbummodel.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:
29
29
#include "imagethumbnailmodel.h"
30
30
#include "album.h"
31
31
 
32
 
namespace KIO { class Job; }
 
32
namespace KIO
 
33
{
 
34
class Job;
 
35
}
33
36
class KJob;
34
37
 
35
38
namespace Digikam
47
50
 
48
51
public:
49
52
 
50
 
    ImageAlbumModel(QObject *parent = 0);
 
53
    ImageAlbumModel(QObject* parent = 0);
51
54
    ~ImageAlbumModel();
52
55
 
53
 
    Album *currentAlbum() const;
 
56
    Album* currentAlbum() const;
54
57
 
55
58
    bool hasScheduledRefresh() const;
56
59
    bool isRecursingAlbums() const;
63
66
     * If called with 0, the model will be empty.
64
67
     * Opening the same album again is a no-op.
65
68
     */
66
 
    void openAlbum(Album *album);
 
69
    void openAlbum(Album* album);
67
70
    /** Reloads the current album */
68
71
    void refresh();
69
72
 
72
75
 
73
76
Q_SIGNALS:
74
77
 
75
 
    void listedAlbumChanged(Album *album);
 
78
    void listedAlbumChanged(Album* album);
76
79
 
77
80
protected Q_SLOTS:
78
81
 
90
93
    void slotCollectionImageChange(const CollectionImageChangeset& changeset);
91
94
    void slotSearchChange(const SearchChangeset& changeset);
92
95
 
93
 
    void slotAlbumAdded(Album *album);
94
 
    void slotAlbumDeleted(Album *album);
95
 
    void slotAlbumRenamed(Album *album);
 
96
    void slotAlbumAdded(Album* album);
 
97
    void slotAlbumDeleted(Album* album);
 
98
    void slotAlbumRenamed(Album* album);
96
99
    void slotAlbumsCleared();
97
100
 
98
101
    void incrementalRefresh();
103
106
 
104
107
private:
105
108
 
106
 
    ImageAlbumModelPriv *const d;
 
109
    ImageAlbumModelPriv* const d;
107
110
};
108
111
 
109
112
} // namespace Digikam