summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:27:44 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-28 02:59:02 +0200
commitca19e545953634b4fb382b24dafa66d9182fa0b2 (patch)
tree2e44dc02e4015203d0aa623fef7c8e6d10879d75
parent1742ec33850bc717ef5510d5291bbcfc056b58bf (diff)
downloadkipi-plugins-ca19e545953634b4fb382b24dafa66d9182fa0b2.tar.gz
kipi-plugins-ca19e545953634b4fb382b24dafa66d9182fa0b2.zip
GCC 4.7 fix.
This resolves bug report 957. Thanks to David C. Rankin. (cherry picked from commit 9f6d6300404413190e22b40925c8842262a2e6e4)
-rw-r--r--kipi-plugins/flickrexport/imageslist.cpp40
1 files changed, 20 insertions, 20 deletions
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;
- TQListViewItemIterator it(d->listView);
- while (it.current())
+ TQListViewItemIterator 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 TQPixmap& pix)
{
- TQListViewItemIterator it(d->listView);
+ TQListViewItemIterator 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;
- TQListViewItemIterator it(d->listView);
- while (it.current())
+ TQListViewItemIterator 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;
- TQListViewItemIterator it(d->listView);
- while (it.current())
+ TQListViewItemIterator 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;
- TQListViewItemIterator it(d->listView);
- while (it.current())
+ TQListViewItemIterator 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;
}