Rename KIcon to enhance compatibility with KDE4

7 files changed, 17 insertions, 17 deletions

diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index 848d36c6..7e078115 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -93,7 +93,7 @@
                                 <string>Clear the current cover search.</string>
                             </property>
                         </widget>
-                        <widget class="KIconViewSearchLine">
+                        <widget class="TDEIconViewSearchLine">
                             <property name="name">
                                 <cstring>m_searchLine</cstring>
                             </property>
@@ -133,7 +133,7 @@
 </widget>
 <customwidgets>
     <customwidget>
-        <class>KIconViewSearchLine</class>
+        <class>TDEIconViewSearchLine</class>
         <header location="global">kiconviewsearchline.h</header>
         <sizehint>
             <width>100</width>
diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp
index fc400e78..d73a5739 100644
--- a/juk/covericonview.cpp
+++ b/juk/covericonview.cpp
@@ -19,21 +19,21 @@
 using CoverUtility::CoverIconViewItem;
 
 CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) :
-    KIconViewItem(parent), m_id(id)
+    TDEIconViewItem(parent), m_id(id)
 {
     CoverDataPtr data = CoverManager::coverInfo(id);
     setText(TQString("%1 - %2").arg(data->artist, data->album));
     setPixmap(data->thumbnail());
 }
 
-CoverIconView::CoverIconView(TQWidget *parent, const char *name) : KIconView(parent, name)
+CoverIconView::CoverIconView(TQWidget *parent, const char *name) : TDEIconView(parent, name)
 {
     setResizeMode(Adjust);
 }
 
 CoverIconViewItem *CoverIconView::currentItem() const
 {
-    return static_cast<CoverIconViewItem *>(KIconView::currentItem());
+    return static_cast<CoverIconViewItem *>(TDEIconView::currentItem());
 }
 
 TQDragObject *CoverIconView::dragObject()
diff --git a/juk/covericonview.h b/juk/covericonview.h
index 42e44d66..cab60b58 100644
--- a/juk/covericonview.h
+++ b/juk/covericonview.h
@@ -26,7 +26,7 @@
 // and such.
 namespace CoverUtility
 {
-    class CoverIconViewItem : public KIconViewItem
+    class CoverIconViewItem : public TDEIconViewItem
     {
     public:
 	CoverIconViewItem(coverKey id, TQIconView *parent);
@@ -41,12 +41,12 @@ namespace CoverUtility
 using CoverUtility::CoverIconViewItem;
 
 /**
- * This class subclasses KIconView in order to provide cover drag-and-drop
+ * This class subclasses TDEIconView in order to provide cover drag-and-drop
  * support.
  *
  * @author Michael Pyne <michael.pyne@kdemail.net>
  */
-class CoverIconView : public KIconView
+class CoverIconView : public TDEIconView
 {
 public:
     CoverIconView(TQWidget *parent, const char *name);
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index 5bb3c4d3..5062624a 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -56,12 +56,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
         ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
             "deleted</b> from your hard disk.</qt>"));
         ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning",
-            KIcon::Desktop, KIcon::SizeLarge));
+            TDEIcon::Desktop, TDEIcon::SizeLarge));
     }
     else {
         ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>"));
         ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full",
-            KIcon::Desktop, KIcon::SizeLarge));
+            TDEIcon::Desktop, TDEIcon::SizeLarge));
     }
 }
 
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index e71fc37d..48e6ba5f 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -432,7 +432,7 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName)
     TQImage bgImage = bgPix.convertToImage(); // Probably 22x22
     TQImage fgImage = fgPix.convertToImage(); // Should be 16x16
 
-    KIconEffect::semiTransparent(bgImage);
+    TDEIconEffect::semiTransparent(bgImage);
     copyImage(bgImage, fgImage, (bgImage.width() - fgImage.width()) / 2,
               (bgImage.height() - fgImage.height()) / 2);
 
@@ -602,7 +602,7 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y)
     if((y + src.height()) >= dest.height())
         return false;
 
-    // We want to use KIconEffect::overlay to do this, since it handles
+    // We want to use TDEIconEffect::overlay to do this, since it handles
     // alpha, but the images need to be the same size.  We can handle that.
 
     TQImage large_src(dest);
@@ -628,7 +628,7 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y)
 
     // Apply effect to image
 
-    KIconEffect::overlay(dest, large_src);
+    TDEIconEffect::overlay(dest, large_src);
 
     return true;
 }
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 5a2de5b2..c08b0015 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -48,7 +48,7 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList,
     TQWidget *mainBox = new TQWidget(this);
     TQBoxLayout *mainLayout = new TQVBoxLayout(mainBox);
 
-    m_iconWidget = new KIconView(mainBox);
+    m_iconWidget = new TDEIconView(mainBox);
     m_iconWidget->setResizeMode(TQIconView::Adjust);
     m_iconWidget->setSpacing(10);
     m_iconWidget->setFixedSize(500,550);
@@ -185,7 +185,7 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const
 ////////////////////////////////////////////////////////////////////////////////
 
 CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) :
-    TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
+    TQObject(parent), TDEIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
 {
     // Set up the iconViewItem
 
diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h
index 4af0cf41..afe2cd18 100644
--- a/juk/webimagefetcherdialog.h
+++ b/juk/webimagefetcherdialog.h
@@ -62,7 +62,7 @@ private:
 
     TQPixmap m_pixmap;
     WebImageList m_imageList;
-    KIconView *m_iconWidget;
+    TDEIconView *m_iconWidget;
     FileHandle m_file;
 };
 
@@ -71,7 +71,7 @@ namespace TDEIO
     class TransferJob;
 }
 
-class CoverIconViewItem : public TQObject, public KIconViewItem
+class CoverIconViewItem : public TQObject, public TDEIconViewItem
 {
     Q_OBJECT