Rename KIcon to enhance compatibility with KDE4

11 files changed, 32 insertions, 32 deletions

diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index a62f457..cee8de1 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -92,12 +92,12 @@ void AdBlock::initLabel()
 
     m_label = new KURLLabel(statusBarEx->statusBar());
 
-    KIconLoader *loader = instance()->iconLoader();
+    TDEIconLoader *loader = instance()->iconLoader();
 
-    m_label->setFixedHeight(loader->currentSize(KIcon::Small));
+    m_label->setFixedHeight(loader->currentSize(TDEIcon::Small));
     m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_label->setUseCursor(false);
-    m_label->setPixmap(loader->loadIcon("filter", KIcon::Small));
+    m_label->setPixmap(loader->loadIcon("filter", TDEIcon::Small));
 
     statusBarEx->addStatusBarItem(m_label, 0, false);    
 
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index 80e4224..d62284a 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -155,7 +155,7 @@ void KonqFeedIcon::addFeedIcon()
     m_feedIcon = new KURLLabel(m_statusBarEx->statusBar());
 
     // from tdehtmlpart's ualabel
-    m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
+    m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
     m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_feedIcon->setUseCursor(false);
     //FIXME hackish
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index 33c965b..dfafaf1 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -186,8 +186,8 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
   }
   else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
   {
-    m_searchWidget = new KIconViewSearchLine(hbox);
-    static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget()));
+    m_searchWidget = new TDEIconViewSearchLine(hbox);
+    static_cast<TDEIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget()));
   }
 
 
@@ -422,7 +422,7 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list)
   }
   else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
   {
-    static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
+    static_cast<TDEIconViewSearchLine*>(m_searchWidget)->updateSearch();
   }
 
   // Make sure the filter menu is enabled once a named
@@ -469,7 +469,7 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item)
 
 	// HACK around it here...
 	if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
-		static_cast<KIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name());
+		static_cast<TDEIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name());
 	}
 
 	TQString mimeType = item->mimetype().stripWhiteSpace();
@@ -510,7 +510,7 @@ void DirFilterPlugin::activateSearch()
 		static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch();
 	}
 	else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
-		static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
+		static_cast<TDEIconViewSearchLine*>(m_searchWidget)->updateSearch();
 	}
 }
 
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index d12f495..79e5326 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -377,7 +377,7 @@ TQPixmap Inode::pixmap(int i) const
   if (!_mimePixmapSet) {
     KURL u;
     u.setPath(path());
-    _mimePixmap = mimeType()->pixmap(u, KIcon::Small);
+    _mimePixmap = mimeType()->pixmap(u, TDEIcon::Small);
 
     _mimePixmapSet = true;
   }
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 964628a..1214647 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -86,7 +86,7 @@ void KIGPDialog::slotDefault()
 
 void KIGPDialog::setupLookPage(const TQString& path) {
     TQFrame *page = addPage( i18n("Look"), i18n("Page Look"),
-                            BarIcon("colorize", KIcon::SizeMedium ) );
+                            BarIcon("colorize", TDEIcon::SizeMedium ) );
 
     m_config->setGroup("Look");
     TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() );
@@ -176,7 +176,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
 
 void KIGPDialog::setupDirectoryPage(const TQString& path) {
     TQFrame *page = addPage( i18n("Folders"), i18n("Folders"),
-                            BarIcon("folder", KIcon::SizeMedium ) );
+                            BarIcon("folder", TDEIcon::SizeMedium ) );
 
     m_config->setGroup("Directory");
     TQVBoxLayout *dvlay = new TQVBoxLayout( page, 0, spacingHint() );
@@ -272,7 +272,7 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) {
 
 void KIGPDialog::setupThumbnailPage(const TQString& path) {
     TQFrame *page = addPage( i18n("Thumbnails"), i18n("Thumbnails"),
-                            BarIcon("thumbnail", KIcon::SizeMedium ) );
+                            BarIcon("thumbnail", TDEIcon::SizeMedium ) );
 
     m_config->setGroup("Thumbnails");
     TQLabel *label;
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 3c4dac1..40822db 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -72,8 +72,8 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
            iconPath = _path + '/' + iconPath.mid(2);
         TQPixmap icon;
         icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
-                                               KIcon::Small, KIcon::SizeSmall,
-                                               KIcon::DefaultState, 0, true);
+                                               TDEIcon::Small, TDEIcon::SizeSmall,
+                                               TDEIcon::DefaultState, 0, true);
         if(icon.isNull())
            icon = CICON("folder");
         insertItem( icon, escapedPath.replace( "&", "&&" ), submenu );
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 062a28c..ae0e500 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -274,7 +274,7 @@ void KonqMFIcon::addMFIcon() {
 	}
 
 	m_mfIcon = new KURLLabel(m_statusBarEx->statusBar());
-	m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
+	m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
 	m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	m_mfIcon->setUseCursor(false);
 	//FIXME hackish
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");