← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/batch/imageinfojob.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/imageinfojob.cpp
49
49
{
50
50
public:
51
51
 
52
 
    ImageInfoJobPriv()
 
52
    ImageInfoJobPriv() :
 
53
        job(0)
53
54
    {
54
 
        job         = 0;
55
55
    }
56
56
 
57
 
    KIO::TransferJob  *job;
 
57
    KIO::TransferJob*  job;
58
58
};
59
59
 
60
60
ImageInfoJob::ImageInfoJob()
61
 
            : d(new ImageInfoJobPriv)
 
61
    : d(new ImageInfoJobPriv)
62
62
{
63
63
}
64
64
 
65
65
ImageInfoJob::~ImageInfoJob()
66
66
{
67
67
    if (d->job)
68
 
       d->job->kill();
 
68
    {
 
69
        d->job->kill();
 
70
    }
 
71
 
69
72
    delete d;
70
73
}
71
74
 
72
 
void ImageInfoJob::allItemsFromAlbum(Album *album)
 
75
void ImageInfoJob::allItemsFromAlbum(Album* album)
73
76
{
74
77
    if (d->job)
75
78
    {
78
81
    }
79
82
 
80
83
    if (!album)
 
84
    {
81
85
        return;
 
86
    }
82
87
 
83
88
    ImageLister lister;
84
89
    d->job = lister.startListJob(album->databaseUrl());
120
125
void ImageInfoJob::slotData(KIO::Job*, const QByteArray& data)
121
126
{
122
127
    if (data.isEmpty())
 
128
    {
123
129
        return;
 
130
    }
124
131
 
125
132
    ImageInfoList itemsList;
126
133
    QDataStream   ds(data);