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

4 files changed, 6 insertions, 6 deletions

diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index c7563a6..58c2bad 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -137,7 +137,7 @@ int FestivalIntConf::voiceCodeToListIndex(const TQString& voiceCode) const
     return -1;
 }
 
-void FestivalIntConf::load(KConfig *config, const TQString &configGroup){
+void FestivalIntConf::load(TDEConfig *config, const TQString &configGroup){
     //kdDebug() << "FestivalIntConf::load: Running" << endl;
     config->setGroup("FestivalInt");
     TQString exePath = config->readEntry("FestivalExecutablePath", "festival");
@@ -170,7 +170,7 @@ void FestivalIntConf::load(KConfig *config, const TQString &configGroup){
     m_widget->characterCodingBox->setCurrentItem(codecNdx);
 }
 
-void FestivalIntConf::save(KConfig *config, const TQString &configGroup){
+void FestivalIntConf::save(TDEConfig *config, const TQString &configGroup){
     // kdDebug() << "FestivalIntConf::save: Running" << endl;
     config->setGroup("FestivalInt");
     config->writeEntry("FestivalExecutablePath", realFilePath(m_widget->festivalPath->url()));
diff --git a/kttsd/plugins/festivalint/festivalintconf.h b/kttsd/plugins/festivalint/festivalintconf.h
index 40f520a..9e55d8c 100644
--- a/kttsd/plugins/festivalint/festivalintconf.h
+++ b/kttsd/plugins/festivalint/festivalintconf.h
@@ -72,14 +72,14 @@ class FestivalIntConf : public PlugInConf {
         *  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/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp
index 065504f..4001208 100644
--- a/kttsd/plugins/festivalint/festivalintproc.cpp
+++ b/kttsd/plugins/festivalint/festivalintproc.cpp
@@ -84,7 +84,7 @@ FestivalIntProc::~FestivalIntProc(){
 }
 
 /** Initialize the speech */
-bool FestivalIntProc::init(KConfig *config, const TQString &configGroup)
+bool FestivalIntProc::init(TDEConfig *config, const TQString &configGroup)
 {
     // kdDebug() << "FestivalIntProc::init: Initializing plug in: Festival" << endl;
 
diff --git a/kttsd/plugins/festivalint/festivalintproc.h b/kttsd/plugins/festivalint/festivalintproc.h
index f086653..2222512 100644
--- a/kttsd/plugins/festivalint/festivalintproc.h
+++ b/kttsd/plugins/festivalint/festivalintproc.h
@@ -59,7 +59,7 @@ class FestivalIntProc : public PlugInProc{
          * @param config          Settings object.
          * @param configGroup     Settings group.
          */
-        virtual bool init(KConfig *config, const TQString &configGroup);
+        virtual bool init(TDEConfig *config, const TQString &configGroup);
 
         /**
          * Returns true when festival is ready to speak a sentence.