Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

7 files changed, 23 insertions, 23 deletions

diff --git a/configdialog/kbfxconfigdlgfonts-old.ui.h b/configdialog/kbfxconfigdlgfonts-old.ui.h
index 49f12fa..adee2de 100644
--- a/configdialog/kbfxconfigdlgfonts-old.ui.h
+++ b/configdialog/kbfxconfigdlgfonts-old.ui.h
@@ -138,7 +138,7 @@ void KbfxConfigDlgFonts::KbfxExportFileAction()
 	<< KbfxExportFontRcDialogURL
 	<< endl;
 
-	KConfig *fontconfig = new KConfig ( KbfxExportFontRcDialogURL );
+	TDEConfig *fontconfig = new TDEConfig ( KbfxExportFontRcDialogURL );
 
 	fontconfig->setGroup ( "Fonts" );
 	fontconfig->writeEntry ( "TooltipText", ConfigInit().m_fontTooltipColor );
diff --git a/configdialog/kbfxconfigdlglayout.ui.h b/configdialog/kbfxconfigdlglayout.ui.h
index b8a4d55..7644244 100644
--- a/configdialog/kbfxconfigdlglayout.ui.h
+++ b/configdialog/kbfxconfigdlglayout.ui.h
@@ -466,7 +466,7 @@ void KbfxConfigDlgLayout::KbfxExportFileAction()
 	<< endl;
 
 	/* write layout theme configuration file */
-	KConfig *layoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL );
+	TDEConfig *layoutconfig = new TDEConfig ( KbfxExportLayoutRcDialogURL );
 
 	layoutconfig->setGroup ( "KbfxButton" );
 	layoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime );
diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h
index 65bd31e..af17719 100644
--- a/configdialog/kbfxconfigdlgthemes.ui.h
+++ b/configdialog/kbfxconfigdlgthemes.ui.h
@@ -204,7 +204,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked()
 	<< ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName
 	<< endl;
 
-	if ( !KIO::NetAccess::del ( ConfigInit().m_SpinxThemeBasePath+ConfigInit().m_SpinxThemeName, 0 ) )
+	if ( !TDEIO::NetAccess::del ( ConfigInit().m_SpinxThemeBasePath+ConfigInit().m_SpinxThemeName, 0 ) )
 	{
 		KMessageBox::sorry ( 0,
 		                     tr2i18n ( "<p align='center'>Could not uninstall this KBFX theme.</p>"
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp
index 88d6ea2..6817e50 100644
--- a/kbfxlib/common/kbfxconfig.cpp
+++ b/kbfxlib/common/kbfxconfig.cpp
@@ -298,11 +298,11 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName )
 	setThemeInfoDefault();
 
 	TQFileInfo * info_theme =  new TQFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion );
-	KConfig * infoconfig = 0;
+	TDEConfig * infoconfig = 0;
 
 	if ( info_theme->exists() == TRUE )
 	{
-		infoconfig = new KConfig ( info_theme->absFilePath() );
+		infoconfig = new TDEConfig ( info_theme->absFilePath() );
 		infoconfig->setGroup ( "ThemeGeneral" );
 		m_InfoVersion = infoconfig->readEntry ( "ThemeVersion", m_InfoVersionDefault );
 		m_InfoAuthor = infoconfig->readEntry ( "AuthorName", m_InfoAuthorDefault );
@@ -325,9 +325,9 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName )
 void KbfxConfig::read()
 {
 	/* read general configuration */
-	KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
+	TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
 
-	KConfig *conf = confskel->config();
+	TDEConfig *conf = confskel->config();
 
 	TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
 
@@ -414,7 +414,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u
 	TQString _abs_path = "";
 	TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxfontrc" );
 	TQFileInfo * info_theme =  new TQFileInfo ( KbfxThemeRcDestination + "/" +  themeName + "_fontrc" );
-	KConfig * fontconfig = 0;
+	TDEConfig * fontconfig = 0;
 
 	/* if theme kbfxfontrc exists, make its configuration as default values - prefer users' configuration */
 	if ( info_theme->exists() == TRUE || info->exists() == TRUE )
@@ -427,7 +427,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u
 		{
 			_abs_path = info->absFilePath();
 		}
-		fontconfig = new KConfig ( _abs_path );
+		fontconfig = new TDEConfig ( _abs_path );
 
 		fontconfig->setGroup ( "Fonts" );
 		m_fontTooltipColor = fontconfig->readColorEntry ( "TooltipText", &m_fontTooltipColorDefault );
@@ -499,8 +499,8 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 	KbfxOffImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) );
 
 	/* use theme's default dude image if any */
-	KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
-	KConfig *conf = confskel->config();
+	TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
+	TDEConfig *conf = confskel->config();
 	TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
 
 	if ( m_SpinxDudeImageDefault == TQString() || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) )
