diff options
| author | joerg <joerg@pkgsrc.org> | 2012-07-03 18:08:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-07-03 18:08:58 +0000 |
| commit | db1c28aeb1108882795857e0f9c9bd54fdc3fdc7 (patch) | |
| tree | 6d465bb5d8bb1353e749286f459b43452ac83f00 /graphics/digikam-kde3 | |
| parent | ea5a83c8a0963b33e5fcf3aa24b110f61b8b1bb1 (diff) | |
| download | pkgsrc-db1c28aeb1108882795857e0f9c9bd54fdc3fdc7.tar.gz | |
Don't shadow variables declared in the same function.
Diffstat (limited to 'graphics/digikam-kde3')
| -rw-r--r-- | graphics/digikam-kde3/distinfo | 3 | ||||
| -rw-r--r-- | graphics/digikam-kde3/patches/patch-digikam_digikam_albummanager.cpp | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/graphics/digikam-kde3/distinfo b/graphics/digikam-kde3/distinfo index 2cfa4cda5e0..bfa37e08f26 100644 --- a/graphics/digikam-kde3/distinfo +++ b/graphics/digikam-kde3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2011/02/06 17:35:05 wiz Exp $ +$NetBSD: distinfo,v 1.5 2012/07/03 18:08:58 joerg Exp $ SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215 @@ -10,3 +10,4 @@ SHA1 (patch-ad) = 59fb7af989b7e32978444d1d2e13493e821cc10e SHA1 (patch-ae) = 8f19dd6698647434bb20f222ef25024473a7ff2d SHA1 (patch-af) = d34710baea502e96cd8254164157ef68a4ef276f SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c +SHA1 (patch-digikam_digikam_albummanager.cpp) = 49df2695fd8aae3b13257efaf07af96adac6a638 diff --git a/graphics/digikam-kde3/patches/patch-digikam_digikam_albummanager.cpp b/graphics/digikam-kde3/patches/patch-digikam_digikam_albummanager.cpp new file mode 100644 index 00000000000..4eaf9f60c06 --- /dev/null +++ b/graphics/digikam-kde3/patches/patch-digikam_digikam_albummanager.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-digikam_digikam_albummanager.cpp,v 1.1 2012/07/03 18:08:58 joerg Exp $ + +--- digikam/digikam/albummanager.cpp.orig 2012-07-03 15:09:03.000000000 +0000 ++++ digikam/digikam/albummanager.cpp +@@ -1579,16 +1579,14 @@ void AlbumManager::slotDatesJobData(KIO: + + // Check if Year Album already exist. + DAlbum *yAlbum = 0; +- AlbumIterator it(d->rootDAlbum); +- while (it.current()) ++ for (AlbumIterator it2(d->rootDAlbum); it2.current(); ++it2) + { +- DAlbum* a = (DAlbum*)(*it); ++ DAlbum* a = (DAlbum*)(*it2); + if (a->date() == QDate(year, 1, 1) && a->range() == DAlbum::Year) + { + yAlbum = a; + break; + } +- ++it; + } + + // If no, create Year album. |