← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/scancontroller.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/scancontroller.cpp
597
597
    QList<AlbumCopyMoveHint> newHints;
598
598
 
599
599
    newHints << hintForAlbum(album, dstAlbumRootId, relativeDstPath, albumName);
 
600
    QString parentAlbumPath = album->albumPath();
 
601
    if (parentAlbumPath == "/")
 
602
        parentAlbumPath = QString(); // dont cut away a "/" in mid() below
600
603
 
601
604
    for (AlbumIterator it(const_cast<PAlbum*>(album)); *it; ++it)
602
605
    {
603
 
        newHints << hintForAlbum((PAlbum*)*it, dstAlbumRootId, relativeDstPath, albumName);
 
606
        PAlbum *a = (PAlbum *)*it;
 
607
        QString childAlbumPath = a->albumPath();
 
608
        newHints << hintForAlbum(a, dstAlbumRootId, relativeDstPath, albumName + childAlbumPath.mid(parentAlbumPath.length()));
604
609
    }
605
610
 
606
611
    return newHints;