← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/batch/imageinfoalbumsjob.cpp

  • 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:
utilities/batch/imageinfoalbumsjob.cpp
45
45
{
46
46
public:
47
47
 
48
 
    ImageInfoAlbumsJobPriv(){}
 
48
    ImageInfoAlbumsJobPriv() {}
49
49
 
50
50
    AlbumList           albumsList;
51
51
    AlbumList::Iterator albumIt;
56
56
};
57
57
 
58
58
ImageInfoAlbumsJob::ImageInfoAlbumsJob()
59
 
                  : d(new ImageInfoAlbumsJobPriv)
 
59
    : d(new ImageInfoAlbumsJobPriv)
60
60
{
61
61
    connect(&d->imageInfoJob, SIGNAL(signalItemsInfo(const ImageInfoList&)),
62
62
            this, SLOT(slotItemsInfo(const ImageInfoList&)));
73
73
void ImageInfoAlbumsJob::allItemsFromAlbums(const AlbumList& albumsList)
74
74
{
75
75
    if (albumsList.isEmpty())
 
76
    {
76
77
        return;
 
78
    }
77
79
 
78
80
    d->albumsList = albumsList;
79
81
    d->albumIt    = d->albumsList.begin();
99
101
void ImageInfoAlbumsJob::slotComplete()
100
102
{
101
103
    ++d->albumIt;
 
104
 
102
105
    if (d->albumIt == d->albumsList.end())
103
106
    {
104
107
        stop();