Rename KIcon to enhance compatibility with KDE4

33 files changed, 119 insertions, 119 deletions

diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index d2fa73c7..ec0c0155 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -61,7 +61,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent)
     l->addWidget(m_eqclear, 1, 0);
 
     m_eqclear->setIconSet( TDEGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", 
-		KIcon::NoGroup, 22 /*KIcon::SizeSmallMedium*/) );
+		TDEIcon::NoGroup, 22 /*TDEIcon::SizeSmallMedium*/) );
 
     connect(m_eqclear, TQT_SIGNAL(clicked()), m_eqedit, TQT_SLOT(clear()) );
 }
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index aaef4e7e..c7b3ff26 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -45,7 +45,7 @@ KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWid
 	resize(0,0);
 	hide(); //initailly hide it
 	m_richText = 0;
-	m_noElemIcon = TDEGlobal::iconLoader()->loadIcon( "orbits", KIcon::NoGroup, 64 );
+	m_noElemIcon = TDEGlobal::iconLoader()->loadIcon( "orbits", TDEIcon::NoGroup, 64 );
 	setMouseTracking(true); // receice mouse move events
 	
 	connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate()));
diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp
index 847d6312..b2d757d8 100644
--- a/kanagram/src/leitnersystemview.cpp
+++ b/kanagram/src/leitnersystemview.cpp
@@ -45,13 +45,13 @@ void LeitnerSystemView::drawSystem(TQPainter* p)
 	{
 		if(i == m_highlightedBox)
 		{
-			//p->drawPixmap(12 + i * 64 + i*10, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel));
+			//p->drawPixmap(12 + i * 64 + i*10, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", TDEIcon::Panel));
 			p->drawRect(12 + i * 64 + i*10, m_imageY,64,64);
 			p->fillRect(12 + i * 64 + i*10, m_imageY,64,64, TQBrush(red));
 		}
 		else
 		{	//for each box 74 = 64(pixmap) + 10(distance between two boxes)
-			//p->drawPixmap(12 + i * 74, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); 
+			//p->drawPixmap(12 + i * 74, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", TDEIcon::Panel)); 
 			p->drawRect(12 + i * 64 + i*10, m_imageY,64,64);
 		}
 	}
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 77ece602..1d2eb280 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -69,7 +69,7 @@ KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f )
     init();
     configRead();
     setIcon( TDEGlobal::iconLoader()->loadIcon("control.png",
-                                                   KIcon::Small) );
+                                                   TDEIcon::Small) );
     _isOpenFile = false;
 }
 
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 06babdfa..8b3799d0 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -77,8 +77,8 @@ ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
   TQString iconstr = exp->menuIcon();
   if ( iconstr.isEmpty() )
     return;
-  KIconLoader* l = doc->instance()->iconLoader();
-  TQPixmap icon = l->loadIcon( iconstr, KIcon::Small, 16, KIcon::DefaultState, 0L, true );
+  TDEIconLoader* l = doc->instance()->iconLoader();
+  TQPixmap icon = l->loadIcon( iconstr, TDEIcon::Small, 16, TDEIcon::DefaultState, 0L, true );
   if ( !icon.isNull() )
     setIconSet( TQIconSet( icon ) );
 }
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index b62d4685..022c50e0 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -224,7 +224,7 @@ void KigPart::setupActions()
     "edit_invert_selection" );
 
   // we need icons...
-  KIconLoader* l = instance()->iconLoader();
+  TDEIconLoader* l = instance()->iconLoader();
   TQPixmap tmp;
 
   aDeleteObjects = new TDEAction(
@@ -271,7 +271,7 @@ void KigPart::setupActions()
   a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ),
                              actionCollection() );
   // grr.. why isn't there an icon for this..
-  a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", KIcon::Toolbar ) ) );
+  a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) );
   a->setToolTip( i18n( "Recenter the screen on the document" ) );
   a->setWhatsThis( i18n( "Recenter the screen on the document" ) );
 
@@ -283,7 +283,7 @@ void KigPart::setupActions()
 #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
   a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
 #else
