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

6 files changed, 10 insertions, 10 deletions

diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h
index 3c6ec3b..65bd31e 100644
--- a/configdialog/kbfxconfigdlgthemes.ui.h
+++ b/configdialog/kbfxconfigdlgthemes.ui.h
@@ -163,7 +163,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked()
 {
 	int messageBoxReturn;
 	int messageBoxUserResReturn;
-	TQString KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
+	TQString KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
 	KbfxThemeRcDestination.append( ConfigInit().m_SpinxThemeName );
 
 	messageBoxReturn = KMessageBox::warningContinueCancel ( 0,
@@ -247,7 +247,7 @@ void KbfxConfigDlgThemes::KbfxThemeInstall ( TQString &installUrl )
 		return;
 	}
 
-	const TQString KbfxThemeDestination = KGlobal::dirs()->saveLocation ( "data",
+	const TQString KbfxThemeDestination = TDEGlobal::dirs()->saveLocation ( "data",
 	                                     TQString ( "kbfx/skins/" ),
 	                                     TRUE );
 
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp
index 0e1c8ee..88d6ea2 100644
--- a/kbfxlib/common/kbfxconfig.cpp
+++ b/kbfxlib/common/kbfxconfig.cpp
@@ -26,8 +26,8 @@ KbfxConfig::KbfxConfig()
 	/* set default configuration values */
 
 	/* KBFX internal settings */
-	KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
-	KbfxRcPath = KGlobal::dirs()->findResource ( "config", "kbfxrc" );
+	KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
+	KbfxRcPath = TDEGlobal::dirs()->findResource ( "config", "kbfxrc" );
 	m_KbfxDeleteOldConf = FALSE;
 	TQString _unspecified = tr2i18n ( "Not Specified" );
 	TQString path = locate ( "data", "kbfx/skins/default/bg.png" );
@@ -329,7 +329,7 @@ void KbfxConfig::read()
 
 	KConfig *conf = confskel->config();
 
-	TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
+	TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
 
 	conf->setGroup ( "KbfxGeneral" );
 	m_KbfxGeneralVersion = conf->readNumEntry ( "Version", 0 );
@@ -501,7 +501,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 	/* use theme's default dude image if any */
 	KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
 	KConfig *conf = confskel->config();
-	TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
+	TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
 
 	if ( m_SpinxDudeImageDefault == TQString() || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) )
 	{
diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp
index 62b75c6..d552578 100644
--- a/src/kbfxplasmacanvasitem.cpp
+++ b/src/kbfxplasmacanvasitem.cpp
@@ -132,7 +132,7 @@ KbfxPlasmaCanvasItem::setExec ( TQString desktopfile )
 void
 KbfxPlasmaCanvasItem::setIconPath ( TQString str )
 {
-	KIconLoader *iconload = KGlobal::iconLoader ();
+	KIconLoader *iconload = TDEGlobal::iconLoader ();
 	m_iconPath =  iconload->iconPath ( str, KIcon::Desktop, false );
 //	m_icon.load(m_iconPath);
 	TQImage _img ( m_iconPath );
diff --git a/src/kbfxplasmaindexitem.cpp b/src/kbfxplasmaindexitem.cpp
index b7a37fd..55c4642 100644
--- a/src/kbfxplasmaindexitem.cpp
+++ b/src/kbfxplasmaindexitem.cpp
@@ -44,7 +44,7 @@ KbfxPlasmaIndexItem::~KbfxPlasmaIndexItem()
 void
 KbfxPlasmaIndexItem::setIcon ( TQString str )
 {
-	KIconLoader *iconload = KGlobal::iconLoader ();
+	KIconLoader *iconload = TDEGlobal::iconLoader ();
 	m_iconPath =  iconload->iconPath ( str, KIcon::Desktop, false );
 
 	m_icon.load ( m_iconPath );
diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp
index 3e7359f..43cef05 100644
--- a/src/kbfxspinx.cpp
+++ b/src/kbfxspinx.cpp
@@ -317,7 +317,7 @@ extern "C"
 {
 	KPanelApplet* init ( TQWidget *parent, const TQString& configFile )
 	{
-		KGlobal::locale()->insertCatalogue ( "KbfxSpinx" );
+		TDEGlobal::locale()->insertCatalogue ( "KbfxSpinx" );
 		return new KbfxSpinx ( configFile, KPanelApplet::Normal,
 		                       KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
 		                       parent, "KbfxSpinx" );
diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp
index 37fcf53..a525435 100644
--- a/src/kbfxspinxtoolbutton.cpp
+++ b/src/kbfxspinxtoolbutton.cpp
@@ -105,7 +105,7 @@ KbfxSpinxToolButton::setDataSource ( KbfxDataSource * src )
 	m_exe = src->command();
 	m_dataSource = new KbfxDataSource();
 	*m_dataSource  = *src; // copy
-	KIconLoader *iconload = KGlobal::iconLoader ();
+	KIconLoader *iconload = TDEGlobal::iconLoader ();
 	TQString m_iconPath =  iconload->iconPath ( m_icon, KIcon::Desktop, false );
 	m_iconPixmap = TQPixmap ( m_iconPath );
 }