← Back to branch summary

~ubuntu-branches/ubuntu/maverick/digikam/maverick

« back to all changes in this revision

Viewing changes to digikam/albummanager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2009-03-17 23:07:56 UTC
  • mfrom: (1.2.20 upstream) (3.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20090317230756-db5b8rqjwb2j35e5
Tags: 2:0.10.0-1ubuntu1
* Remaining changes to Debian (committed to Debian SVN):
  - Depends: kde-icons-oxygen dropped (included through kdelibs)
  - Recommends: kipi-plugins added (provides major functionality)
  - debian/digikamthemedesigner.manpage: add missing manpage
* Remaning change to Debian:
  - Section: devel for -dbg package (no debug in Jaunty)

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/albummanager.cpp
1605
1605
    album->m_path = newName;
1606
1606
    KUrl newUrl = album->fileUrl();
1607
1607
 
 
1608
    QString newAlbumPath = album->albumPath();
 
1609
 
1608
1610
    // We use a private shortcut around collection scanner noticing our changes,
1609
1611
    // we rename them directly. Faster.
1610
1612
    ScanController::instance()->suspendCollectionScan();
1627
1629
        AlbumIterator it(album);
1628
1630
        while ((subAlbum = static_cast<PAlbum*>(it.current())) != 0)
1629
1631
        {
1630
 
            access.db()->renameAlbum(subAlbum->id(), subAlbum->albumRootId(), subAlbum->albumPath());
 
1632
            subAlbum->m_parentPath = newAlbumPath + subAlbum->m_parentPath.mid(oldAlbumPath.length());
 
1633
            access.db()->renameAlbum(subAlbum->id(), album->albumRootId(), subAlbum->albumPath());
1631
1634
            ++it;
1632
1635
        }
1633
1636
    }