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

7 files changed, 22 insertions, 22 deletions

diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 9acfe00d6..e8118b8bc 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -643,7 +643,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
 
 TQString KIMProxy::preferredApp()
 {
-	KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
+	TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
 	store->setGroup( IM_CLIENT_PREFERENCES_SECTION );
 	TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY );
 	//kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl;
diff --git a/interfaces/kio/http.h b/interfaces/kio/http.h
index 15803209c..6a07e9971 100644
--- a/interfaces/kio/http.h
+++ b/interfaces/kio/http.h
@@ -21,7 +21,7 @@
 #define KIOSLAVE_HTTP_H_
 
 
-namespace KIO {
+namespace TDEIO {
 
   /** HTTP / DAV method **/
   enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 061f8405d..2998af9f5 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     }
 
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
-    KConfigGroup config( TDEGlobal::config(), ConfigGroup );
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
     connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
 {
-    KConfigGroup config( TDEGlobal::config(), ConfigGroup );
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
 
     delete d;
diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/ktexteditor/configinterface.h
index cb8538465..4879fa66b 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/ktexteditor/configinterface.h
@@ -22,7 +22,7 @@
 #include <tdelibs_export.h>
 
 class TQCString;
-class KConfig;
+class TDEConfig;
 
 namespace KTextEditor
 {
@@ -60,14 +60,14 @@ class KTEXTEDITOR_EXPORT ConfigInterface
       Read/Write the config of the part to a given kconfig object
       to store the settings in a different place than the standard
     */
-    virtual void readConfig (KConfig *) = 0;
-    virtual void writeConfig (KConfig *) = 0;
+    virtual void readConfig (TDEConfig *) = 0;
+    virtual void writeConfig (TDEConfig *) = 0;
     
     /**
       Read/Write session config of only this document/view/plugin 
     */
-    virtual void readSessionConfig (KConfig *) = 0;
-    virtual void writeSessionConfig (KConfig *) = 0;
+    virtual void readSessionConfig (TDEConfig *) = 0;
+    virtual void writeSessionConfig (TDEConfig *) = 0;
     
     /**
       Shows a config dialog for the part, changes will be applied
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 85466f55d..807d342d0 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -47,7 +47,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
 
 
 	KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
-	KConfig *config=new KConfig("default_components");
+	TDEConfig *config=new TDEConfig("default_components");
   	config->setGroup("KTextEditor");
   	TQString editor = config->readPathEntry("embeddedEditor");
 
@@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){
 }
 
 void EditorChooser::readAppSetting(const TQString& postfix){
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	TQString editor=cfg->readPathEntry("editor");
@@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 }
 
 void EditorChooser::writeAppSetting(const TQString& postfix){
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
@@ -105,14 +105,14 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
 
 	KTextEditor::Document *tmpDoc=0;
 
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
 	cfg->setGroup(previousGroup);
 	if (editor.isEmpty())
 	{
-		KConfig *config=new KConfig("default_components");
+		TDEConfig *config=new TDEConfig("default_components");
   		config->setGroup("KTextEditor");
 	  	editor = config->readPathEntry("embeddedEditor", "katepart");
 		delete config;
@@ -135,14 +135,14 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
 
         KTextEditor::Editor *tmpEd=0;
 
-        KConfig *cfg=kapp->config();
+        TDEConfig *cfg=kapp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
         cfg->setGroup(previousGroup);
         if (editor.isEmpty())
         {
-                KConfig *config=new KConfig("default_components");
+                TDEConfig *config=new TDEConfig("default_components");
                 config->setGroup("KTextEditor");
                 editor = config->readPathEntry("embeddedEditor", "katepart");
                 delete config;
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index 0010dd3a8..d56e8d8e5 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -6,7 +6,7 @@
 
 #include <tqwidget.h>
 
-class KConfig;
+class TDEConfig;
 class TQString;
 
 namespace KTextEditor
@@ -45,8 +45,8 @@ public:
 	virtual const TQStringList &choices();
 	virtual void saveSettings();
 
-	void readAppSetting(KConfig *cfg,const TQString& postfix);
-	void writeAppSetting(KConfig *cfg,const TQString& postfix);
+	void readAppSetting(TDEConfig *cfg,const TQString& postfix);
+	void writeAppSetting(TDEConfig *cfg,const TQString& postfix);
 
 public slots:
 	virtual void madeChoice(int pos,const TQString &choice);
diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/ktexteditor/sessionconfiginterface.h
index c79de0011..b4fb52233 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/ktexteditor/sessionconfiginterface.h
@@ -22,7 +22,7 @@
 #include <tdelibs_export.h>
 
 class TQCString;
-class KConfig;
+class TDEConfig;
 
 namespace KTextEditor
 {
@@ -53,8 +53,8 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface
      * In case of the document, that means for example it should reload the file,
      * restore all marks, ...
     */
-    virtual void readSessionConfig (KConfig *) = 0;
-    virtual void writeSessionConfig (KConfig *) = 0;
+    virtual void readSessionConfig (TDEConfig *) = 0;
+    virtual void writeSessionConfig (TDEConfig *) = 0;
 
   private:
     class PrivateSessionConfigInterface *d;