Rename KIcon to enhance compatibility with KDE4

10 files changed, 30 insertions, 30 deletions

diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index a765837..61e2ab2 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -501,12 +501,12 @@ void AlbumIconView::slotDoubleClicked(IconItem *item)
     if (d->albumSettings->getItemRightClickAction() == AlbumSettings::ShowPreview)
     {
         // icon effect takes too much time
-        //KIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect()));
+        //TDEIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect()));
         signalPreviewItem(static_cast<AlbumIconItem *>(item));
     }
     else
     {
-        KIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect()));
+        TDEIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect()));
         slotDisplayItem(static_cast<AlbumIconItem *>(item));
     }
 }
@@ -560,7 +560,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
     for( iter = offers.begin(); iter != offers.end(); ++iter )
     {
         ptr = *iter;
-        openWithMenu.insertItem( ptr->pixmap(KIcon::Small), ptr->name(), index++);
+        openWithMenu.insertItem( ptr->pixmap(TDEIcon::Small), ptr->name(), index++);
         serviceVector.push_back(ptr);
     }
      
diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h
index 2bb6f56..3e79033 100644
--- a/digikam/digikam/albummanager.h
+++ b/digikam/digikam/albummanager.h
@@ -345,12 +345,12 @@ public:
      * Update the icon for a TAlbum. 
      * @return true if the operation succeeds, false otherwise
      * @param album the album for which icon should be changed
-     * @param iconKDE  a simple filename which can be loaded by KIconLoader
+     * @param iconKDE  a simple filename which can be loaded by TDEIconLoader
      * @param iconID   id of the icon image file
      * @param errMsg this will contain the error message describing why the
      * operation failed
      * \note if iconKDE is not empty then iconID is used. So if you want to set
-     * the icon to a file which can be loaded by KIconLoader, pass it in as
+     * the icon to a file which can be loaded by TDEIconLoader, pass it in as
      * iconKDE. otherwise pass a null TQString to iconKDE and set iconID
      */
     bool updateTAlbumIcon(TAlbum* album, const TQString& iconKDE,
diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp
index fa4f366..a658f35 100644
--- a/digikam/digikam/albumthumbnailloader.cpp
+++ b/digikam/digikam/albumthumbnailloader.cpp
@@ -190,9 +190,9 @@ TQRect AlbumThumbnailLoader::computeBlendRect(int iconSize)
 
 TQPixmap AlbumThumbnailLoader::loadIcon(const TQString &name, int size)
 {
-    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
-    return iconLoader->loadIcon(name, KIcon::NoGroup,
-                                size, KIcon::DefaultState,
+    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    return iconLoader->loadIcon(name, TDEIcon::NoGroup,
+                                size, TDEIcon::DefaultState,
                                 0, true);
 }
 
diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp
index 3affe60..aac0fb0 100644
--- a/digikam/digikam/digikamfirstrun.cpp
+++ b/digikam/digikam/digikamfirstrun.cpp
@@ -89,9 +89,9 @@ DigikamFirstRun::DigikamFirstRun(TDEConfig* config, TQWidget* parent,
                               "include the slash in the translation","/Pictures"));
     m_ui->m_path->setMode(KFile::Directory | KFile::LocalOnly);
 
-    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
-    m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup,
-                                128, KIcon::DefaultState, 0, true));
+    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup,
+                                128, TDEIcon::DefaultState, 0, true));
     m_ui->setMinimumSize(450, m_ui->sizeHint().height());
 }
 
diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp
index 66d410b..21a3ef8 100644
--- a/digikam/digikam/imagepreviewview.cpp
+++ b/digikam/digikam/imagepreviewview.cpp
@@ -353,7 +353,7 @@ void ImagePreviewView::slotContextMenu()
     for( iter = offers.begin(); iter != offers.end(); ++iter )
     {
         ptr = *iter;
-        openWithMenu.insertItem( ptr->pixmap(KIcon::Small), ptr->name(), index++);
+        openWithMenu.insertItem( ptr->pixmap(TDEIcon::Small), ptr->name(), index++);
         serviceVector.push_back(ptr);
     }
 
diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp
index 06dab23..b63ab7d 100644
--- a/digikam/digikam/pixmapmanager.cpp
+++ b/digikam/digikam/pixmapmanager.cpp
@@ -197,20 +197,20 @@ void PixmapManager::slotFailedThumbnail(const KURL& url)
         if (settings->getImageFileFilter().upper().contains(ext.upper()) ||
             settings->getRawFileFilter().upper().contains(ext.upper()))
         { 
-            img = DesktopIcon("image", KIcon::SizeEnormous).convertToImage();
+            img = DesktopIcon("image", TDEIcon::SizeEnormous).convertToImage();
         }
         else if (settings->getMovieFileFilter().upper().contains(ext.upper()))
         {
-            img = DesktopIcon("video", KIcon::SizeEnormous).convertToImage();
+            img = DesktopIcon("video", TDEIcon::SizeEnormous).convertToImage();
         }
         else if (settings->getAudioFileFilter().upper().contains(ext.upper()))
         {
-            img = DesktopIcon("sound", KIcon::SizeEnormous).convertToImage();
+            img = DesktopIcon("sound", TDEIcon::SizeEnormous).convertToImage();
         }
     }
 
     if (img.isNull())
-        img = DesktopIcon("file_broken", KIcon::SizeEnormous).convertToImage();
+        img = DesktopIcon("file_broken", TDEIcon::SizeEnormous).convertToImage();
 
     // Resize icon to the right size depending of current settings.
 
diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp
index e409f8d..a0bc177 100644
--- a/digikam/digikam/scanlib.cpp
+++ b/digikam/digikam/scanlib.cpp
@@ -94,7 +94,7 @@ void ScanLib::startScan()
 {
     struct timeval tv1, tv2;
     TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
-                  "run", KIcon::NoGroup, 32);
+                  "run", TDEIcon::NoGroup, 32);
 
     TQString message = i18n("Finding non-existent Albums");
     if (m_splash) m_splash->message(message);
@@ -205,7 +205,7 @@ void ScanLib::findMissingItems()
     TQDir dir(albumPath);
     TQStringList fileList(dir.entryList(TQDir::Dirs));
     TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
-                  "folder_image", KIcon::NoGroup, 32);
+                  "folder_image", TDEIcon::NoGroup, 32);
 
     AlbumDB* db = AlbumManager::instance()->albumDB();
     db->beginTransaction(); 
diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp
index 48cd77b..c0c78f7 100644
--- a/digikam/digikam/syncjob.cpp
+++ b/digikam/digikam/syncjob.cpp
@@ -243,9 +243,9 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size)
     }
     else
     {
-        KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
-        *thumbnail_ = iconLoader->loadIcon(name, KIcon::NoGroup, thumbnailSize_,
-                                           KIcon::DefaultState, 0, true);
+        TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+        *thumbnail_ = iconLoader->loadIcon(name, TDEIcon::NoGroup, thumbnailSize_,
+                                           TDEIcon::DefaultState, 0, true);
     }
     return *thumbnail_;
 }
diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp
index 2ae0f71..92a3aa2 100644
--- a/digikam/digikam/tageditdlg.cpp
+++ b/digikam/digikam/tageditdlg.cpp
@@ -104,8 +104,8 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create)
     // --------------------------------------------------------
 
     TQLabel *logo            = new TQLabel(page);
-    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
-    logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true));
+    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true));
 
     d->topLabel = new TQLabel(page);
     d->topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine);
@@ -219,11 +219,11 @@ void TagEditDlg::slotIconResetClicked()
 void TagEditDlg::slotIconChanged()
 {
 #if KDE_IS_VERSION(3,3,0)
-    KIconDialog dlg(this);
-    dlg.setup(KIcon::NoGroup, KIcon::Application, false, 20, false, false, false);
+    TDEIconDialog dlg(this);
+    dlg.setup(TDEIcon::NoGroup, TDEIcon::Application, false, 20, false, false, false);
     TQString icon = dlg.openDialog();
 #else
-    TQString icon = KIconDialog::getIcon(KIcon::NoGroup, KIcon::Application, false, 20);
+    TQString icon = TDEIconDialog::getIcon(TDEIcon::NoGroup, TDEIcon::Application, false, 20);
     if (icon.startsWith("/"))
         return;
 #endif
diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp
index 91e6260..225dd04 100644
--- a/digikam/digikam/tagspopupmenu.cpp
+++ b/digikam/digikam/tagspopupmenu.cpp
@@ -141,11 +141,11 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int
     d->addToID          = addToID;
     d->mode             = mode;
 
-    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
     d->addTagPix            = iconLoader->loadIcon("tag",
-                                        KIcon::NoGroup,
-                                        KIcon::SizeSmall,
-                                        KIcon::DefaultState,
+                                        TDEIcon::NoGroup,
+                                        TDEIcon::SizeSmall,
+                                        TDEIcon::DefaultState,
                                         0, true);
     
     connect(this, TQT_SIGNAL(aboutToShow()),