@@ -529,7 +529,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 	TQString _abs_path = "";
 	TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" );
 	TQFileInfo * info_theme =  new TQFileInfo ( KbfxThemeRcDestination + "/" +  themeName + "_layoutrc" );
-	KConfig *layoutconfig = 0;
+	TDEConfig *layoutconfig = 0;
 
 	/* if theme kbfxlayoutrc exists, make its configuration as default values - prefer users' configuration */
 	if ( info_theme->exists() == TRUE || info->exists() == TRUE )
@@ -543,7 +543,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 			_abs_path = info->absFilePath();
 		}
 
-		layoutconfig = new KConfig ( _abs_path );
+		layoutconfig = new TDEConfig ( _abs_path );
 
 		layoutconfig->setGroup ( "KbfxButton" );
 		m_KbfxNormalButtonPath = layoutconfig->readEntry ( "Normal", m_KbfxNormalButtonPathDefault );
@@ -702,10 +702,10 @@ void KbfxConfig::write()
 		kdDebug() << "Deleting general RC file: " << KbfxRcPath << endl;
 	}
 
-	KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
+	TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
 
 	/* write general KBFX configuration options */
-	KConfig *conf = confskel->config();
+	TDEConfig *conf = confskel->config();
 
 	conf->setGroup ( "KDE Action Restrictions" );
 	conf->writeEntry ( "warn_unwritable_config", FALSE );
@@ -746,7 +746,7 @@ void KbfxConfig::write()
 void KbfxConfig::writeFontrc ( TQString & themeName )
 {
 	/* write fonts KBFX configuration from theme name */
-	KConfig *fontconfig = new KConfig ( KbfxThemeRcDestination + "/" +  themeName + "_fontrc" );
+	TDEConfig *fontconfig = new TDEConfig ( KbfxThemeRcDestination + "/" +  themeName + "_fontrc" );
 
 	fontconfig->setGroup ( "Fonts" );
 	fontconfig->writeEntry ( "TooltipText", m_fontTooltipColor );
@@ -775,7 +775,7 @@ void KbfxConfig::writeThemerc ( TQString & themeName )
 	checkValues();
 
 	/* write layout theme configuration from theme name */
-	KConfig *layoutconfig = new KConfig ( KbfxThemeRcDestination + "/" +  themeName + "_layoutrc" );
+	TDEConfig *layoutconfig = new TDEConfig ( KbfxThemeRcDestination + "/" +  themeName + "_layoutrc" );
 
 	layoutconfig->setGroup ( "KbfxButton" );
 	layoutconfig->writeEntry ( "Normal", m_KbfxNormalButtonPath );
diff --git a/kbfxlib/common/kbfxkiodownload.cpp b/kbfxlib/common/kbfxkiodownload.cpp
index 8a74b38..1794df0 100644
--- a/kbfxlib/common/kbfxkiodownload.cpp
+++ b/kbfxlib/common/kbfxkiodownload.cpp
@@ -38,15 +38,15 @@ KbfxKioDownload::~KbfxKioDownload()
 
 void KbfxKioDownload::KbfxKioDownloadStart ( TQString &url )
 {
-	KIO::Job *download_job = KIO::file_copy ( KURL ( url ),
+	TDEIO::Job *download_job = TDEIO::file_copy ( KURL ( url ),
 	                         KURL ( m_KbfxBrowserTmpFile ),
 	                         -1,
 	                         TRUE );
-	connect ( download_job, TQT_SIGNAL ( result ( KIO::Job* ) ),
-	          this, TQT_SLOT ( KbfxBrowserResult ( KIO::Job * ) ) );
+	connect ( download_job, TQT_SIGNAL ( result ( TDEIO::Job* ) ),
+	          this, TQT_SLOT ( KbfxBrowserResult ( TDEIO::Job * ) ) );
 }
 
-void KbfxKioDownload::KbfxBrowserResult ( KIO::Job *download_job )
+void KbfxKioDownload::KbfxBrowserResult ( TDEIO::Job *download_job )
 {
 	m_KbfxBrowserError = download_job->error();
 
diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h
index 2d9e319..9646176 100644
--- a/kbfxlib/common/kbfxkiodownload.h
+++ b/kbfxlib/common/kbfxkiodownload.h
@@ -66,7 +66,7 @@ class KbfxKioDownload : public TQObject
 
 	private slots:
 		/* current job is done here */
-		virtual void KbfxBrowserResult ( KIO::Job * );
+		virtual void KbfxBrowserResult ( TDEIO::Job * );
 
 	signals:
 		/* emitted when the download is ready */
diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h
index 74cc5f8..f7745d2 100644
--- a/src/kbfxspinx.h
+++ b/src/kbfxspinx.h
@@ -93,7 +93,7 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject
 		bool m_tooltip;
 
 	private:
-		KConfig *ksConfig;
+		TDEConfig *ksConfig;
 		KbfxButton * kbfxBtn;
 		KbfxSpinxMenuWidget * m_menuWidget;
 		KbfxSpinxPopUp * m_menu;