Rename KIcon to enhance compatibility with KDE4

3 files changed, 27 insertions, 27 deletions

diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 87f990b30..62f7f055a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -159,11 +159,11 @@ int sizeValue(KPanelExtension::Size s)
 int maxButtonDim()
 {
     int maxDim;
-    //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
+    //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge;
 
     KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
     kickerconfig->setGroup("General");
-    maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
+    maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);;
     delete kickerconfig;
     return maxDim;
 }
@@ -358,7 +358,7 @@ void colorize(TQImage& image)
         b = (b + (76 - gray) > 255 ? 255 : b + (76 - gray));
     }
     color.setRgb(r, g, b);
-    KIconEffect::colorize(image, color, 1.0);
+    TDEIconEffect::colorize(image, color, 1.0);
 }
 
 TQColor blendColors(const TQColor& c1, const TQColor& c2)
@@ -415,22 +415,22 @@ TQIconSet menuIconSet(const TQString& icon)
         if (iconSize > 0)
         {
             iconset = TDEGlobal::iconLoader()->loadIconSet(icon,
-                                                     KIcon::NoGroup,
+                                                     TDEIcon::NoGroup,
                                                      iconSize, true);
         }
         else if (iconSize == 0)
         {
             TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon,
-                                                         KIcon::Small,
+                                                         TDEIcon::Small,
                                                          0,
-                                                         KIcon::DefaultState,
+                                                         TDEIcon::DefaultState,
                                                          0,
                                                          true);
 
             TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon,
-                                                         KIcon::Small,
+                                                         TDEIcon::Small,
                                                          0,
-                                                         KIcon::ActiveState,
+                                                         TDEIcon::ActiveState,
                                                          0,
                                                          true);
 
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 1f011da5a..c1bd517d8 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
       m_popupDirection(KPanelApplet::Up),
       m_iconAlignment(AlignCenter),
       m_orientation(Qt::Horizontal),
-      m_size((KIcon::StdSizes)-1),
+      m_size((TDEIcon::StdSizes)-1),
       m_fontPercent(0.40),
       m_forceStandardCursor(forceStandardCursor)
 {
@@ -208,7 +208,7 @@ void PanelButton::setOrientation(Orientation o)
 
 void PanelButton::updateIcon(int group)
 {
-    if (group != KIcon::Panel)
+    if (group != TDEIcon::Panel)
     {
         return;
     }
@@ -516,7 +516,7 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
 	
 	TQPixmap pix = labelIcon();
 	if (KickerSettings::showIconActivationEffect() == true) {
-		KIconEffect::visualActivate(this, this->geometry(), &pix);
+		TDEIconEffect::visualActivate(this, this->geometry(), &pix);
 	}
     }
     TQButton::mouseReleaseEvent(e);
@@ -781,16 +781,16 @@ int PanelButton::preferredIconSize(int proposed_size) const
 {
     // (re)calculates the icon sizes and report true if they have changed.
     // Get sizes from icontheme. We assume they are sorted.
-    KIconTheme *ith = TDEGlobal::iconLoader()->theme();
+    TDEIconTheme *ith = TDEGlobal::iconLoader()->theme();
 
     if (!ith)
     {
         return -1; // unknown icon size
     }
 
-    TQValueList<int> sizes = ith->querySizes(KIcon::Panel);
+    TQValueList<int> sizes = ith->querySizes(TDEIcon::Panel);
 
-    int sz = ith->defaultSize(KIcon::Panel);
+    int sz = ith->defaultSize(TDEIcon::Panel);
 
     if (proposed_size < 0)
     {
@@ -878,10 +878,10 @@ void PanelButton::loadTiles()
 
 void PanelButton::loadIcons()
 {
-    KIconLoader * ldr = TDEGlobal::iconLoader();
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
     TQString nm = m_iconName;
-    KIcon::States defaultState = isEnabled() ? KIcon::DefaultState :
-                                               KIcon::DisabledState;
+    TDEIcon::States defaultState = isEnabled() ? TDEIcon::DefaultState :
+                                               TDEIcon::DisabledState;
     if (nm=="kmenu-suse")
     {
         TQString pth = locate( "data", "kicker/data/kickoff/kmenu_basic.png" );
@@ -894,12 +894,12 @@ void PanelButton::loadIcons()
         }
     }
     else
-        m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState, 0L, true);
+        m_icon = ldr->loadIcon(nm, TDEIcon::Panel, m_size, defaultState, 0L, true);
 
     if (m_icon.isNull())
     {
         nm = defaultIcon();
-        m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState);
+        m_icon = ldr->loadIcon(nm, TDEIcon::Panel, m_size, defaultState);
     }
 
     if (!isEnabled())
@@ -908,11 +908,11 @@ void PanelButton::loadIcons()
     }
     else
     {
-        m_iconh = ldr->loadIcon(nm, KIcon::Panel, m_size,
-                                KIcon::ActiveState, 0L, true);
+        m_iconh = ldr->loadIcon(nm, TDEIcon::Panel, m_size,
+                                TDEIcon::ActiveState, 0L, true);
     }
 
-    m_iconz = ldr->loadIcon(nm, KIcon::Panel, KIcon::SizeHuge,
+    m_iconz = ldr->loadIcon(nm, TDEIcon::Panel, TDEIcon::SizeHuge,
                             defaultState, 0L, true );
 }
 
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 87fd17200..a046ca266 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -154,11 +154,11 @@ void SimpleButton::generateIcons()
     }
 
     TQImage image = pixmap()->convertToImage();
-    KIconEffect effect;
+    TDEIconEffect effect;
 
-    m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
-    m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
-    m_disabledIcon = effect.apply(image, KIcon::Panel, KIcon::DisabledState);
+    m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
+    m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
+    m_disabledIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DisabledState);
     
     updateGeometry();
 }
@@ -188,7 +188,7 @@ void SimpleButton::slotSettingsChanged(int category)
 
 void SimpleButton::slotIconChanged( int group )
 {
-    if (group != KIcon::Panel)
+    if (group != TDEIcon::Panel)
     {
         return;
     }