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

1 files changed, 11 insertions, 11 deletions

diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index e12b24c..a4630d6 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -163,9 +163,9 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 	{
 		InstWizard::showWizard();
 
-		KProcess process;
+		TDEProcess process;
 		process << "touch" << stamp;
-		process.start(KProcess::Block, KProcess::Stderr);
+		process.start(TDEProcess::Block, TDEProcess::Stderr);
 		process.clearArguments();
 	}
 
@@ -180,20 +180,20 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 	inplug = new InputManager( this, stack, mtBar );
 
 	m_startWindow = new StartWindow( stack );
-	inplug->addStartWindow( m_startWindow, KGlobal::iconLoader()->loadIcon("kmenu", KIcon::Small), i18n("Start") );
+	inplug->addStartWindow( m_startWindow, TDEGlobal::iconLoader()->loadIcon("kmenu", KIcon::Small), i18n("Start") );
 
 	playerWidget = new TQVBox( stack );
 	playerWidget->setMouseTracking( true );
-	inplug->addPlayerWidget( playerWidget, KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Player Window") );
+	inplug->addPlayerWidget( playerWidget, TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Player Window") );
 
 	// playlist
 	m_playlist = new PlayList( stack, TQT_TQOBJECT(this) );
-	inplug->add( m_playlist, KGlobal::iconLoader()->loadIcon("view_text", KIcon::Small), i18n( "Playlist") );
+	inplug->add( m_playlist, TDEGlobal::iconLoader()->loadIcon("view_text", KIcon::Small), i18n( "Playlist") );
 	m_playlist->setFileFilter(DEFAULT_FILTER);
 	guiFactory()->addClient( m_playlist );
 
 	cddisc = new Disc( stack, TQT_TQOBJECT(this) );
-	inplug->add( cddisc, KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Small), i18n( "Audio CD") );
+	inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Small), i18n( "Audio CD") );
 	guiFactory()->addClient( cddisc );
 
 	connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&)));
@@ -203,7 +203,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 #ifdef HAVE_DVB
 	if ( dvbPanel )
 	{
-		inplug->add( dvbPanel, KGlobal::iconLoader()->loadIcon("tv", KIcon::Small), i18n( "Digital TV") );
+		inplug->add( dvbPanel, TDEGlobal::iconLoader()->loadIcon("tv", KIcon::Small), i18n( "Digital TV") );
 		guiFactory()->addClient( dvbPanel );
 		dvbPanel->checkFirstRun();
 	}
@@ -797,7 +797,7 @@ void Kaffeine::loadConfig()
 	if ( m_dvbClientEnabled )
 	{
 		dvbClient = new CdWidget( m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath, this, TQT_TQOBJECT(this), "cdwidget");
-		inplug->add( dvbClient, KGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") );
+		inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") );
 	}
 	else
 		dvbClient = 0;
@@ -913,7 +913,7 @@ void Kaffeine::slotDvbClient( bool enabled, const TQString &address, int port, i
 				connect( dvbClient, TQT_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQT_SLOT(getTimeShiftFilename(const TQString&)) );
 				dvbClient->enableLive( true );
 			}
-			inplug->add( dvbClient, KGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") );
+			inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") );
 		}
 	}
 	else
@@ -955,7 +955,7 @@ void Kaffeine::optionsConfigureKeys()
 
 void Kaffeine::optionsConfigureToolbars()
 {
-	saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+	saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 
 	// use the standard toolbar editor
 	KEditToolbar dlg(factory());
@@ -966,7 +966,7 @@ void Kaffeine::optionsConfigureToolbars()
 
 void Kaffeine::applyNewToolbarConfig()
 {
-	applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+	applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
 void Kaffeine::slotSystemTray(bool embed)