From 6379d18e0ec321e0e08a1389ee4a12f0eaa5992e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:28:14 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kttsd/plugins/flite/fliteconf.cpp | 4 ++--
 kttsd/plugins/flite/fliteconf.h   | 4 ++--
 kttsd/plugins/flite/fliteproc.cpp | 2 +-
 kttsd/plugins/flite/fliteproc.h   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kttsd/plugins/flite')

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.
-- 
cgit v1.2.1