Rename KIcon to enhance compatibility with KDE4

36 files changed, 96 insertions, 96 deletions

diff --git a/ksquirrel/imageedit/sq_imageconvert.ui.h b/ksquirrel/imageedit/sq_imageconvert.ui.h
index f73fd88..af44c2b 100644
--- a/ksquirrel/imageedit/sq_imageconvert.ui.h
+++ b/ksquirrel/imageedit/sq_imageconvert.ui.h
@@ -16,7 +16,7 @@ void SQ_ImageConvert::init()
     initLibs();
 
     pushWriteOptions->setPixmap(TQPixmap(locate("data", "images/imageedit/resize_toolbutton2.png")));
-    pushOptions->setPixmap(SQ_IconLoader::instance()->loadIcon("configure", KIcon::Desktop, KIcon::SizeSmall));
+    pushOptions->setPixmap(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     SQ_Config::instance()->setGroup("Image edit options");
 
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index 86d0765..84f6974 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -660,7 +660,7 @@ void KSquirrel::createStatusBar(KStatusBar *bar)
     sbar->addWidget(vb, 1, true);
 
     TQToolButton *fireDisk = new TQToolButton(sbar, "reload disk size");
-    fireDisk->setIconSet(SQ_IconLoader::instance()->loadIcon("reload", KIcon::Desktop, KIcon::SizeSmall));
+    fireDisk->setIconSet(SQ_IconLoader::instance()->loadIcon("reload", TDEIcon::Desktop, TDEIcon::SizeSmall));
     fireDisk->setTextLabel(i18n("Reload"));
     fireDisk->setUsesTextLabel(false);
     connect(fireDisk, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFireDisk()));
@@ -1147,7 +1147,7 @@ void KSquirrel::createPostSplash()
     TQPixmap todo = TQPixmap::fromMimeSource(locate("data", "images/tray.png"));
 
     if(todo.isNull())
-        todo = SQ_IconLoader::instance()->loadIcon("ksquirrel", KIcon::Desktop, 16);
+        todo = SQ_IconLoader::instance()->loadIcon("ksquirrel", TDEIcon::Desktop, 16);
 
     pp->setPixmap(todo);
     pp->setFixedWidth(18);
diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/ksquirrel/ksquirrelpart/sq_externaltool.cpp
index f075b0b..6220e07 100644
--- a/ksquirrel/ksquirrelpart/sq_externaltool.cpp
+++ b/ksquirrel/ksquirrelpart/sq_externaltool.cpp
@@ -104,7 +104,7 @@ SQ_PopupMenu* SQ_ExternalTool::newPopupMenu()
     // construct new menu
     for(unsigned int i = 0;i < count();i++)
     {
-        id = menu->insertItem(SQ_IconLoader::instance()->loadIcon(toolPixmap(i), KIcon::Desktop, KIcon::SizeSmall), toolName(i));
+        id = menu->insertItem(SQ_IconLoader::instance()->loadIcon(toolPixmap(i), TDEIcon::Desktop, TDEIcon::SizeSmall), toolName(i));
         menu->setItemParameter(id, i);
     }
 
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 7546ce6..fa9661f 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -855,9 +855,9 @@ void SQ_GLWidget::initAccelsAndMenu()
     menuImage = new TQPopupMenu(menu);
     menuFile = new TQPopupMenu(menu);
 
