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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/kdiff3.h b/src/kdiff3.h
index 00cca9e..4ce8db2 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -112,10 +112,10 @@ class KDiff3App : public TQSplitter
 
     /** save general Options like all bar positions and status as well as the geometry
         and the recent file list to the configuration file */
-    void saveOptions( KConfig* );
+    void saveOptions( TDEConfig* );
 
     /** read general Options again and initialize all variables like the recent file list */
-    void readOptions( KConfig* );
+    void readOptions( TDEConfig* );
 
     // Finish initialisation (virtual, so that it can be called from the shell too.)
     virtual void completeInit(const TQString& fn1="", const TQString& fn2="", const TQString& fn3="");
@@ -182,7 +182,7 @@ class KDiff3App : public TQSplitter
 
   private:
     /** the configuration object of the application */
-    //KConfig *config;
+    //TDEConfig *config;
 
     // KAction pointers to enable/disable actions
     KAction* fileOpen;