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

4 files changed, 10 insertions, 10 deletions

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.