diff options
| author | Darrell Anderson <[email protected]> | 2012-04-27 23:19:38 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-28 02:54:20 +0200 |
| commit | 70be32fe119cb07779bffd8be5a1566b4cbc09d6 (patch) | |
| tree | 1110ceb487ce9dca7fd0bebf568ebef35e2ea0d9 | |
| parent | aff49594f5cbc82210cffde3d7328e6f90bd0ef3 (diff) | |
| download | digikam-70be32fe119cb07779bffd8be5a1566b4cbc09d6.tar.gz digikam-70be32fe119cb07779bffd8be5a1566b4cbc09d6.zip | |
GCC 4.7 fix.
This partially resolves bug report 958.
Thanks to David C. Rankin.
(cherry picked from commit a209c81b78b8af98c53748bc1eb9020ef6b2605e)
| -rw-r--r-- | digikam/digikam/albummanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index cb4989e4..8001fd9a 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -1579,16 +1579,16 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data) // Check if Year Album already exist. DAlbum *yAlbum = 0; - AlbumIterator it(d->rootDAlbum); - while (it.current()) + AlbumIterator it2(d->rootDAlbum); + while (it2.current()) { - DAlbum* a = (DAlbum*)(*it); + DAlbum* a = (DAlbum*)(*it2); if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year) { yAlbum = a; break; } - ++it; + ++it2; } // If no, create Year album. |