summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:19:38 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:19:38 -0500
commita209c81b78b8af98c53748bc1eb9020ef6b2605e (patch)
treebb483fb3a5c3b818c0d40e79c2610bce2511bd1d
parenta94890345ef2caae35a72ed3a398b2984349bb2f (diff)
downloaddigikam-a209c81b78b8af98c53748bc1eb9020ef6b2605e.tar.gz
digikam-a209c81b78b8af98c53748bc1eb9020ef6b2605e.zip
GCC 4.7 fix.
This partially resolves bug report 958. Thanks to David C. Rankin.
-rw-r--r--digikam/digikam/albummanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp
index d6b9f74..07f43bb 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.