File kipi-plugins-gcc47.diff of Package kde3-kipi-plugins
commit 9f6d6300404413190e22b40925c8842262a2e6e4
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1335587264 -0500
GCC 4.7 fix.
This resolves bug report 957.
Thanks to David C. Rankin.
diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp
index 06f2f9d..b19aac4 100644
--- a/kipi-plugins/flickrexport/imageslist.cpp
+++ b/kipi-plugins/flickrexport/imageslist.cpp
@@ -228,15 +228,15 @@ void ImagesList::slotAddImages(const KURL::List& list)
bool find = false;
- QListViewItemIterator it(d->listView);
- while (it.current())
+ QListViewItemIterator it2(d->listView);
+ while (it2.current())
{
- ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it);
+ ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it2);
if (item->url() == imageUrl)
find = true;
- ++it;
+ ++it2;
}
if (!find)
@@ -256,16 +256,16 @@ void ImagesList::slotAddImages(const KURL::List& list)
void ImagesList::slotGotThumbnail(const KFileItem *item, const QPixmap& pix)
{
- QListViewItemIterator it(d->listView);
+ QListViewItemIterator it2(d->listView);
- while (it.current())
+ while (it2.current())
{
- ImagesListViewItem *selItem = dynamic_cast<ImagesListViewItem*>(*it);
+ ImagesListViewItem *selItem = dynamic_cast<ImagesListViewItem*>(*it2);
if (selItem->url() == item->url())
{
selItem->setPixmap(0, pix);
}
- ++it;
+ ++it2;
}
}
@@ -284,17 +284,17 @@ void ImagesList::slotRemoveItems()
do
{
find = false;
- QListViewItemIterator it(d->listView);
- while (it.current())
+ QListViewItemIterator it2(d->listView);
+ while (it2.current())
{
- ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it);
+ ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it2);
if (item->isSelected())
{
delete item;
find = true;
break;
}
- ++it;
+ ++it2;
}
}
while(find);
@@ -308,17 +308,17 @@ void ImagesList::removeItemByUrl(const KURL& url)
do
{
find = false;
- QListViewItemIterator it(d->listView);
- while (it.current())
+ QListViewItemIterator it2(d->listView);
+ while (it2.current())
{
- ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it);
+ ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it2);
if (item->url() == url)
{
delete item;
find = true;
break;
}
- ++it;
+ ++it2;
}
}
while(find);
@@ -329,12 +329,12 @@ void ImagesList::removeItemByUrl(const KURL& url)
KURL::List ImagesList::imageUrls() const
{
KURL::List list;
- QListViewItemIterator it(d->listView);
- while (it.current())
+ QListViewItemIterator it2(d->listView);
+ while (it2.current())
{
- ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it);
+ ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it2);
list.append(item->url());
- ++it;
+ ++it2;
}
return list;
}