Rename KIcon to enhance compatibility with KDE4

8 files changed, 32 insertions, 32 deletions

diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index ad2b11463..8068023a5 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -150,10 +150,10 @@ void AboutWidget::updatePixmap()
     }
     else
     {
-        KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+        TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
         TQString iconPath;
         if (!_icon.isEmpty()) {
-            iconPath = loader->iconPath( _icon, KIcon::Toolbar );
+            iconPath = loader->iconPath( _icon, TDEIcon::Toolbar );
             content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
         }
 
@@ -171,7 +171,7 @@ void AboutWidget::updatePixmap()
             {
                 szName = module->moduleName();
                 szComment = module->comment();
-                iconPath = loader->iconPath( module->icon(), KIcon::Small );
+                iconPath = loader->iconPath( module->icon(), TDEIcon::Small );
 
                 content += "<img src=\"" + iconPath +" \"</a>&nbsp;<a href=\"%1\" class=\"kcm_link\">" + szName + "</a></td><td class=\"kc_rightcol\">" + szComment;
                 KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index d6cdd91d1..a929df229 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -83,8 +83,8 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
 
   TQWhatsThis::remove( this );
   TQWhatsThis::add( this, config->comment() );
-  KIconLoader *loader = TDEGlobal::instance()->iconLoader();
-  TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
+  TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
+  TQPixmap icon = loader->loadIcon( config->icon(), TDEIcon::NoGroup, 22 );
   m_icon->setPixmap( icon );
   m_name->setText( config->moduleName() );
 
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index 09f0e4047..2c7266468 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -42,7 +42,7 @@ TQString KCGlobal::_irelease = "";
 TQString KCGlobal::_iversion = "";
 TQString KCGlobal::_imachine = "";
 IndexViewMode KCGlobal::_viewmode = Icon;
-KIcon::StdSizes KCGlobal::_iconsize = KIcon::SizeMedium;
+TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium;
 TQString KCGlobal::_baseGroup = "";
 
 void KCGlobal::init()
diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h
index 551b3fcb6..0fbc1d9b7 100644
--- a/kcontrol/kcontrol/global.h
+++ b/kcontrol/kcontrol/global.h
@@ -45,7 +45,7 @@ public:
   static TQString systemVersion() { return _iversion; }
   static TQString systemMachine() { return _imachine; }
   static IndexViewMode viewMode() { return _viewmode; }
-  static KIcon::StdSizes iconSize() { return _iconsize; }
+  static TDEIcon::StdSizes iconSize() { return _iconsize; }
   static TQString baseGroup();
 
   static void setIsInfoCenter(bool b) { _infocenter = b; }
@@ -59,7 +59,7 @@ public:
   static void setSystemVersion(const TQString& n){ _iversion = n; }
   static void setSystemMachine(const TQString& n){ _imachine = n; }
   static void setViewMode(IndexViewMode m) { _viewmode = m; }
-  static void setIconSize(KIcon::StdSizes s) { _iconsize = s; }
+  static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; }
 
   static void repairAccels( TQWidget * tw );
 
@@ -69,7 +69,7 @@ private:
   static TQStringList _types;
   static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _tdeversion;
   static IndexViewMode _viewmode;
-  static KIcon::StdSizes _iconsize;
+  static TDEIcon::StdSizes _iconsize;
   static TQString _baseGroup;
 };
 
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 77e442a98..f899eb4c7 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -72,7 +72,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
      TQString name = group->caption();
      name.replace("&", "&&");
   
-     parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
+     parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
                         , name, menu);
 
      fill(menu, path);
@@ -87,7 +87,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
      TQString name = module->moduleName();
      name.replace("&", "&&");
 
