Rename KIcon to enhance compatibility with KDE4

5 files changed, 126 insertions, 126 deletions

diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 710927b8a..4287725b3 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -32,9 +32,9 @@
 
 #include "icons.h"
 
-/**** KIconConfig ****/
+/**** TDEIconConfig ****/
 
-KIconConfig::KIconConfig(TQWidget *parent, const char *name)
+TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
     : TDECModule(parent, name)
 {
 
@@ -114,13 +114,13 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
     preview();
 }
 
-KIconConfig::~KIconConfig()
+TDEIconConfig::~TDEIconConfig()
 {
   delete mpSystrayConfig;
   delete mpEffect;
 }
 
-TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
+TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
 {
     TQLabel *lab = new TQLabel(str, parent);
     lay->addWidget(lab, 1, i, Qt::AlignCenter);
@@ -133,14 +133,14 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
     return push;
 }
 
-void KIconConfig::init()
+void TDEIconConfig::init()
 {
     mpLoader = TDEGlobal::iconLoader();
     mpConfig = TDEGlobal::config();
-    mpEffect = new KIconEffect;
+    mpEffect = new TDEIconEffect;
     mpTheme = mpLoader->theme();
     mUsage = 0;
-    for (int i=0; i<KIcon::LastGroup; i++)
+    for (int i=0; i<TDEIcon::LastGroup; i++)
 	mbChanged[i] = false;
 
     // Fill list/checkboxen
@@ -165,11 +165,11 @@ void KIconConfig::init()
     mStates += "Disabled";
 }
 
