Rename KIcon to enhance compatibility with KDE4

7 files changed, 40 insertions, 40 deletions

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 );