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

2 files changed, 9 insertions, 9 deletions

diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 0c565820..c9e1f19b 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -264,7 +264,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
 	TQString tempFileName( "" );
 	if ( !url.isLocalFile() )
 	{
-		if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) )
+		if ( ! TDEIO::NetAccess::download( url, tempFileName, widget() ) )
 		{
 			slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) );
 			tempFileName = "";
@@ -288,9 +288,9 @@ void KomparePart::cleanUpTemporaryFiles()
 {
 	// i hope a local file will not be removed if it was not downloaded...
 	if ( !m_info.localSource.isEmpty() )
-		KIO::NetAccess::removeTempFile( m_info.localSource );
+		TDEIO::NetAccess::removeTempFile( m_info.localSource );
 	if ( !m_info.localDestination.isEmpty() )
-		KIO::NetAccess::removeTempFile( m_info.localDestination );
+		TDEIO::NetAccess::removeTempFile( m_info.localDestination );
 }
 
 void KomparePart::compare( const KURL& source, const KURL& destination )
@@ -433,7 +433,7 @@ void KomparePart::saveDiff()
 
 	if( dlg->exec() ) {
 		w->saveOptions();
-		KConfig* config = instance()->config();
+		TDEConfig* config = instance()->config();
 		saveProperties( config );
 		config->sync();
 
@@ -441,7 +441,7 @@ void KomparePart::saveDiff()
 		{
 			KURL url = KFileDialog::getSaveURL( m_info.destination.url(),
 			              i18n("*.diff *.dif *.patch|Patch Files"), widget(), i18n( "Save .diff" ) );
-			if ( KIO::NetAccess::exists( url, false, widget() ) )
+			if ( TDEIO::NetAccess::exists( url, false, widget() ) )
 			{
 				int result = KMessageBox::warningYesNoCancel( widget(), i18n("The file exists or is write-protected; do you want to overwrite it?"), i18n("File Exists"), i18n("Overwrite"), i18n("Do Not Overwrite") );
 				if ( result == KMessageBox::Cancel )
@@ -722,7 +722,7 @@ bool KomparePart::queryClose()
 	return true;
 }
 
-int KomparePart::readProperties( KConfig *config )
+int KomparePart::readProperties( TDEConfig *config )
 {
 	m_viewSettings->loadSettings( config );
 	m_diffSettings->loadSettings( config );
@@ -730,7 +730,7 @@ int KomparePart::readProperties( KConfig *config )
 	return 0;
 }
 
-int KomparePart::saveProperties( KConfig *config )
+int KomparePart::saveProperties( TDEConfig *config )
 {
 	m_viewSettings->saveSettings( config );
 	m_diffSettings->saveSettings( config );
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index c2ed918e..721d7afc 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -76,8 +76,8 @@ public:
 	// Sessionmanagement stuff, added to the kompare iface
 	// because they are not in the Part class where they belong
 	// Should be added when bic changes are allowed again (kde 4.0)
-	virtual int readProperties( KConfig *config );
-	virtual int saveProperties( KConfig *config );
+	virtual int readProperties( TDEConfig *config );
+	virtual int saveProperties( TDEConfig *config );
 	// this one is called when the shell_app is about to close.
 	// we need it now to save the properties of the part when apps dont (can't)
 	// use the readProperties and saveProperties methods