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

18 files changed, 52 insertions, 52 deletions

diff --git a/kompare/ChangeLog b/kompare/ChangeLog
index 3ff4c222..d7f82d98 100644
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@@ -63,7 +63,7 @@ Nov    20, 2003 : Otto Bruggeman
 	* When swapping source with destination also change the windows caption and the statusbar text
 	* Make sure that when swapping and when there are changes, all changes that were made can be 
 	  saved, discarded or cancel the whole swap (strings are recycled from the queryClose method)
-	* Give a better parent to the KIO::NetAccess::download in komparemodellist.cpp
+	* Give a better parent to the TDEIO::NetAccess::download in komparemodellist.cpp
 	* Added some FIXME's for after the branching to make the urls appear in bold in the error message
 	* Make queryClose not use the isModified from the part but from the modellist
 
diff --git a/kompare/interfaces/kompareinterface.h b/kompare/interfaces/kompareinterface.h
index 37fabe9f..06ab7a77 100644
--- a/kompare/interfaces/kompareinterface.h
+++ b/kompare/interfaces/kompareinterface.h
@@ -8,7 +8,7 @@
 #include <tqstringlist.h>
 #include <kdemacros.h>
 
-class KConfig;
+class TDEConfig;
 class KURL;
 
 class KompareInterfacePrivate;
@@ -87,8 +87,8 @@ public:
 	 * Warning this should be in class Part in KDE 4.0, not here !
 	 * Around that time the methods will disappear here
 	 */
-	virtual int readProperties( KConfig* config ) = 0;
-	virtual int saveProperties( KConfig* config ) = 0;
+	virtual int readProperties( TDEConfig* config ) = 0;
+	virtual int saveProperties( TDEConfig* config ) = 0;
 
 	/**
 	 * Warning this should be in class ReadWritePart in KDE 4.0, not here !
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index a1c70d90..94e9747d 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -294,7 +294,7 @@ void KompareShell::setCaption( const TQString& caption )
 	KParts::DockMainWindow::setCaption( caption, m_viewPart->isModified() );
 }
 
-void KompareShell::saveProperties(KConfig* config)
+void KompareShell::saveProperties(TDEConfig* config)
 {
 	// The 'config' object points to the session managed
 	// config file.  Anything you write here will be available
@@ -314,7 +314,7 @@ void KompareShell::saveProperties(KConfig* config)
 	m_viewPart->saveProperties( config );
 }
 
-void KompareShell::readProperties(KConfig* config)
+void KompareShell::readProperties(TDEConfig* config)
 {
 	// The 'config' object points to the session managed
 	// config file. This function is automatically called whenever
diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h
index 195c2248..6e51c0eb 100644
--- a/kompare/kompare_shell.h
+++ b/kompare/kompare_shell.h
@@ -99,14 +99,14 @@ protected:
 	* This method is called when it is time for the app to save its
 	* properties for session management purposes.
 	*/
-	void saveProperties(KConfig *);
+	void saveProperties(TDEConfig *);
 
 	/**
-	* This method is called when this app is restored.  The KConfig
+	* This method is called when this app is restored.  The TDEConfig
 	* object points to the session management config file that was saved
 	* with @ref saveProperties
 	*/
