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

---
 kmouth/optionsdialog.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kmouth/optionsdialog.cpp')

diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index 3cff9c7..f207fcc 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -65,7 +65,7 @@ void PreferencesWidget::ok() {
    save  = closeCombo->currentItem ();
 }
 
-void PreferencesWidget::readOptions (KConfig *config) {
+void PreferencesWidget::readOptions (TDEConfig *config) {
    config->setGroup("Preferences");
    if (config->hasKey("AutomaticSpeak"))
       if (config->readEntry ("AutomaticSpeak") == "Yes")
@@ -91,7 +91,7 @@ void PreferencesWidget::readOptions (KConfig *config) {
    closeCombo->setCurrentItem (save);
 }
 
-void PreferencesWidget::saveOptions (KConfig *config) {
+void PreferencesWidget::saveOptions (TDEConfig *config) {
    config->setGroup("Preferences");
    if (speak)
       config->writeEntry ("AutomaticSpeak", "Yes");
@@ -184,12 +184,12 @@ TextToSpeechSystem *OptionsDialog::getTTSSystem() const {
    return commandWidget->getTTSSystem();
 }
 
-void OptionsDialog::readOptions (KConfig *config) {
+void OptionsDialog::readOptions (TDEConfig *config) {
    commandWidget->readOptions (config, "TTS System");
    behaviourWidget->readOptions (config);
 }
 
-void OptionsDialog::saveOptions (KConfig *config) {
+void OptionsDialog::saveOptions (TDEConfig *config) {
    commandWidget->saveOptions (config, "TTS System");
    behaviourWidget->saveOptions (config);
    config->sync();
@@ -199,7 +199,7 @@ bool OptionsDialog::isSpeakImmediately () {
    return behaviourWidget->isSpeakImmediately ();
 }
 
-KCModule *OptionsDialog::loadKttsd () {
+TDECModule *OptionsDialog::loadKttsd () {
    KLibLoader *loader = KLibLoader::self();
 
    TQString libname = "kcm_kttsd";
@@ -218,7 +218,7 @@ KCModule *OptionsDialog::loadKttsd () {
          // Reuse "lib" instead of letting createInstanceFromLibrary recreate it
          KLibFactory *factory = lib->factory();
          if (factory != 0) {
-            KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule> (factory);
+            TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule> (factory);
             if (module)
                 return module;
          }
-- 
cgit v1.2.1