-     int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
+     int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
                                      , name, id);
      _moduleDict.insert(realid, module);
 
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index 982cef297..df69395ee 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -38,12 +38,12 @@
 static TQPixmap appIcon(const TQString &iconName)
 {
      TQString path;
-     TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
-     // make sure they are not larger than KIcon::SizeSmall
-     if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall)
+     TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::Small, 0, TDEIcon::DefaultState, &path, true);
+     // make sure they are not larger than TDEIcon::SizeSmall
+     if (normal.width() > TDEIcon::SizeSmall || normal.height() > TDEIcon::SizeSmall)
      {
          TQImage tmp = normal.convertToImage();
-         tmp = tmp.smoothScale(KIcon::SizeSmall, KIcon::SizeSmall);
+         tmp = tmp.smoothScale(TDEIcon::SizeSmall, TDEIcon::SizeSmall);
          normal.convertFromImage(tmp);
      }
      return normal;
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index cee6cbfd4..e53c899da 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap
 public:
  ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
 	TQListBoxPixmap(listbox,
-      TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
+      TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall),
       module->moduleName())
   , m_module(module)
  { 
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 87661f8d5..13c7a6f56 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -68,13 +68,13 @@ TopLevel::TopLevel(const char* name)
 
   TQString size = config->readEntry("IconSize", "Medium");
   if (size == "Small")
-    KCGlobal::setIconSize(KIcon::SizeSmall);
+    KCGlobal::setIconSize(TDEIcon::SizeSmall);
   else if (size == "Large")
-    KCGlobal::setIconSize(KIcon::SizeLarge);
+    KCGlobal::setIconSize(TDEIcon::SizeLarge);
   else if (size == "Huge")
-    KCGlobal::setIconSize(KIcon::SizeHuge);
+    KCGlobal::setIconSize(TDEIcon::SizeHuge);
   else
-    KCGlobal::setIconSize(KIcon::SizeMedium);
+    KCGlobal::setIconSize(TDEIcon::SizeMedium);
 
   // initialize the entries
   _modules = new ConfigModuleList();
@@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name)
                TQT_SLOT( activateModule( ConfigModule * ) ) );
       _dock->setBaseWidget( aw );
       KWin::setIcons(  winId(),
-		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  KIcon::NoGroup,  32 ),
-		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  KIcon::NoGroup,  16 ) );
+		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  TDEIcon::NoGroup,  32 ),
+		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  TDEIcon::NoGroup,  16 ) );
   }
   else
   {
@@ -205,13 +205,13 @@ TopLevel::~TopLevel()
 
   switch (KCGlobal::iconSize())
     {
-    case KIcon::SizeSmall:
+    case TDEIcon::SizeSmall:
       config->writeEntry("IconSize", "Small");
       break;
-    case KIcon::SizeLarge:
+    case TDEIcon::SizeLarge:
       config->writeEntry("IconSize", "Large");
       break;
-    case KIcon::SizeHuge:
+    case TDEIcon::SizeHuge:
       config->writeEntry("IconSize", "Huge");
       break;
     default:
@@ -295,13 +295,13 @@ void TopLevel::activateIconView()
 
   switch(KCGlobal::iconSize())
     {
-    case KIcon::SizeSmall:
+    case TDEIcon::SizeSmall:
       icon_small->setChecked(true);
       break;
-    case KIcon::SizeLarge:
+    case TDEIcon::SizeLarge:
       icon_large->setChecked(true);
       break;
-    case KIcon::SizeHuge:
+    case TDEIcon::SizeHuge:
       icon_huge->setChecked(true);
       break;
     default:
@@ -323,25 +323,25 @@ void TopLevel::activateTreeView()
 
 void TopLevel::activateSmallIcons()
 {
-  KCGlobal::setIconSize(KIcon::SizeSmall);
+  KCGlobal::setIconSize(TDEIcon::SizeSmall);
   _index->reload();
 }
 
 void TopLevel::activateMediumIcons()
 {
-  KCGlobal::setIconSize(KIcon::SizeMedium);
+  KCGlobal::setIconSize(TDEIcon::SizeMedium);
   _index->reload();
 }
 
 void TopLevel::activateLargeIcons()
 {
-  KCGlobal::setIconSize(KIcon::SizeLarge);
+  KCGlobal::setIconSize(TDEIcon::SizeLarge);
   _index->reload();
 }
 
 void TopLevel::activateHugeIcons()
 {
-  KCGlobal::setIconSize(KIcon::SizeHuge);
+  KCGlobal::setIconSize(TDEIcon::SizeHuge);
   _index->reload();
 }