← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/photolayoutseditor/widgets/canvas/Canvas.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:
extra/kipi-plugins/photolayoutseditor/widgets/canvas/Canvas.cpp
508
508
{
509
509
    QList<AbstractPhoto*> items;
510
510
    QModelIndexList selectedIndexes = selectionModel()->selectedRows();
511
 
    foreach (QModelIndex index, selectedIndexes)
 
511
    foreach(QModelIndex index, selectedIndexes)
512
512
        items << static_cast<LayersModelItem*>(index.internalPointer())->photo();
513
513
    m_scene->removeItems(items);
514
514
}
521
521
    QList<AbstractPhoto*> selectedItems = m_scene->selectedItems();
522
522
    QModelIndexList oldSelected = selectionModel()->selectedIndexes();
523
523
    QModelIndexList newSelected = model()->itemsToIndexes(selectedItems);
524
 
    foreach (QModelIndex index, oldSelected)
 
524
    foreach(QModelIndex index, oldSelected)
525
525
    {
526
526
        if (!newSelected.contains(index) && index.column() == LayersModelItem::NameString)
527
527
            selectionModel()->select(index, QItemSelectionModel::Rows | QItemSelectionModel::Deselect);
561
561
    const QModelIndexList & oldSel = oldSelection.indexes();
562
562
    const QModelIndexList & newSel = newSelection.indexes();
563
563
    QSet<QModelIndex> deselected = oldSel.toSet().subtract(newSel.toSet());
564
 
    foreach (QModelIndex index, deselected)
 
564
    foreach(QModelIndex index, deselected)
565
565
    {
566
566
        if (index.column() != LayersModelItem::NameString)
567
567
            continue;
570
570
            temp->photo()->setSelected(false);
571
571
    }
572
572
    QSet<QModelIndex> selected = newSel.toSet().subtract(oldSel.toSet());
573
 
    foreach (QModelIndex index, selected)
 
573
    foreach(QModelIndex index, selected)
574
574
    {
575
575
        if (index.column() != LayersModelItem::NameString)
576
576
            continue;