-void KIconConfig::initDefaults()
+void TDEIconConfig::initDefaults()
 {
-    mDefaultEffect[0].type = KIconEffect::NoEffect;
-    mDefaultEffect[1].type = KIconEffect::NoEffect;
-    mDefaultEffect[2].type = KIconEffect::ToGray;
+    mDefaultEffect[0].type = TDEIconEffect::NoEffect;
+    mDefaultEffect[1].type = TDEIconEffect::NoEffect;
+    mDefaultEffect[2].type = TDEIconEffect::ToGray;
     mDefaultEffect[0].transparant = false;
     mDefaultEffect[1].transparant = false;
     mDefaultEffect[2].transparant = true;
@@ -185,9 +185,9 @@ void KIconConfig::initDefaults()
 
     const int defDefSizes[] = { 32, 22, 22, 16, 32 };
 
-    KIcon::Group i;
+    TDEIcon::Group i;
     TQStringList::ConstIterator it;
-    for(it=mGroups.begin(), i=KIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
+    for(it=mGroups.begin(), i=TDEIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
     {
 	mbDP[i] = false;
 	mbChanged[i] = true;
@@ -213,24 +213,24 @@ void KIconConfig::initDefaults()
         int group = mGroups.findIndex( "Desktop" );
         if ( group != -1 )
         {
-            mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
+            mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
             mEffects[ group ][ activeState ].value = 0.7;
         }
 
         group = mGroups.findIndex( "Panel" );
         if ( group != -1 )
         {
-            mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
+            mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
             mEffects[ group ][ activeState ].value = 0.7;
         }
     }
 }
 
-void KIconConfig::read()
+void TDEIconConfig::read()
 {
     if (mpTheme)
     {
-        for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
+        for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
             mAvSizes[i] = mpTheme->querySizes(i);
 
         mTheme = mpTheme->current();
@@ -238,7 +238,7 @@ void KIconConfig::read()
     }
     else
     {
-        for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
+        for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
             mAvSizes[i] = TQValueList<int>();
 
         mTheme = TQString::null;
@@ -262,17 +262,17 @@ void KIconConfig::read()
 	{
 	    TQString tmp = mpConfig->readEntry(*it2 + "Effect");
 	    if (tmp == "togray")
-		effect = KIconEffect::ToGray;
+		effect = TDEIconEffect::ToGray;
 	    else if (tmp == "colorize")
-		effect = KIconEffect::Colorize;
+		effect = TDEIconEffect::Colorize;
 	    else if (tmp == "togamma")
-		effect = KIconEffect::ToGamma;
+		effect = TDEIconEffect::ToGamma;
 	    else if (tmp == "desaturate")
-		effect = KIconEffect::DeSaturate;
+		effect = TDEIconEffect::DeSaturate;
 	    else if (tmp == "tomonochrome")
-		effect = KIconEffect::ToMonochrome;
+		effect = TDEIconEffect::ToMonochrome;
 	    else if (tmp == "none")
-		effect = KIconEffect::NoEffect;
+		effect = TDEIconEffect::NoEffect;
 	    else continue;
 	    mEffects[i][j].type = effect;
 	    mEffects[i][j].value = mpConfig->readDoubleNumEntry(*it2 + "Value");
@@ -287,14 +287,14 @@ void KIconConfig::read()
     mSysTraySize = mpSystrayConfig->readNumEntry("systrayIconWidth", 22);
 
     mpKickerConfig->setGroup("General");
-    mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
+    mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);
 
     TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
     mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
 }
 
-void KIconConfig::apply()
+void TDEIconConfig::apply()
 {
     int i;
 
@@ -332,7 +332,7 @@ void KIconConfig::apply()
         int delta = 1000, dw, index = -1, size = 0, i;
         TQValueList<int>::Iterator it;
         mpSizeBox->clear();
-        if (mUsage < KIcon::LastGroup) {
+        if (mUsage < TDEIcon::LastGroup) {
             for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
             {
                 mpSizeBox->insertItem(TQString().setNum(*it));
@@ -355,31 +355,31 @@ void KIconConfig::apply()
     }
 }
 
-void KIconConfig::preview(int i)
+void TDEIconConfig::preview(int i)
 {
     // Apply effects ourselves because we don't want to sync
     // the configuration every preview.
 
     int viewedGroup;
     if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
-        viewedGroup = KIcon::FirstGroup;
+        viewedGroup = TDEIcon::FirstGroup;
     }
     else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
-        viewedGroup = KIcon::FirstGroup;
+        viewedGroup = TDEIcon::FirstGroup;
     }
     else {
-        viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
+        viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
     }
 
     TQPixmap pm;
     if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
-        pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mQuickLaunchSize);
+        pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mQuickLaunchSize);
     }
     else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
-        pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSysTraySize);
+        pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSysTraySize);
     }
     else {
-        pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
+        pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
     }
     TQImage img = pm.convertToImage();
     if (mbDP[viewedGroup])
@@ -396,32 +396,32 @@ void KIconConfig::preview(int i)
     mpPreview[i]->setPixmap(pm);
 }
 
-void KIconConfig::preview()
+void TDEIconConfig::preview()
 {
     preview(0);
     preview(1);
     preview(2);
 }
 
-void KIconConfig::load()
+void TDEIconConfig::load()
 {
     load( false );
 }
 
-void KIconConfig::load( bool useDefaults )
+void TDEIconConfig::load( bool useDefaults )
 {
     mpConfig = TDEGlobal::config();
     mpConfig->setReadDefaults( useDefaults );
     read();
     apply();
-    for (int i=0; i<KIcon::LastGroup; i++)
+    for (int i=0; i<TDEIcon::LastGroup; i++)
 	mbChanged[i] = false;
     preview();
     emit changed( useDefaults );
 }
 
 
