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

9 files changed, 25 insertions, 25 deletions

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: