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

24 files changed, 94 insertions, 94 deletions

diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index c2c411b3e..0464f39bd 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -34,7 +34,7 @@
 #include "advancedTabOptions.h"
 #include "main.h"
 
-advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const char* name)
+advancedTabDialog::advancedTabDialog(TQWidget* parent, TDEConfig* config, const char* name)
     : KDialogBase(KDialogBase::Plain,
                   i18n("Advanced Options"),
                   KDialogBase::Ok |
diff --git a/kcontrol/konqhtml/advancedTabDialog.h b/kcontrol/konqhtml/advancedTabDialog.h
index 3e340b5b8..8951b01e1 100644
--- a/kcontrol/konqhtml/advancedTabDialog.h
+++ b/kcontrol/konqhtml/advancedTabDialog.h
@@ -29,7 +29,7 @@ class advancedTabDialog : public KDialogBase
     Q_OBJECT
 
     public:
-        advancedTabDialog(TQWidget* parent, KConfig *config, const char* name);
+        advancedTabDialog(TQWidget* parent, TDEConfig *config, const char* name);
         ~advancedTabDialog();
 
     protected slots:
@@ -38,7 +38,7 @@ class advancedTabDialog : public KDialogBase
         void changed();
 
     private:
-        KConfig* m_pConfig;
+        TDEConfig* m_pConfig;
         advancedTabOptions* m_advancedWidget;
 };
 
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index fa22ab533..78619d818 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -25,8 +25,8 @@
 
 #include "appearance.moc"
 
-KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
-    : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group),
+KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *)
+    : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group),
       fSize( 10 ), fMinSize( HTML_DEFAULT_MIN_FONT_SIZE )
 
 {
@@ -320,7 +320,7 @@ void KAppearanceOptions::load()
 
 void KAppearanceOptions::load( bool useDefaults )
 {
-    KConfig khtmlrc("khtmlrc", true, false);
+    TDEConfig khtmlrc("khtmlrc", true, false);
 	 m_pConfig->setReadDefaults( useDefaults );
 
 	 khtmlrc.setReadDefaults( useDefaults );
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index ea85322db..6bca1908f 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -19,11 +19,11 @@
 class TQSpinBox;
 class KFontCombo;
 
-class KAppearanceOptions : public KCModule
+class KAppearanceOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
+  KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
   ~KAppearanceOptions();
 
   virtual void load();
@@ -48,7 +48,7 @@ private:
 
 private:
 
-  KConfig *m_pConfig;
+  TDEConfig *m_pConfig;
   TQString m_groupname;
   TQStringList m_families;
 
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 29dccb14b..b61abd99b 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -32,7 +32,7 @@
 #include "policies.h"
 #include "policydlg.h"
 
-DomainListView::DomainListView(KConfig *config,const TQString &title,
+DomainListView::DomainListView(TDEConfig *config,const TQString &title,
 		TQWidget *parent,const char *name) :
 	TQGroupBox(title, parent, name), config(config) {
   setColumnLayout(0, Qt::Vertical);
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index a8238bbb4..f62b2e46a 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -29,7 +29,7 @@ class TQListViewItem;
 class TQPushButton;
 class TQStringList;
 
-class KConfig;
+class TDEConfig;
 class KListView;
 
 class Policies;
@@ -67,7 +67,7 @@ public:
    * @param parent parent widget
    * @param name internal name for debugging
    */
-  DomainListView(KConfig *config,const TQString &title,TQWidget *parent,
+  DomainListView(TDEConfig *config,const TQString &title,TQWidget *parent,
   		const char *name = 0);
 
   virtual ~DomainListView();
@@ -191,7 +191,7 @@ private slots:
 
 protected:
 
-    KConfig *config;
+    TDEConfig *config;
 
   KListView *domainSpecificLV;
 
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 731bae2ec..1bb71d4db 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -38,9 +38,9 @@
 #include "filteropts.h"
 #include "filteropts.moc"
 
-KCMFilter::KCMFilter(KConfig *config, TQString group,
+KCMFilter::KCMFilter(TDEConfig *config, TQString group,
                      TQWidget *parent, const char * )
-    : KCModule( parent, "kcmkonqhtml" ),
+    : TDECModule( parent, "kcmkonqhtml" ),
       mConfig( config ),
       mGroupname( group ),
       mSelCount(0)
diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h
index 1678e5333..fae52b53f 100644
--- a/kcontrol/konqhtml/filteropts.h
+++ b/kcontrol/konqhtml/filteropts.h
@@ -26,13 +26,13 @@ class TQLineEdit;
 class TQListBoxItem;
 class TQCheckBox;
 
-class KConfig;
+class TDEConfig;
 
-class KCMFilter : public KCModule
+class KCMFilter : public TDECModule
 {
     Q_OBJECT
 public:
-    KCMFilter( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+    KCMFilter( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
     ~KCMFilter();
     
     void load();
@@ -66,7 +66,7 @@ private:
     TQPushButton *mImportButton;
     TQPushButton *mExportButton;
 
-    KConfig *mConfig;
+    TDEConfig *mConfig;
     TQString mGroupname;
     int mSelCount;
 };
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 9e199cbe4..153692082 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -32,8 +32,8 @@ enum AnimationsType { AnimationsAlways=0, AnimationsNever=1, AnimationsLoopOnce=
 enum SmoothScrollingType { SmoothScrollingAlways=0, SmoothScrollingNever=1, SmoothScrollingWhenEfficient=2 };
 //-----------------------------------------------------------------------------
 
-KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
-    : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
+KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *)
+    : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
 {
     int row = 0;
     TQGridLayout *lay = new TQGridLayout(this, 10, 2, 0, KDialog::spacingHint());
@@ -230,7 +230,7 @@ void KMiscHTMLOptions::load()
 
 void KMiscHTMLOptions::load( bool useDefaults )
 {
-    KConfig khtmlrc("khtmlrc", true, false);
+    TDEConfig khtmlrc("khtmlrc", true, false);
     khtmlrc.setReadDefaults( useDefaults );
 	 m_pConfig->setReadDefaults( useDefaults );
 
@@ -290,13 +290,13 @@ void KMiscHTMLOptions::load( bool useDefaults )
     m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
     m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
 
-    KConfig config("kbookmarkrc", true, false);
+    TDEConfig config("kbookmarkrc", true, false);
     config.setReadDefaults( useDefaults );
 	 config.setGroup("Bookmarks");
     m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) );
     m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );
 
-    KConfig kdeglobals("kdeglobals", true, false);
+    TDEConfig kdeglobals("kdeglobals", true, false);
     kdeglobals.setReadDefaults( useDefaults );
 	 kdeglobals.setGroup("KDE");
     bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
@@ -363,13 +363,13 @@ void KMiscHTMLOptions::save()
     m_pConfig->writeEntry( "AlwaysTabbedMode", !(m_pDynamicTabbarHide->isChecked()) );
     m_pConfig->sync();
 
-    KConfig config("kbookmarkrc", false, false);
+    TDEConfig config("kbookmarkrc", false, false);
     config.setGroup("Bookmarks");
     config.writeEntry("AdvancedAddBookmarkDialog", m_pAdvancedAddBookmarkCheckBox->isChecked());
     config.writeEntry("FilteredToolbar", m_pOnlyMarkedBookmarksCheckBox->isChecked());
     config.sync();
 
-    KConfig kdeglobals("kdeglobals", false, false);
+    TDEConfig kdeglobals("kdeglobals", false, false);
     kdeglobals.setGroup("KDE");
     switch(m_pSmoothScrollingCombo->currentItem())
     {
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 42024f71b..151607419 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -30,12 +30,12 @@
 class TQRadioButton;
 class KIntNumInput;
 
-class KMiscHTMLOptions : public KCModule
+class KMiscHTMLOptions : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
+    KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
 	~KMiscHTMLOptions();
     virtual void load();
     virtual void load( bool useDefaults );
@@ -47,7 +47,7 @@ private slots:
     void launchAdvancedTabDialog();
 
 private:
-    KConfig* m_pConfig;
+    TDEConfig* m_pConfig;
     TQString  m_groupname;
 
     TQComboBox* m_pUnderlineCombo;
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index af168ed1f..68b20fd2f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -31,7 +31,7 @@
 
 // == class JavaPolicies =====
 
-JavaPolicies::JavaPolicies(KConfig* config, const TQString &group, bool global,
+JavaPolicies::JavaPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain) :
 	Policies(config,group,global,domain,"java.","EnableJava") {
 }
@@ -45,9 +45,9 @@ JavaPolicies::~JavaPolicies() {
 
 // == class KJavaOptions =====
 
-KJavaOptions::KJavaOptions( KConfig* config, TQString group,
+KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
                             TQWidget *parent, const char *name )
-    : KCModule( parent, name ),
+    : TDECModule( parent, name ),
       _removeJavaScriptDomainAdvice(false),
       m_pConfig( config ),
       m_groupname( group ),
@@ -278,7 +278,7 @@ void KJavaOptions::toggleJavaControls()
 
 // == class JavaDomainListView =====
 
-JavaDomainListView::JavaDomainListView(KConfig *config,const TQString &group,
+JavaDomainListView::JavaDomainListView(TDEConfig *config,const TQString &group,
 	KJavaOptions *options,TQWidget *parent,const char *name)
 	: DomainListView(config,i18n( "Doma&in-Specific" ), parent, name),
 	group(group), options(options) {
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index de8f7c7eb..b93a77e86 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -21,7 +21,7 @@
 #include "policies.h"
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KListView;
 class KURLRequester;
 class KIntNumInput;
@@ -48,7 +48,7 @@ public:
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
-  JavaPolicies(KConfig* config, const TQString &group, bool global,
+  JavaPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain = TQString::null);
 
   /** empty constructur to make TQMap happy
@@ -65,7 +65,7 @@ public:
 class JavaDomainListView : public DomainListView {
   Q_OBJECT
 public:
-  JavaDomainListView(KConfig *config,const TQString &group,KJavaOptions *opt,
+  JavaDomainListView(TDEConfig *config,const TQString &group,KJavaOptions *opt,
   		TQWidget *parent,const char *name = 0);
   virtual ~JavaDomainListView();
 
@@ -84,12 +84,12 @@ private:
   KJavaOptions *options;
 };
 
-class KJavaOptions : public KCModule
+class KJavaOptions : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KJavaOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+    KJavaOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 
     virtual void load();
     virtual void load( bool useDefaults );
@@ -104,7 +104,7 @@ private slots:
 
 private:
 
-    KConfig* m_pConfig;
+    TDEConfig* m_pConfig;
     TQString  m_groupname;
     JavaPolicies java_global_policies;
 
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index e50224f53..e36743783 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -34,9 +34,9 @@
 
 // == class KJavaScriptOptions =====
 
-KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidget *parent,
+KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget *parent,
 										const char *name ) :
-  KCModule( parent, name ),
+  TDECModule( parent, name ),
   _removeJavaScriptDomainAdvice(false),
    m_pConfig( config ), m_groupname( group ),
   js_global_policies(config,group,true,TQString::null),
@@ -165,7 +165,7 @@ void KJavaScriptOptions::slotChangeJSEnabled() {
 
 // == class JSDomainListView =====
 
-JSDomainListView::JSDomainListView(KConfig *config,const TQString &group,
+JSDomainListView::JSDomainListView(TDEConfig *config,const TQString &group,
 	KJavaScriptOptions *options, TQWidget *parent,const char *name)
 	: DomainListView(config,i18n( "Do&main-Specific" ), parent, name),
 	group(group), options(options) {
diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h
index 5c9aa74e3..f5735294d 100644
--- a/kcontrol/konqhtml/jsopts.h
+++ b/kcontrol/konqhtml/jsopts.h
@@ -16,7 +16,7 @@
 #include "jspolicies.h"
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KURLRequester;
 class TQCheckBox;
 class TQComboBox;
@@ -35,7 +35,7 @@ class KJavaScriptOptions;
 class JSDomainListView : public DomainListView {
   Q_OBJECT
 public:
-  JSDomainListView(KConfig *config,const TQString &group,KJavaScriptOptions *opt,
+  JSDomainListView(TDEConfig *config,const TQString &group,KJavaScriptOptions *opt,
   		TQWidget *parent,const char *name = 0);
   virtual ~JSDomainListView();
 
@@ -54,11 +54,11 @@ private:
   KJavaScriptOptions *options;
 };
 
-class KJavaScriptOptions : public KCModule
+class KJavaScriptOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KJavaScriptOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+  KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 
   virtual void load();
   virtual void load( bool useDefaults );
@@ -72,7 +72,7 @@ private slots:
 
 private:
 
-  KConfig *m_pConfig;
+  TDEConfig *m_pConfig;
   TQString m_groupname;
   JSPolicies js_global_policies;
   TQCheckBox *enableJavaScriptGloballyCB;
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 5196af8dd..c035c1857 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -33,7 +33,7 @@
 
 // == class JSPolicies ==
 
-JSPolicies::JSPolicies(KConfig* config,const TQString &group,
+JSPolicies::JSPolicies(TDEConfig* config,const TQString &group,
 		bool global,const TQString &domain) :
 	Policies(config,group,global,domain,"javascript.","EnableJavaScript") {
 }
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index 45352fbb9..7f3e400fa 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -29,7 +29,7 @@
 
 #include "policies.h"
 
-class KConfig;
+class TDEConfig;
 class TQRadioButton;
 class TQButtonGroup;
 
@@ -63,7 +63,7 @@ public:
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
-  JSPolicies(KConfig* config, const TQString &group, bool global,
+  JSPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain = TQString::null);
 		
   /**
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 93fb20d70..6e79a59ec 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -8,8 +8,8 @@
 #include "khttpoptdlg.h"
 
 
-KHTTPOptions::KHTTPOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
-  : KCModule( parent, name ), m_pConfig(config), m_groupname(group)
+KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *name)
+  : TDECModule( parent, name ), m_pConfig(config), m_groupname(group)
 {
   TQVBoxLayout *lay = new TQVBoxLayout(this, 10, 5);
 
diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index f758be15c..0a3507085 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -15,11 +15,11 @@
 *  Dialog for configuring HTTP Options like charset and language negotiation
 *  and assuming that file got from HTTP is HTML if no Content-Type is given
 */
-class KHTTPOptions : public KCModule
+class KHTTPOptions : public TDECModule
 {
 Q_OBJECT
   public:
-    KHTTPOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
+    KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
 
     virtual void load();
     virtual void load( bool useDefaults );
@@ -28,7 +28,7 @@ Q_OBJECT
 
   private:
 
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     TQString m_groupname;
 
     // Acceptable languages "LANG" - locale selected languages
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index f1f28efca..35a958b46 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -43,40 +43,40 @@
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_khtml_behavior(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_khtml_fonts(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
+	KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KJSParts(c, parent, "kcmkonqhtml");
 	}
 
-	KDE_EXPORT KCModule *create_khtml_plugins(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-        KDE_EXPORT KCModule *create_khtml_filter(TQWidget *parent, const char *name )
+        KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name )
         {
-	    KConfig *c = new KConfig( "khtmlrc", false, false );
+	    TDEConfig *c = new TDEConfig( "khtmlrc", false, false );
             return new KCMFilter(c, "Filter Settings", parent, name);
         }
 }
 
 
-KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
-	: KCModule(parent, name), mConfig(config)
+KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name)
+	: TDECModule(parent, name), mConfig(config)
 {
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"),
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index eeb9da311..182ac2756 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -33,13 +33,13 @@ class KJavaScriptOptions;
 
 class TQTabWidget;
 
-class KJSParts : public KCModule
+class KJSParts : public TDECModule
 {
   Q_OBJECT
 
 public:
 
-  KJSParts(KConfig *config,TQWidget *parent, const char *name);
+  KJSParts(TDEConfig *config,TQWidget *parent, const char *name);
   virtual ~KJSParts();
 
   void load();
@@ -54,7 +54,7 @@ private:
   KJavaScriptOptions *javascript;
   KJavaOptions       *java;
 
-  KConfig *mConfig;
+  TDEConfig *mConfig;
 };
 
 #endif
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index c78a63eec..c8f9f760d 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -33,7 +33,7 @@
 
 // == class PluginPolicies =====
 
-PluginPolicies::PluginPolicies(KConfig* config, const TQString &group, bool global,
+PluginPolicies::PluginPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain) :
 	Policies(config,group,global,domain,"plugins.","EnablePlugins") {
 }
@@ -43,9 +43,9 @@ PluginPolicies::~PluginPolicies() {
 
 // == class KPluginOptions =====
 
-KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *parent,
+KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *parent,
                             const char *)
-    : KCModule( parent, "kcmkonqhtml" ),
+    : TDECModule( parent, "kcmkonqhtml" ),
       m_pConfig( config ),
       m_groupname( group ),
       m_nspluginscan (0),
@@ -190,7 +190,7 @@ void KPluginOptions::load( bool useDefaults )
 
 /****************************************************************************/
 
-  KConfig *config = new KConfig("kcmnspluginrc", true);
+  TDEConfig *config = new TDEConfig("kcmnspluginrc", true);
 
   config->setReadDefaults( useDefaults );
 
@@ -236,7 +236,7 @@ void KPluginOptions::save()
 
 /*****************************************************************************/
 
-    KConfig *config= new KConfig("kcmnspluginrc", false);
+    TDEConfig *config= new TDEConfig("kcmnspluginrc", false);
 
     dirSave( config );
     pluginSave( config );
@@ -364,7 +364,7 @@ void KPluginOptions::dirInit()
 }
 
 
-void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
+void KPluginOptions::dirLoad( TDEConfig *config, bool useDefault )
 {
     TQStringList paths;
 
@@ -406,7 +406,7 @@ void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
 }
 
 
-void KPluginOptions::dirSave( KConfig *config )
+void KPluginOptions::dirSave( TDEConfig *config )
 {
     // create stringlist
     TQStringList paths;
@@ -506,7 +506,7 @@ void KPluginOptions::pluginInit()
 }
 
 
-void KPluginOptions::pluginLoad( KConfig* /*config*/ )
+void KPluginOptions::pluginLoad( TDEConfig* /*config*/ )
 {
     kdDebug() << "-> KPluginOptions::fillPluginList" << endl;
     m_widget->pluginList->clear();
@@ -583,7 +583,7 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ )
 }
 
 
-void KPluginOptions::pluginSave( KConfig* /*config*/ )
+void KPluginOptions::pluginSave( TDEConfig* /*config*/ )
 {
 
 }
@@ -623,7 +623,7 @@ void PluginDomainDialog::slotClose() {
 
 // == class PluginDomainListView =====
 
-PluginDomainListView::PluginDomainListView(KConfig *config,const TQString &group,
+PluginDomainListView::PluginDomainListView(TDEConfig *config,const TQString &group,
 	KPluginOptions *options,TQWidget *parent,const char *name)
 	: DomainListView(config,i18n( "Doma&in-Specific" ), parent, name),
 	group(group), options(options) {
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index 8b61f8f16..37aeceeda 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -16,7 +16,7 @@
 #include "domainlistview.h"
 #include "policies.h"
 
-class KConfig;
+class TDEConfig;
 class TQCheckBox;
 
 #include <kcmodule.h>
@@ -44,7 +44,7 @@ public:
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
-  PluginPolicies(KConfig* config, const TQString &group, bool global,
+  PluginPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain = TQString::null);
 
   virtual ~PluginPolicies();
@@ -55,7 +55,7 @@ public:
 class PluginDomainListView : public DomainListView {
   Q_OBJECT
 public:
-  PluginDomainListView(KConfig *config,const TQString &group,KPluginOptions *opt,
+  PluginDomainListView(TDEConfig *config,const TQString &group,KPluginOptions *opt,
   		TQWidget *parent,const char *name = 0);
   virtual ~PluginDomainListView();
 
@@ -90,12 +90,12 @@ private:
   TQBoxLayout *thisLayout;
 };
 
-class KPluginOptions : public KCModule
+class KPluginOptions : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KPluginOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+    KPluginOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 	~KPluginOptions();
 
     virtual void load();
@@ -111,7 +111,7 @@ private slots:
 
 private:
 
-    KConfig* m_pConfig;
+    TDEConfig* m_pConfig;
     TQString  m_groupname;
 
     TQCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand;
@@ -140,8 +140,8 @@ private:
 /******************************************************************************/
  protected:
   void dirInit();
-  void dirLoad( KConfig *config, bool useDefault = false );
-  void dirSave( KConfig *config );
+  void dirLoad( TDEConfig *config, bool useDefault = false );
+  void dirSave( TDEConfig *config );
 
  protected slots:
   void dirNew();
@@ -154,8 +154,8 @@ private:
 /******************************************************************************/
  protected:
   void pluginInit();
-  void pluginLoad( KConfig *config );
-  void pluginSave( KConfig *config );
+  void pluginLoad( TDEConfig *config );
+  void pluginSave( TDEConfig *config );
 
   friend class PluginDomainListView;
 };
diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp
index 524bd4d15..0c1cd3bc5 100644
--- a/kcontrol/konqhtml/policies.cpp
+++ b/kcontrol/konqhtml/policies.cpp
@@ -26,7 +26,7 @@
 
 // == class Policies ==
 
-Policies::Policies(KConfig* config,const TQString &group,
+Policies::Policies(TDEConfig* config,const TQString &group,
 		bool global,const TQString &domain, const TQString &prefix,
 		const TQString &feature_key) :
 	is_global(global), config(config), groupname(group),
diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h
index a9814396a..df2a97750 100644
--- a/kcontrol/konqhtml/policies.h
+++ b/kcontrol/konqhtml/policies.h
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 
-class KConfig;
+class TDEConfig;
 
 // special value for inheriting a global policy
 #define INHERIT_POLICY		32767
@@ -54,7 +54,7 @@ public:
    * @param feature_key key of the "feature enabled" policy. The final
    *	key the policy is stored under will be prefix + featureKey.
    */
-  Policies(KConfig* config, const TQString &group, bool global,
+  Policies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain, const TQString &prefix,
 		const TQString &feature_key);
 
@@ -123,7 +123,7 @@ protected:
   unsigned int feature_enabled;
 
   bool is_global;
-  KConfig *config;
+  TDEConfig *config;
   TQString groupname;
   TQString domain;
   TQString prefix;