-	void readProperties(KConfig *);
+	void readProperties(TDEConfig *);
 
 private slots:
 	void slotSetStatusBarText( const TQString& text );
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
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index d24abaf9..06f7e4bc 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -37,7 +37,7 @@ KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name )
 {
 	setIconListAllVisible(true);
 
-	KConfig* cfg = kapp->config();
+	TDEConfig* cfg = kapp->config();
 	TQVBox* filesBox = addVBoxPage( i18n( "Files" ), i18n( "Here you can enter the files you want to compare." ) );
 	m_filesPage = new FilesPage( filesBox );
 	m_filesSettings = new FilesSettings( this );
@@ -76,7 +76,7 @@ void KompareURLDialog::slotOk()
 {
 	m_filesPage->setURLsInComboBoxes();
 
-	KConfig* cfg = kapp->config();
+	TDEConfig* cfg = kapp->config();
 
 	m_filesPage->apply();
 	m_diffPage->apply();
diff --git a/kompare/kompareurldialog.h b/kompare/kompareurldialog.h
index 419c5102..641f8939 100644
--- a/kompare/kompareurldialog.h
+++ b/kompare/kompareurldialog.h
@@ -26,7 +26,7 @@
 class TQGroupBox;
 
 class KComboBox;
-class KConfig;
+class TDEConfig;
 class KFileDialog;
 class KURLComboBox;
 class KURLRequester;
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 6c2186f5..26239d78 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -44,9 +44,9 @@ DiffSettings::~DiffSettings()
 {
 }
 
-void DiffSettings::loadSettings( KConfig* config )
+void DiffSettings::loadSettings( TDEConfig* config )
 {
-	KConfigGroup group( config, "Diff Options" );
+	TDEConfigGroup group( config, "Diff Options" );
 	m_diffProgram                    = group.readEntry    ( "DiffProgram", "" );
 	m_linesOfContext                 = group.readNumEntry ( "LinesOfContext", 3 );
 	m_largeFiles                     = group.readBoolEntry( "LargeFiles", true );
@@ -66,7 +66,7 @@ void DiffSettings::loadSettings( KConfig* config )
 
 	m_format = static_cast<Kompare::Format>( group.readNumEntry( "Format", Kompare::Unified ) );
 
-	KConfigGroup group2 ( config, "Exclude File Options" );
+	TDEConfigGroup group2 ( config, "Exclude File Options" );
 	m_excludeFilePattern             = group2.readBoolEntry( "Pattern", false );
 	m_excludeFilePatternList         = group2.readListEntry( "PatternList" );
 	m_excludeFilesFile               = group2.readBoolEntry( "File", false );
@@ -74,9 +74,9 @@ void DiffSettings::loadSettings( KConfig* config )
 	m_excludeFilesFileHistoryList    = group2.readListEntry( "FileHistoryList" );
 }
 
-void DiffSettings::saveSettings( KConfig* config )
+void DiffSettings::saveSettings( TDEConfig* config )
 {
-	KConfigGroup group( config, "Diff Options" );
+	TDEConfigGroup group( config, "Diff Options" );
 	group.writeEntry( "DiffProgram",                    m_diffProgram );
 	group.writeEntry( "LinesOfContext",                 m_linesOfContext );
 	group.writeEntry( "Format",                         m_format );
@@ -96,7 +96,7 @@ void DiffSettings::saveSettings( KConfig* config )
 	group.writeEntry( "NewFiles",                       m_newFiles );
 	group.setDirty( true );
 
-	KConfigGroup group2( config, "Exclude File Options" );
+	TDEConfigGroup group2( config, "Exclude File Options" );
 	group2.writeEntry( "Pattern",            m_excludeFilePattern );
 	group2.writeEntry( "PatternList",        m_excludeFilePatternList );
 	group2.writeEntry( "File",               m_excludeFilesFile );
diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h
index 08a2728e..27abbe7c 100644
--- a/kompare/libdialogpages/diffsettings.h
+++ b/kompare/libdialogpages/diffsettings.h
@@ -35,8 +35,8 @@ public:
 	virtual ~DiffSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 
 public:
 	TQString m_diffProgram;
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 4ec2490c..6b3b0928 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -26,7 +26,7 @@ class TQGroupBox;
 
 class TQComboBox;
 class KComboBox;
-class KConfig;
+class TDEConfig;
 class KFileDialog;
 class KURLComboBox;
 class KURLRequester;
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index 01b70076..966d5fcd 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -30,7 +30,7 @@ FilesSettings::~FilesSettings()
 {
 }
 
-void FilesSettings::loadSettings( KConfig* config )
+void FilesSettings::loadSettings( TDEConfig* config )
 {
 	config->setGroup( m_configGroupName );
 
@@ -41,7 +41,7 @@ void FilesSettings::loadSettings( KConfig* config )
 	m_encoding                 = config->readEntry    ( "Encoding", "default" );
 }
 
-void FilesSettings::saveSettings( KConfig* config )
+void FilesSettings::saveSettings( TDEConfig* config )
 {
 	config->setGroup( m_configGroupName );
 	config->writeEntry( "Recent Sources", m_recentSources );
diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h
index 945b53c2..59517770 100644
--- a/kompare/libdialogpages/filessettings.h
+++ b/kompare/libdialogpages/filessettings.h
@@ -23,7 +23,7 @@
 
 #include "settingsbase.h"
 
-class KConfig;
+class TDEConfig;
 
 class FilesSettings : public SettingsBase
 {
@@ -35,8 +35,8 @@ public:
 
 public:
 	// some virtual functions that will be overloaded from the base class
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 
 	void setGroup( const TQString& groupName );
 
diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp
index 6e347719..9c184194 100644
--- a/kompare/libdialogpages/settingsbase.cpp
+++ b/kompare/libdialogpages/settingsbase.cpp
@@ -31,11 +31,11 @@ SettingsBase::~SettingsBase()
 
 }
 
-void SettingsBase::loadSettings( KConfig* /* config */ )
+void SettingsBase::loadSettings( TDEConfig* /* config */ )
 {
 }
 
-void SettingsBase::saveSettings( KConfig* /* config */ )
+void SettingsBase::saveSettings( TDEConfig* /* config */ )
 {
 }
 
diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h
index 607a2dc2..41eed474 100644
--- a/kompare/libdialogpages/settingsbase.h
+++ b/kompare/libdialogpages/settingsbase.h
@@ -25,7 +25,7 @@
 #include "kompare.h"
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 class SettingsBase : public TQObject
 {
@@ -36,8 +36,8 @@ public:
 	~SettingsBase();
 
 public:
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 };
 
 #endif
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 85420d53..8bbd8895 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -46,9 +46,9 @@ ViewSettings::~ViewSettings()
 {
 }
 
-void ViewSettings::loadSettings( KConfig* config )
+void ViewSettings::loadSettings( TDEConfig* config )
 {
-	KConfigGroup cfg( config, "View Options" );
+	TDEConfigGroup cfg( config, "View Options" );
 	m_removeColor         = cfg.readColorEntry( "RemoveColor",         &default_removeColor );
 	m_changeColor         = cfg.readColorEntry( "ChangeColor",         &default_changeColor );
 	m_addColor            = cfg.readColorEntry( "AddColor",            &default_addColor );
@@ -61,9 +61,9 @@ void ViewSettings::loadSettings( KConfig* config )
 	m_font                = cfg.readFontEntry ( "TextFont", &stdFixed );
 }
 
-void ViewSettings::saveSettings( KConfig* config )
+void ViewSettings::saveSettings( TDEConfig* config )
 {
-	KConfigGroup cfg( config, "View Options" );
+	TDEConfigGroup cfg( config, "View Options" );
 	cfg.writeEntry( "RemoveColor",         m_removeColor );
 	cfg.writeEntry( "ChangeColor",         m_changeColor );
 	cfg.writeEntry( "AddColor",            m_addColor );
diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h
index 84fc3539..7443285e 100644
--- a/kompare/libdialogpages/viewsettings.h
+++ b/kompare/libdialogpages/viewsettings.h
@@ -40,8 +40,8 @@ public:
 	~ViewSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 	TQColor colorForDifferenceType( int type, bool selected = false, bool applied = false );
 
 public:
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 4d76e07f..20d7e551 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -360,22 +360,22 @@ bool KompareModelList::saveDestination( DiffModel* model )
 		TQString destination = model->destinationPath() + model->destinationFile();
 		kdDebug(8101) << "Tempfilename   : " << temp->name() << endl;
 		kdDebug(8101) << "DestinationURL : " << destination << endl;
-		KIO::UDSEntry entry;
-		if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) )
+		TDEIO::UDSEntry entry;
+		if ( !TDEIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) )
 		{
-			if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) )
+			if ( !TDEIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) )
 			{
 				emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) );
 				return false;
 			}
 		}
-		result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() );
+		result = TDEIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() );
 	}
 	else
 	{
 		kdDebug(8101) << "Tempfilename   : " << temp->name() << endl;
 		kdDebug(8101) << "DestinationURL : " << m_destination << endl;
-		result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() );
+		result = TDEIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() );
 	}
 
 	if ( !result )
@@ -613,7 +613,7 @@ void KompareModelList::slotWriteDiffOutput( bool success )
 			emit error( i18n( "Could not write to the temporary file." ) );
 		}
 
-		KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() );
+		TDEIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() );
 
 		emit status( Kompare::FinishedWritingDiff );
 	}