-void KIconConfig::save()
+void TDEIconConfig::save()
 {
     int i, j;
     TQStringList::ConstIterator it, it2;
@@ -436,19 +436,19 @@ void KIconConfig::save()
 	    TQString tmp;
 	    switch (mEffects[i][j].type)
 	    {
-	    case KIconEffect::ToGray:
+	    case TDEIconEffect::ToGray:
 		tmp = "togray";
 		break;
-	    case KIconEffect::ToGamma:
+	    case TDEIconEffect::ToGamma:
 		tmp = "togamma";
 		break;
-	    case KIconEffect::Colorize:
+	    case TDEIconEffect::Colorize:
 		tmp = "colorize";
 		break;
-	    case KIconEffect::DeSaturate:
+	    case TDEIconEffect::DeSaturate:
 		tmp = "desaturate";
 		break;
-	    case KIconEffect::ToMonochrome:
+	    case TDEIconEffect::ToMonochrome:
 		tmp = "tomonochrome";
 		break;
 	    default:
@@ -487,7 +487,7 @@ void KIconConfig::save()
     emit changed(false);
 
     // Emit KIPC change message.
-    for (int i=0; i<KIcon::LastGroup; i++)
+    for (int i=0; i<TDEIcon::LastGroup; i++)
     {
 	if (mbChanged[i])
 	{
@@ -503,16 +503,16 @@ void KIconConfig::save()
     kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
 }
 
-void KIconConfig::defaults()
+void TDEIconConfig::defaults()
 {
     load( true );
 }
 
-void KIconConfig::QLSizeLockedChanged(bool checked) {
+void TDEIconConfig::QLSizeLockedChanged(bool checked) {
     emit changed();
 }
 
-void KIconConfig::slotUsage(int index)
+void TDEIconConfig::slotUsage(int index)
 {
     mUsage = index;
     if (mpUsageList->text(index) == i18n("Panel Buttons")) {
@@ -531,11 +531,11 @@ void KIconConfig::slotUsage(int index)
         mPreviewButton2->setEnabled(false);
         mPreviewButton3->setEnabled(false);
     }
-    else if ( mUsage == KIcon::Panel || mUsage == KIcon::LastGroup )
+    else if ( mUsage == TDEIcon::Panel || mUsage == TDEIcon::LastGroup )
     {
         mpSizeBox->setEnabled(false);
         mpDPCheck->setEnabled(false);
-	mpAnimatedCheck->setEnabled( mUsage == KIcon::Panel );
+	mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Panel );
         mPreviewButton1->setEnabled(true);
         mPreviewButton2->setEnabled(true);
         mPreviewButton3->setEnabled(true);
@@ -544,7 +544,7 @@ void KIconConfig::slotUsage(int index)
     {
         mpSizeBox->setEnabled(true);
         mpDPCheck->setEnabled(true);
-	mpAnimatedCheck->setEnabled( mUsage == KIcon::Desktop );
+	mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Desktop );
         mPreviewButton1->setEnabled(true);
         mPreviewButton2->setEnabled(true);
         mPreviewButton3->setEnabled(true);
@@ -554,9 +554,9 @@ void KIconConfig::slotUsage(int index)
     preview();
 }
 
-void KIconConfig::EffectSetup(int state)
+void TDEIconConfig::EffectSetup(int state)
 {
-    int viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
+    int viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
 
     if (mpUsageList->currentText() == i18n("Panel Buttons")) {
         return;
@@ -565,7 +565,7 @@ void KIconConfig::EffectSetup(int state)
         return;
     }
 
-    TQPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
+    TQPixmap pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
     TQImage img = pm.convertToImage();
     if (mbDP[viewedGroup])
     {
@@ -581,12 +581,12 @@ void KIconConfig::EffectSetup(int state)
     case 2 : caption = i18n("Setup Disabled Icon Effect"); break;
     }
 
-    KIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
+    TDEIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
 
     if (dlg.exec() == TQDialog::Accepted)
     {
-        if (mUsage == KIcon::LastGroup) {
-            for (int i=0; i<KIcon::LastGroup; i++)
+        if (mUsage == TDEIcon::LastGroup) {
+            for (int i=0; i<TDEIcon::LastGroup; i++)
                 mEffects[i][state] = dlg.effect();
         } else {
             mEffects[mUsage][state] = dlg.effect();
@@ -597,8 +597,8 @@ void KIconConfig::EffectSetup(int state)
 
         emit changed(true);
 
-        if (mUsage == KIcon::LastGroup) {
-            for (int i=0; i<KIcon::LastGroup; i++)
+        if (mUsage == TDEIcon::LastGroup) {
+            for (int i=0; i<TDEIcon::LastGroup; i++)
                 mbChanged[i] = true;
         } else {
             mbChanged[mUsage] = true;
@@ -607,7 +607,7 @@ void KIconConfig::EffectSetup(int state)
     preview(state);
 }
 
-void KIconConfig::slotSize(int index)
+void TDEIconConfig::slotSize(int index)
 {
     if (mpUsageList->currentText() == i18n("Panel Buttons")) {
         mQuickLaunchSize = mpSizeBox->currentText().toInt();
@@ -620,7 +620,7 @@ void KIconConfig::slotSize(int index)
         emit changed(true);
     }
     else {
-        Q_ASSERT(mUsage < KIcon::LastGroup);
+        Q_ASSERT(mUsage < TDEIcon::LastGroup);
         mSizes[mUsage] = mAvSizes[mUsage][index];
         preview();
         emit changed(true);
@@ -628,9 +628,9 @@ void KIconConfig::slotSize(int index)
     }
 }
 
-void KIconConfig::slotDPCheck(bool check)
+void TDEIconConfig::slotDPCheck(bool check)
 {
-    Q_ASSERT(mUsage < KIcon::LastGroup);
+    Q_ASSERT(mUsage < TDEIcon::LastGroup);
     if (mbDP[mUsage] != check)
     {
         mbDP[mUsage] = check;
@@ -641,9 +641,9 @@ void KIconConfig::slotDPCheck(bool check)
 
 }
 
-void KIconConfig::slotAnimatedCheck(bool check)
+void TDEIconConfig::slotAnimatedCheck(bool check)
 {
-    Q_ASSERT(mUsage < KIcon::LastGroup);
+    Q_ASSERT(mUsage < TDEIcon::LastGroup);
     if (mbAnimated[mUsage] != check)
     {
         mbAnimated[mUsage] = check;
@@ -652,17 +652,17 @@ void KIconConfig::slotAnimatedCheck(bool check)
     }
 }
 
-void KIconConfig::slotRoundedCheck(bool check)
+void TDEIconConfig::slotRoundedCheck(bool check)
 {
     emit changed(true);
 }
 
-void KIconConfig::slotActiveEffect(bool check)
+void TDEIconConfig::slotActiveEffect(bool check)
 {
     emit changed(true);
 }
 
-KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
+TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
     const Effect &defaultEffect,
     const TQString &caption, const TQImage &image,
     TQWidget *parent, char *name)
@@ -672,7 +672,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
       mDefaultEffect(defaultEffect),
       mExample(image)
 {
-    mpEffect = new KIconEffect;
+    mpEffect = new TDEIconEffect;
 
     TQLabel *lbl;
     TQGroupBox *frame;
@@ -749,67 +749,67 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
     preview();
 }
 
-KIconEffectSetupDialog::~KIconEffectSetupDialog()
+TDEIconEffectSetupDialog::~TDEIconEffectSetupDialog()
 {
   delete mpEffect;
 }
 
-void KIconEffectSetupDialog::init()
+void TDEIconEffectSetupDialog::init()
 {
     mpEffectBox->setCurrentItem(mEffect.type);
-    mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
-    mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
-    mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
+    mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
+    mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
+    mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
     mpEffectSlider->setValue((int) (100.0 * mEffect.value + 0.5));
     mpEColButton->setColor(mEffect.color);
     mpECol2Button->setColor(mEffect.color2);
     mpSTCheck->setChecked(mEffect.transparant);
 }
 
-void KIconEffectSetupDialog::slotEffectValue(int value)
+void TDEIconEffectSetupDialog::slotEffectValue(int value)
 {
      mEffect.value = 0.01 * value;
      preview();
 }
 
-void KIconEffectSetupDialog::slotEffectColor(const TQColor &col)
+void TDEIconEffectSetupDialog::slotEffectColor(const TQColor &col)
 {
      mEffect.color = col;
      preview();
 }
 
-void KIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
+void TDEIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
 {
      mEffect.color2 = col;
      preview();
 }
 
-void KIconEffectSetupDialog::slotEffectType(int type)
+void TDEIconEffectSetupDialog::slotEffectType(int type)
 {
     mEffect.type = type;
-    mpEffectGroup->setEnabled(mEffect.type != KIconEffect::NoEffect);
-    mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
-    mpEffectColor->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
-    mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
-    mpEffectColor2->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
-    mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
+    mpEffectGroup->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
+    mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
+    mpEffectColor->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
+    mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
+    mpEffectColor2->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
+    mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
     preview();
 }
 
-void KIconEffectSetupDialog::slotSTCheck(bool b)
+void TDEIconEffectSetupDialog::slotSTCheck(bool b)
 {
      mEffect.transparant = b;
      preview();
 }
 
-void KIconEffectSetupDialog::slotDefault()
+void TDEIconEffectSetupDialog::slotDefault()
 {
      mEffect = mDefaultEffect;
      init();
      preview();
 }
 
-void KIconEffectSetupDialog::preview()
+void TDEIconEffectSetupDialog::preview()
 {
     TQPixmap pm;
     TQImage img = mExample.copy();
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index aafa31748..1438a9f1a 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -36,9 +36,9 @@ class TQWidget;
 
 class KColorButton;
 class TDEConfig;
-class KIconEffect;
-class KIconLoader;
-class KIconTheme;
+class TDEIconEffect;
+class TDEIconLoader;
+class TDEIconTheme;
 
 struct Effect 
 {
@@ -53,13 +53,13 @@ struct Effect
 /**
  * The General Icons tab in kcontrol.
  */
-class KIconConfig: public TDECModule
+class TDEIconConfig: public TDECModule
 {
     Q_OBJECT
 
 public:
-    KIconConfig(TQWidget *parent, const char *name=0);
-    ~KIconConfig();
+    TDEIconConfig(TQWidget *parent, const char *name=0);
+    ~TDEIconConfig();
 
     virtual void load();
     virtual void load( bool useDefaults );
@@ -103,9 +103,9 @@ private:
     int mSysTraySize;
     int mQuickLaunchSize;
 
-    KIconEffect *mpEffect;
-    KIconTheme *mpTheme;
-    KIconLoader *mpLoader;
+    TDEIconEffect *mpEffect;
+    TDEIconTheme *mpTheme;
+    TDEIconLoader *mpLoader;
     TDEConfig *mpConfig;
     KSimpleConfig *mpSystrayConfig;
     KSimpleConfig *mpKickerConfig;
@@ -121,15 +121,15 @@ private:
     TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
 };
 
-class KIconEffectSetupDialog: public KDialogBase
+class TDEIconEffectSetupDialog: public KDialogBase
 {
     Q_OBJECT
      
 public:
-    KIconEffectSetupDialog(const Effect &, const Effect &,
+    TDEIconEffectSetupDialog(const Effect &, const Effect &,
                            const TQString &, const TQImage &,
 			   TQWidget *parent=0L, char *name=0L);
-    ~KIconEffectSetupDialog();
+    ~TDEIconEffectSetupDialog();
     Effect effect() { return mEffect; }
 
 protected:
@@ -145,7 +145,7 @@ protected slots:
     void slotDefault();
 
 private:
-    KIconEffect *mpEffect;
+    TDEIconEffect *mpEffect;
     TQListBox *mpEffectBox;
     TQCheckBox *mpSTCheck;
     TQSlider *mpEffectSlider;
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index cb0d23508..f1b5ada9e 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -124,13 +124,13 @@ void IconThemesConfig::loadThemes()
 {
   m_iconThemes->clear();
   m_themeNames.clear();
-  TQStringList themelist(KIconTheme::list());
+  TQStringList themelist(TDEIconTheme::list());
   TQString name;
   TQString tname;
   TQStringList::Iterator it;
   for (it=themelist.begin(); it != themelist.end(); ++it)
   {
-    KIconTheme icontheme(*it);
+    TDEIconTheme icontheme(*it);
     if (!icontheme.isValid()) kdDebug() << "notvalid\n";
     if (icontheme.isHidden()) continue;
 
@@ -194,7 +194,7 @@ void IconThemesConfig::installNewTheme()
   TDEGlobal::instance()->newIconLoader();
   loadThemes();
 
-  TQListViewItem *item=iconThemeItem(KIconTheme::current());
+  TQListViewItem *item=iconThemeItem(TDEIconTheme::current());
   m_iconThemes->setSelected(item, true);
   updateRemoveButton();
 }
@@ -289,12 +289,12 @@ void IconThemesConfig::removeSelectedTheme()
         "This will delete the files installed by this theme.</qt>").
 	arg(selected->text(0));
 
-  bool deletingCurrentTheme=(selected==iconThemeItem(KIconTheme::current()));
+  bool deletingCurrentTheme=(selected==iconThemeItem(TDEIconTheme::current()));
 
   int r=KMessageBox::warningContinueCancel(this,question,i18n("Confirmation"),KStdGuiItem::del());
   if (r!=KMessageBox::Continue) return;
 
-  KIconTheme icontheme(m_themeNames[selected->text(0)]);
+  TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
 
   // delete the index file before the async TDEIO::del so loadThemes() will
   // ignore that dir.
@@ -309,9 +309,9 @@ void IconThemesConfig::removeSelectedTheme()
   TQListViewItem *item=0L;
   //Fallback to the default if we've deleted the current theme
   if (!deletingCurrentTheme)
-     item=iconThemeItem(KIconTheme::current());
+     item=iconThemeItem(TDEIconTheme::current());
   if (!item)
-     item=iconThemeItem(KIconTheme::defaultThemeName());
+     item=iconThemeItem(TDEIconTheme::defaultThemeName());
 
   m_iconThemes->setSelected(item, true);
   updateRemoveButton();
@@ -326,12 +326,12 @@ void IconThemesConfig::updateRemoveButton()
   bool enabled = false;
   if (selected)
   {
-    KIconTheme icontheme(m_themeNames[selected->text(0)]);
+    TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
     TQFileInfo fi(icontheme.dir());
     enabled = fi.isWritable();
     // Don't let users remove the current theme.
-    if(m_themeNames[selected->text(0)] == KIconTheme::current() || 
-			 m_themeNames[selected->text(0)] == KIconTheme::defaultThemeName())
+    if(m_themeNames[selected->text(0)] == TDEIconTheme::current() || 
+			 m_themeNames[selected->text(0)] == TDEIconTheme::defaultThemeName())
       enabled = false;
   }
   m_removeButton->setEnabled(enabled);
@@ -343,20 +343,20 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
   KSVGIconEngine engine;
 #endif 
   TQString dirName(m_themeNames[item->text(0)]);
-  KIconTheme icontheme(dirName);
+  TDEIconTheme icontheme(dirName);
   if (!icontheme.isValid()) kdDebug() << "notvalid\n";
 
   updateRemoveButton();
-  const int size = icontheme.defaultSize(KIcon::Desktop);
+  const int size = icontheme.defaultSize(TDEIcon::Desktop);
 
-  KIcon icon=icontheme.iconPath("exec.png", size, KIcon::MatchBest);
+  TDEIcon icon=icontheme.iconPath("exec.png", size, TDEIcon::MatchBest);
   if (!icon.isValid()) {
 #ifdef HAVE_LIBART
-	  icon=icontheme.iconPath("exec.svg", size, KIcon::MatchBest);
+	  icon=icontheme.iconPath("exec.svg", size, TDEIcon::MatchBest);
 	  if(engine.load(size, size, icon.path))
               m_previewExec->setPixmap(*engine.image());
           else {
-              icon=icontheme.iconPath("exec.svgz", size, KIcon::MatchBest);
+              icon=icontheme.iconPath("exec.svgz", size, TDEIcon::MatchBest);
               if(engine.load(size, size, icon.path))
                   m_previewExec->setPixmap(*engine.image());
           }
@@ -365,14 +365,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
   else
           m_previewExec->setPixmap(TQPixmap(icon.path));
 
-  icon=icontheme.iconPath("folder.png",size,KIcon::MatchBest);
+  icon=icontheme.iconPath("folder.png",size,TDEIcon::MatchBest);
   if (!icon.isValid()) {
 #ifdef HAVE_LIBART
-	  icon=icontheme.iconPath("folder.svg", size, KIcon::MatchBest);
+	  icon=icontheme.iconPath("folder.svg", size, TDEIcon::MatchBest);
 	  if(engine.load(size, size, icon.path))
               m_previewFolder->setPixmap(*engine.image());
           else {
-              icon=icontheme.iconPath("folder.svgz", size, KIcon::MatchBest);
+              icon=icontheme.iconPath("folder.svgz", size, TDEIcon::MatchBest);
               if(engine.load(size, size, icon.path))
                   m_previewFolder->setPixmap(*engine.image());
           }
@@ -381,14 +381,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
   else
   	  m_previewFolder->setPixmap(TQPixmap(icon.path));
 
-  icon=icontheme.iconPath("txt.png",size,KIcon::MatchBest);
+  icon=icontheme.iconPath("txt.png",size,TDEIcon::MatchBest);
   if (!icon.isValid()) {
 #ifdef HAVE_LIBART
-	  icon=icontheme.iconPath("txt.svg", size, KIcon::MatchBest);
+	  icon=icontheme.iconPath("txt.svg", size, TDEIcon::MatchBest);
 	  if(engine.load(size, size, icon.path))
               m_previewDocument->setPixmap(*engine.image());
           else {
-              icon=icontheme.iconPath("txt.svgz", size, KIcon::MatchBest);
+              icon=icontheme.iconPath("txt.svgz", size, TDEIcon::MatchBest);
               if(engine.load(size, size, icon.path))
                   m_previewDocument->setPixmap(*engine.image());
           }
@@ -403,7 +403,7 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
 
 void IconThemesConfig::load()
 {
-  m_defaultTheme=iconThemeItem(KIconTheme::current());
+  m_defaultTheme=iconThemeItem(TDEIconTheme::current());
   m_iconThemes->setSelected(m_defaultTheme, true);
   updateRemoveButton();
 
@@ -424,10 +424,10 @@ void IconThemesConfig::save()
   config->writeEntry("Theme", m_themeNames[selected->text(0)]);
   delete config;
 
-  KIconTheme::reconfigure();
+  TDEIconTheme::reconfigure();
   emit changed(false);
 
-  for (int i=0; i<KIcon::LastGroup; i++)
+  for (int i=0; i<TDEIcon::LastGroup; i++)
   {
     KIPC::sendMessageAll(KIPC::IconChanged, i);
   }
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 8a9b564ac..06108a287 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -47,7 +47,7 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
   tab->addTab(tab1, i18n("&Theme"));
   connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
-  tab2 = new KIconConfig(this, "effects");
+  tab2 = new TDEIconConfig(this, "effects");
   tab->addTab(tab2, i18n("Ad&vanced"));
   connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
diff --git a/kcontrol/icons/testicons.cpp b/kcontrol/icons/testicons.cpp
index 64f326ebf..85adb7b35 100644
--- a/kcontrol/icons/testicons.cpp
+++ b/kcontrol/icons/testicons.cpp
@@ -6,7 +6,7 @@
 int main(int argc, char **argv)
 {
     TDEApplication app(argc, argv, "testicons");
-    KIconConfig *w = new KIconConfig(0L, "testicons");
+    TDEIconConfig *w = new TDEIconConfig(0L, "testicons");
     app.setMainWidget(w);
     w->show();
     return app.exec();