Rename KIcon to enhance compatibility with KDE4

8 files changed, 27 insertions, 27 deletions

diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 1f1d2f4c..1329f8a9 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -42,21 +42,21 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ
 		   KDialogBase::Ok, parent, name )
 {
   bookmarkLink = 0L;
-  TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",KIcon::SizeMedium));
+  TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",TDEIcon::SizeMedium));
   internetLink = new  internetLinkPage(page );
   connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged (  )));
 
-  page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",KIcon::SizeMedium));
+  page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",TDEIcon::SizeMedium));
   mailLink = new  mailLinkPage(page );
   connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
 
-  page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",KIcon::SizeMedium));
+  page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",TDEIcon::SizeMedium));
   fileLink = new  fileLinkPage(page );
   connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
 
   if ( displayBookmarkLink)
   {
-      page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",KIcon::SizeMedium));
+      page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",TDEIcon::SizeMedium));
       bookmarkLink = new  bookmarkLinkPage(page );
       connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
   }
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index a5b057bc..0c6abfaa 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -98,7 +98,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
     else
-      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small),
+      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
         text(), popupMenu(), -1, index );
 
     if ( !isEnabled() )
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index ba6f17e1..6797a69c 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -37,16 +37,16 @@ class KoTemplateGroup;
 class TQGridLayout;
 
 /**
- * Our reimplementation of KIconCanvas used within the template-chooser dialog.
+ * Our reimplementation of TDEIconCanvas used within the template-chooser dialog.
  * @internal
  */
-class KoTCDIconCanvas : public KIconCanvas
+class KoTCDIconCanvas : public TDEIconCanvas
 {
     Q_OBJECT
   
     public:
 	KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L )
-	    : KIconCanvas( parent, name ) {}
+	    : TDEIconCanvas( parent, name ) {}
 
 	bool isCurrentValid() { return currentItem(); }
 	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance);
@@ -56,21 +56,21 @@ class KoTCDIconCanvas : public KIconCanvas
 	    if ( e->key() == Key_Return || e->key() == Key_Enter )
 		e->ignore();
 	    else
-		KIconCanvas::keyPressEvent( e );
+		TDEIconCanvas::keyPressEvent( e );
 	}
 };
 
 /// @internal
-class KoTCDIconViewItem : public KIconViewItem
+class KoTCDIconViewItem : public TDEIconViewItem
 {
     public:
 	KoTCDIconViewItem(TQIconView *parent=0)
-	    : KIconViewItem ( parent )
+	    : TDEIconViewItem ( parent )
 	    {}
 
 	KoTCDIconViewItem(TQIconView *parent=0, const TQString &text=0, const TQPixmap &icon=0,
                       const TQString &descr=0, const TQString &fullname=0)
-	    : KIconViewItem(parent, text, icon)
+	    : TDEIconViewItem(parent, text, icon)
 	    {
             m_descr = descr;
             m_full = fullname;
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 9b1f213c..09e7833e 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -367,7 +367,7 @@ void KoTemplateCreateDia::slotSelect() {
     d->m_default->setChecked(false);
     d->m_custom->setChecked(true);
 
-    TQString name = KIconDialog::getIcon();
+    TQString name = TDEIconDialog::getIcon();
     if( name.isEmpty() ) {
         if(d->m_customFile.isEmpty()) {
             d->m_default->setChecked(true);
@@ -376,7 +376,7 @@ void KoTemplateCreateDia::slotSelect() {
         return;
     }
     // ### TODO: do a better remote loading without having to have d->m_tempFile
-    TQString path = TDEGlobal::iconLoader()->iconPath(name, KIcon::Desktop);
+    TQString path = TDEGlobal::iconLoader()->iconPath(name, TDEIcon::Desktop);
     d->m_customFile = path;
     d->m_customPixmap=TQPixmap();
     updatePixmap();
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 2f9a41e2..0bbf4ff8 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -251,7 +251,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
             else
                 instance = TDEGlobal::instance();
             */
-            id = menu->insertItem( iconSet( KIcon::Small, 0 ), text(), this,//dsweet
+            id = menu->insertItem( iconSet( TDEIcon::Small, 0 ), text(), this,//dsweet
                                    TQT_SLOT( slotActivated() ), 0, -1, index );
         }
         else
@@ -289,7 +289,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
 
         if ( icon().isEmpty() ) // old code using TQIconSet directly
         {
-            bar->insertButton( iconSet( KIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this,
+            bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this,
                                TQT_SLOT( slotActivated() ),
                                isEnabled(), plainText(), index );
         }
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index eb190613..89574bcf 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -166,7 +166,7 @@ void TTDESelectColorAction::updatePixmap()
       }
     }
     else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) {
-        TQPixmap pix =iconSet(KIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
+        TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
   if ( pix.isNull() )
       return;
         TQPainter p(&pix);
diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp
index bfdc6c11..6725812a 100644
--- a/lib/kofficeui/ttdeaction.cpp
+++ b/lib/kofficeui/ttdeaction.cpp
@@ -155,7 +155,7 @@ void TTDEAction::updateLayout(TQWidget* base)
 
   TQPixmap pix;
   if (hasIcon())
-    pix = iconSet(KIcon::Small).pixmap();
+    pix = iconSet(TDEIcon::Small).pixmap();
 
   if (!icon().isEmpty())
     pix = BarIcon(icon());
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 51d82500..72956275 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -190,23 +190,23 @@ void TTDEToolBarButton::setIcon( const TQString& icon )
   d->m_iconName = icon;
   int iconSize = 16;
 
-  setPixmap( BarIcon(icon, iconSize, KIcon::ActiveState, d->m_instance), false );
-  setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) );
-  setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) );
+  setPixmap( BarIcon(icon, iconSize, TDEIcon::ActiveState, d->m_instance), false );
+  setDisabledPixmap( BarIcon(icon, iconSize, TDEIcon::DisabledState, d->m_instance) );
+  setDefaultPixmap( BarIcon(icon, iconSize, TDEIcon::DefaultState, d->m_instance) );
 }
 
 void TTDEToolBarButton::setDisabledIcon( const TQString &icon )
 {
   d->m_disabledIconName = icon;
   int iconSize = 16;
-  setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) );
+  setDisabledPixmap( BarIcon(icon, iconSize, TDEIcon::DisabledState, d->m_instance) );
 }
 
 void TTDEToolBarButton::setDefaultIcon( const TQString &icon )
 {
   d->m_defaultIconName = icon;
   int iconSize = 16;
-  setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) );
+  setDefaultPixmap( BarIcon(icon, iconSize, TDEIcon::DefaultState, d->m_instance) );
 }
 
 TQPixmap TTDEToolBarButton::getActivePixmap() const
@@ -417,8 +417,8 @@ void TTDEToolBarButton::makeDefaultPixmap()
   if (activePixmap.isNull())
     return;
 
-  KIconEffect effect;
-  defaultPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DefaultState);
+  TDEIconEffect effect;
+  defaultPixmap = effect.apply(activePixmap, TDEIcon::Toolbar, TDEIcon::DefaultState);
 }
 
 void TTDEToolBarButton::makeDisabledPixmap()
@@ -426,8 +426,8 @@ void TTDEToolBarButton::makeDisabledPixmap()
   if (activePixmap.isNull())
     return;
 
-  KIconEffect effect;
-  disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState);
+  TDEIconEffect effect;
+  disabledPixmap = effect.apply(activePixmap, TDEIcon::Toolbar, TDEIcon::DisabledState);
 }
 
 TQSize TTDEToolBarButton::sizeHint() const