-    menu->insertItem(SQ_IconLoader::instance()->loadIcon("icons", KIcon::Desktop, KIcon::SizeSmall), i18n("File"), menuFile);
-    menu->insertItem(SQ_IconLoader::instance()->loadIcon("view_orientation", KIcon::Desktop, KIcon::SizeSmall), i18n("Rotate"), menuRotate);
-    menu->insertItem(SQ_IconLoader::instance()->loadIcon("viewmag", KIcon::Desktop, KIcon::SizeSmall), i18n("Zoom"), menuZoom);
+    menu->insertItem(SQ_IconLoader::instance()->loadIcon("icons", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("File"), menuFile);
+    menu->insertItem(SQ_IconLoader::instance()->loadIcon("view_orientation", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Rotate"), menuRotate);
+    menu->insertItem(SQ_IconLoader::instance()->loadIcon("viewmag", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Zoom"), menuZoom);
     menu->insertItem(i18n("Move"), menuMove);
 
 #ifndef KSQUIRREL_PART
@@ -869,7 +869,7 @@ void SQ_GLWidget::initAccelsAndMenu()
 #define SQ_ADD_KACTION(b) \
     (new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
 
-    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
+    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
 
 #ifndef KSQUIRREL_PART
     menuFile->insertSeparator();
@@ -929,7 +929,7 @@ void SQ_GLWidget::initAccelsAndMenu()
     menuImage->insertItem(i18n("To clipboard") + "\tQ", SQ_ADD_KACTION(TQt::Key_Q), TQT_SLOT(activate()));
     menuImage->insertItem(i18n("Print") + "\tCtrl+P", SQ_ADD_KACTION(TQt::Key_P+CTRL), TQT_SLOT(activate()));
     menuImage->insertSeparator();
-    id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", KIcon::Desktop, KIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQT_SLOT(activate()));
+    id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQT_SLOT(activate()));
     menuImage->setItemEnabled(id_settings, false);
     menuImage->insertSeparator();
     menuImage->insertItem(i18n("Color balance...") + "\tD", SQ_ADD_KACTION(TQt::Key_D), TQT_SLOT(activate()));
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.cpp b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
index aa55a43..fa3e45a 100644
--- a/ksquirrel/ksquirrelpart/sq_iconloader.cpp
+++ b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
@@ -37,10 +37,10 @@ SQ_IconLoader::SQ_IconLoader(TQObject *parent) : TQObject(parent)
 SQ_IconLoader::~SQ_IconLoader()
 {}
 
-TQPixmap SQ_IconLoader::loadIcon(const TQString& name, KIcon::Group group, int size) const
+TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int size) const
 {
     // try to load from installed icon theme
-    TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, KIcon::DefaultState, 0, true);
+    TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, TDEIcon::DefaultState, 0, true);
 
     // requested pixmap not found, let's
     // try to find it in our pixmaps
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.h b/ksquirrel/ksquirrelpart/sq_iconloader.h
index a49ee11..dec6a6e 100644
--- a/ksquirrel/ksquirrelpart/sq_iconloader.h
+++ b/ksquirrel/ksquirrelpart/sq_iconloader.h
@@ -35,7 +35,7 @@ class SQ_IconLoader : public TQObject
         SQ_IconLoader(TQObject *parent = 0);
         ~SQ_IconLoader();
 
-        TQPixmap loadIcon(const TQString &name, KIcon::Group group = KIcon::Desktop, int size = 16) const;
+        TQPixmap loadIcon(const TQString &name, TDEIcon::Group group = TDEIcon::Desktop, int size = 16) const;
 
     private:
         static SQ_IconLoader *m_instance;
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
index 6338bc4..9b08d0a 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
@@ -36,8 +36,8 @@ void SQ_ImageProperties::init()
     copyentry->plug(menu);
     copyall->plug(menu);
 
-    ok = SQ_IconLoader::instance()->loadIcon("ok", KIcon::Desktop, 16);
-    error = SQ_IconLoader::instance()->loadIcon("error", KIcon::Desktop, 16);
+    ok = SQ_IconLoader::instance()->loadIcon("ok", TDEIcon::Desktop, 16);
+    error = SQ_IconLoader::instance()->loadIcon("error", TDEIcon::Desktop, 16);
 }
 
 void SQ_ImageProperties::destroy()
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp
index 049fdc6..9828838 100644
--- a/ksquirrel/sidebar/sq_categoriesview.cpp
+++ b/ksquirrel/sidebar/sq_categoriesview.cpp
@@ -91,7 +91,7 @@ SQ_CategoriesView::SQ_CategoriesView(TQWidget *parent, const char *name) : KFile
 
     // create custom branch
     root = new SQ_CategoriesViewBranch(this, m_dir->root(), i18n("Categories"),
-                SQ_IconLoader::instance()->loadIcon("bookmark", KIcon::Desktop, KIcon::SizeSmall));
+                SQ_IconLoader::instance()->loadIcon("bookmark", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     addBranch(root);
 
@@ -164,7 +164,7 @@ SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *parent, const char *name) : TQVBox(
 
     menu = new SQ_CategoryBrowserMenu(view->dir()->root(), 0, "Categories menu");
 
-    toolbar->setIconSize(KIcon::SizeSmall);
+    toolbar->setIconSize(TDEIcon::SizeSmall);
 
     toolbar->insertButton("folder_new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
     toolbar->insertButton("edittrash", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), true, i18n("Delete"));
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
index 7c3399b..a4df824 100644
--- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
+++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
@@ -203,8 +203,8 @@ void SQ_CategoryBrowserMenu::initialize()
                 KSimpleConfig c(path + "/.directory", true);
                 c.setDesktopGroup();
                 icon = TDEGlobal::iconLoader()->loadIcon(c.readEntry("Icon"),
-                                                       KIcon::Small, KIcon::SizeSmall,
-                                                       KIcon::DefaultState, 0, true);
+                                                       TDEIcon::Small, TDEIcon::SizeSmall,
+                                                       TDEIcon::DefaultState, 0, true);
                 if(icon.isNull())
                     icon = CICON("folder");
                 name = c.readEntry("Name", name);
@@ -254,8 +254,8 @@ void SQ_CategoryBrowserMenu::initialize()
 
                 TQString s = c.readEntry("Icon");
                 if(!_icons->contains(s)) {
-                    icon  = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
-                                                            KIcon::DefaultState, 0, true);
+                    icon  = TDEGlobal::iconLoader()->loadIcon(s, TDEIcon::Small, TDEIcon::SizeSmall,
+                                                            TDEIcon::DefaultState, 0, true);
 
                     if(icon.isNull()) {
                         TQString type = c.readEntry("Type", "Application");
diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp
index a63190b..70b8e42 100644
--- a/ksquirrel/sidebar/sq_directorybasket.cpp
+++ b/ksquirrel/sidebar/sq_directorybasket.cpp
@@ -59,14 +59,14 @@ SQ_DBMenu::~SQ_DBMenu()
 
 void SQ_DBMenu::slotChangeIcon()
 {
-    KIconDialog dialog(TDEGlobal::iconLoader());
-    dialog.setup(KIcon::Desktop, KIcon::MimeType, true, KIcon::SizeSmall);
+    TDEIconDialog dialog(TDEGlobal::iconLoader());
+    dialog.setup(TDEIcon::Desktop, TDEIcon::MimeType, true, TDEIcon::SizeSmall);
     TQString result = dialog.openDialog();
 
     if(!result.isEmpty() && item)
     {
         item->setIcon(result);
-        item->setPixmap(0, SQ_IconLoader::instance()->loadIcon(result, KIcon::Desktop, KIcon::SizeSmall));
+        item->setPixmap(0, SQ_IconLoader::instance()->loadIcon(result, TDEIcon::Desktop, TDEIcon::SizeSmall));
     }
 }
 
@@ -189,7 +189,7 @@ KFileTreeViewItem* SQ_DirectoryBasketBranch::createTreeViewItem(KFileTreeViewIte
         if(!icon.isEmpty())
         {
             i->setIcon(icon);
-            i->setPixmap(0, SQ_IconLoader::instance()->loadIcon(icon, KIcon::Desktop, KIcon::SizeSmall));
+            i->setPixmap(0, SQ_IconLoader::instance()->loadIcon(icon, TDEIcon::Desktop, TDEIcon::SizeSmall));
         }
 
         if(ok) i->setIndex(index);
@@ -221,7 +221,7 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi
 
     // create custom branch
     root = new SQ_DirectoryBasketBranch(this, dir->root(), TQString(), 
-            SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, KIcon::SizeSmall));
+            SQ_IconLoader::instance()->loadIcon("folder", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     // some hacks to create our SQ_TreeViewItem as root item
     SQ_DirectoryItem  *ritem = new SQ_DirectoryItem(this,
diff --git a/ksquirrel/sidebar/sq_mountview.cpp b/ksquirrel/sidebar/sq_mountview.cpp
index 15f545d..a4cba87 100644
--- a/ksquirrel/sidebar/sq_mountview.cpp
+++ b/ksquirrel/sidebar/sq_mountview.cpp
@@ -39,11 +39,11 @@ SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : TDEListView(par
     m_inst = this;
 
     popup = new TDEPopupMenu;
-    id_mount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("hdd_mount", KIcon::Desktop, KIcon::SizeSmall),
+    id_mount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("hdd_mount", TDEIcon::Desktop, TDEIcon::SizeSmall),
                 i18n("Mount"), this, TQT_SLOT(slotMount()));
-    id_unmount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("hdd_unmount", KIcon::Desktop, KIcon::SizeSmall),
+    id_unmount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("hdd_unmount", TDEIcon::Desktop, TDEIcon::SizeSmall),
                 i18n("Unmount"), this, TQT_SLOT(slotUnmount()));
-    popup->insertItem(SQ_IconLoader::instance()->loadIcon("reload", KIcon::Desktop, KIcon::SizeSmall),
+    popup->insertItem(SQ_IconLoader::instance()->loadIcon("reload", TDEIcon::Desktop, TDEIcon::SizeSmall),
                 i18n("Refresh"), this, TQT_SLOT(slotRefresh()));
     popup->insertSeparator();
     popup->insertItem(i18n("Cancel"));
diff --git a/ksquirrel/sidebar/sq_mountviewitem.cpp b/ksquirrel/sidebar/sq_mountviewitem.cpp
index d6c2b0e..532c0c8 100644
--- a/ksquirrel/sidebar/sq_mountviewitem.cpp
+++ b/ksquirrel/sidebar/sq_mountviewitem.cpp
@@ -37,8 +37,8 @@ void SQ_MountViewItem::setMounted(bool b)
     TQFileInfo inf(text(0));
 
     if(m_mounted)
-        setPixmap(0, inf.isReadable() ? SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, KIcon::SizeMedium)
-                : SQ_IconLoader::instance()->loadIcon("folder_locked", KIcon::Desktop, KIcon::SizeMedium));
+        setPixmap(0, inf.isReadable() ? SQ_IconLoader::instance()->loadIcon("folder", TDEIcon::Desktop, TDEIcon::SizeMedium)
+                : SQ_IconLoader::instance()->loadIcon("folder_locked", TDEIcon::Desktop, TDEIcon::SizeMedium));
     else
-        setPixmap(0, SQ_IconLoader::instance()->loadIcon("folder_red", KIcon::Desktop, KIcon::SizeMedium));
+        setPixmap(0, SQ_IconLoader::instance()->loadIcon("folder_red", TDEIcon::Desktop, TDEIcon::SizeMedium));
 }
diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp
index b932fa7..79c3a6f 100644
--- a/ksquirrel/sidebar/sq_multibar.cpp
+++ b/ksquirrel/sidebar/sq_multibar.cpp
@@ -79,7 +79,7 @@ void SQ_MultiBar::addWidget(TQWidget *new_w, const TQString &text, const TQStrin
     stack->addWidget(new_w, m_id);
 
     // add button
-    mt->appendTab(TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Desktop, 22), m_id, text);
+    mt->appendTab(TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Desktop, 22), m_id, text);
 
     // since we cann't determine which tab was clicked,
     // we should use TQSignalMapper to determine it.
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index f6213fc..9f9fcf1 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -70,7 +70,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
     popup->insertSeparator();
     popup->insertItem(i18n("Execute")+"\tEnter", TQT_TQOBJECT(this), TQT_SIGNAL(execute()));
 
-    multi_pix = SQ_IconLoader::instance()->loadIcon("tdemultiple", KIcon::Desktop, KIcon::SizeSmall);
+    multi_pix = SQ_IconLoader::instance()->loadIcon("tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
 
     setMinimumHeight(20);
     setFocusPolicy(TQ_WheelFocus);
diff --git a/ksquirrel/sidebar/sq_treeview.cpp b/ksquirrel/sidebar/sq_treeview.cpp
index ce1eedd..d09f2af 100644
--- a/ksquirrel/sidebar/sq_treeview.cpp
+++ b/ksquirrel/sidebar/sq_treeview.cpp
@@ -91,7 +91,7 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par
     setColumnWidth(1, 18);
 
     root = new SQ_FileTreeViewBranch(this, TQDir::rootDirPath(), TQString(),
-        SQ_IconLoader::instance()->loadIcon("folder_red", KIcon::Desktop, KIcon::SizeSmall));
+        SQ_IconLoader::instance()->loadIcon("folder_red", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     // some hacks to create our SQ_TreeViewItem as root item
     SQ_TreeViewItem  *ritem = new SQ_TreeViewItem(this,
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp
index 29d7236..4011ca4 100644
--- a/ksquirrel/sidebar/sq_treeviewmenu.cpp
+++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp
@@ -15,11 +15,11 @@
 
 SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name)
 {
-    id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder_new", KIcon::Desktop, KIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
+    id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder_new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
     insertSeparator();
     id_rename = insertItem(i18n("Rename"), this, TQT_SLOT(slotDirectoryRename()));
     id_clear  = insertItem(i18n("Clear contents"), this, TQT_SLOT(slotDirectoryClear()));
-    id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("editdelete", KIcon::Desktop, KIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
+    id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
     insertSeparator();
     id_prop = insertItem(i18n("Properties"), this, TQT_SLOT(slotDirectoryProperties()));
 }
diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp
index baa32c0..3af8ceb 100644
--- a/ksquirrel/sq_diroperator.cpp
+++ b/ksquirrel/sq_diroperator.cpp
@@ -316,7 +316,7 @@ void SQ_DirOperator::slotSelectionChanged()
     if(fi)
     {
         // determine pixmap
-        px = fi->pixmap(KIcon::SizeSmall);
+        px = fi->pixmap(TDEIcon::SizeSmall);
 
         // costruct name and size
         str = TQString("%1 %2 %3")
diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp
index 84fa83d..848b3b3 100644
--- a/ksquirrel/sq_dragprovider.cpp
+++ b/ksquirrel/sq_dragprovider.cpp
@@ -122,9 +122,9 @@ void SQ_DragProvider::start()
     TQPixmap dragIcon;
 
     if(urls.count() > 1)
-        dragIcon = SQ_IconLoader::instance()->loadIcon("tdemultiple", KIcon::Desktop, KIcon::SizeSmall);
+        dragIcon = SQ_IconLoader::instance()->loadIcon("tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
     else
-        dragIcon = first->pixmap(KIcon::SizeSmall);
+        dragIcon = first->pixmap(TDEIcon::SizeSmall);
 
     const int flags = TQt::AlignAuto|TQt::AlignVCenter|TQt::ShowPrefix;
     TQPixmap dragPixmap;
diff --git a/ksquirrel/sq_externaltool.cpp b/ksquirrel/sq_externaltool.cpp
index f075b0b..6220e07 100644
--- a/ksquirrel/sq_externaltool.cpp
+++ b/ksquirrel/sq_externaltool.cpp
@@ -104,7 +104,7 @@ SQ_PopupMenu* SQ_ExternalTool::newPopupMenu()
     // construct new menu
     for(unsigned int i = 0;i < count();i++)
     {
-        id = menu->insertItem(SQ_IconLoader::instance()->loadIcon(toolPixmap(i), KIcon::Desktop, KIcon::SizeSmall), toolName(i));
+        id = menu->insertItem(SQ_IconLoader::instance()->loadIcon(toolPixmap(i), TDEIcon::Desktop, TDEIcon::SizeSmall), toolName(i));
         menu->setItemParameter(id, i);
     }
 
diff --git a/ksquirrel/sq_externaltools.ui.h b/ksquirrel/sq_externaltools.ui.h
index c52b333..5c4c302 100644
--- a/ksquirrel/sq_externaltools.ui.h
+++ b/ksquirrel/sq_externaltools.ui.h
@@ -20,7 +20,7 @@ void SQ_ExternalTools::init()
         else
             item = new TQListViewItem(listTools, TQString(), (*it).name, (*it).command, (*it).icon);
 
-        item->setPixmap(0, SQ_IconLoader::instance()->loadIcon(item->text(3), KIcon::Desktop, 16));
+        item->setPixmap(0, SQ_IconLoader::instance()->loadIcon(item->text(3), TDEIcon::Desktop, 16));
         itemafter = item;
 
         item->setRenameEnabled(1, true);
@@ -30,12 +30,12 @@ void SQ_ExternalTools::init()
         listTools->insertItem(item);
     }
 
-    pushToolUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", KIcon::Desktop, KIcon::SizeSmall));
-    pushToolDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", KIcon::Desktop, KIcon::SizeSmall));
-    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", KIcon::Desktop, KIcon::SizeSmall));
-    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", KIcon::Desktop, KIcon::SizeSmall));
-    pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", KIcon::Desktop, KIcon::SizeSmall));
-    pushHelp->setPixmap(SQ_IconLoader::instance()->loadIcon("help", KIcon::Desktop, KIcon::SizeSmall));
+    pushToolUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushToolDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushHelp->setPixmap(SQ_IconLoader::instance()->loadIcon("help", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     listTools->setCurrentItem(listTools->firstChild());
     listTools->clearSelection();
@@ -127,13 +127,13 @@ void SQ_ExternalTools::slotToolRenameRequest( TQListViewItem *item, const TQPoin
         item->startRename(pos);
     else
     {
-        KIconDialog dialog(TDEGlobal::iconLoader());
-        dialog.setup(KIcon::Desktop, KIcon::Application, true, 16);
+        TDEIconDialog dialog(TDEGlobal::iconLoader());
+        dialog.setup(TDEIcon::Desktop, TDEIcon::Application, true, 16);
         TQString result = dialog.openDialog();
     
         if(!result.isEmpty())
         {
-            item->setPixmap(0, SQ_IconLoader::instance()->loadIcon(result, KIcon::Desktop, 16));
+            item->setPixmap(0, SQ_IconLoader::instance()->loadIcon(result, TDEIcon::Desktop, 16));
             item->setText(3, result);
         }
     }
diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp
index 03b47f7..85aaa34 100644
--- a/ksquirrel/sq_filedetailview.cpp
+++ b/ksquirrel/sq_filedetailview.cpp
@@ -49,7 +49,7 @@ SQ_FileDetailView::SQ_FileDetailView(TQWidget* parent, const char* name)
     : KFileDetailView(parent, name)
 {
     // pixmap for directory item
-    dirPix = SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, KIcon::SizeSmall);
+    dirPix = SQ_IconLoader::instance()->loadIcon("folder", TDEIcon::Desktop, TDEIcon::SizeSmall);
 
     toolTip = new KonqFileTip(this);
     slotResetToolTip();
diff --git a/ksquirrel/sq_fileiconview.cpp b/ksquirrel/sq_fileiconview.cpp
index edb1188..686f90b 100644
--- a/ksquirrel/sq_fileiconview.cpp
+++ b/ksquirrel/sq_fileiconview.cpp
@@ -45,8 +45,8 @@ SQ_FileIconView::SQ_FileIconView(TQWidget *parent, const char *name) : SQ_FileIc
 
     setSorting(TQDir::IgnoreCase);
 
-    dirPix = SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, (n == "icon view")
-                    ? KIcon::SizeMedium : KIcon::SizeSmall);
+    dirPix = SQ_IconLoader::instance()->loadIcon("folder", TDEIcon::Desktop, (n == "icon view")
+                    ? TDEIcon::SizeMedium : TDEIcon::SizeSmall);
 }
 
 SQ_FileIconView::~SQ_FileIconView()
diff --git a/ksquirrel/sq_filethumbview.cpp b/ksquirrel/sq_filethumbview.cpp
index 210f1cd..0be1da4 100644
--- a/ksquirrel/sq_filethumbview.cpp
+++ b/ksquirrel/sq_filethumbview.cpp
@@ -71,7 +71,7 @@ SQ_FileThumbView::SQ_FileThumbView(TQWidget *parent, const char *name) : SQ_File
     setResizeMode(TQIconView::Adjust);
 
     // load "pending" pixmaps
-    pending = SQ_IconLoader::instance()->loadIcon("clock", KIcon::Desktop, 32);
+    pending = SQ_IconLoader::instance()->loadIcon("clock", TDEIcon::Desktop, 32);
 
     connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotContentsMoving(int, int)));
 
@@ -458,7 +458,7 @@ void SQ_FileThumbView::rebuildPendingPixmap(bool dir)
     TQPixmap pixmapDir;
 
     if(dir)
-        pixmapDir = SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, 48);
+        pixmapDir = SQ_IconLoader::instance()->loadIcon("folder", TDEIcon::Desktop, 48);
 
     TQPixmap *p = dir ? &directoryCache : &pendingCache;
     TQPixmap *w = dir ? &pixmapDir : &pending;
diff --git a/ksquirrel/sq_filethumbviewitem.cpp b/ksquirrel/sq_filethumbviewitem.cpp
index 99a7a68..f5325cd 100644
--- a/ksquirrel/sq_filethumbviewitem.cpp
+++ b/ksquirrel/sq_filethumbviewitem.cpp
@@ -35,7 +35,7 @@ SQ_FileThumbViewItem::~SQ_FileThumbViewItem()
 
 void SQ_FileThumbViewItem::paintItem(TQPainter *p, const TQColorGroup &cg)
 {
-    KIconViewItem::paintPixmap(p, cg);
+    TDEIconViewItem::paintPixmap(p, cg);
     paintText(p, cg);
 }
 
diff --git a/ksquirrel/sq_filters.ui.h b/ksquirrel/sq_filters.ui.h
index 3edad81..199af20 100644
--- a/ksquirrel/sq_filters.ui.h
+++ b/ksquirrel/sq_filters.ui.h
@@ -33,11 +33,11 @@ void SQ_Filters::init()
         listFilters->insertItem(item);
     }
 
-    pushFilterUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", KIcon::Desktop, KIcon::SizeSmall));
-    pushFilterDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", KIcon::Desktop, KIcon::SizeSmall));
-    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", KIcon::Desktop, KIcon::SizeSmall));
-    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", KIcon::Desktop, KIcon::SizeSmall));
-    pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", KIcon::Desktop, KIcon::SizeSmall));
+    pushFilterUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushFilterDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     listFilters->setCurrentItem(listFilters->firstChild());
     listFilters->clearSelection();
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 7546ce6..fa9661f 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -855,9 +855,9 @@ void SQ_GLWidget::initAccelsAndMenu()
     menuImage = new TQPopupMenu(menu);
     menuFile = new TQPopupMenu(menu);
 
-    menu->insertItem(SQ_IconLoader::instance()->loadIcon("icons", KIcon::Desktop, KIcon::SizeSmall), i18n("File"), menuFile);
-    menu->insertItem(SQ_IconLoader::instance()->loadIcon("view_orientation", KIcon::Desktop, KIcon::SizeSmall), i18n("Rotate"), menuRotate);
-    menu->insertItem(SQ_IconLoader::instance()->loadIcon("viewmag", KIcon::Desktop, KIcon::SizeSmall), i18n("Zoom"), menuZoom);
+    menu->insertItem(SQ_IconLoader::instance()->loadIcon("icons", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("File"), menuFile);
+    menu->insertItem(SQ_IconLoader::instance()->loadIcon("view_orientation", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Rotate"), menuRotate);
+    menu->insertItem(SQ_IconLoader::instance()->loadIcon("viewmag", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Zoom"), menuZoom);
     menu->insertItem(i18n("Move"), menuMove);
 
 #ifndef KSQUIRREL_PART
@@ -869,7 +869,7 @@ void SQ_GLWidget::initAccelsAndMenu()
 #define SQ_ADD_KACTION(b) \
     (new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
 
-    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
+    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
 
 #ifndef KSQUIRREL_PART
     menuFile->insertSeparator();
@@ -929,7 +929,7 @@ void SQ_GLWidget::initAccelsAndMenu()
     menuImage->insertItem(i18n("To clipboard") + "\tQ", SQ_ADD_KACTION(TQt::Key_Q), TQT_SLOT(activate()));
     menuImage->insertItem(i18n("Print") + "\tCtrl+P", SQ_ADD_KACTION(TQt::Key_P+CTRL), TQT_SLOT(activate()));
     menuImage->insertSeparator();
-    id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", KIcon::Desktop, KIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQT_SLOT(activate()));
+    id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQT_SLOT(activate()));
     menuImage->setItemEnabled(id_settings, false);
     menuImage->insertSeparator();
     menuImage->insertItem(i18n("Color balance...") + "\tD", SQ_ADD_KACTION(TQt::Key_D), TQT_SLOT(activate()));
diff --git a/ksquirrel/sq_iconloader.cpp b/ksquirrel/sq_iconloader.cpp
index aa55a43..fa3e45a 100644
--- a/ksquirrel/sq_iconloader.cpp
+++ b/ksquirrel/sq_iconloader.cpp
@@ -37,10 +37,10 @@ SQ_IconLoader::SQ_IconLoader(TQObject *parent) : TQObject(parent)
 SQ_IconLoader::~SQ_IconLoader()
 {}
 
-TQPixmap SQ_IconLoader::loadIcon(const TQString& name, KIcon::Group group, int size) const
+TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int size) const
 {
     // try to load from installed icon theme
-    TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, KIcon::DefaultState, 0, true);
+    TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, TDEIcon::DefaultState, 0, true);
 
     // requested pixmap not found, let's
     // try to find it in our pixmaps
diff --git a/ksquirrel/sq_iconloader.h b/ksquirrel/sq_iconloader.h
index a49ee11..dec6a6e 100644
--- a/ksquirrel/sq_iconloader.h
+++ b/ksquirrel/sq_iconloader.h
@@ -35,7 +35,7 @@ class SQ_IconLoader : public TQObject
         SQ_IconLoader(TQObject *parent = 0);
         ~SQ_IconLoader();
 
-        TQPixmap loadIcon(const TQString &name, KIcon::Group group = KIcon::Desktop, int size = 16) const;
+        TQPixmap loadIcon(const TQString &name, TDEIcon::Group group = TDEIcon::Desktop, int size = 16) const;
 
     private:
         static SQ_IconLoader *m_instance;
diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h
index 708a9c5..52cf83a 100644
--- a/ksquirrel/sq_imageproperties.ui.h
+++ b/ksquirrel/sq_imageproperties.ui.h
@@ -36,8 +36,8 @@ void SQ_ImageProperties::init()
     copyentry->plug(menu);
     copyall->plug(menu);
 
-    ok = SQ_IconLoader::instance()->loadIcon("ok", KIcon::Desktop, 16);
-    error = SQ_IconLoader::instance()->loadIcon("error", KIcon::Desktop, 16);
+    ok = SQ_IconLoader::instance()->loadIcon("ok", TDEIcon::Desktop, 16);
+    error = SQ_IconLoader::instance()->loadIcon("error", TDEIcon::Desktop, 16);
 }
 
 void SQ_ImageProperties::destroy()
diff --git a/ksquirrel/sq_options.ui.h b/ksquirrel/sq_options.ui.h
index 81062fe..d4fdd9a 100644
--- a/ksquirrel/sq_options.ui.h
+++ b/ksquirrel/sq_options.ui.h
@@ -22,7 +22,7 @@
 
 void SQ_Options::init()
 {
-    buttonOk->setIconSet(SQ_IconLoader::instance()->loadIcon("ok", KIcon::Desktop, KIcon::SizeSmall));
+    buttonOk->setIconSet(SQ_IconLoader::instance()->loadIcon("ok", TDEIcon::Desktop, TDEIcon::SizeSmall));
     int tp;
     SQ_Config *tdeconf = SQ_Config::instance();
     TQColor color;
@@ -145,14 +145,14 @@ void SQ_Options::init()
     spinRows->setRange(0, 5, 1, true);
     spinRows->setValue(tdeconf->readNumEntry("rows", 2));
 
-    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("display", KIcon::Desktop, KIcon::SizeMedium), i18n("General"));    
-    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, KIcon::SizeMedium), i18n("Filing"));
-    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("images", KIcon::Desktop, KIcon::SizeMedium), i18n("Thumbnails"));
+    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("display", TDEIcon::Desktop, TDEIcon::SizeMedium), i18n("General"));    
+    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("folder", TDEIcon::Desktop, TDEIcon::SizeMedium), i18n("Filing"));
+    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("images", TDEIcon::Desktop, TDEIcon::SizeMedium), i18n("Thumbnails"));
     new SQ_IconListItem(listMain, TQPixmap::fromMimeSource(locate("data", "images/listbox/image_win.png")), i18n("Image window"));
