← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to core/digikam/items/imagecategorizedview.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/digikam/items/imagecategorizedview.cpp
309
309
    QModelIndex        current = currentIndex();
310
310
    QList<ImageInfo>   infos;
311
311
 
312
 
    foreach (const QModelIndex& index, indexes)
 
312
    foreach(const QModelIndex& index, indexes)
313
313
    {
314
314
        ImageInfo info = d->filterModel->imageInfo(index);
315
315
 
336
336
    QList<ImageInfo> infos = imageInfos();
337
337
    KUrl::List       urls;
338
338
 
339
 
    foreach (const ImageInfo& info, infos)
 
339
    foreach(const ImageInfo& info, infos)
340
340
    {
341
341
        urls << info.fileUrl();
342
342
    }
349
349
    QList<ImageInfo> infos = selectedImageInfos();
350
350
    KUrl::List       urls;
351
351
 
352
 
    foreach (const ImageInfo& info, infos)
 
352
    foreach(const ImageInfo& info, infos)
353
353
    {
354
354
        urls << info.fileUrl();
355
355
    }
391
391
            int minDiff                            = d->filterModel->rowCount();
392
392
            QList<QModelIndex> indexesForImageInfo = d->filterModel->mapListFromSource(d->model->indexesForImageInfo(info));
393
393
 
394
 
            foreach (const QModelIndex& index, indexesForImageInfo)
 
394
            foreach(const QModelIndex& index, indexesForImageInfo)
395
395
            {
396
396
                if (index == anchor || !index.isValid() || removed.contains(index))
397
397
                {
512
512
{
513
513
    QItemSelection mySelection;
514
514
 
515
 
    foreach (const ImageInfo& info, infos)
 
515
    foreach(const ImageInfo& info, infos)
516
516
    {
517
517
        QModelIndex index = d->filterModel->indexForImageInfo(info);
518
518
        mySelection.select(index, index);