1 files changed, 15 insertions, 15 deletions

diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index e63bd2b..38a6fb7 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -580,7 +580,7 @@ void DvbPanel::catContextMenu( TQIconViewItem *it, const TQPoint &p )
 					ok = false;
 			}
 			if ( ok ) {
-				KIconViewItem* item = new DIconViewItem(this, iconView, name, KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::NoGroup, KIcon::SizeSmallMedium));
+				KIconViewItem* item = new DIconViewItem(this, iconView, name, TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::NoGroup, KIcon::SizeSmallMedium));
 				item->setDropEnabled( true );
 				dvbConfig->addCategory( name, "kaffeine" );
 			}
@@ -588,7 +588,7 @@ void DvbPanel::catContextMenu( TQIconViewItem *it, const TQPoint &p )
 		case 1 :
 			icon = KIconDialog::getIcon();
 			if ( !icon.isEmpty() ) {
-				it->setPixmap( KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeSmallMedium) );
+				it->setPixmap( TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeSmallMedium) );
 				dvbConfig->changeIconCategory( it->text(), icon );
 			}
 			break;
@@ -1027,12 +1027,12 @@ void DvbPanel::setConfig()
 
 	TQString s = locateLocal("appdata", "");
 	dvbConfig = new DVBconfig( s );
-	item = new DIconViewItem(this, iconView, i18n("All"), KGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+	item = new DIconViewItem(this, iconView, i18n("All"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
 	iconView->setFixedHeight( item->height()+iconView->horizontalScrollBar()->height() );
 	item->setDropEnabled( true );
-	item = new DIconViewItem(this, iconView, i18n("Radio"), KGlobal::iconLoader()->loadIcon(dvbConfig->radioIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+	item = new DIconViewItem(this, iconView, i18n("Radio"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->radioIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
 	item->setDropEnabled( false );
-	item = new DIconViewItem(this, iconView, i18n("TV"), KGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+	item = new DIconViewItem(this, iconView, i18n("TV"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
 	item->setDropEnabled( false );
 
 	KTrader::OfferList offers = KTrader::self()->query("KaffeineDvbPlugin");
@@ -1051,7 +1051,7 @@ void DvbPanel::setConfig()
 	}
 
 	for ( i=0; i<(int)dvbConfig->categories.count(); i++ ) {
-		item = new DIconViewItem(this, iconView, dvbConfig->categories.at(i)->name, KGlobal::iconLoader()->loadIcon(dvbConfig->categories.at(i)->icon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+		item = new DIconViewItem(this, iconView, dvbConfig->categories.at(i)->name, TDEGlobal::iconLoader()->loadIcon(dvbConfig->categories.at(i)->icon, KIcon::NoGroup, KIcon::SizeSmallMedium));
 		item->setDropEnabled( true );
 	}
 
@@ -1065,7 +1065,7 @@ void DvbPanel::setConfig()
 		connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) );
 		connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) );
 	}
-	fifoName = KGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts";
+	fifoName = TDEGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts";
 	TQFile f( fifoName );
 	if ( f.exists() )
 		f.remove();
@@ -1073,7 +1073,7 @@ void DvbPanel::setConfig()
 		perror( fifoName.latin1() );
 		fifoName = "";
 	}
-	fifoName1 = KGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts";
+	fifoName1 = TDEGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts";
 	TQFile f1( fifoName1 );
 	if ( f1.exists() )
 		f1.remove();
@@ -1349,10 +1349,10 @@ void DvbPanel::checkTimers()
 					emit dvbStop();
 				}
 				if ( d->startTimer( chan, dvbConfig->recordDir, dvbConfig->sizeFile, t, dvbConfig->filenameFormat ) ) {
-					KProcess proc;
+					TDEProcess proc;
 					proc << TQDir::homeDirPath()+"/bin/kaffeine_recording";
 					proc << "On";
-					proc.start( KProcess::DontCare );
+					proc.start( TDEProcess::DontCare );
 					t->running = 1;
 					if ( timersDialog )
 						emit timersChanged();
@@ -1423,10 +1423,10 @@ void DvbPanel::setRecord()
 	ret = d->canStartTimer( live, &curchan );
 	if ( ret==0 ) {
 		if ( d->startTimer( &curchan, dvbConfig->recordDir, dvbConfig->sizeFile, rt, dvbConfig->filenameFormat ) ) {
-			KProcess proc;
+			TDEProcess proc;
 			proc << TQDir::homeDirPath()+"/bin/kaffeine_recording";
 			proc << "On";
-			proc.start( KProcess::DontCare );
+			proc.start( TDEProcess::DontCare );
 
 			for ( i=0; i<(int)timers.count(); i++ ) {
 				t = timers.at(i);
@@ -1526,14 +1526,14 @@ void DvbPanel::killTimer( RecTimer *t )
 
 	for ( i=0; i<(int)timers.count(); i++ ) {
 		if ( timers.at(i)==t ) {
-			KProcess proc;
+			TDEProcess proc;
 			proc << TQDir::homeDirPath()+"/bin/kaffeine_recording";
 			if ( recordLed->state()==KLed::On )
 				proc << "On";
 			else
 				proc << "Off";
-			proc << KProcess::quote( t->fullPath );
-			proc.start( KProcess::DontCare );
+			proc << TDEProcess::quote( t->fullPath );
+			proc.start( TDEProcess::DontCare );
 
 			if ( t->mode )
 				updateModeTimer( t );