Rename KIcon to enhance compatibility with KDE4

11 files changed, 29 insertions, 29 deletions

diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index fa4af2ea6..d302034de 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         saveContainerConfig(true);
 
         PanelDrag *dd = new PanelDrag(_moveAC, this);
-        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), KIcon::Small));
+        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
         grabKeyboard();
         dd->drag();
         releaseKeyboard();
@@ -1334,13 +1334,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
             {
                 // non-TDE executable
                 TQString pixmapFile;
-                KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0,
-                                        KIcon::DefaultState, &pixmapFile);
+                KMimeType::pixmapForURL(url, 0, TDEIcon::Panel, 0,
+                                        TDEIcon::DefaultState, &pixmapFile);
                 PanelExeDialog dlg(TQString::null, TQString::null, url.path(),
                                    pixmapFile, TQString::null, false, 0);
                 if (dlg.exec() == TQDialog::Accepted)
                 {
-                    // KIconloader returns a full path, we only want the name
+                    // TDEIconloader returns a full path, we only want the name
                     TQFileInfo iconfi(dlg.iconPath());
                     a = new NonKDEAppButtonContainer(dlg.title(),
                                                      dlg.description(),
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 75e4df12f..9c1d718c9 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -74,8 +74,8 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
 
     itemDescription->installEventFilter(this);
 
-    KIconLoader * ldr = TDEGlobal::iconLoader();
-    TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
+    TQPixmap icon = ldr->loadIcon(info.icon(), TDEIcon::Panel, TDEIcon::SizeLarge);
     itemPixmap->setPixmap(icon);
     itemPixmap->installEventFilter(this);
 }
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index 86c5e386e..ca5958ad9 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -100,8 +100,8 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         }
 
         TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
-                                                     KIcon::Small, 0,
-                                                     KIcon::DefaultState,
+                                                     TDEIcon::Small, 0,
+                                                     TDEIcon::DefaultState,
                                                      0, true));
         insertItem(iconPix, i18n("&About %1").arg( titleText ), About);
         needSeparator = !(actions & KPanelApplet::Help);
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 3ebe095dc..66b8aa475 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -46,9 +46,9 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
     hbox2->setSpacing( KDialog::spacingHint() );
     TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 );
 
-    iconBtn = new KIconButton( hbox2 );
+    iconBtn = new TDEIconButton( hbox2 );
     iconBtn->setFixedSize( 50, 50 );
-    iconBtn->setIconType( KIcon::Panel, KIcon::Place );
+    iconBtn->setIconType( TDEIcon::Panel, TDEIcon::Place );
     label1->setBuddy( iconBtn );
 
     TQHBox *hbox1 = new TQHBox( page );
diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h
index 113a7b83a..d1b3b623d 100644
--- a/kicker/kicker/ui/browser_dlg.h
+++ b/kicker/kicker/ui/browser_dlg.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdialogbase.h>
 
-class KIconButton;
+class TDEIconButton;
 class KLineEdit;
 
 class PanelBrowserDialog : public KDialogBase
@@ -45,7 +45,7 @@ protected slots:
     virtual void slotOk();
     void slotPathChanged( const TQString &_text );
 protected:
-    KIconButton *iconBtn;
+    TDEIconButton *iconBtn;
     KLineEdit *pathInput;
     TQPushButton *browseBtn;
 };
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 9aa352500..5ab73edb3 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -197,8 +197,8 @@ void PanelBrowserMenu::initialize()
                     iconPath = path + '/' + iconPath.mid(2);
 
                 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");
                 name = c.readEntry("Name", name);
@@ -245,8 +245,8 @@ void PanelBrowserMenu::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/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index fcdc76176..0f77862f0 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -64,7 +64,7 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
     ui->m_exec->setURL(path);
     ui->m_commandLine->setText(cmd);
     ui->m_inTerm->setChecked(inTerm);
-    ui->m_icon->setIconType(KIcon::Panel, KIcon::Application);
+    ui->m_icon->setIconType(TDEIcon::Panel, TDEIcon::Application);
 
     updateIcon();
 
@@ -168,7 +168,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str)
 
     if (it != m_partialPath2full.end())
         exeLocation = it.data();
-    KMimeType::pixmapForURL(KURL( exeLocation ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
+    KMimeType::pixmapForURL(KURL( exeLocation ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
     updateIcon();
 }
 
@@ -196,7 +196,7 @@ void PanelExeDialog::slotSelect(const TQString& exec)
         return;
     }
 
-    KMimeType::pixmapForURL(KURL( exec ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
+    KMimeType::pixmapForURL(KURL( exec ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
     updateIcon();
 }
 
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 0054fbb60..29b617e3f 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -140,10 +140,10 @@ void HideButton::generateIcons()
     TQImage image = pixmap()->convertToImage();
     image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
 
-    KIconEffect effect;
+    TDEIconEffect effect;
 
-    m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
-    m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
+    m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
+    m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
 }
 
 void HideButton::slotSettingsChanged(int category)
@@ -167,7 +167,7 @@ void HideButton::slotSettingsChanged(int category)
 
 void HideButton::slotIconChanged(int group)
 {
-    if (group != KIcon::Panel)
+    if (group != TDEIcon::Panel)
     {
         return;
     }
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index abe5370a6..a1616f79f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
 void KMenuItem::setIcon(const TQString& icon, int size)
 {
     m_icon = icon;
-    TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
+    TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Panel, size ));
 }
 
 void KMenuItem::setHasChildren( bool flag )
@@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
         return 0;
 
       o = new KMultipleDrag(viewport());
-      TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
-      TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
+      TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), TDEIcon::Panel, m_iconSize);
+      TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", TDEIcon::Small );
 
       TQPainter p( &pix );
       p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);
diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui
index 187dd7cb5..cbd85b4d0 100644
--- a/kicker/kicker/ui/nonKDEButtonSettings.ui
+++ b/kicker/kicker/ui/nonKDEButtonSettings.ui
@@ -128,7 +128,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KIconButton" row="0" column="0" rowspan="3" colspan="1">
+        <widget class="TDEIconButton" row="0" column="0" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>m_icon</cstring>
             </property>
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index baea6a54b..c6e6639e9 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -783,7 +783,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
 
         case KST_KService:
         {
-            icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
+            icon = static_cast<KService *>(e)->pixmap(TDEIcon::Small);
             TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
             if (filePath[0] != '/')
             {
@@ -796,7 +796,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
         case KST_KServiceGroup:
         {
             icon = TDEGlobal::iconLoader()
-                   ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
+                   ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), TDEIcon::Small);
             url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
             break;
         }