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

4 files changed, 9 insertions, 9 deletions

diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index c38a0b3..f86c773 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -145,7 +145,7 @@ class HadifixConfPrivate {
                            100, 100, 100, "Local");
       };
 
-      void load (KConfig *config, const TQString &configGroup) {
+      void load (TDEConfig *config, const TQString &configGroup) {
          config->setGroup(configGroup);
          
          TQString voice = config->readEntry("voice", configWidget->getVoiceFilename());
@@ -173,7 +173,7 @@ class HadifixConfPrivate {
          );
       };
 
-      void save (KConfig *config, const TQString &configGroup) {
+      void save (TDEConfig *config, const TQString &configGroup) {
          config->setGroup(configGroup);
          config->writeEntry ("hadifixExec", PlugInConf::realFilePath(configWidget->hadifixURL->url()));
          config->writeEntry ("mbrolaExec", PlugInConf::realFilePath(configWidget->mbrolaURL->url()));
@@ -233,13 +233,13 @@ HadifixConf::~HadifixConf(){
    delete d;
 }
 
-void HadifixConf::load(KConfig *config, const TQString &configGroup) {
+void HadifixConf::load(TDEConfig *config, const TQString &configGroup) {
    // kdDebug() << "HadifixConf::load: Running" << endl;
    d->setDefaults();
    d->load (config, configGroup);
 }
 
-void HadifixConf::save(KConfig *config, const TQString &configGroup) {
+void HadifixConf::save(TDEConfig *config, const TQString &configGroup) {
    // kdDebug() << "HadifixConf::save: Running" << endl;
    d->save (config, configGroup);
 }
diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h
index cc6d1e5..67e0dcb 100644
--- a/kttsd/plugins/hadifix/hadifixconf.h
+++ b/kttsd/plugins/hadifix/hadifixconf.h
@@ -27,13 +27,13 @@ class HadifixConf : public PlugInConf {
             the control center, to undo all of his changes and restore the currently 
             valid settings. NOTE that this is not called after the modules is loaded,
             so you probably want to call this method in the constructor.*/
-        void load(KConfig *config, const TQString &configGroup);
+        void load(TDEConfig *config, const TQString &configGroup);
 
         /** This function gets called when the user wants to save the settings in 
             the user interface, updating the config files or wherever the 
             configuration is stored. The method is called when the user clicks "Apply" 
             or "Ok". */
-        void save(KConfig *config, const TQString &configGroup);
+        void save(TDEConfig *config, const TQString &configGroup);
 
         /** This function is called to set the settings in the module to sensible
             default values. It gets called when hitting the "Default" button. The 
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index a217e1e..52f10db 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -47,7 +47,7 @@ class HadifixProcPrivate {
         delete hadifixProc;
       };
 
-      void load(KConfig *config, const TQString &configGroup) {
+      void load(TDEConfig *config, const TQString &configGroup) {
          config->setGroup(configGroup);
          hadifix  = config->readEntry ("hadifixExec",   TQString());
          mbrola   = config->readEntry ("mbrolaExec",    TQString());
@@ -92,7 +92,7 @@ HadifixProc::~HadifixProc(){
 }
 
 /** Initializate the speech */
-bool HadifixProc::init(KConfig *config, const TQString &configGroup){
+bool HadifixProc::init(TDEConfig *config, const TQString &configGroup){
    // kdDebug() << "HadifixProc::init: Initializing plug in: Hadifix" << endl;
 
    if (d == 0)
diff --git a/kttsd/plugins/hadifix/hadifixproc.h b/kttsd/plugins/hadifix/hadifixproc.h
index 98bdf42..34039c0 100644
--- a/kttsd/plugins/hadifix/hadifixproc.h
+++ b/kttsd/plugins/hadifix/hadifixproc.h
@@ -44,7 +44,7 @@ class HadifixProc : public PlugInProc{
     ~HadifixProc();
     
     /** Initializate the speech */
-    virtual bool init (KConfig *config, const TQString &configGroup);
+    virtual bool init (TDEConfig *config, const TQString &configGroup);
     
     /** 
     * Say a text.  Synthesize and audibilize it.