Rename KIcon to enhance compatibility with KDE4

4 files changed, 16 insertions, 16 deletions

diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index f1cb737..02bfe8a 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -47,11 +47,11 @@ MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
 {
     loadTags();
 
-    KIconLoader * il = TDEGlobal::iconLoader();
+    TDEIconLoader * il = TDEGlobal::iconLoader();
 
-    btnRefreshTags->setIconSet( il->loadIconSet( "reload", KIcon::Small ) );
-    btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) );
-    btnNew->setIconSet( il->loadIconSet( "bookmark_add", KIcon::Small ) );
+    btnRefreshTags->setIconSet( il->loadIconSet( "reload", TDEIcon::Small ) );
+    btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", TDEIcon::Small ) );
+    btnNew->setIconSet( il->loadIconSet( "bookmark_add", TDEIcon::Small ) );
 
     connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( slotGetTags() ) );
@@ -234,7 +234,7 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int
     tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) );
     tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) );
     tagMenu->insertSeparator();
-    tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ),
+    tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small ),
                          i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) );
 
     tagMenu->exec( pos );
@@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos
     TQPopupMenu * menu = new TQPopupMenu( this );
     TQ_CHECK_PTR( menu );
 
-    menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ),
+    menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", TDEIcon::Small ),
                       i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) );
 
     menu->exec( pos );
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 45938a9..dc43d8b 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -319,9 +319,9 @@ void ConfigDialog::createLink()
   TQLineEdit *name = new TQLineEdit(i18n("New link"), main);
   TQLineEdit *url = new TQLineEdit("file:/", main);
   
-  KIconButton *icon = new KIconButton(main);
+  TDEIconButton *icon = new TDEIconButton(main);
   icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-  icon->setIconType(KIcon::Small, KIcon::Any);
+  icon->setIconType(TDEIcon::Small, TDEIcon::Any);
   icon->setStrictIconSize(true);
   icon->setIcon("folder");
   
@@ -351,7 +351,7 @@ void ConfigDialog::createLink()
     
     if(!name_str.isEmpty() && !url_str.isEmpty()){
       if(icon_str.isEmpty()){
-        icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small);
+        icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small);
       }
       
       TQPixmap icon(icon_str);
@@ -402,9 +402,9 @@ void ConfigDialog::editLink(TQListViewItem *item)
     TQLineEdit *name = new TQLineEdit(linkList[item]->name, main);
     TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
     
-    KIconButton *icon = new KIconButton(main);
+    TDEIconButton *icon = new TDEIconButton(main);
     icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-    icon->setIconType(KIcon::Small, KIcon::Any);
+    icon->setIconType(TDEIcon::Small, TDEIcon::Any);
     icon->setStrictIconSize(true);
     icon->setIcon(linkList[item]->icon);
     
@@ -434,7 +434,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
       
       if(!name_str.isEmpty() && !url_str.isEmpty()){
         if(icon_str.isEmpty()){
-          icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small);
+          icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small);
         }
         
         TQPixmap icon(icon_str);
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index ce3844a..a08a01c 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -61,10 +61,10 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
   if(!icon.isNull()){
     TQPixmap pix;
     if(m_items.count() == 1){
-      pix = m_items.getFirst()->pixmap(KIcon::SizeLarge);
+      pix = m_items.getFirst()->pixmap(TDEIcon::SizeLarge);
     }
     else{
-      pix = DesktopIcon("tdemultiple", KIcon::SizeLarge);
+      pix = DesktopIcon("tdemultiple", TDEIcon::SizeLarge);
     }
   
     TQByteArray data;
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index 87a3d00..d02c772 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -57,8 +57,8 @@ namespace KSB_News {
     //        access the already present TQPixmap
     KDesktopFile desktopFile(desktopName, true);
     TQString iconName = desktopFile.readIcon();
-    KIconLoader iconLoader;
-    m_appIcon = iconLoader.loadIcon(iconName, KIcon::Small);
+    TDEIconLoader iconLoader;
+    m_appIcon = iconLoader.loadIcon(iconName, TDEIcon::Small);
 
     // create all sidebar widgets
     widgets = new TQWidgetStack(widgetParent, "main_widgetstack");