-  tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar );
+  tmp = l->loadIcon( "window_fullscreen", TDEIcon::Toolbar );
   a = new TDEAction(
     i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F,
     m_widget, TQT_SLOT( toggleFullScreen() ),
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index a4fdb0c9..831a4b64 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -84,7 +84,7 @@ KigGUIAction::KigGUIAction( GUIAction* act,
                             TQObject* parent )
   : TDEAction( act->descriptiveName(),
              doc.instance()->iconLoader()->loadIcon(
-               act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
+               act->iconFileName(), TDEIcon::Toolbar, 0, TDEIcon::DefaultState, 0L, true ),
              act->shortcut(),
              0, 0,              // no slot connection
              parent, act->actionName() ),
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index e0af9850..8f9365c1 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -131,7 +131,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="KIconButton">
+                        <widget class="TDEIconButton">
                             <property name="name">
                                 <cstring>typeIcon</cstring>
                             </property>
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index f8c82dfa..67509396 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -143,7 +143,7 @@ void TextLabelModeBase::leftReleased( TQMouseEvent* e, KigWidget* v )
       int t;
       if ( iconfile && *iconfile )
       {
-        TQPixmap pix = mdoc.instance()->iconLoader()->loadIcon( iconfile, KIcon::User );
+        TQPixmap pix = mdoc.instance()->iconLoader()->loadIcon( iconfile, TDEIcon::User );
         t = p->insertItem( TQIconSet( pix ), s, i + 1 );
       }
       else
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 042e379a..5c2528a6 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -306,8 +306,8 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
       insertItem( menunames[i], mmenus[i], i, index++ );
     else
     {
-      KIconLoader* l = part.instance()->iconLoader();
-      TQPixmap icon = l->loadIcon( menuicons[i], KIcon::Small, 22, KIcon::DefaultState, 0L, true );
+      TDEIconLoader* l = part.instance()->iconLoader();
+      TQPixmap icon = l->loadIcon( menuicons[i], TDEIcon::Small, 22, TDEIcon::DefaultState, 0L, true );
       insertItem( TQIconSet( icon ), menunames[i], mmenus[i], i, index++ );
     }
   };
