From 6379d18e0ec321e0e08a1389ee4a12f0eaa5992e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:28:14 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmouth/configwizard.cpp | 8 ++++---- kmouth/configwizard.h | 10 +++++----- kmouth/kmouth.h | 4 ++-- kmouth/optionsdialog.cpp | 12 ++++++------ kmouth/optionsdialog.h | 14 +++++++------- kmouth/phrasebook/phrasebook.cpp | 8 ++++---- kmouth/phraselist.cpp | 4 ++-- kmouth/phraselist.h | 4 ++-- kmouth/texttospeechconfigurationwidget.cpp | 4 ++-- kmouth/texttospeechconfigurationwidget.h | 4 ++-- kmouth/texttospeechsystem.cpp | 4 ++-- kmouth/texttospeechsystem.h | 6 +++--- kmouth/wordcompletion/dictionarycreationwizard.cpp | 2 +- kmouth/wordcompletion/dictionarycreationwizard.h | 2 +- kmouth/wordcompletion/wordcompletion.cpp | 4 ++-- kmouth/wordcompletion/wordcompletionwidget.cpp | 6 +++--- kmouth/wordcompletion/wordcompletionwidget.h | 2 +- 17 files changed, 49 insertions(+), 49 deletions(-) (limited to 'kmouth') diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index 7b21441..b92551b 100644 --- a/kmouth/configwizard.cpp +++ b/kmouth/configwizard.cpp @@ -31,7 +31,7 @@ #include "wordcompletion/wordcompletion.h" #include "wordcompletion/dictionarycreationwizard.h" -ConfigWizard::ConfigWizard (TQWidget *parent, const char *name, KConfig *config) +ConfigWizard::ConfigWizard (TQWidget *parent, const char *name, TDEConfig *config) : KWizard(parent, name, true) { setCaption (i18n("Initial Configuration - KMouth")); @@ -44,7 +44,7 @@ ConfigWizard::ConfigWizard (TQWidget *parent, const char *name, KConfig *config) ConfigWizard::~ConfigWizard() { } -void ConfigWizard::initCommandPage(KConfig *config) { +void ConfigWizard::initCommandPage(TDEConfig *config) { config->setGroup("TTS System"); bool displayCommand = false; if (!config->hasKey("Command")) displayCommand = true; @@ -78,7 +78,7 @@ void ConfigWizard::initBookPage() { bookWidget = 0; } -void ConfigWizard::initCompletion (KConfig *config) { +void ConfigWizard::initCompletion (TDEConfig *config) { if (!WordCompletion::isConfigured()) { TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", "dictionary.txt"); TQFile file(dictionaryFile); @@ -113,7 +113,7 @@ void ConfigWizard::initCompletion (KConfig *config) { completionWidget = 0; } -void ConfigWizard::saveConfig (KConfig *config) { +void ConfigWizard::saveConfig (TDEConfig *config) { if (commandWidget != 0) { commandWidget->ok(); commandWidget->saveOptions (config, "TTS System"); diff --git a/kmouth/configwizard.h b/kmouth/configwizard.h index 93a75f2..47054c2 100644 --- a/kmouth/configwizard.h +++ b/kmouth/configwizard.h @@ -23,7 +23,7 @@ #include -class KConfig; +class TDEConfig; class TextToSpeechConfigurationWidget; class InitialPhraseBookWidget; class CompletionWizardWidget; @@ -37,20 +37,20 @@ class ConfigWizard : public KWizard { Q_OBJECT public: - ConfigWizard (TQWidget *parent, const char *name, KConfig *config); + ConfigWizard (TQWidget *parent, const char *name, TDEConfig *config); ~ConfigWizard(); bool configurationNeeded (); bool requestConfiguration (); - void saveConfig (KConfig *config); + void saveConfig (TDEConfig *config); protected: void help(); private: - void initCommandPage (KConfig *config); + void initCommandPage (TDEConfig *config); void initBookPage(); - void initCompletion (KConfig *config); + void initCompletion (TDEConfig *config); TextToSpeechConfigurationWidget *commandWidget; InitialPhraseBookWidget *bookWidget; diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h index 72fa608..99d6bd5 100644 --- a/kmouth/kmouth.h +++ b/kmouth/kmouth.h @@ -48,7 +48,7 @@ class PhraseBook; * full session management as well as using KActions. * @see KMainWindow * @see TDEApplication - * @see KConfig + * @see TDEConfig * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation @@ -151,7 +151,7 @@ class KMouthApp : public KMainWindow private: bool isConfigured; /** the configuration object of the application */ - KConfig *config; + TDEConfig *config; /** The phrase list */ PhraseList *phraseList; /** The configuration dialog */ 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 (factory); + TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory (factory); if (module) return module; } diff --git a/kmouth/optionsdialog.h b/kmouth/optionsdialog.h index 90b264f..6955b34 100644 --- a/kmouth/optionsdialog.h +++ b/kmouth/optionsdialog.h @@ -24,7 +24,7 @@ #include "preferencesui.h" #include "texttospeechconfigurationwidget.h" class TQTabWidget; -class KCModule; +class TDECModule; class WordCompletionWidget; /**This class represents a configuration widget for user preferences. @@ -38,8 +38,8 @@ public: PreferencesWidget(TQWidget *parent, const char *name); ~PreferencesWidget(); - void readOptions (KConfig *config); - void saveOptions (KConfig *config); + void readOptions (TDEConfig *config); + void saveOptions (TDEConfig *config); void ok(); void cancel(); @@ -68,8 +68,8 @@ public: TextToSpeechSystem *getTTSSystem() const; - void readOptions (KConfig *config); - void saveOptions (KConfig *config); + void readOptions (TDEConfig *config); + void saveOptions (TDEConfig *config); bool isSpeakImmediately(); @@ -80,10 +80,10 @@ private: TQTabWidget *tabCtl; TextToSpeechConfigurationWidget *commandWidget; PreferencesWidget *behaviourWidget; - KCModule *kttsd; + TDECModule *kttsd; WordCompletionWidget *completionWidget; - KCModule *loadKttsd (); + TDECModule *loadKttsd (); void unloadKttsd (); }; diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index f03cd96..8f51ba6 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -245,7 +245,7 @@ bool PhraseBook::save (const KURL &url, bool asPhrasebook) { save (*tempFile.textStream(), asPhrasebook); tempFile.close(); - return KIO::NetAccess::upload(tempFile.name(), url); + return TDEIO::NetAccess::upload(tempFile.name(), url); } } @@ -273,7 +273,7 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p return -1; } - if (KIO::NetAccess::exists(url)) { + if (TDEIO::NetAccess::exists(url)) { if (KMessageBox::warningContinueCancel(0,TQString("%1").arg(i18n("The file %1 already exists. " "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { return 0; @@ -334,7 +334,7 @@ bool PhraseBook::open (const KURL &url) { fileUrl.setPath (url.url()); } - if (KIO::NetAccess::download (fileUrl, tempFile)) { + if (TDEIO::NetAccess::download (fileUrl, tempFile)) { TQStringList list = TQStringList(); // First: try to load it as a normal phrase book @@ -362,7 +362,7 @@ bool PhraseBook::open (const KURL &url) { else error = true; } - KIO::NetAccess::removeTempFile (tempFile); + TDEIO::NetAccess::removeTempFile (tempFile); return !error; } diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index 736b3a1..24a0bd0 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -172,7 +172,7 @@ void PhraseList::configureCompletionCombo(const TQStringList &list) { } } -void PhraseList::saveCompletionOptions(KConfig *config) { +void PhraseList::saveCompletionOptions(TDEConfig *config) { config->setGroup("General Options"); config->writeEntry("Show speak button", speakButton->isVisible() || !lineEdit->isVisible()); @@ -181,7 +181,7 @@ void PhraseList::saveCompletionOptions(KConfig *config) { config->writeEntry("List", completion->currentWordList()); } -void PhraseList::readCompletionOptions(KConfig *config) { +void PhraseList::readCompletionOptions(TDEConfig *config) { config->setGroup("General Options"); if (!config->readBoolEntry("Show speak button", true)) speakButton->hide(); diff --git a/kmouth/phraselist.h b/kmouth/phraselist.h index d846510..ab62853 100644 --- a/kmouth/phraselist.h +++ b/kmouth/phraselist.h @@ -80,8 +80,8 @@ public slots: void configureCompletion(); void saveWordCompletion(); - void saveCompletionOptions(KConfig *config); - void readCompletionOptions(KConfig *config); + void saveCompletionOptions(TDEConfig *config); + void readCompletionOptions(TDEConfig *config); protected slots: void lineEntered (const TQString &phrase); diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp index f7fe16a..64c7035 100644 --- a/kmouth/texttospeechconfigurationwidget.cpp +++ b/kmouth/texttospeechconfigurationwidget.cpp @@ -72,7 +72,7 @@ TextToSpeechSystem *TextToSpeechConfigurationWidget::getTTSSystem() const { return ttsSystem; } -void TextToSpeechConfigurationWidget::readOptions (KConfig *config, const TQString &langGroup) { +void TextToSpeechConfigurationWidget::readOptions (TDEConfig *config, const TQString &langGroup) { ttsSystem->readOptions (config, langGroup); urlReq->setURL (ttsSystem->ttsCommand); stdInButton->setChecked (ttsSystem->stdIn); @@ -80,7 +80,7 @@ void TextToSpeechConfigurationWidget::readOptions (KConfig *config, const TQStri useKttsd->setChecked (ttsSystem->useKttsd); } -void TextToSpeechConfigurationWidget::saveOptions (KConfig *config, const TQString &langGroup) { +void TextToSpeechConfigurationWidget::saveOptions (TDEConfig *config, const TQString &langGroup) { ttsSystem->saveOptions (config, langGroup); } diff --git a/kmouth/texttospeechconfigurationwidget.h b/kmouth/texttospeechconfigurationwidget.h index a5ef3ba..70466eb 100644 --- a/kmouth/texttospeechconfigurationwidget.h +++ b/kmouth/texttospeechconfigurationwidget.h @@ -35,8 +35,8 @@ public: TextToSpeechSystem *getTTSSystem() const; - void readOptions (KConfig *config, const TQString &langGroup); - void saveOptions (KConfig *config, const TQString &langGroup); + void readOptions (TDEConfig *config, const TQString &langGroup); + void saveOptions (TDEConfig *config, const TQString &langGroup); void ok(); void cancel(); diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp index f7f9515..b061f6b 100644 --- a/kmouth/texttospeechsystem.cpp +++ b/kmouth/texttospeechsystem.cpp @@ -66,7 +66,7 @@ void TextToSpeechSystem::speak (const TQString &text, const TQString &language) } } -void TextToSpeechSystem::readOptions (KConfig *config, const TQString &langGroup) { +void TextToSpeechSystem::readOptions (TDEConfig *config, const TQString &langGroup) { config->setGroup(langGroup); ttsCommand = config->readPathEntry("Command"); stdIn = config->readBoolEntry("StdIn", true); @@ -87,7 +87,7 @@ void TextToSpeechSystem::readOptions (KConfig *config, const TQString &langGroup } } -void TextToSpeechSystem::saveOptions (KConfig *config, const TQString &langGroup) { +void TextToSpeechSystem::saveOptions (TDEConfig *config, const TQString &langGroup) { config->setGroup(langGroup); config->writePathEntry("Command", ttsCommand); config->writeEntry("StdIn", stdIn); diff --git a/kmouth/texttospeechsystem.h b/kmouth/texttospeechsystem.h index 598d102..8ad7782 100644 --- a/kmouth/texttospeechsystem.h +++ b/kmouth/texttospeechsystem.h @@ -23,7 +23,7 @@ #include #include -class KConfig; +class TDEConfig; /**This class represents a text-to-speech system. *@author Gunnar Schmi Dt @@ -37,8 +37,8 @@ public: TextToSpeechSystem(); ~TextToSpeechSystem(); - void readOptions (KConfig *config, const TQString &langGroup); - void saveOptions (KConfig *config, const TQString &langGroup); + void readOptions (TDEConfig *config, const TQString &langGroup); + void saveOptions (TDEConfig *config, const TQString &langGroup); public slots: void speak (const TQString &text, const TQString &language); diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index bb35713..b7edf60 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -347,7 +347,7 @@ CompletionWizardWidget::CompletionWizardWidget (KWizard *parent, const char *nam CompletionWizardWidget::~CompletionWizardWidget() { } -void CompletionWizardWidget::ok (KConfig *config) { +void CompletionWizardWidget::ok (TDEConfig *config) { WordList::WordMap map; KProgressDialog *pdlg = WordList::progressDialog(); diff --git a/kmouth/wordcompletion/dictionarycreationwizard.h b/kmouth/wordcompletion/dictionarycreationwizard.h index 8d99da5..fb82fcd 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.h +++ b/kmouth/wordcompletion/dictionarycreationwizard.h @@ -107,7 +107,7 @@ public: CompletionWizardWidget(KWizard *parent, const char *name); ~CompletionWizardWidget(); - void ok (KConfig *config); + void ok (TDEConfig *config); }; #endif diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp index 7936044..ce373a1 100644 --- a/kmouth/wordcompletion/wordcompletion.cpp +++ b/kmouth/wordcompletion/wordcompletion.cpp @@ -95,7 +95,7 @@ TQString WordCompletion::currentWordList() { } bool WordCompletion::isConfigured() { - KConfig *config = new KConfig("kmouthrc"); + TDEConfig *config = new TDEConfig("kmouthrc"); bool result = config->hasGroup("Dictionary 0"); delete config; @@ -110,7 +110,7 @@ void WordCompletion::configure() { d->dictionaries.clear(); d->dictDetails.clear(); - KConfig *config = new KConfig("kmouthrc"); + TDEConfig *config = new TDEConfig("kmouthrc"); TQStringList groups = config->groupList(); for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it) if ((*it).startsWith ("Dictionary ")) { diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index b5e34d6..c9e9a1e 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -106,7 +106,7 @@ WordCompletionWidget::WordCompletionWidget(TQWidget *parent, const char *name) : connect (languageButton, TQT_SIGNAL (activated (int)), this, TQT_SLOT (languageSelected(int)) ); // Object for the KCMKTTSD configuration - config = new KConfig("kmouthrc"); + config = new TDEConfig("kmouthrc"); // Load the configuration from the file load(); @@ -250,7 +250,7 @@ void WordCompletionWidget::exportDictionary() { if (url.isEmpty() || !url.isValid()) return; - if (KIO::NetAccess::exists(url, false, this)) { + if (TDEIO::NetAccess::exists(url, false, this)) { if (KMessageBox::warningContinueCancel(0,TQString("%1").arg(i18n("The file %1 already exists. " "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { return; @@ -258,7 +258,7 @@ void WordCompletionWidget::exportDictionary() { } KURL src; src.setPath( TDEGlobal::dirs()->findResource ("appdata", item->filename()) ); - KIO::NetAccess::copy (src, url, this); + TDEIO::NetAccess::copy (src, url, this); } } diff --git a/kmouth/wordcompletion/wordcompletionwidget.h b/kmouth/wordcompletion/wordcompletionwidget.h index a12b9e1..a3f5088 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.h +++ b/kmouth/wordcompletion/wordcompletionwidget.h @@ -73,7 +73,7 @@ private: /** * Object holding all the configuration */ - KConfig *config; + TDEConfig *config; TQStringList newDictionaryFiles; TQStringList removedDictionaryFiles; }; -- cgit v1.2.1