Rename KIcon to enhance compatibility with KDE4

14 files changed, 22 insertions, 22 deletions

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 4ee27476..f034f4a7 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -73,7 +73,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   associatedTextEdit->setTextFormat(TQt::PlainText);*/
 
   // icon for non-empty scripts
-  scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", KIcon::Small);
+  scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", TDEIcon::Small);
 
   // signals and slots connections
   m_formWindow = a_form;
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index c37116c5..ab56089a 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -45,8 +45,8 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict<TQWidget>& a_w
   bool a_modal)
   : FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList), m_useInternalParser(useInternalParser)
 {
-  clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", KIcon::Toolbar));
-  copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", KIcon::Toolbar));
+  clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", TDEIcon::Toolbar));
+  copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar));
 
   groupComboBox->insertStringList(SpecialInformation::groups());
   connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int)));
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 1180f652..66056c90 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -45,7 +45,7 @@ AboutDialog::AboutDialog(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
@@ -122,7 +122,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
   m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
   m_aboutData->setCopyrightStatement(m_copyright);
   if (!m_icon.isEmpty())
-    m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());  
+    m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage());  
 }
 
 void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress)
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index ba5b23ac..d03f87d8 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 9a84bd4b..618e054d 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -177,7 +177,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::setPixmap:
     {
-      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
+      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], TDEIcon::Small);
       if (pixmap.isNull())
         pixmap.load(args[0]);
       int index = args[1].toInt();
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index f49a35ae..7eab9e0d 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -38,7 +38,7 @@ PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name)
   setStates(states);
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", TDEIcon::NoGroup, 128));
   setAutoResize(false);
 }
 
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index 721ad120..af07eef2 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -80,7 +80,7 @@ KomStdPlugin::KomStdPlugin()
   addWidget("SpinBoxInt", group, "", 0);
   // addWidget("Wizard", group, "");
   addWidget("TabWidget", group, "", 0);
-  addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true);
+  addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", TDEIcon::NoGroup, TDEIcon::SizeMedium)), "", true);
   // addWidget("SubDialog", group, "");
   addWidget("ListBox", group, "", 0);
   addWidget("Timer", group, "", 0);
@@ -92,9 +92,9 @@ KomStdPlugin::KomStdPlugin()
   addWidget("Slider", group, "", 0);
   addWidget("Table", group, "", 0);
   addWidget("DatePicker", group, "", 0);
-  addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
-  addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
-  addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
+  addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
+  addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
+  addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", TDEIcon::NoGroup, TDEIcon::SizeMedium)));
 }
 
 TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name )
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 1320ce8b..cfeb1e7d 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -41,7 +41,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
@@ -130,7 +130,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid
     if (icon.isEmpty())
      return TQString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index));
     else
-     return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
+     return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::NoGroup, TDEIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index));
   }
   return TQString();
 }
@@ -159,7 +159,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
       if (args[3].isEmpty())
         id = m_menu->insertItem(args[0], index);
       else
-        id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index);
+        id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], TDEIcon::NoGroup, TDEIcon::SizeMedium), args[0], index);
       m_associations[id] = args[1];
       return TQString::number(id);
       break;
@@ -175,7 +175,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
       if (args[3].isEmpty())
         m_menu->changeItem(id, args[1]);
       else
-        m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]);
+        m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], TDEIcon::NoGroup, TDEIcon::SizeMedium), args[1]);
       m_associations[id] = args[2];
       break;
     }
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index 28f7ad5c..d1cc6951 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -38,7 +38,7 @@ ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index 04f3cb41..a56c9118 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -137,7 +137,7 @@ TQString TabWidget::handleDCOP(int function, const TQStringList& args)
     case TAB_setTabIcon:
     {
       TQWidget *w = page(args[0].toInt());
-      setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium));
+      setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], TDEIcon::NoGroup, TDEIcon::SizeMedium));
       break;
     }
     case TAB_isTabEnabled:
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index c11e6c4a..44de93a5 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -46,7 +46,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index e54077dd..3e62a26d 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -431,7 +431,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::setPixmap:
     {
-      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small);
+      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], TDEIcon::Small);
       if (args[1].toInt() == -1)
         for (TQListViewItemIterator it(this); it.current(); ++it)
           it.current()->setPixmap(0, pixmap);
diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp
index ffaa8080..d8b91da0 100644
--- a/kommander/working/plugintemplate/plugin.cpp
+++ b/kommander/working/plugintemplate/plugin.cpp
@@ -16,7 +16,7 @@ public:
 
 %{APPNAME}Plugin::%{APPNAME}Plugin()
 {
-    addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) );
+    addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", TDEIcon::NoGroup, TDEIcon::SizeMedium)) );
 }
 
 TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name)
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index e950205e..d6ad8a0b 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -28,7 +28,7 @@ enum Functions {
 /*
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setAlignment(TQt::AlignCenter);