@@ -375,7 +375,7 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in
 {
   if ( menu == NormalModePopupObjects::ToplevelMenu )
   {
-    KIconLoader* l = popup.part().instance()->iconLoader();
+    TDEIconLoader* l = popup.part().instance()->iconLoader();
     std::vector<ObjectHolder*> os = popup.objects();
 
     /*
@@ -397,9 +397,9 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in
       popup.addAction( menu, i18n( "&Show" ), nextfree+1 );
     }
     nextfree += 2;
-    TQPixmap p = l->loadIcon( "move", KIcon::Toolbar );
+    TQPixmap p = l->loadIcon( "move", TDEIcon::Toolbar );
     popup.addAction( menu, p, i18n( "&Move" ), nextfree++ );
-    p = l->loadIcon( "editdelete", KIcon::Toolbar );
+    p = l->loadIcon( "editdelete", TDEIcon::Toolbar );
     popup.addAction( menu, p, i18n( "&Delete" ), nextfree++ );
   }
   else if ( menu == NormalModePopupObjects::SetColorMenu )
@@ -756,7 +756,7 @@ void ObjectConstructorActionsProvider::fillUpMenu( NormalModePopupObjects& popup
       TQCString iconfile = (*i)->iconFileName();
       if ( !iconfile.isEmpty() && !iconfile.isNull() )
       {
-        TQPixmap icon = popup.part().instance()->iconLoader()->loadIcon( iconfile, KIcon::Toolbar, 22, KIcon::DefaultState, 0L, true );
+        TQPixmap icon = popup.part().instance()->iconLoader()->loadIcon( iconfile, TDEIcon::Toolbar, 22, TDEIcon::DefaultState, 0L, true );
         popup.addAction( menu, icon, (*i)->descriptiveName(), nextfree++ );
       }
       else
@@ -881,7 +881,7 @@ void PropertiesActionsProvider::fillUpMenu( NormalModePopupObjects& popup,
     {
       if ( iconfile && *iconfile )
       {
-        TQPixmap pix = popup.part().instance()->iconLoader()->loadIcon( iconfile, KIcon::Toolbar, 22, KIcon::DefaultState, 0L, true );
+        TQPixmap pix = popup.part().instance()->iconLoader()->loadIcon( iconfile, TDEIcon::Toolbar, 22, TDEIcon::DefaultState, 0L, true );
         popup.addAction( menu, pix, i18n( o->imp()->properties()[i] ), nextfree++ );
       }
       else
@@ -1052,8 +1052,8 @@ void ScriptActionsProvider::fillUpMenu( NormalModePopupObjects& popup, int menu,
 {
   if ( menu == NormalModePopupObjects::StartMenu )
   {
-    KIconLoader* l = popup.part().instance()->iconLoader();
-    TQPixmap p = l->loadIcon( ScriptType::icon( ScriptType::Python ), KIcon::Toolbar, 22, KIcon::DefaultState, 0L, true );
+    TDEIconLoader* l = popup.part().instance()->iconLoader();
+    TQPixmap p = l->loadIcon( ScriptType::icon( ScriptType::Python ), TDEIcon::Toolbar, 22, TDEIcon::DefaultState, 0L, true );
     popup.addAction( menu, p, i18n( "Python Script" ), nextfree++ );
     mns++;
   }
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 917a46fc..82b280fa 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -68,10 +68,10 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part )
   buttonOk->setGuiItem( KStdGuiItem::ok() );
   buttonCancel->setGuiItem( KStdGuiItem::cancel() );
   il = part.instance()->iconLoader();
-  buttonEdit->setIconSet( TQIconSet( il->loadIcon( "edit", KIcon::Small ) ) );
-  buttonRemove->setIconSet( TQIconSet( il->loadIcon( "editdelete", KIcon::Small ) ) );
-  buttonExport->setIconSet( TQIconSet( il->loadIcon( "fileexport", KIcon::Small ) ) );
-  buttonImport->setIconSet( TQIconSet( il->loadIcon( "fileimport", KIcon::Small ) ) );
+  buttonEdit->setIconSet( TQIconSet( il->loadIcon( "edit", TDEIcon::Small ) ) );
+  buttonRemove->setIconSet( TQIconSet( il->loadIcon( "editdelete", TDEIcon::Small ) ) );
+  buttonExport->setIconSet( TQIconSet( il->loadIcon( "fileexport", TDEIcon::Small ) ) );
+  buttonImport->setIconSet( TQIconSet( il->loadIcon( "fileimport", TDEIcon::Small ) ) );
 
   typeList->setColumnWidth( 0, 22 );
   typeList->setColumnWidth( 1, 140 );
@@ -96,7 +96,7 @@ TQListViewItem* TypesDialog::newListItem( Macro* m )
   TQCString ifn = m->action->iconFileName();
   if ( !ifn.isNull() )
   {
-    TQPixmap p = il->loadIcon( ifn, KIcon::Small );
+    TQPixmap p = il->loadIcon( ifn, TDEIcon::Small );
     e->setPixmap( 0, p );
   }
   return e;
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index 6e06bb79..636999c5 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -43,7 +43,7 @@ class TypesDialog : public TypesDialogBase
 
   // necessary because some MacroList functions need it..
   KigPart& mpart;
-  const KIconLoader* il;
+  const TDEIconLoader* il;
   TQPopupMenu* popup;
 public:
   TypesDialog( TQWidget* parent, KigPart& );
diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc
index d22fa40c..380189e6 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cc
@@ -239,8 +239,8 @@ void ScriptModeBase::setScriptType( ScriptType::Type type )
   mwizard->setType( mtype );
   if ( mtype != ScriptType::Unknown )
   {
-    KIconLoader* il = mpart.instance()->iconLoader();
-    mwizard->setIcon( il->loadIcon( ScriptType::icon( mtype ), KIcon::Small ) );
+    TDEIconLoader* il = mpart.instance()->iconLoader();
+    mwizard->setIcon( il->loadIcon( ScriptType::icon( mtype ), TDEIcon::Small ) );
   }
 }
 
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index 71eb82e6..b6fdaddb 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -184,7 +184,7 @@ void KLatin::resetGUI()
 	// various options that are available to choose
 	// and setCentralWidget it.
 	klatinchoose = new KLatinChoose(this);
-	klatinchoose->QuitButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("exit", KIcon::Small));
+	klatinchoose->QuitButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("exit", TDEIcon::Small));
 	klatinchoose->show();
 	setCentralWidget(klatinchoose);
 
diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp
index b8037c95..ef42f25e 100644
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@@ -38,8 +38,8 @@ KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name)
 	m_totalCorrect = 0;
 	m_numWrong = 0;
 
-	OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
-	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
+	OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", TDEIcon::Small));
+	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", TDEIcon::Small));
 
 	// Set connections
 	connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack()));
diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp
index e0ec76fa..e7d06e88 100644
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@@ -33,9 +33,9 @@
 KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name)
 	: KLatinVerbsWidget(parent, name)
 {
-	OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
-	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
-	ChangeButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("apply", KIcon::Small));
+	OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", TDEIcon::Small));
+	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", TDEIcon::Small));
+	ChangeButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("apply", TDEIcon::Small));
 
 	ChooseConjugation->insertItem(i18n("1st"));
 	ChooseConjugation->insertItem(i18n("2nd"));
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 1d577b57..d8844647 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -35,7 +35,7 @@
 KLatinVocab::KLatinVocab(TQWidget* parent, const char *name)
 	: KLatinVocabWidget(parent, name)
 {
-	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
+	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", TDEIcon::Small));
 
 	m_vocabFile = TQString();
 	
diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp
index 8e2c1ae1..d8cd5b21 100644
--- a/kpercentage/kpercentage/kpercentage.cpp
+++ b/kpercentage/kpercentage/kpercentage.cpp
@@ -49,7 +49,7 @@ KPercentage::KPercentage( const char *name ) :
     splash_screen->raise();
 
     // Icon loader for the button's icons
-    KIconLoader icon_loader;
+    TDEIconLoader icon_loader;
 
     // let's set a suitable, not too small font size
     TQFont the_font( font() );
@@ -85,11 +85,11 @@ KPercentage::KPercentage( const char *name ) :
     KPushButton *button_percentage = new KPushButton( i18n( "??% o&f x = y" ), this );
     KPushButton *button_random = new KPushButton( i18n( "??" ), this );
     KPushButton *button_help = new KPushButton( KStdGuiItem::help().text(), this );
-    button_help->setIconSet( TQIconSet( icon_loader.loadIcon( "help", KIcon::NoGroup, 32 ) ) );
+    button_help->setIconSet( TQIconSet( icon_loader.loadIcon( "help", TDEIcon::NoGroup, 32 ) ) );
 	KHelpMenu *help_menu = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), true );
 	button_help->setPopup( ( TQPopupMenu* ) ( help_menu->menu() ) );
     KPushButton *button_close = new KPushButton( i18n( "E&xit" ), this );
-    button_close->setIconSet( TQIconSet( icon_loader.loadIcon( "exit", KIcon::NoGroup, 32 ) ) );
+    button_close->setIconSet( TQIconSet( icon_loader.loadIcon( "exit", TDEIcon::NoGroup, 32 ) ) );
 
     combo_box_level = new KComboBox( this );
     combo_box_level->insertItem( i18n( "Easy" ) );
diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp
index 6198180c..11018c3e 100644
--- a/kpercentage/kpercentage/kpercentmain.cpp
+++ b/kpercentage/kpercentage/kpercentmain.cpp
@@ -94,9 +94,9 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) :
     push_button_cancel = new TQPushButton( this, "push_button_cancel" );
     push_button_cancel->setText( KStdGuiItem::cancel().text() );
 
-    KIconLoader icon_loader;
-    push_button_apply->setIconSet( TQIconSet( icon_loader.loadIcon( "button_ok", KIcon::NoGroup, 32 ) ) );
-    push_button_cancel->setIconSet( TQIconSet( icon_loader.loadIcon( "button_cancel", KIcon::NoGroup, 32 ) ) );
+    TDEIconLoader icon_loader;
+    push_button_apply->setIconSet( TQIconSet( icon_loader.loadIcon( "button_ok", TDEIcon::NoGroup, 32 ) ) );
+    push_button_cancel->setIconSet( TQIconSet( icon_loader.loadIcon( "button_cancel", TDEIcon::NoGroup, 32 ) ) );
 
     label_1 = new TQLabel( this, "label_1" );
     label_1->setText( i18n( " % of " ) );
diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp
index b82a0f6f..77593304 100644
--- a/kstars/kstars/ccdpreviewwg.cpp
+++ b/kstars/kstars/ccdpreviewwg.cpp
@@ -65,11 +65,11 @@ FILE *CCDwfp;
    brightnessChanged(brightnessBar->value());
    contrastChanged(contrastBar->value());    
 	 
-  KIconLoader *icons = TDEGlobal::iconLoader();
+  TDEIconLoader *icons = TDEGlobal::iconLoader();
   
-  playPix    = icons->loadIcon( "player_play", KIcon::Toolbar );
-  pausePix   = icons->loadIcon( "player_pause", KIcon::Toolbar );
-  capturePix = icons->loadIcon( "frame_image", KIcon::Toolbar );
+  playPix    = icons->loadIcon( "player_play", TDEIcon::Toolbar );
+  pausePix   = icons->loadIcon( "player_pause", TDEIcon::Toolbar );
+  capturePix = icons->loadIcon( "frame_image", TDEIcon::Toolbar );
   
   playB->setPixmap(pausePix);	
   captureB->setPixmap(capturePix);
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index 6210db85..0baba4e2 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -63,11 +63,11 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
     localListView->setSorting(-1);
     clientListView->setSorting(-1);
 
-    KIconLoader *icons = TDEGlobal::iconLoader();
-    runningPix = icons->loadIcon( "exec", KIcon::Small);
-    stopPix    = icons->loadIcon( "button_cancel", KIcon::Small);
-    localMode  = icons->loadIcon( "network_local", KIcon::Small);
-    serverMode = icons->loadIcon( "network", KIcon::Small);
+    TDEIconLoader *icons = TDEGlobal::iconLoader();
+    runningPix = icons->loadIcon( "exec", TDEIcon::Small);
+    stopPix    = icons->loadIcon( "button_cancel", TDEIcon::Small);
+    localMode  = icons->loadIcon( "network_local", TDEIcon::Small);
+    serverMode = icons->loadIcon( "network", TDEIcon::Small);
 
     LocalpopMenu = new TDEPopupMenu(localListView);
     LocalpopMenu->insertItem( runningPix, i18n("Run Service") , 0);
@@ -75,9 +75,9 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
 
     localListView->setRootIsDecorated(true);
 
-  connected           = icons->loadIcon( "connect_established", KIcon::Small);
-  disconnected        = icons->loadIcon( "connect_no", KIcon::Small);
-  establishConnection = icons->loadIcon( "connect_creating", KIcon::Small);
+  connected           = icons->loadIcon( "connect_established", TDEIcon::Small);
+  disconnected        = icons->loadIcon( "connect_no", TDEIcon::Small);
+  establishConnection = icons->loadIcon( "connect_creating", TDEIcon::Small);
 
   ClientpopMenu = new TDEPopupMenu(clientListView);
   ClientpopMenu->insertItem( establishConnection, i18n("Connect") , 0);
diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp
index 5d109048..083dca84 100644
--- a/kstars/kstars/indifitsconf.cpp
+++ b/kstars/kstars/indifitsconf.cpp
@@ -27,8 +27,8 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag
 : INDIConf(parent,name, modal,fl)
 {
 
-  KIconLoader *icons = TDEGlobal::iconLoader();
-  selectDirB->setPixmap( icons->loadIcon( "fileopen", KIcon::Toolbar ) );
+  TDEIconLoader *icons = TDEGlobal::iconLoader();
+  selectDirB->setPixmap( icons->loadIcon( "fileopen", TDEIcon::Toolbar ) );
   connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory()));
   connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int)));
 }
diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp
index eb880d3e..28e1a85f 100644
--- a/kstars/kstars/streamwg.cpp
+++ b/kstars/kstars/streamwg.cpp
@@ -52,11 +52,11 @@ FILE *wfp;
    //videoFrameLayout = new TQVBoxLayout(videoFrame, 0, 0); 
    streamFrame      = new VideoWG(videoFrame);
       
-  KIconLoader *icons = TDEGlobal::iconLoader();
+  TDEIconLoader *icons = TDEGlobal::iconLoader();
   
-  playPix    = icons->loadIcon( "player_play", KIcon::Toolbar );
-  pausePix   = icons->loadIcon( "player_pause", KIcon::Toolbar );
-  capturePix = icons->loadIcon( "frame_image", KIcon::Toolbar );
+  playPix    = icons->loadIcon( "player_play", TDEIcon::Toolbar );
+  pausePix   = icons->loadIcon( "player_pause", TDEIcon::Toolbar );
+  capturePix = icons->loadIcon( "frame_image", TDEIcon::Toolbar );
   
   playB->setPixmap(pausePix);	
   captureB->setPixmap(capturePix);
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index d3184aea..e40ccaa0 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -105,12 +105,12 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent )
 	obsList.setAutoDelete( false ); //do NOT delete removed pointers!
 	
 	//Add icons to Push Buttons
-	KIconLoader *icons = TDEGlobal::iconLoader();
-	ui->OpenButton->setPixmap( icons->loadIcon( "fileopen", KIcon::Toolbar ) );
-	ui->SaveButton->setPixmap( icons->loadIcon( "filesave", KIcon::Toolbar ) );
-	ui->SaveAsButton->setPixmap( icons->loadIcon( "filesaveas", KIcon::Toolbar ) );
-	ui->WizardButton->setPixmap( icons->loadIcon( "wizard", KIcon::Toolbar ) );
-	ui->MiniButton->setPixmap( icons->loadIcon( "window_nofullscreen", KIcon::Toolbar ) );
+	TDEIconLoader *icons = TDEGlobal::iconLoader();
+	ui->OpenButton->setPixmap( icons->loadIcon( "fileopen", TDEIcon::Toolbar ) );
+	ui->SaveButton->setPixmap( icons->loadIcon( "filesave", TDEIcon::Toolbar ) );
+	ui->SaveAsButton->setPixmap( icons->loadIcon( "filesaveas", TDEIcon::Toolbar ) );
+	ui->WizardButton->setPixmap( icons->loadIcon( "wizard", TDEIcon::Toolbar ) );
+	ui->MiniButton->setPixmap( icons->loadIcon( "window_nofullscreen", TDEIcon::Toolbar ) );
 
 	ui->CenterButton->setEnabled( false );
 	ui->ScopeButton->setEnabled( false );
@@ -676,7 +676,7 @@ void ObservingList::slotWizard() {
 
 void ObservingList::slotToggleSize() {
 	if ( isLarge() ) {
-		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_fullscreen", KIcon::Toolbar ) );
+		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_fullscreen", TDEIcon::Toolbar ) );
 
 		//switch widget stack to show TinyTable
 		ui->TableStack->raiseWidget( ui->TinyTable );
@@ -697,7 +697,7 @@ void ObservingList::slotToggleSize() {
 		bIsLarge = false;
 
 	} else {
-		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_nofullscreen", KIcon::Toolbar ) );
+		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_nofullscreen", TDEIcon::Toolbar ) );
 
 		//switch widget stack to show FullTable
 		ui->TableStack->raiseWidget( ui->FullTable );
diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp
index 49cc6d28..b43c0adc 100644
--- a/kstars/kstars/tools/planetviewer.cpp
+++ b/kstars/kstars/tools/planetviewer.cpp
@@ -48,7 +48,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name)
 	pw->timeStep->setDaysOnly( true );
 	pw->timeStep->tsbox()->setValue( 1 ); //start with 1-day timestep
 
-	pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) );
+	pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", TDEIcon::Toolbar ) );
 	pw->dateBox->setDate( ((KStars*)parent)->data()->lt().date() );
 	
 	vlay->addWidget( pw );
@@ -115,11 +115,11 @@ void PlanetViewer::slotRunClock() {
 	isClockRunning = !isClockRunning;
 	
 	if ( isClockRunning ) {
-		pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Toolbar ) );
+		pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "player_pause", TDEIcon::Toolbar ) );
 		tmr.start( 100 );
 //		pw->dateBox->setEnabled( false );
 	} else {
-		pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) );
+		pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", TDEIcon::Toolbar ) );
 		tmr.stop();
 //		pw->dateBox->setEnabled( true );
 	}
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 93d95955..088babd2 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -265,17 +265,17 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name )
           new TQListViewItem(INDI_filter, setINDIFilterNumFunc->prototype());
 
 	//Add icons to Push Buttons
-	KIconLoader *icons = TDEGlobal::iconLoader();
-	sb->NewButton->setIconSet( icons->loadIcon( "filenew", KIcon::Toolbar ) );
-	sb->OpenButton->setIconSet( icons->loadIcon( "fileopen", KIcon::Toolbar ) );
-	sb->SaveButton->setIconSet( icons->loadIconSet( "filesave", KIcon::Toolbar ) );
-	sb->SaveAsButton->setIconSet( icons->loadIconSet( "filesaveas", KIcon::Toolbar ) );
-	sb->RunButton->setIconSet( icons->loadIconSet( "launch", KIcon::Toolbar ) );
-	sb->CopyButton->setIconSet( icons->loadIconSet( "reload", KIcon::Toolbar ) );
-	sb->AddButton->setIconSet( icons->loadIconSet( "back", KIcon::Toolbar ) );
-	sb->RemoveButton->setIconSet( icons->loadIconSet( "forward", KIcon::Toolbar ) );
-	sb->UpButton->setIconSet( icons->loadIconSet( "up", KIcon::Toolbar ) );
-	sb->DownButton->setIconSet( icons->loadIconSet( "down", KIcon::Toolbar ) );
+	TDEIconLoader *icons = TDEGlobal::iconLoader();
+	sb->NewButton->setIconSet( icons->loadIcon( "filenew", TDEIcon::Toolbar ) );
+	sb->OpenButton->setIconSet( icons->loadIcon( "fileopen", TDEIcon::Toolbar ) );
+	sb->SaveButton->setIconSet( icons->loadIconSet( "filesave", TDEIcon::Toolbar ) );
+	sb->SaveAsButton->setIconSet( icons->loadIconSet( "filesaveas", TDEIcon::Toolbar ) );
+	sb->RunButton->setIconSet( icons->loadIconSet( "launch", TDEIcon::Toolbar ) );
+	sb->CopyButton->setIconSet( icons->loadIconSet( "reload", TDEIcon::Toolbar ) );
+	sb->AddButton->setIconSet( icons->loadIconSet( "back", TDEIcon::Toolbar ) );
+	sb->RemoveButton->setIconSet( icons->loadIconSet( "forward", TDEIcon::Toolbar ) );
+	sb->UpButton->setIconSet( icons->loadIconSet( "up", TDEIcon::Toolbar ) );
+	sb->DownButton->setIconSet( icons->loadIconSet( "down", TDEIcon::Toolbar ) );
 
 	//Prepare the widget stack
 	argBlank = new TQWidget( sb->ArgStack );
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index 389ced39..f016aa73 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -168,7 +168,7 @@ void kvoctrainApp::initActions()
   editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows"));
   editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis());
 
-  editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
+  editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", TDEIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
   editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary"));
   editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());
 
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index 10adff15..bca7dcd9 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -57,8 +57,8 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p
 
   triggerSect = -1;
 
-  m_pixInQuery = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small));
-  m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small));
+  m_pixInQuery = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small));
+  m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small));
 
   delayTimer = new TQTimer(this);
   connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout()));
diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp
index 2b32ab6c..3433c6f1 100644
--- a/kwordquiz/src/dlglanguage.cpp
+++ b/kwordquiz/src/dlglanguage.cpp
@@ -27,8 +27,8 @@ DlgLanguage::DlgLanguage(TQWidget *parent, const char *name, bool modal): KDialo
 {
   dlgBase = new DlgLanguageBase( this, "Dlg" );
   setMainWidget(dlgBase);
-  dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
-  dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", KIcon::Panel));
+  dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
+  dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", TDEIcon::Panel));
   
   completion1 = new KCompletion();
   completion1->setItems(Prefs::columnTitles1());
diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp
index 1daea15e..36640b89 100644
--- a/kwordquiz/src/flashview.cpp
+++ b/kwordquiz/src/flashview.cpp
@@ -181,22 +181,22 @@ void FlashView::updateScore()
   TQString s;
   s = s.setNum(m_quiz->questionCount(), 10);
   lblScoreCount->setText(s);
-  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
 
   s = m_score->answerText();
   lblScoreAnswered->setText(s);
   if (!s.isEmpty())
-    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
   s = m_score->correctText();
   lblScoreCorrect->setText(s);
   if (!s.isEmpty())
-    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
 
   s = m_score->errorText();
   lblScoreError->setText(s);
   if (!s.isEmpty())
-    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 }
 
 void FlashView::slotTimer( )
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 4206a476..6abf0e02 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -205,11 +205,11 @@ void KWordQuizApp::initActions()
 
   TDEPopupMenu *popup = mode->popupMenu();
   popup->clear();
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3);
-  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4);
 
   mode1 = new TDEToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1");
   mode2 = new TDEToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2");
diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp
index 879bc450..4a8e11b8 100644
--- a/kwordquiz/src/multipleview.cpp
+++ b/kwordquiz/src/multipleview.cpp
@@ -120,7 +120,7 @@ void MultipleView::slotCheck()
     if (fIsCorrect)
     {
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
       lblCorrectHeader->clear();
       picCorrectAnswer->clear();
       lblCorrect->clear();
@@ -132,11 +132,11 @@ void MultipleView::slotCheck()
     {
       m_error++;
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 
       lblCorrect->setText(m_quiz->answer(m_question));
       //lblCorrect->setFont(m_quiz->fontAnswer(m_question));
-      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
       lblCorrectHeader->setText(i18n("Correct Answer"));
       m_score->countIncrement(WTQScore::cdError);
       updateScore();
@@ -146,7 +146,7 @@ void MultipleView::slotCheck()
     lblPreviousQuestionHeader->setText(i18n("Previous Question"));
     lblPreviousQuestion->setText(m_quiz->question(m_question));
     //lblPreviousQuestion->setFont(m_quiz->fontQuestion(m_question));
-    picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
     lblYourAnswerHeader->setText(i18n("Your Answer"));
     lblYourAnswer->setText(m_quiz->yourAnswer(m_question, ans));
@@ -168,7 +168,7 @@ void MultipleView::slotCheck()
       opt1->hide();
       opt2->hide();
       opt3->hide();
-      picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+      picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
       picAnswer->clear();
     }
   }
@@ -224,22 +224,22 @@ void MultipleView::updateScore()
   TQString s;
   s = s.setNum(m_quiz->questionCount(), 10);
   lblScoreCount->setText(s);
-  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
 
   s = m_score->answerText();
   lblScoreAnswered->setText(s);
   if (!s.isEmpty())
-    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
   s = m_score->correctText();
   lblScoreCorrect->setText(s);
   if (!s.isEmpty())
-    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
 
   s = m_score->errorText();
   lblScoreError->setText(s);
   if (!s.isEmpty())
-    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 }
 
 
@@ -253,7 +253,7 @@ void MultipleView::showQuestion(int i)
   lblQuestion -> setText(m_quiz ->question(i));
   //lblQuestion -> setFont(m_quiz->fontQuestion(i));
 
-  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel));
+  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), TDEIcon::Panel));
 
   lblAnswerLanguage -> setText(m_quiz ->langAnswer(i));
 
@@ -278,7 +278,7 @@ void MultipleView::showQuestion(int i)
   opt2->setChecked(false);
   opt3->setChecked(false);
 
-  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel));
+  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), TDEIcon::Panel));
 }
 
 void MultipleView::slotApplySettings( )
diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp
index 049b4e19..6a5af0aa 100644
--- a/kwordquiz/src/qaview.cpp
+++ b/kwordquiz/src/qaview.cpp
@@ -150,7 +150,7 @@ void QAView::slotCheck()
     if (fIsCorrect)
     {
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
       lblYourAnswer->setText(m_quiz->yourAnswer(m_question, txtAnswer->text()));
       lblCorrectHeader->clear();
       picCorrectAnswer->clear();
@@ -163,10 +163,10 @@ void QAView::slotCheck()
     {
       m_error++;
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
       lblYourAnswer->setText(highlightError(m_quiz->answer(m_question), m_quiz->yourAnswer(m_question, txtAnswer->text())));
       lblCorrect->setText(m_quiz->answer(m_question));
-      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
       lblCorrectHeader->setText(i18n("Correct Answer"));
       m_score->countIncrement(WTQScore::cdError);
       updateScore();
@@ -175,7 +175,7 @@ void QAView::slotCheck()
 
     lblPreviousQuestionHeader->setText(i18n("Previous Question"));
     lblPreviousQuestion->setText(m_quiz->question(m_question));
-    picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
     lblYourAnswerHeader->setText(i18n("Your Answer"));
 
     if (++m_question < m_quiz->questionCount())
@@ -194,7 +194,7 @@ void QAView::slotCheck()
       lblAnswerLanguage->clear();
       lblAnswerBlank->hide();
       txtAnswer->hide();
-      picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+      picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
       picAnswer->clear();
     }
   }
@@ -245,22 +245,22 @@ void QAView::updateScore()
   TQString s;
   s = s.setNum(m_quiz->questionCount(), 10);
   lblScoreCount->setText(s);
-  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
 
   s = m_score->answerText();
   lblScoreAnswered->setText(s);
   if (!s.isEmpty())
-    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
   s = m_score->correctText();
   lblScoreCorrect->setText(s);
   if (!s.isEmpty())
-    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
 
   s = m_score->errorText();
   lblScoreError->setText(s);
   if (!s.isEmpty())
-    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 }
 
 
@@ -274,7 +274,7 @@ void QAView::showQuestion(int i)
   lblQuestion -> setText(m_quiz ->question(i));
   //lblQuestion -> setFont(m_quiz->fontQuestion(i));
   
-  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel));
+  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), TDEIcon::Panel));
 
   lblAnswerLanguage -> setText(m_quiz ->langAnswer(i));
 
@@ -290,7 +290,7 @@ void QAView::showQuestion(int i)
   //txtAnswer->setFont(m_quiz->fontAnswer(i));
   txtAnswer -> setText("");
 
-  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel));  
+  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), TDEIcon::Panel));  
 
   //@todo handle keyboard layouts
 }