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

2 files changed, 9 insertions, 9 deletions

diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex
index 8f22471..8095a43 100644
--- a/Documentation/ConduitProgrammingTutorial/index.tex
+++ b/Documentation/ConduitProgrammingTutorial/index.tex
@@ -363,7 +363,7 @@ kpilotdaemon: somefunction: Value of i=5
 
 In this section I will shortly describe how you can implement a configuration dialog for your conduit. 
 There is nothing Palm- or KPilot-specific about this. All the configuration dialog does is to read the 
-configuration settings from the config file (using the \class{KConfig} class from tdelibs), and let 
+configuration settings from the config file (using the \class{TDEConfig} class from tdelibs), and let 
 the user change them in the dialog. If the user exists the dialog by pressing OK, the new values are 
 read from the dialog controls and written back to the configuration file.
 
@@ -461,7 +461,7 @@ to retrieve the settings from the configuration file. We then use the methods of
     FUNCTIONSETUP;
 
     if (!fConfig) return;
-    KConfigGroupSaver s(fConfig,MALConduitFactory::group());
+    TDEConfigGroupSaver s(fConfig,MALConduitFactory::group());
     
     fConfigWidget->syncTime->setButton(fConfig->readNumEntry(MALConduitFactory::syncTime(), 0));
     
@@ -488,7 +488,7 @@ to retrieve the settings from the configuration file. We then use the methods of
 In this example, we don't store to the configuration file if a custom proxy port should be used. Instead, we just store a port number, and if the port number is 0 this means to use the default port. In this case, the custom port CheckBox needs to stay unchecked, and the port NumEntry control will stay disabled as it is in the dialog template. In all other cases, however, the custom port CheckBox should be checked, and the port NumEntry control will be enabled and filled with the correct custom port.
 
 
-The KPilot user can then change all the settings in the dialogbox without any intervention from KPilot, so we don't need to write any code for that. Only the \code{commitChanges()} method remains to be done, which does the opposite of the readSettings() method. It reads the values of the controls and stores them to the configuration file. The \class{KConfig} class (the \code{fConfig} variable, resp.) has only one method \code{KConfig::writeEntry("entryname", valueOfWhateverType)} to write a value to the configuration file. However, this method has several overloaded implementations so that you can write numeric, string, boolean, date and many more variable types with the same syntax. First, we need to set the correct configuration group again, and then we just read each of the settings and write it out immediately using the \code{writeEntry} method:
+The KPilot user can then change all the settings in the dialogbox without any intervention from KPilot, so we don't need to write any code for that. Only the \code{commitChanges()} method remains to be done, which does the opposite of the readSettings() method. It reads the values of the controls and stores them to the configuration file. The \class{TDEConfig} class (the \code{fConfig} variable, resp.) has only one method \code{TDEConfig::writeEntry("entryname", valueOfWhateverType)} to write a value to the configuration file. However, this method has several overloaded implementations so that you can write numeric, string, boolean, date and many more variable types with the same syntax. First, we need to set the correct configuration group again, and then we just read each of the settings and write it out immediately using the \code{writeEntry} method:
 
 {\footnotesize\begin{verbatim}
 /* virtual */ void MALWidgetSetup::commitChanges()
@@ -496,7 +496,7 @@ The KPilot user can then change all the settings in the dialogbox without any in
     FUNCTIONSETUP;
 
     if (!fConfig) return;
-    KConfigGroupSaver s(fConfig,MALConduitFactory::group());
+    TDEConfigGroupSaver s(fConfig,MALConduitFactory::group());
     
     fConfig->writeEntry(MALConduitFactory::syncTime(),
         fConfigWidget->syncTime->id(fConfigWidget->syncTime->selected()));
@@ -828,7 +828,7 @@ When using the libmal library, all we have to do is to make some proxy settings,
 void MALConduit::readConfig() {
   FUNCTIONSETUP;
   QDateTime dt;
-  KConfigGroupSaver g(fConfig, MALConduitFactory::group());
+  TDEConfigGroupSaver g(fConfig, MALConduitFactory::group());
   fLastSync = fConfig->readDateTimeEntry(MALConduitFactory::lastSync(), &dt);
   DEBUGCONDUIT<<"Last sync was "<<fLastSync.toString()<<endl;
 
@@ -847,7 +847,7 @@ void MALConduit::readConfig() {
 
 void MALConduit::saveConfig() {
   FUNCTIONSETUP;
-  KConfigGroupSaver g(fConfig, MALConduitFactory::group());
+  TDEConfigGroupSaver g(fConfig, MALConduitFactory::group());
   fConfig->writeEntry(MALConduitFactory::lastSync(), QDateTime::currentDateTime());
 }
 
@@ -1352,7 +1352,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) {
     
     // Now calculate the md5 checksum of the PC text and write it to the config file
     {
-      KConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
+      TDEConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
       KMD5 docmd5;
       QFile docfile(docconverter.docFilename());
       if (docfile.open(IO_ReadOnly)) {
@@ -1392,7 +1392,7 @@ After the sync is done, just call cleanup and emit the \code{syncDone} signal:
 void DOCConduit::cleanup() {
   FUNCTIONSETUP;
   
-  KConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
+  TDEConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
   fConfig->writeEntry(DOCConduitFactory::fDOCList, fDBNames);
   fConfig->sync();
 
diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.h b/Documentation/ConduitProgrammingTutorial/mal-factory.h
index dac91d0..ff9727c 100644
--- a/Documentation/ConduitProgrammingTutorial/mal-factory.h
+++ b/Documentation/ConduitProgrammingTutorial/mal-factory.h
@@ -41,7 +41,7 @@ protected:
 private:
     TDEInstance *fInstance;
     static TDEAboutData *fAbout;
-    // KConfig entry keys.
+    // TDEConfig entry keys.
     static const char *fGroup;
     static const char *fLastSync, *fSyncTime, 
         *fProxyType, *fProxyServer, *fProxyPort, *fProxyUser, *fProxyPassword;