Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

9 files changed, 48 insertions, 48 deletions

diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 0a3b103..2d3ad9a 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -319,7 +319,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	view->setSelectionMode( KFile::Multi );
 	fileBrowser->setMode( KFile::Files );
 	fileBrowser->setView( view );
-	fileBrowser->setViewConfig( KGlobal::config(), "PlaylistFileBrowser" );
+	fileBrowser->setViewConfig( TDEGlobal::config(), "PlaylistFileBrowser" );
 	fileBrowser->setOnlyDoubleClickSelectsFiles( true );
 	v1->addWidget( fileBrowser );
 	v->addLayout( v1 );
@@ -390,7 +390,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	searchBtn = new TQToolButton( playlist );
 	searchBtn->setAutoRaise( true );
 	TQToolTip::add( searchBtn, i18n("Search"));
-	searchBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("locationbar_erase", KIcon::Small) );
+	searchBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("locationbar_erase", KIcon::Small) );
 	h1->addWidget( searchBtn );
 	TQLabel* filterLabel = new TQLabel(i18n("Filter") + ":", playlist);
 	h1->addWidget(filterLabel);
@@ -419,7 +419,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
 
 	m_isCurrentEntry = UserIcon("playing");
-	m_cdPixmap = KGlobal::iconLoader()->loadIcon("cdtrack", KIcon::Small);
+	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("cdtrack", KIcon::Small);
 
 	setXMLFile("kaffeineplaylist.rc");
 	setupActions();
@@ -433,7 +433,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 		}
 	}
 
-	loadConfig( KGlobal::config() );
+	loadConfig( TDEGlobal::config() );
 
 	connect(coverFrame, TQT_SIGNAL(changeCurrentCover()), this, TQT_SLOT(chooseCurrentCover()));
 	connect(coverFrame, TQT_SIGNAL(gallery()), this, TQT_SLOT(showGallery()));
@@ -646,7 +646,7 @@ void PlayList::loadConfig(KConfig* config)
 
 void PlayList::saveConfig()
 {
-	saveConfig( KGlobal::config() );
+	saveConfig( TDEGlobal::config() );
 }
 
 void PlayList::saveConfig(KConfig* config)
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index dd4ad2d..a58fad5 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/kaffeine/src/input/audiobrowser/urllistview.cpp
@@ -41,23 +41,23 @@ UrlListView::UrlListView(TQWidget *parent, const char *name ) : KListView(parent
  m_listCleared(true), m_itemOfContextMenu(NULL)
 {
   m_contextMenu = new KPopupMenu(this);
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem()));
   m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext()));
   m_contextMenu->insertSeparator();
 
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X);
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C);
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V);
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X);
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C);
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V);
   m_contextMenu->insertItem(i18n("Select &All"), this, TQT_SIGNAL(signalSelectAll()), CTRL+Key_A);
   m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQT_SIGNAL(signalPlaylistFromSelected()));
   m_contextMenu->insertSeparator();
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 );
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 );
   m_contextMenu->insertSeparator();
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle()));
-  m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo()));
 
 /* width of the "length"-column */
-  TQFontMetrics met(KGlobalSettings::generalFont());
+  TQFontMetrics met(TDEGlobalSettings::generalFont());
   int w1 = met.width(i18n("Length"));
   int w2 =  met.width("5:55:55") + 2;
 
diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index 31bba0c..dc66a77 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -113,8 +113,8 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	h1->addWidget( ripBtn );
 	vb->addLayout( h1 );
 
-	cdBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) );
-	ripBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) );
+	cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) );
+	ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) );
 
 	connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) );
 	connect( ripBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startRIP()) );
@@ -160,7 +160,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	enc->setTextLabel( i18n("Encode...") );
 	enc->setTextPosition( TQToolButton::Under );
 	enc->setUsesTextLabel( true );
-	enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
+	enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
 	enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
 	vb->addWidget( encodeWidget );
@@ -180,7 +180,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	setXMLFile("kaffeinedisc.rc");
 	setupActions();
 
-	loadConfig( KGlobal::config() );
+	loadConfig( TDEGlobal::config() );
 
 	para = NULL;
 	trackCurrent = 0;
@@ -248,7 +248,7 @@ void Disc::loadConfig( KConfig* config )
 
 void Disc::saveConfig()
 {
-	KConfig* config = KGlobal::config();
+	KConfig* config = TDEGlobal::config();
 
 	config->setGroup("Disc");
 	config->writeEntry( "SplitSizes", split->sizes() );
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index 36b052a..ee86993 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -250,7 +250,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent )
 		return false;
 	}
 
-	KiloConfig dlg( myParent, KGlobal::config(), encoderName );
+	KiloConfig dlg( myParent, TDEGlobal::config(), encoderName );
 	int ret = dlg.exec();
 	if ( ret!=TQDialog::Accepted )
 		return false;
@@ -269,7 +269,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent )
 	if  ( !loadEncoder( myParent ) )
 		return false;
 
-	if ( !currentEncoder->options( myParent, KGlobal::config() ) ) {
+	if ( !currentEncoder->options( myParent, TDEGlobal::config() ) ) {
 		unloadEncoder();
 		return false;
 	}
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index fa59aea..b1b69bb 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -590,7 +590,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 
 	for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) {
 		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
-			KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
+			TDEGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
 		vb = new TQVBoxLayout( page, 6, 6 );
 		gb = new TQGroupBox( "", page );
 		grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -827,7 +827,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	}
 
 	page = addPage(i18n("Recording"),i18n("DVB Recording Options"),
-		KGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -907,7 +907,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	filenameFormatLe->setText( dvbConfig->filenameFormat );
 
 	page = addPage(i18n("Broadcasting"),i18n("DVB Broadcasting"),
-		KGlobal::instance()->iconLoader()->loadIcon( "network_local", KIcon::NoGroup, KIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "network_local", KIcon::NoGroup, KIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -933,7 +933,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	sportSpin->setValue( dvbConfig->senderPort );
 
 	page = addPage(i18n("Misc"),i18n("Misc"),
-		KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -976,7 +976,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 
 	if ( p ) {
 		page = addPage(i18n("DVB plugins"),i18n("DVB plugins"),
-			KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
+			TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
 		vb = new TQVBoxLayout( page, 6, 6 );
 		gb = new TQGroupBox( "", page );
 		grid = new TQGridLayout( gb, 1, 1, 20, 6 );
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 );
diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp
index e47bb60..746e1b4 100644
--- a/kaffeine/src/input/dvb/kevents.cpp
+++ b/kaffeine/src/input/dvb/kevents.cpp
@@ -248,7 +248,7 @@ void KEvents::checkEpgSearch(TQString searchword)
 							if(!found)
 								break;
 
-							begin = KGlobal::locale()->formatDateTime( desc->startDateTime );
+							begin = TDEGlobal::locale()->formatDateTime( desc->startDateTime );
 							duration = desc->duration.toString("hh:mm");
 							title = desc->title;
 
@@ -348,7 +348,7 @@ void KEvents::mouseClickedSlot( int btn, TQListViewItem *it, const TQPoint &p, i
 				s = s+"</font></b><br>";
 			}
 			s = s+"<br><font color=\"darkred\">";
-			s = s+KGlobal::locale()->formatDateTime( ei->event->startDateTime, false )+"<br>";
+			s = s+TDEGlobal::locale()->formatDateTime( ei->event->startDateTime, false )+"<br>";
 			s = s+ei->event->duration.toString("hh:mm");
 			s = s+"</font><br><br>";
 			for ( i=0; i<(int)ei->event->shortEvents.count(); i++ ) {
@@ -442,7 +442,7 @@ void KEvents::checkNewEvent()
 		i = 0;
 		while ( (desc=es->getEventDesc(i)) ) {
 			++i;
-			begin = KGlobal::locale()->formatDateTime( desc->startDateTime );
+			begin = TDEGlobal::locale()->formatDateTime( desc->startDateTime );
 			duration = desc->duration.toString("hh:mm");
 			title = desc->title;
 			if ( title.isEmpty() )
@@ -457,7 +457,7 @@ void KEvents::checkNewEvent()
 	for ( i=0; i<(int)channels->count(); i++ ) {
 		ch = channels->at(i);
 		if ( (desc=events->getEventDesc( ch->tp.source, ch->tp.nid, ch->tp.tsid, ch->sid, 0 )) ) {
-			begin = KGlobal::locale()->formatDateTime( desc->startDateTime );
+			begin = TDEGlobal::locale()->formatDateTime( desc->startDateTime );
 			duration = desc->duration.toString("hh:mm");
 			title = desc->title;
 			if ( title.isEmpty() )
diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp
index e6d5b9b..ef05fe1 100644
--- a/kaffeine/src/input/dvb/krecord.cpp
+++ b/kaffeine/src/input/dvb/krecord.cpp
@@ -125,7 +125,7 @@ void KRecord::refresh()
 		else s = "";
 		s = s+ti->name;*/
 		s = ti->name;
-		itt = new KListViewItem( (TQListView*)list, "", s, ti->channel, KGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") );
+		itt = new KListViewItem( (TQListView*)list, "", s, ti->channel, TDEGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") );
 		if ( ti->mode )
 			itt->setPixmap( 0, yesRepeat );
 		if ( ti->running )
@@ -150,7 +150,7 @@ void KRecord::newTimer()
 	if ( ret==KTimerEditor::Accepted ) {
 		*t = dlg.timer;
 		after = where( t, true );
-		itt = new KListViewItem( (TQListView*)list, "", t->name, t->channel, KGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") );
+		itt = new KListViewItem( (TQListView*)list, "", t->name, t->channel, TDEGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") );
 		if ( t->mode )
 			itt->setPixmap( 0, yesRepeat );
 		if ( t->running )
diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
index ede428f..c0c7ad7 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
@@ -78,7 +78,7 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
 
 	lastChannel = 0;
 	enableLive( false );
-	loadConfig( KGlobal::config() );
+	loadConfig( TDEGlobal::config() );
 }
 
 
@@ -157,7 +157,7 @@ void CdWidget::loadConfig( KConfig* config )
 
 void CdWidget::saveConfig()
 {
-	KConfig* config = KGlobal::config();
+	KConfig* config = TDEGlobal::config();
 	config->setGroup("DVBClient");
 	config->writeEntry( "SplitSizes", split->sizes() );
 }