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

1 files changed, 7 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 679007b..3fa0b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -798,7 +798,7 @@ TODO: only re-write a local database if it is changed.
 * Implemented the kontact plugin for KPilot (showing status information)
 * Added three DCOP functions to the daemon for querying status information
 * Hotsync log is written out to a file (~/.kde/share/apps/kpilot/lastsync.log)
-* Converted all conduits to KConfig XT (mail und kroupware still missing)
+* Converted all conduits to TDEConfig XT (mail und kroupware still missing)
 * Converted the config dialog to a KCM module
 * KPilot plugin for contact: shows status in summary and makes config available
 * kpilotDaemon sends a DCOP signal when its settings/state are changed
@@ -808,7 +808,7 @@ TODO: only re-write a local database if it is changed.
 * implemented the kconf_update scripts to move groupless entries to the
   [General] group
 * Still missing:
-    o) KConfig sync between the three processes working on the
+    o) TDEConfig sync between the three processes working on the
        kpilot config: kpilot, kpilotDaemon and possibly kontact
        with the kpilot plugin
     o) Wizard to setup kpilot correctly for kontact (the defaults
@@ -2524,7 +2524,7 @@ In these complex modern final days, (to quote Pogo), what's up?
 * conduits/knotes/*
   - Ditto; it configures and syncs, although the sync is rather sparse.
   I discovered that const char * const is a useful type, though. It saves
-  an accessor function for KConfig entry keys.
+  an accessor function for TDEConfig entry keys.
 
 The bad conduits:
 
@@ -2594,7 +2594,7 @@ sync part which has not been tested at all.
   - Fixed up includes, removed old PISOCK_INCLUDE.
 * abbrowser-conduit.cc
   - Changed kdDebug() to DEBUGCONDUIT, applied indent style, #ifdef DEBUGs
-  - Replaced static QString objects by const char * (KConfig keys)
+  - Replaced static QString objects by const char * (TDEConfig keys)
   - Removed old files
   - Assume FirstTime is always *true*, this is at least partly broken,
     but it makes the conduit compile at least.
@@ -3005,7 +3005,7 @@ KPilot dialogs with something sensible made with designer.
   of bugs in the other code. Added some documentation explaining possible
   crashes due to missing TDEApplication instance.
   FINALLY did something sensible about code duplication -- added get and
-  set methods to a subclass of KConfig for all KPilot settings.
+  set methods to a subclass of TDEConfig for all KPilot settings.
 * kpilot/kpilotOptions.{h,cc}
   Is deprecated and removed. Say hello to the new world of .ui files.
 * kpilot/kpilot.{h,cc}
@@ -3178,7 +3178,7 @@ there, though.
   somewhere that there is a direct correlation between shoddy indenting
   style and bug density.
 * kpilot/pilotDaemon.h
-  Added a missing class declaration for KServerSocket.
+  Added a missing class declaration for TDEServerSocket.
 * kpilot/kpilot.{h,cc}
   Removed all remaining KPilotLink cruft. KPilot now communicates with
   the daemon through DCOP only.
@@ -4201,7 +4201,7 @@ Some questions:
 * Do we really want to be new() and delete()ing the config file so
   often? Perhaps getConfig() should do some caching.
 * Should we add icons for the other menu items?
-* Is there an entry iterator in KConfig so that you can iterate over
+* Is there an entry iterator in TDEConfig so that you can iterate over
   entries in a certain group (and possibly delete them?)
 
 Some philosophical stuff: