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

24 files changed, 39 insertions, 39 deletions

diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 72731df..837e862 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -81,7 +81,7 @@ CommandConf::~CommandConf()
     delete m_progressDlg;
 }
 
-void CommandConf::load(KConfig *config, const TQString &configGroup) {
+void CommandConf::load(TDEConfig *config, const TQString &configGroup) {
     // kdDebug() << "CommandConf::load: Running" << endl;
     config->setGroup(configGroup);
     m_widget->urlReq->setURL (config->readEntry("Command", "cat -"));
@@ -92,7 +92,7 @@ void CommandConf::load(KConfig *config, const TQString &configGroup) {
     m_widget->characterCodingBox->setCurrentItem(codec);
 }
 
-void CommandConf::save(KConfig *config, const TQString &configGroup) {
+void CommandConf::save(TDEConfig *config, const TQString &configGroup) {
     // kdDebug() << "CommandConf::save: Running" << endl;
     config->setGroup(configGroup);
     config->writeEntry("Command", m_widget->urlReq->url());
diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h
index 1bb2a89..bbc0421 100644
--- a/kttsd/plugins/command/commandconf.h
+++ b/kttsd/plugins/command/commandconf.h
@@ -52,14 +52,14 @@ class CommandConf : 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/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index a5042fa..b284287 100644
--- a/kttsd/plugins/command/commandproc.cpp
+++ b/kttsd/plugins/command/commandproc.cpp
@@ -64,7 +64,7 @@ CommandProc::~CommandProc()
 }
 
 /** Initialize */
-bool CommandProc::init(KConfig *config, const TQString &configGroup){
+bool CommandProc::init(TDEConfig *config, const TQString &configGroup){
     kdDebug() << "CommandProc::init: Initializing plug in: Command " << endl;
 
     config->setGroup(configGroup);
diff --git a/kttsd/plugins/command/commandproc.h b/kttsd/plugins/command/commandproc.h
index f206f9b..694c41f 100644
--- a/kttsd/plugins/command/commandproc.h
+++ b/kttsd/plugins/command/commandproc.h
@@ -40,7 +40,7 @@ class CommandProc : public PlugInProc{
         ~CommandProc();
 
         /** Initializate the speech */
-        bool init (KConfig *config, const TQString &configGroup);
+        bool init (TDEConfig *config, const TQString &configGroup);
 
         /**
          * Say a text string.
diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp
index 53bf672..7bc8c17 100644
--- a/kttsd/plugins/epos/eposconf.cpp
+++ b/kttsd/plugins/epos/eposconf.cpp
@@ -102,7 +102,7 @@ EposConf::~EposConf(){
     delete m_progressDlg;
 }
 
-void EposConf::load(KConfig *config, const TQString &configGroup){
+void EposConf::load(TDEConfig *config, const TQString &configGroup){
     // kdDebug() << "EposConf::load: Running " << endl;
 
     config->setGroup(configGroup);
@@ -128,7 +128,7 @@ TQString EposConf::languageCodeToEposLanguage(const TQString &languageCode)
     return eposLanguage;
 }
 
-void EposConf::save(KConfig *config, const TQString &configGroup){
+void EposConf::save(TDEConfig *config, const TQString &configGroup){
     // kdDebug() << "EposConf::save: Running" << endl;
 
     config->setGroup("Epos");
diff --git a/kttsd/plugins/epos/eposconf.h b/kttsd/plugins/epos/eposconf.h
index f9cc7b1..dc0abdc 100644
--- a/kttsd/plugins/epos/eposconf.h
+++ b/kttsd/plugins/epos/eposconf.h
@@ -59,14 +59,14 @@ class EposConf : 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/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp
index b13f240..bdf0d25 100644
--- a/kttsd/plugins/epos/eposproc.cpp
+++ b/kttsd/plugins/epos/eposproc.cpp
@@ -64,7 +64,7 @@ EposProc::~EposProc(){
 }
 
 /** Initialize the speech */
-bool EposProc::init(KConfig* config, const TQString& configGroup)
+bool EposProc::init(TDEConfig* config, const TQString& configGroup)
 {
     // kdDebug() << "EposProc::init: Running" << endl;
     // kdDebug() << "Initializing plug in: Epos" << endl;
diff --git a/kttsd/plugins/epos/eposproc.h b/kttsd/plugins/epos/eposproc.h
index b48b932..4c13d83 100644
--- a/kttsd/plugins/epos/eposproc.h
+++ b/kttsd/plugins/epos/eposproc.h
@@ -55,7 +55,7 @@ class EposProc : 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);
 
         /**
          * Say a text string.
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.
diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp
index 2d39003..1fa1d42 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -70,7 +70,7 @@ FliteConf::~FliteConf(){
     delete m_progressDlg;
 }
 
-void FliteConf::load(KConfig *config, const TQString &configGroup){
+void FliteConf::load(TDEConfig *config, const TQString &configGroup){
     // kdDebug() << "FliteConf::load: Loading configuration for language " << langGroup << " with plug in " << "Festival Lite (flite)" << endl;
 
     config->setGroup(configGroup);
@@ -83,7 +83,7 @@ void FliteConf::load(KConfig *config, const TQString &configGroup){
     m_widget->flitePath->setURL(fliteExe);
 }
 
-void FliteConf::save(KConfig *config, const TQString &configGroup){
+void FliteConf::save(TDEConfig *config, const TQString &configGroup){
     // kdDebug() << "FliteConf::save: Saving configuration for language " << langGroup << " with plug in " << "Festival Lite (flite)" << endl;
 
     config->setGroup("Flite");
diff --git a/kttsd/plugins/flite/fliteconf.h b/kttsd/plugins/flite/fliteconf.h
index 92ed8be..d3ba729 100644
--- a/kttsd/plugins/flite/fliteconf.h
+++ b/kttsd/plugins/flite/fliteconf.h
@@ -58,14 +58,14 @@ class FliteConf : 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/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp
index 86b6afa..fdd2449 100644
--- a/kttsd/plugins/flite/fliteproc.cpp
+++ b/kttsd/plugins/flite/fliteproc.cpp
@@ -55,7 +55,7 @@ FliteProc::~FliteProc(){
 }
 
 /** Initialize the speech */
-bool FliteProc::init(KConfig* config, const TQString& configGroup){
+bool FliteProc::init(TDEConfig* config, const TQString& configGroup){
     // kdDebug() << "Running: FliteProc::init(const TQString &lang)" << endl;
     // kdDebug() << "Initializing plug in: Flite" << endl;
     // Retrieve path to flite executable.
diff --git a/kttsd/plugins/flite/fliteproc.h b/kttsd/plugins/flite/fliteproc.h
index e472067..51950b0 100644
--- a/kttsd/plugins/flite/fliteproc.h
+++ b/kttsd/plugins/flite/fliteproc.h
@@ -53,7 +53,7 @@ class FliteProc : 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);
         
         /**
          * Say a text string.
diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp
index 0c9c519..523dda9 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -68,7 +68,7 @@ FreeTTSConf::~FreeTTSConf() {
         delete m_progressDlg;
 }
 
-void FreeTTSConf::load(KConfig *config, const TQString &configGroup) {
+void FreeTTSConf::load(TDEConfig *config, const TQString &configGroup) {
 	// kdDebug() << "FreeTTSConf::load: Running" << endl;
 
 	config->setGroup(configGroup);
@@ -84,7 +84,7 @@ void FreeTTSConf::load(KConfig *config, const TQString &configGroup) {
 	/// If freettsPath is still empty, then we couldn't find the file in the path.
 }
 
-void FreeTTSConf::save(KConfig *config, const TQString &configGroup){
+void FreeTTSConf::save(TDEConfig *config, const TQString &configGroup){
 	// kdDebug() << "FreeTTSConf::save: Running" << endl;
 
     config->setGroup("FreeTTS");
diff --git a/kttsd/plugins/freetts/freettsconf.h b/kttsd/plugins/freetts/freettsconf.h
index 29e98e4..b55fceb 100644
--- a/kttsd/plugins/freetts/freettsconf.h
+++ b/kttsd/plugins/freetts/freettsconf.h
@@ -48,13 +48,13 @@ class FreeTTSConf : 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/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp
index 4d6c177..e78a75c 100644
--- a/kttsd/plugins/freetts/freettsproc.cpp
+++ b/kttsd/plugins/freetts/freettsproc.cpp
@@ -45,7 +45,7 @@ FreeTTSProc::~FreeTTSProc() {
 }
 
 /** Initializate the speech */
-bool FreeTTSProc::init(KConfig *config, const TQString &configGroup) {
+bool FreeTTSProc::init(TDEConfig *config, const TQString &configGroup) {
 	kdDebug() << "Running: FreeTTSProc::init()" << endl;
 	kdDebug() << "Initializing plug in: FreeTTS" << endl;
 	config->setGroup(configGroup);
diff --git a/kttsd/plugins/freetts/freettsproc.h b/kttsd/plugins/freetts/freettsproc.h
index 8e1e06f..4a11836 100644
--- a/kttsd/plugins/freetts/freettsproc.h
+++ b/kttsd/plugins/freetts/freettsproc.h
@@ -46,7 +46,7 @@ public:
 	* @param config         Settings object.
     * @param configGroup        Settings group.
 	*/
-    virtual bool init(KConfig *config, const TQString &configGroup);
+    virtual bool init(TDEConfig *config, const TQString &configGroup);
 	
 	/**
 	* Say a text string.
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.