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

96 files changed, 240 insertions, 240 deletions

diff --git a/extra/kde300/kaccelaction.h b/extra/kde300/kaccelaction.h
index c1e53f5..b9fb056 100644
--- a/extra/kde300/kaccelaction.h
+++ b/extra/kde300/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /*
 	KAccelAction holds information an a given action, such as "Execute Command"
@@ -153,7 +153,7 @@ class KAccelActions
 
 	void clear();
 	bool init( const KAccelActions& );
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	void updateShortcuts( KAccelActions& );
 
@@ -173,8 +173,8 @@ class KAccelActions
 	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	void emitKeycodeChanged();
diff --git a/extra/kde300/kaccelbase.h b/extra/kde300/kaccelbase.h
index e485433..5405a1f 100644
--- a/extra/kde300/kaccelbase.h
+++ b/extra/kde300/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde300/kicontheme.h b/extra/kde300/kicontheme.h
index 94c2e33..bf813b0 100644
--- a/extra/kde300/kicontheme.h
+++ b/extra/kde300/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde300/kurifilter.h b/extra/kde300/kurifilter.h
index c0be129..d7dc5b3 100644
--- a/extra/kde300/kurifilter.h
+++ b/extra/kde300/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde301/kaccelaction.h b/extra/kde301/kaccelaction.h
index c1e53f5..b9fb056 100644
--- a/extra/kde301/kaccelaction.h
+++ b/extra/kde301/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /*
 	KAccelAction holds information an a given action, such as "Execute Command"
@@ -153,7 +153,7 @@ class KAccelActions
 
 	void clear();
 	bool init( const KAccelActions& );
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	void updateShortcuts( KAccelActions& );
 
@@ -173,8 +173,8 @@ class KAccelActions
 	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	void emitKeycodeChanged();
diff --git a/extra/kde301/kaccelbase.h b/extra/kde301/kaccelbase.h
index e485433..5405a1f 100644
--- a/extra/kde301/kaccelbase.h
+++ b/extra/kde301/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde301/kicontheme.h b/extra/kde301/kicontheme.h
index 94c2e33..bf813b0 100644
--- a/extra/kde301/kicontheme.h
+++ b/extra/kde301/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde301/kurifilter.h b/extra/kde301/kurifilter.h
index c0be129..d7dc5b3 100644
--- a/extra/kde301/kurifilter.h
+++ b/extra/kde301/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde303/kaccelaction.h b/extra/kde303/kaccelaction.h
index c1e53f5..b9fb056 100644
--- a/extra/kde303/kaccelaction.h
+++ b/extra/kde303/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /*
 	KAccelAction holds information an a given action, such as "Execute Command"
@@ -153,7 +153,7 @@ class KAccelActions
 
 	void clear();
 	bool init( const KAccelActions& );
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	void updateShortcuts( KAccelActions& );
 
@@ -173,8 +173,8 @@ class KAccelActions
 	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	void emitKeycodeChanged();
diff --git a/extra/kde303/kaccelbase.h b/extra/kde303/kaccelbase.h
index e485433..5405a1f 100644
--- a/extra/kde303/kaccelbase.h
+++ b/extra/kde303/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde303/kicontheme.h b/extra/kde303/kicontheme.h
index 94c2e33..bf813b0 100644
--- a/extra/kde303/kicontheme.h
+++ b/extra/kde303/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde303/kurifilter.h b/extra/kde303/kurifilter.h
index c0be129..d7dc5b3 100644
--- a/extra/kde303/kurifilter.h
+++ b/extra/kde303/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde310/kaccelaction.h b/extra/kde310/kaccelaction.h
index b339517..b3ed712 100644
--- a/extra/kde310/kaccelaction.h
+++ b/extra/kde310/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde310/kaccelbase.h b/extra/kde310/kaccelbase.h
index efa075a..4a1a44f 100644
--- a/extra/kde310/kaccelbase.h
+++ b/extra/kde310/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde310/kicontheme.h b/extra/kde310/kicontheme.h
index b918eb3..eb358e7 100644
--- a/extra/kde310/kicontheme.h
+++ b/extra/kde310/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde310/kurifilter.h b/extra/kde310/kurifilter.h
index c9113fe..798aafd 100644
--- a/extra/kde310/kurifilter.h
+++ b/extra/kde310/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde311/kaccelaction.h b/extra/kde311/kaccelaction.h
index b339517..b3ed712 100644
--- a/extra/kde311/kaccelaction.h
+++ b/extra/kde311/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde311/kaccelbase.h b/extra/kde311/kaccelbase.h
index efa075a..4a1a44f 100644
--- a/extra/kde311/kaccelbase.h
+++ b/extra/kde311/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde311/kicontheme.h b/extra/kde311/kicontheme.h
index b918eb3..eb358e7 100644
--- a/extra/kde311/kicontheme.h
+++ b/extra/kde311/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde311/kurifilter.h b/extra/kde311/kurifilter.h
index c9113fe..798aafd 100644
--- a/extra/kde311/kurifilter.h
+++ b/extra/kde311/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde312/kaccelaction.h b/extra/kde312/kaccelaction.h
index b339517..b3ed712 100644
--- a/extra/kde312/kaccelaction.h
+++ b/extra/kde312/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde312/kaccelbase.h b/extra/kde312/kaccelbase.h
index efa075a..4a1a44f 100644
--- a/extra/kde312/kaccelbase.h
+++ b/extra/kde312/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde312/kicontheme.h b/extra/kde312/kicontheme.h
index b918eb3..eb358e7 100644
--- a/extra/kde312/kicontheme.h
+++ b/extra/kde312/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde312/kurifilter.h b/extra/kde312/kurifilter.h
index c9113fe..798aafd 100644
--- a/extra/kde312/kurifilter.h
+++ b/extra/kde312/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde313/kaccelaction.h b/extra/kde313/kaccelaction.h
index b339517..b3ed712 100644
--- a/extra/kde313/kaccelaction.h
+++ b/extra/kde313/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde313/kaccelbase.h b/extra/kde313/kaccelbase.h
index efa075a..4a1a44f 100644
--- a/extra/kde313/kaccelbase.h
+++ b/extra/kde313/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde313/kicontheme.h b/extra/kde313/kicontheme.h
index b918eb3..eb358e7 100644
--- a/extra/kde313/kicontheme.h
+++ b/extra/kde313/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde313/kurifilter.h b/extra/kde313/kurifilter.h
index c9113fe..798aafd 100644
--- a/extra/kde313/kurifilter.h
+++ b/extra/kde313/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde314/kaccelaction.h b/extra/kde314/kaccelaction.h
index b339517..b3ed712 100644
--- a/extra/kde314/kaccelaction.h
+++ b/extra/kde314/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde314/kaccelbase.h b/extra/kde314/kaccelbase.h
index efa075a..4a1a44f 100644
--- a/extra/kde314/kaccelbase.h
+++ b/extra/kde314/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde314/kicontheme.h b/extra/kde314/kicontheme.h
index b918eb3..eb358e7 100644
--- a/extra/kde314/kicontheme.h
+++ b/extra/kde314/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde314/kurifilter.h b/extra/kde314/kurifilter.h
index 30f903b..8eb3d5d 100644
--- a/extra/kde314/kurifilter.h
+++ b/extra/kde314/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde315/kaccelaction.h b/extra/kde315/kaccelaction.h
index b339517..b3ed712 100644
--- a/extra/kde315/kaccelaction.h
+++ b/extra/kde315/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde315/kaccelbase.h b/extra/kde315/kaccelbase.h
index efa075a..4a1a44f 100644
--- a/extra/kde315/kaccelbase.h
+++ b/extra/kde315/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with @ref setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde315/kicontheme.h b/extra/kde315/kicontheme.h
index 89d519f..cfd6eed 100644
--- a/extra/kde315/kicontheme.h
+++ b/extra/kde315/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde315/kurifilter.h b/extra/kde315/kurifilter.h
index 30f903b..8eb3d5d 100644
--- a/extra/kde315/kurifilter.h
+++ b/extra/kde315/kurifilter.h
@@ -30,7 +30,7 @@ class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
 class TQStringList;
-class KCModule;
+class TDECModule;
 
 /**
 * This is a basic message object used for exchanging filtering
@@ -342,7 +342,7 @@ public:
      *
      * @return A configuration module, @p null if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde320/kaccelaction.h b/extra/kde320/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde320/kaccelaction.h
+++ b/extra/kde320/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde320/kaccelbase.h b/extra/kde320/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde320/kaccelbase.h
+++ b/extra/kde320/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde320/kicontheme.h b/extra/kde320/kicontheme.h
index 4e559fc..880375a 100644
--- a/extra/kde320/kicontheme.h
+++ b/extra/kde320/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde320/kurifilter.h b/extra/kde320/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde320/kurifilter.h
+++ b/extra/kde320/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde321/kaccelaction.h b/extra/kde321/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde321/kaccelaction.h
+++ b/extra/kde321/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde321/kaccelbase.h b/extra/kde321/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde321/kaccelbase.h
+++ b/extra/kde321/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde321/kicontheme.h b/extra/kde321/kicontheme.h
index 4e559fc..880375a 100644
--- a/extra/kde321/kicontheme.h
+++ b/extra/kde321/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde321/kurifilter.h b/extra/kde321/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde321/kurifilter.h
+++ b/extra/kde321/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde322/kaccelaction.h b/extra/kde322/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde322/kaccelaction.h
+++ b/extra/kde322/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde322/kaccelbase.h b/extra/kde322/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde322/kaccelbase.h
+++ b/extra/kde322/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde322/kicontheme.h b/extra/kde322/kicontheme.h
index 4e559fc..880375a 100644
--- a/extra/kde322/kicontheme.h
+++ b/extra/kde322/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde322/kurifilter.h b/extra/kde322/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde322/kurifilter.h
+++ b/extra/kde322/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde323/kaccelaction.h b/extra/kde323/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde323/kaccelaction.h
+++ b/extra/kde323/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde323/kaccelbase.h b/extra/kde323/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde323/kaccelbase.h
+++ b/extra/kde323/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde323/kicontheme.h b/extra/kde323/kicontheme.h
index 4e559fc..880375a 100644
--- a/extra/kde323/kicontheme.h
+++ b/extra/kde323/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde323/kurifilter.h b/extra/kde323/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde323/kurifilter.h
+++ b/extra/kde323/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde330/kaccelaction.h b/extra/kde330/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde330/kaccelaction.h
+++ b/extra/kde330/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde330/kaccelbase.h b/extra/kde330/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde330/kaccelbase.h
+++ b/extra/kde330/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde330/kicontheme.h b/extra/kde330/kicontheme.h
index 5f9be44..d1ac559 100644
--- a/extra/kde330/kicontheme.h
+++ b/extra/kde330/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde330/kurifilter.h b/extra/kde330/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde330/kurifilter.h
+++ b/extra/kde330/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde331/kaccelaction.h b/extra/kde331/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde331/kaccelaction.h
+++ b/extra/kde331/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde331/kaccelbase.h b/extra/kde331/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde331/kaccelbase.h
+++ b/extra/kde331/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde331/kicontheme.h b/extra/kde331/kicontheme.h
index ebd8af7..913bea4 100644
--- a/extra/kde331/kicontheme.h
+++ b/extra/kde331/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde331/kurifilter.h b/extra/kde331/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde331/kurifilter.h
+++ b/extra/kde331/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde332/kaccelaction.h b/extra/kde332/kaccelaction.h
index 024292d..da6f449 100644
--- a/extra/kde332/kaccelaction.h
+++ b/extra/kde332/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde332/kaccelbase.h b/extra/kde332/kaccelbase.h
index 2ecb048..30aeebe 100644
--- a/extra/kde332/kaccelbase.h
+++ b/extra/kde332/kaccelbase.h
@@ -172,14 +172,14 @@ class KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde332/kicontheme.h b/extra/kde332/kicontheme.h
index 7922524..8031d39 100644
--- a/extra/kde332/kicontheme.h
+++ b/extra/kde332/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde332/kurifilter.h b/extra/kde332/kurifilter.h
index f3eec28..325da8f 100644
--- a/extra/kde332/kurifilter.h
+++ b/extra/kde332/kurifilter.h
@@ -35,7 +35,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -387,7 +387,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde340/kaccelaction.h b/extra/kde340/kaccelaction.h
index 6d34b4f..51a9076 100644
--- a/extra/kde340/kaccelaction.h
+++ b/extra/kde340/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde340/kaccelbase.h b/extra/kde340/kaccelbase.h
index d9038d5..861ec68 100644
--- a/extra/kde340/kaccelbase.h
+++ b/extra/kde340/kaccelbase.h
@@ -171,14 +171,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde340/kicontheme.h b/extra/kde340/kicontheme.h
index f7a8459..fac3fdb 100644
--- a/extra/kde340/kicontheme.h
+++ b/extra/kde340/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde340/kurifilter.h b/extra/kde340/kurifilter.h
index 59bb6a6..33efcdd 100644
--- a/extra/kde340/kurifilter.h
+++ b/extra/kde340/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde341/kaccelaction.h b/extra/kde341/kaccelaction.h
index 6d34b4f..51a9076 100644
--- a/extra/kde341/kaccelaction.h
+++ b/extra/kde341/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde341/kaccelbase.h b/extra/kde341/kaccelbase.h
index d9038d5..861ec68 100644
--- a/extra/kde341/kaccelbase.h
+++ b/extra/kde341/kaccelbase.h
@@ -171,14 +171,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde341/kicontheme.h b/extra/kde341/kicontheme.h
index f7a8459..fac3fdb 100644
--- a/extra/kde341/kicontheme.h
+++ b/extra/kde341/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde341/kurifilter.h b/extra/kde341/kurifilter.h
index 59bb6a6..33efcdd 100644
--- a/extra/kde341/kurifilter.h
+++ b/extra/kde341/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde342/kaccelaction.h b/extra/kde342/kaccelaction.h
index 6d34b4f..51a9076 100644
--- a/extra/kde342/kaccelaction.h
+++ b/extra/kde342/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde342/kaccelbase.h b/extra/kde342/kaccelbase.h
index d9038d5..861ec68 100644
--- a/extra/kde342/kaccelbase.h
+++ b/extra/kde342/kaccelbase.h
@@ -171,14 +171,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde342/kicontheme.h b/extra/kde342/kicontheme.h
index a6528ad..9c94b4c 100644
--- a/extra/kde342/kicontheme.h
+++ b/extra/kde342/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde342/kurifilter.h b/extra/kde342/kurifilter.h
index 59bb6a6..33efcdd 100644
--- a/extra/kde342/kurifilter.h
+++ b/extra/kde342/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde343/kaccelaction.h b/extra/kde343/kaccelaction.h
index 6d34b4f..51a9076 100644
--- a/extra/kde343/kaccelaction.h
+++ b/extra/kde343/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -397,7 +397,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -518,7 +518,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde343/kaccelbase.h b/extra/kde343/kaccelbase.h
index d9038d5..861ec68 100644
--- a/extra/kde343/kaccelbase.h
+++ b/extra/kde343/kaccelbase.h
@@ -171,14 +171,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde343/kicontheme.h b/extra/kde343/kicontheme.h
index a6528ad..9c94b4c 100644
--- a/extra/kde343/kicontheme.h
+++ b/extra/kde343/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde343/kurifilter.h b/extra/kde343/kurifilter.h
index 59bb6a6..33efcdd 100644
--- a/extra/kde343/kurifilter.h
+++ b/extra/kde343/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde350/kaccelaction.h b/extra/kde350/kaccelaction.h
index 4c7ac18..9cca25d 100644
--- a/extra/kde350/kaccelaction.h
+++ b/extra/kde350/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde350/kaccelbase.h b/extra/kde350/kaccelbase.h
index a217846..1772f99 100644
--- a/extra/kde350/kaccelbase.h
+++ b/extra/kde350/kaccelbase.h
@@ -201,14 +201,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde350/kicontheme.h b/extra/kde350/kicontheme.h
index d60cba4..793f4a6 100644
--- a/extra/kde350/kicontheme.h
+++ b/extra/kde350/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde350/kurifilter.h b/extra/kde350/kurifilter.h
index ac80066..f290f62 100644
--- a/extra/kde350/kurifilter.h
+++ b/extra/kde350/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde351/kaccelaction.h b/extra/kde351/kaccelaction.h
index 4c7ac18..9cca25d 100644
--- a/extra/kde351/kaccelaction.h
+++ b/extra/kde351/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde351/kaccelbase.h b/extra/kde351/kaccelbase.h
index a217846..1772f99 100644
--- a/extra/kde351/kaccelbase.h
+++ b/extra/kde351/kaccelbase.h
@@ -201,14 +201,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde351/kicontheme.h b/extra/kde351/kicontheme.h
index c7c9290..0bd7e96 100644
--- a/extra/kde351/kicontheme.h
+++ b/extra/kde351/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde351/kurifilter.h b/extra/kde351/kurifilter.h
index ac80066..f290f62 100644
--- a/extra/kde351/kurifilter.h
+++ b/extra/kde351/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde352/kaccelaction.h b/extra/kde352/kaccelaction.h
index 4c7ac18..9cca25d 100644
--- a/extra/kde352/kaccelaction.h
+++ b/extra/kde352/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde352/kaccelbase.h b/extra/kde352/kaccelbase.h
index a217846..1772f99 100644
--- a/extra/kde352/kaccelbase.h
+++ b/extra/kde352/kaccelbase.h
@@ -201,14 +201,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde352/kicontheme.h b/extra/kde352/kicontheme.h
index c7c9290..0bd7e96 100644
--- a/extra/kde352/kicontheme.h
+++ b/extra/kde352/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde352/kurifilter.h b/extra/kde352/kurifilter.h
index ac80066..f290f62 100644
--- a/extra/kde352/kurifilter.h
+++ b/extra/kde352/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/extra/kde353/kaccelaction.h b/extra/kde353/kaccelaction.h
index 4c7ac18..9cca25d 100644
--- a/extra/kde353/kaccelaction.h
+++ b/extra/kde353/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/extra/kde353/kaccelbase.h b/extra/kde353/kaccelbase.h
index a217846..1772f99 100644
--- a/extra/kde353/kaccelbase.h
+++ b/extra/kde353/kaccelbase.h
@@ -201,14 +201,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/extra/kde353/kicontheme.h b/extra/kde353/kicontheme.h
index c7c9290..0bd7e96 100644
--- a/extra/kde353/kicontheme.h
+++ b/extra/kde353/kicontheme.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 //class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/extra/kde353/kurifilter.h b/extra/kde353/kurifilter.h
index ac80066..f290f62 100644
--- a/extra/kde353/kurifilter.h
+++ b/extra/kde353/kurifilter.h
@@ -38,7 +38,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -390,7 +390,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.