← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/batch/batchalbumssyncmetadata.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/batchalbumssyncmetadata.cpp
62
62
{
63
63
public:
64
64
 
65
 
    BatchAlbumsSyncMetadataPriv()
 
65
    BatchAlbumsSyncMetadataPriv() :
 
66
        cancel(false),
 
67
        imageInfoJob(0),
 
68
        status(NotRunning)
66
69
    {
67
 
        cancel       = false;
68
 
        imageInfoJob = 0;
69
 
        status       = NotRunning;
70
70
    }
71
71
 
72
72
    bool                 cancel;
73
73
 
74
74
    QTime                duration;
75
75
 
76
 
    ImageInfoJob        *imageInfoJob;
 
76
    ImageInfoJob*        imageInfoJob;
77
77
 
78
78
    AlbumList            palbumList;
79
79
    AlbumList::Iterator  albumsIt;
81
81
};
82
82
 
83
83
BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(QWidget* /*parent*/)
84
 
                       : DProgressDlg(0), d(new BatchAlbumsSyncMetadataPriv)
 
84
    : DProgressDlg(0), d(new BatchAlbumsSyncMetadataPriv)
85
85
{
86
86
    d->imageInfoJob = new ImageInfoJob();
87
87
 
157
157
    if (d->status == LoadingAlbum)
158
158
    {
159
159
        d->status = ReceivingImageInfos;
 
160
 
160
161
        if (!list.isEmpty())
161
162
        {
162
163
            QPixmap pix = KIconLoader::global()->loadIcon("folder-image", KIconLoader::NoGroup, 32);
186
187
    done(Cancel);
187
188
}
188
189
 
189
 
void BatchAlbumsSyncMetadata::closeEvent(QCloseEvent *e)
 
190
void BatchAlbumsSyncMetadata::closeEvent(QCloseEvent* e)
190
191
{
191
192
    abort();
192
193
    e->accept();