-    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("penguin", KIcon::Desktop, KIcon::SizeMedium), i18n("Sidebar"));
+    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("penguin", TDEIcon::Desktop, TDEIcon::SizeMedium), i18n("Sidebar"));
 
 #ifdef SQ_HAVE_KIPI
-    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("kipi", KIcon::Desktop, KIcon::SizeMedium), i18n("KIPI"));
+    new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("kipi", TDEIcon::Desktop, TDEIcon::SizeMedium), i18n("KIPI"));
 
 	TQWidget *pg6 = widgetStack->widget(5);
 	TQGridLayout *pageLayout6 = new TQGridLayout(pg6, 2, 1, 0, -1, "pageLayout_6");
diff --git a/ksquirrel/sq_pluginsinfo.ui.h b/ksquirrel/sq_pluginsinfo.ui.h
index b363937..487ff6b 100644
--- a/ksquirrel/sq_pluginsinfo.ui.h
+++ b/ksquirrel/sq_pluginsinfo.ui.h
@@ -13,8 +13,8 @@
 
 void SQ_PluginsInfo::init()
 {
-    tableLib->setColumnText (5, SQ_IconLoader::instance()->loadIcon("fileopen", KIcon::Desktop, KIcon::SizeSmall), "");
-    tableLib->setColumnText (6, SQ_IconLoader::instance()->loadIcon("filesave", KIcon::Desktop, KIcon::SizeSmall), "");
+    tableLib->setColumnText (5, SQ_IconLoader::instance()->loadIcon("fileopen", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
+    tableLib->setColumnText (6, SQ_IconLoader::instance()->loadIcon("filesave", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
 
     showLibs();
 }
@@ -28,8 +28,8 @@ void SQ_PluginsInfo::showLibs()
 
 	if(!cnt) return;
 
-	TQPixmap ok = SQ_IconLoader::instance()->loadIcon("ok", KIcon::Desktop, KIcon::SizeSmall);
-	TQPixmap configure = SQ_IconLoader::instance()->loadIcon("configure", KIcon::Desktop, KIcon::SizeSmall);
+	TQPixmap ok = SQ_IconLoader::instance()->loadIcon("ok", TDEIcon::Desktop, TDEIcon::SizeSmall);
+	TQPixmap configure = SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall);
 
 	SQ_LibraryHandler::iterator itEnd = SQ_LibraryHandler::instance()->end();
 	TQListViewItem *item;
diff --git a/ksquirrel/sq_progressbox.cpp b/ksquirrel/sq_progressbox.cpp
index 0997470..bab32d8 100644
--- a/ksquirrel/sq_progressbox.cpp
+++ b/ksquirrel/sq_progressbox.cpp
@@ -29,7 +29,7 @@ SQ_ProgressBox::SQ_ProgressBox(TQWidget *parent, const char *name) : TQHBox(pare
 //    TQToolBar *progressBoxBar = new TQToolBar(TQString(), NULL, this);
     buttonStop = new TQPushButton(this);
     buttonStop->setFlat(true);
-    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", KIcon::Desktop, KIcon::SizeSmall));
+    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
     connect(buttonStop, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotThumbnailUpdateToggle()));
 
     // create progress bar
@@ -50,10 +50,10 @@ SQ_ProgressBox::~SQ_ProgressBox()
 
 void SQ_ProgressBox::startButtonPixmap()
 {
-    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_play", KIcon::Desktop, KIcon::SizeSmall));
+    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_play", TDEIcon::Desktop, TDEIcon::SizeSmall));
 }
 
 void SQ_ProgressBox::stopButtonPixmap()
 {
-    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", KIcon::Desktop, KIcon::SizeSmall));
+    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
 }
diff --git a/ksquirrel/sq_slideshow.ui.h b/ksquirrel/sq_slideshow.ui.h
index 9f2c397..ffdfd42 100644
--- a/ksquirrel/sq_slideshow.ui.h
+++ b/ksquirrel/sq_slideshow.ui.h
@@ -19,8 +19,8 @@ void SQ_SlideShow::init()
     checkRecurs->setChecked(SQ_Config::instance()->readBoolEntry("recurs", false));
     spinDelay->setValue(SQ_Config::instance()->readNumEntry("delay", 1000));
     spinCycle->setValue(SQ_Config::instance()->readNumEntry("repeat", 0));
-    pushCurrent->setPixmap(SQ_IconLoader::instance()->loadIcon("folder_green", KIcon::Desktop, 16));
-    pushHistory->setPixmap(SQ_IconLoader::instance()->loadIcon("history", KIcon::Desktop, 16));
+    pushCurrent->setPixmap(SQ_IconLoader::instance()->loadIcon("folder_green", TDEIcon::Desktop, 16));
+    pushHistory->setPixmap(SQ_IconLoader::instance()->loadIcon("history", TDEIcon::Desktop, 16));
     checkMessages->setChecked(SQ_Config::instance()->readBoolEntry("messages", true));
     checkName->setChecked(SQ_Config::instance()->readBoolEntry("messages_name", true));
     checkSize->setChecked(SQ_Config::instance()->readBoolEntry("messages_size", false));
diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp
index 0d5be40..931fadd 100644
--- a/ksquirrel/sq_slideshowwidget.cpp
+++ b/ksquirrel/sq_slideshowwidget.cpp
@@ -75,29 +75,29 @@ SQ_SlideShowWidget::SQ_SlideShowWidget(TQWidget *parent, const char *name)
     options->hide();
     message->hide();
 
-    int is = KIcon::SizeMedium;
+    int is = TDEIcon::SizeMedium;
 
     TQToolButton *b = new TQToolButton(options);
-    b->setIconSet(SQ_IconLoader::instance()->loadIcon("previous", KIcon::Desktop, is));
+    b->setIconSet(SQ_IconLoader::instance()->loadIcon("previous", TDEIcon::Desktop, is));
     connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(previous()));
     connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotResetPause()));
 
     b = new TQToolButton(options);
