3 files changed, 14 insertions, 14 deletions
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index c3b83a9..1f13257 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -389,7 +389,7 @@ bool FlickrTalker::addPhoto(const TQString& photoPath, const FPhotoInfo& info,
     TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
 #endif
     TQFileInfo fileInfo(photoPath);
-    if (rawFilesExt.upper().tqcontains(fileInfo.extension(false).upper()))
+    if (rawFilesExt.upper().contains(fileInfo.extension(false).upper()))
         KDcrawIface::KDcraw::loadDcrawPreview(image, photoPath);
     else
         image.load(photoPath);
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index a619157..609a5cd 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -352,7 +352,7 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
         }
         else
         {
-            TQListViewItem* tqparent = m_albumDict.tqfind( album.parent_ref_num );
+            TQListViewItem* tqparent = m_albumDict.find( album.parent_ref_num );
             if ( tqparent )
             {
                 GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.name,
@@ -383,7 +383,7 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
 
     if (lastSelectedID > 0)
     {
-        GAlbumViewItem* lastSelectedItem = m_albumDict.tqfind( lastSelectedID );
+        GAlbumViewItem* lastSelectedItem = m_albumDict.find( lastSelectedID );
         if (lastSelectedItem)
         {
             m_tagView->setSelected( lastSelectedItem, true );
diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp
index b93cc43..bb402a0 100644
--- a/kipi-plugins/flickrexport/imageslist.cpp
+++ b/kipi-plugins/flickrexport/imageslist.cpp
@@ -226,7 +226,7 @@ void ImagesList::slotAddImages(const KURL::List& list)
 
         // Check if the new item already exist in the list.
 
-        bool tqfind = false;
+        bool find = false;
 
         TQListViewItemIterator it(d->listView);
         while (it.current())
@@ -234,12 +234,12 @@ void ImagesList::slotAddImages(const KURL::List& list)
             ImagesListViewItem* item = dynamic_cast<ImagesListViewItem*>(*it);
 
             if (item->url() == imageUrl)
-                tqfind = true;
+                find = true;
 
             ++it;
         }
 
-        if (!tqfind)
+        if (!find)
         {
             new ImagesListViewItem(d->listView, imageUrl);
             urls.append(imageUrl);
@@ -280,10 +280,10 @@ void ImagesList::slotAddItems()
 
 void ImagesList::slotRemoveItems()
 {
-    bool tqfind;
+    bool find;
     do
     {
-        tqfind = false;
+        find = false;
         TQListViewItemIterator it(d->listView);
         while (it.current())
         {
@@ -291,23 +291,23 @@ void ImagesList::slotRemoveItems()
             if (item->isSelected())
             {
                 delete item;
-                tqfind = true;
+                find = true;
                 break;
             }
             ++it;
         }
     }
-    while(tqfind);
+    while(find);
 
     emit signalImageListChanged(imageUrls().isEmpty());
 }
 
 void ImagesList::removeItemByUrl(const KURL& url)
 {
-    bool tqfind;
+    bool find;
     do
     {
-        tqfind = false;
+        find = false;
         TQListViewItemIterator it(d->listView);
         while (it.current())
         {
@@ -315,13 +315,13 @@ void ImagesList::removeItemByUrl(const KURL& url)
             if (item->url() == url)
             {
                 delete item;
-                tqfind = true;
+                find = true;
                 break;
             }
             ++it;
         }
     }
-    while(tqfind);
+    while(find);
 
     emit signalImageListChanged(imageUrls().isEmpty());
 }