-    b->setIconSet(SQ_IconLoader::instance()->loadIcon("next", KIcon::Desktop, is));
+    b->setIconSet(SQ_IconLoader::instance()->loadIcon("next", TDEIcon::Desktop, is));
     connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(next()));
     connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotResetPause()));
 
     buttonPause = new TQToolButton(options);
     buttonPause->setToggleButton(true);
-    buttonPause->setIconSet(SQ_IconLoader::instance()->loadIcon("player_pause", KIcon::Desktop, is));
+    buttonPause->setIconSet(SQ_IconLoader::instance()->loadIcon("player_pause", TDEIcon::Desktop, is));
     connect(buttonPause, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(pause()));
 
     b = new TQToolButton(options);
-    b->setIconSet(SQ_IconLoader::instance()->loadIcon("help", KIcon::Desktop, is));
+    b->setIconSet(SQ_IconLoader::instance()->loadIcon("help", TDEIcon::Desktop, is));
     connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowHelp()));
 
     b = new TQToolButton(options);
-    b->setIconSet(SQ_IconLoader::instance()->loadIcon("cancel", KIcon::Desktop, is));
+    b->setIconSet(SQ_IconLoader::instance()->loadIcon("cancel", TDEIcon::Desktop, is));
     connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSlideShow()));
 
     options->adjustSize();
diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/ksquirrel/sq_thumbnailcachemaster.ui.h
index ec7aaed..e22176d 100644
--- a/ksquirrel/sq_thumbnailcachemaster.ui.h
+++ b/ksquirrel/sq_thumbnailcachemaster.ui.h
@@ -15,9 +15,9 @@
 
 void SQ_ThumbnailCacheMaster::init()
 {
-    pushCache->setIconSet(SQ_IconLoader::instance()->loadIcon("kcalc", KIcon::Desktop, KIcon::SizeSmall));
-    pushCacheMemory->setIconSet(SQ_IconLoader::instance()->loadIcon("kcalc", KIcon::Desktop, KIcon::SizeSmall));
-    pushShowCache->setIconSet(SQ_IconLoader::instance()->loadIcon("memory", KIcon::Desktop, KIcon::SizeSmall));
+    pushCache->setIconSet(SQ_IconLoader::instance()->loadIcon("kcalc", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushCacheMemory->setIconSet(SQ_IconLoader::instance()->loadIcon("kcalc", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushShowCache->setIconSet(SQ_IconLoader::instance()->loadIcon("memory", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     slotCalcCacheMemory();
 }
diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp
index 1f405da..797bf73 100644
--- a/ksquirrel/sq_thumbnailloadjob.cpp
+++ b/ksquirrel/sq_thumbnailloadjob.cpp
@@ -60,7 +60,7 @@
 SQ_ThumbnailLoadJob::SQ_ThumbnailLoadJob(const KFileItemList &items, SQ_FileThumbView *parnt) 
     : TDEIO::Job(false), parent(parnt)
 {
-    mBrokenThumbnail.thumbnail = TDEGlobal::iconLoader()->loadIcon("file_broken", KIcon::Desktop, SQ_ThumbnailSize::smallest());
+    mBrokenThumbnail.thumbnail = TDEGlobal::iconLoader()->loadIcon("file_broken", TDEIcon::Desktop, SQ_ThumbnailSize::smallest());
     mItems = items;
 
     donothing = false;