diff options
101 files changed, 212 insertions, 212 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 500b710..2fb3799 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -720,7 +720,7 @@ void KbStateApplet::about() { void KbStateApplet::loadConfig() { - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); size = c->readNumEntry("IconDim", 20); fillSpace = c->readBoolEntry("fill space", true); @@ -733,7 +733,7 @@ void KbStateApplet::loadConfig() void KbStateApplet::saveConfig() { - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); c->writeEntry("IconDim", size); c->writeEntry("fill space", fillSpace); diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index af844a3..6bcf106 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -567,7 +567,7 @@ void KmagApp::saveZoomPixmap() KMessageBox::error(0, i18n("Unable to save temporary file (before uploading to the network file you specified)."), i18n("Error Writing File")); } else { - if(!KIO::NetAccess::upload(tempFile.name(), url, this)) { + if(!TDEIO::NetAccess::upload(tempFile.name(), url, this)) { KMessageBox::error(0, i18n("Unable to upload file over the network."), i18n("Error Writing File")); } else { diff --git a/kmag/kmag.h b/kmag/kmag.h index 51de1b8..a834da5 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -49,7 +49,7 @@ * 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 @@ -190,7 +190,7 @@ class KmagApp : public KMainWindow int edgesize; /// the configuration object of the application - KConfig *config; + TDEConfig *config; // KAction pointers to enable/disable actions KAction *fileNewWindow, *m_pSnapshot, *m_pCopy, *m_keyConf, *m_toolConf; 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 <kwizard.h> -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<KCModule> (factory); + TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule> (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("<qt>%1</qt>").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 <tqobject.h> #include <tqptrlist.h> -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("<qt>%1</qt>").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; }; diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp index 4fd00be..330cad2 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp @@ -28,7 +28,7 @@ using namespace std; // App specific includes #include "freeverbsetupimpl.h" -FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *parent, const char *name, bool modal, KConfig *config ) +FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *parent, const char *name, bool modal, TDEConfig *config ) : Freeverb_Setup(parent,name,modal), m_config(config) { // initialize Widgets diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h index d99cc3c..2112af0 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h @@ -35,7 +35,7 @@ class FreeverbSetupImpl : public Freeverb_Setup { Q_OBJECT public: - FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, KConfig *config=0); + FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, TDEConfig *config=0); ~FreeverbSetupImpl(); public slots: @@ -55,7 +55,7 @@ private: // Methods private: - KConfig *m_config; + TDEConfig *m_config; }; diff --git a/ksayit/src/effectstack.cpp b/ksayit/src/effectstack.cpp index 75ef7f5..cdea2f5 100644 --- a/ksayit/src/effectstack.cpp +++ b/ksayit/src/effectstack.cpp @@ -20,7 +20,7 @@ #include "effectstack.h" #include "fxpluginhandler.h" -EffectStack::EffectStack(FXPluginHandler *pluginhandler, KConfig *config) +EffectStack::EffectStack(FXPluginHandler *pluginhandler, TDEConfig *config) : dispatcher(), server(), m_pluginhandler(pluginhandler), diff --git a/ksayit/src/effectstack.h b/ksayit/src/effectstack.h index 0716ef7..0a2f959 100644 --- a/ksayit/src/effectstack.h +++ b/ksayit/src/effectstack.h @@ -35,7 +35,7 @@ class FXPluginHandler; */ class EffectStack{ public: - EffectStack(FXPluginHandler *pluginhandler=0, KConfig *config=0); + EffectStack(FXPluginHandler *pluginhandler=0, TDEConfig *config=0); ~EffectStack(); // KDE::PlayObject *playobj; @@ -49,7 +49,7 @@ public: //Methods private: FXPluginHandler *m_pluginhandler; - KConfig *m_config; + TDEConfig *m_config; }; diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp index 61d0491..55c87e7 100644 --- a/ksayit/src/fxpluginhandler.cpp +++ b/ksayit/src/fxpluginhandler.cpp @@ -26,7 +26,7 @@ #include "ksayit_ttsplugin.h" -FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, KConfig *config) +FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, TDEConfig *config) : TQObject(parent, name), m_config(config) { m_mapPluginList.clear(); diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h index 4da5fb6..1ee84e7 100644 --- a/ksayit/src/fxpluginhandler.h +++ b/ksayit/src/fxpluginhandler.h @@ -49,7 +49,7 @@ class FXPluginHandler : public TQObject Q_OBJECT public: - FXPluginHandler(TQObject *parent = 0, const char *name = 0, KConfig *config=0); + FXPluginHandler(TQObject *parent = 0, const char *name = 0, TDEConfig *config=0); ~FXPluginHandler(); public: // Methods @@ -87,7 +87,7 @@ public: // Methods void getPlugins(TQStringList &pluginlist); private: // Attributes - KConfig *m_config; + TDEConfig *m_config; TQMap<TQString, fx_struct> m_mapPluginList; // holds all plugins found on the system // TQMap<TQString, fx_struct> m_mapActivePlugins; // holds the active effects TQStringList m_lstActivePlugins; diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp index fc0100e..db2ce0b 100644 --- a/ksayit/src/fxsetupimpl.cpp +++ b/ksayit/src/fxsetupimpl.cpp @@ -28,7 +28,7 @@ #include "fxpluginhandler.h" FX_SetupImpl::FX_SetupImpl(TQWidget *parent, const char *name, - KConfig *config, + TDEConfig *config, FXPluginHandler *fxpluginhandler ) : FX_Setup(parent,name), m_config(config), m_fxpluginhandler(fxpluginhandler) { diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h index 7f480f9..e062877 100644 --- a/ksayit/src/fxsetupimpl.h +++ b/ksayit/src/fxsetupimpl.h @@ -41,7 +41,7 @@ class FX_SetupImpl : public FX_Setup { public: FX_SetupImpl(TQWidget *parent=0, const char *name=0, - KConfig *config=0, + TDEConfig *config=0, FXPluginHandler *fxpluginhandler=0); ~FX_SetupImpl(); @@ -79,7 +79,7 @@ private: // Methods void Init(TQStringList c_avail); private: - KConfig *m_config; + TDEConfig *m_config; FXPluginHandler *m_fxpluginhandler; TQStringList pluginlist; diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index 14a79f3..dd27641 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -61,7 +61,7 @@ class KSayItBookmarkHandler; * full session management as well as using KActions. * @see KMainWindow * @see TDEApplication - * @see KConfig + * @see TDEConfig * * @author Robert Vogl */ @@ -322,7 +322,7 @@ private: // Methods private: - KConfig *config; + TDEConfig *config; KSayItViewImpl *view; KSayItSystemTray *tray; EffectStack *es; diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index 9fb65d9..7944328 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -41,7 +41,7 @@ VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString &caption, bool modal, - KConfig *config, + TDEConfig *config, FXPluginHandler *fxpluginhandler, KTTSDLib *ttslib) : KDialogBase(IconList, caption, Ok|Cancel, Ok, parent, name, modal, true), diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h index 6ed65c2..01d171c 100644 --- a/ksayit/src/voicesetupdlg.h +++ b/ksayit/src/voicesetupdlg.h @@ -38,7 +38,7 @@ class VoiceSetupDlg : public KDialogBase { public: VoiceSetupDlg(TQWidget *parent=0, const char *name=0, const TQString &caption=NULL, bool modal=true, - KConfig *config=0, + TDEConfig *config=0, FXPluginHandler *fxpluginhandler=0, KTTSDLib *kttslib=0); @@ -81,7 +81,7 @@ private slots: void slotOk(); private: - KConfig *m_config; + TDEConfig *m_config; FXPluginHandler *m_fxpluginhandler; KTTSDLib *m_kttslib; TQFrame *m_fxPage; diff --git a/kttsd/ChangeLog b/kttsd/ChangeLog index c156450..441502c 100644 --- a/kttsd/ChangeLog +++ b/kttsd/ChangeLog @@ -422,7 +422,7 @@ * Standarize the .desktop files 2004-10-20 Gary Cramblitt (PhantomsDad) - * kcm_kttsmgr and kcm_kttsd are now identical libraries/KCModules. + * kcm_kttsmgr and kcm_kttsd are now identical libraries/TDECModules. Applications should use kcm_kttsd. When all apps have stopped using kcm_kttsmgr, remove it. @@ -62,7 +62,7 @@ _ KTTSMgr: _ KTTSD: _ I am told that when kttsd crashes, it can take knotify down with it. See about "disconnecting" knotify from kttsd (using post to Qt event queue). - _ Strange msg being produced by KIO::move, but it works fine. ?? + _ Strange msg being produced by TDEIO::move, but it works fine. ?? kio (KIOJob): stat file:///home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav kio (KIOJob): error 11 /home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav kio (KIOJob): This seems to be a suitable case for trying to rename before stat+[list+]copy+del @@ -83,7 +83,7 @@ _ Other/General: _ .desktop files must have a Type keyword, but what to use for kcmkttsd_testmessage.desktop? _ Add option to kill plugin process when no longer needed so that memory can be recovered. Or maybe some sort of "nice" setting so that process will be swapped out when no longer needed. - _ Convert to KConfig XT. + _ Convert to TDEConfig XT. _ Add a plugin for TuxTalk, http://tuxtalk.sourceforge.net/. Since it only supports English (at the moment) and is alpha, don't think it is worth it now. _ Add a plugin for dhvani, an Indian and Hindi TTS engine, http://dhvani.sourceforge.net/ diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index 5ffdef9..983b68b 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -114,7 +114,7 @@ int main(int argc, char *argv[]) TQStringList(), &errorNo); if(plugIn) { - KConfig* config = new KConfig("kttsdrc"); + TDEConfig* config = new TDEConfig("kttsdrc"); config->setGroup( "General" ); plugIn->init( config, groupName ); TQTextStream inp ( stdin, IO_ReadOnly ); diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 0a7ddb9..4fe3c9d 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -112,11 +112,11 @@ SbdConf::~SbdConf(){ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. */ -void SbdConf::load(KConfig* config, const TQString& configGroup){ +void SbdConf::load(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "SbdConf::load: Running" << endl; config->setGroup( configGroup ); m_widget->nameLineEdit->setText( @@ -145,11 +145,11 @@ void SbdConf::load(KConfig* config, const TQString& configGroup){ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ -void SbdConf::save(KConfig* config, const TQString& configGroup){ +void SbdConf::save(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "SbdConf::save: Running" << endl; config->setGroup( configGroup ); config->writeEntry("UserFilterName", m_widget->nameLineEdit->text() ); @@ -310,7 +310,7 @@ void SbdConf::slotLoadButton_clicked() m_widget, "sbd_loadfile"); if ( filename.isEmpty() ) return; - KConfig* cfg = new KConfig( filename, true, false, 0 ); + TDEConfig* cfg = new TDEConfig( filename, true, false, 0 ); load( cfg, "Filter" ); delete cfg; configChanged(); @@ -324,7 +324,7 @@ void SbdConf::slotSaveButton_clicked() m_widget, "sbd_savefile"); if ( filename.isEmpty() ) return; - KConfig* cfg = new KConfig( filename, false, false, 0 ); + TDEConfig* cfg = new TDEConfig( filename, false, false, 0 ); save( cfg, "Filter" ); delete cfg; } diff --git a/kttsd/filters/sbd/sbdconf.h b/kttsd/filters/sbd/sbdconf.h index 58f7e6d..8bcd34b 100644 --- a/kttsd/filters/sbd/sbdconf.h +++ b/kttsd/filters/sbd/sbdconf.h @@ -65,7 +65,7 @@ class SbdConf : public KttsFilterConf * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. * @@ -74,7 +74,7 @@ class SbdConf : public KttsFilterConf * any instance-specific parameters to load, but it may still wish * to load parameters that apply to all instances of the plugin. */ - virtual void load(KConfig *config, const TQString &configGroup); + virtual void load(TDEConfig *config, const TQString &configGroup); /** * This function gets called when the user wants to save the settings in @@ -82,11 +82,11 @@ class SbdConf : public KttsFilterConf * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ - virtual void save(KConfig *config, const TQString &configGroup); + virtual void save(TDEConfig *config, const TQString &configGroup); /** * This function is called to set the settings in the module to sensible diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index 98eec0d..f817147 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -596,7 +596,7 @@ SbdProc::~SbdProc() * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ -bool SbdProc::init(KConfig* config, const TQString& configGroup){ +bool SbdProc::init(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "PlugInProc::init: Running" << endl; config->setGroup( configGroup ); // m_configuredRe = config->readEntry( "SentenceDelimiterRegExp", "([\\.\\?\\!\\:\\;])\\s|(\\n *\\n)" ); diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h index 089e664..d0d8f86 100644 --- a/kttsd/filters/sbd/sbdproc.h +++ b/kttsd/filters/sbd/sbdproc.h @@ -56,7 +56,7 @@ #include "filterproc.h" class TalkerCode; -class KConfig; +class TDEConfig; class TQDomElement; class TQDomNode; @@ -263,7 +263,7 @@ class SbdProc : virtual public KttsFilterProc * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init( KConfig *config, const TQString &configGroup ); + virtual bool init( TDEConfig *config, const TQString &configGroup ); /** * Returns True if this filter is a Sentence Boundary Detector. diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 21a4c51..6a96307 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -122,11 +122,11 @@ StringReplacerConf::~StringReplacerConf(){ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. */ -void StringReplacerConf::load(KConfig* config, const TQString& configGroup){ +void StringReplacerConf::load(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "StringReplacerConf::load: Running" << endl; // See if this filter previously save its word list. config->setGroup( configGroup ); @@ -253,11 +253,11 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear) * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ -void StringReplacerConf::save(KConfig* config, const TQString& configGroup){ +void StringReplacerConf::save(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "StringReplacerConf::save: Running" << endl; TQString wordsFilename = TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", true ); diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.h b/kttsd/filters/stringreplacer/stringreplacerconf.h index bd63de2..ba66d0b 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.h +++ b/kttsd/filters/stringreplacer/stringreplacerconf.h @@ -70,7 +70,7 @@ class StringReplacerConf : public KttsFilterConf * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. * @@ -79,7 +79,7 @@ class StringReplacerConf : public KttsFilterConf * any instance-specific parameters to load, but it may still wish * to load parameters that apply to all instances of the plugin. */ - virtual void load(KConfig *config, const TQString &configGroup); + virtual void load(TDEConfig *config, const TQString &configGroup); /** * This function gets called when the user wants to save the settings in @@ -87,11 +87,11 @@ class StringReplacerConf : public KttsFilterConf * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ - virtual void save(KConfig *config, const TQString &configGroup); + virtual void save(TDEConfig *config, const TQString &configGroup); /** * This function is called to set the settings in the module to sensible diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index 5d4d818..a00b66f 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -68,7 +68,7 @@ StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, cons * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ -bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ +bool StringReplacerProc::init(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "StringReplacerProc::init: Running" << endl; TQString wordsFilename = TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ); diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h index f6f73c6..38a12e4 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.h +++ b/kttsd/filters/stringreplacer/stringreplacerproc.h @@ -60,7 +60,7 @@ public: * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Convert input, returning output. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index f62e185..ce5e00f 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -103,11 +103,11 @@ TalkerChooserConf::~TalkerChooserConf(){ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. */ -void TalkerChooserConf::load(KConfig* config, const TQString& configGroup){ +void TalkerChooserConf::load(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "TalkerChooserConf::load: Running" << endl; config->setGroup( configGroup ); m_widget->nameLineEdit->setText( config->readEntry( "UserFilterName", m_widget->nameLineEdit->text() ) ); @@ -138,11 +138,11 @@ void TalkerChooserConf::load(KConfig* config, const TQString& configGroup){ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ -void TalkerChooserConf::save(KConfig* config, const TQString& configGroup){ +void TalkerChooserConf::save(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "TalkerChooserConf::save: Running" << endl; config->setGroup( configGroup ); config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() ); @@ -239,7 +239,7 @@ void TalkerChooserConf::slotLoadButton_clicked() m_widget, "talkerchooser_loadfile"); if ( filename.isEmpty() ) return; - KConfig* cfg = new KConfig( filename, true, false, 0 ); + TDEConfig* cfg = new TDEConfig( filename, true, false, 0 ); load( cfg, "Filter" ); delete cfg; configChanged(); @@ -253,7 +253,7 @@ void TalkerChooserConf::slotSaveButton_clicked() m_widget, "talkerchooser_savefile"); if ( filename.isEmpty() ) return; - KConfig* cfg = new KConfig( filename, false, false, 0 ); + TDEConfig* cfg = new TDEConfig( filename, false, false, 0 ); save( cfg, "Filter" ); delete cfg; } diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h index b92339e..2d59c59 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.h +++ b/kttsd/filters/talkerchooser/talkerchooserconf.h @@ -67,7 +67,7 @@ class TalkerChooserConf : public KttsFilterConf * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. * @@ -76,7 +76,7 @@ class TalkerChooserConf : public KttsFilterConf * any instance-specific parameters to load, but it may still wish * to load parameters that apply to all instances of the plugin. */ - virtual void load(KConfig *config, const TQString &configGroup); + virtual void load(TDEConfig *config, const TQString &configGroup); /** * This function gets called when the user wants to save the settings in @@ -84,11 +84,11 @@ class TalkerChooserConf : public KttsFilterConf * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ - virtual void save(KConfig *config, const TQString &configGroup); + virtual void save(TDEConfig *config, const TQString &configGroup); /** * This function is called to set the settings in the module to sensible diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp index 2ea8134..4cf2bd9 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp @@ -61,7 +61,7 @@ TalkerChooserProc::~TalkerChooserProc() * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ -bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){ +bool TalkerChooserProc::init(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "PlugInProc::init: Running" << endl; config->setGroup( configGroup ); m_re = config->readEntry( "MatchRegExp" ); diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.h b/kttsd/filters/talkerchooser/talkerchooserproc.h index e45bb04..9a27820 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.h +++ b/kttsd/filters/talkerchooser/talkerchooserproc.h @@ -53,7 +53,7 @@ public: * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Returns True if the plugin supports asynchronous processing, diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index d0bd0d3..8ead454 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -89,11 +89,11 @@ XmlTransformerConf::~XmlTransformerConf(){ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. */ -void XmlTransformerConf::load(KConfig* config, const TQString& configGroup){ +void XmlTransformerConf::load(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "XmlTransformerConf::load: Running" << endl; config->setGroup( configGroup ); m_widget->nameLineEdit->setText( config->readEntry( "UserFilterName", m_widget->nameLineEdit->text() ) ); @@ -113,11 +113,11 @@ void XmlTransformerConf::load(KConfig* config, const TQString& configGroup){ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ -void XmlTransformerConf::save(KConfig* config, const TQString& configGroup){ +void XmlTransformerConf::save(TDEConfig* config, const TQString& configGroup){ // kdDebug() << "XmlTransformerConf::save: Running" << endl; config->setGroup( configGroup ); config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() ); diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.h b/kttsd/filters/xmltransformer/xmltransformerconf.h index 1fd1cb8..b129a02 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.h +++ b/kttsd/filters/xmltransformer/xmltransformerconf.h @@ -62,7 +62,7 @@ class XmlTransformerConf : public KttsFilterConf * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. * @@ -71,7 +71,7 @@ class XmlTransformerConf : public KttsFilterConf * any instance-specific parameters to load, but it may still wish * to load parameters that apply to all instances of the plugin. */ - virtual void load(KConfig *config, const TQString &configGroup); + virtual void load(TDEConfig *config, const TQString &configGroup); /** * This function gets called when the user wants to save the settings in @@ -79,11 +79,11 @@ class XmlTransformerConf : public KttsFilterConf * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ - virtual void save(KConfig *config, const TQString &configGroup); + virtual void save(TDEConfig *config, const TQString &configGroup); /** * This function is called to set the settings in the module to sensible diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index c513c5d..23ba3db 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -69,7 +69,7 @@ XmlTransformerProc::XmlTransformerProc( TQObject *parent, const char *name, cons * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ -bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) +bool XmlTransformerProc::init(TDEConfig* config, const TQString& configGroup) { // kdDebug() << "XmlTransformerProc::init: Running." << endl; config->setGroup( configGroup ); diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h index a7c5ccc..d9f0881 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.h +++ b/kttsd/filters/xmltransformer/xmltransformerproc.h @@ -58,7 +58,7 @@ public: * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Returns True if the plugin supports asynchronous processing, diff --git a/kttsd/kcmkttsmgr/kcmkttsd.desktop b/kttsd/kcmkttsmgr/kcmkttsd.desktop index 2348b29..20e2544 100644 --- a/kttsd/kcmkttsmgr/kcmkttsd.desktop +++ b/kttsd/kcmkttsmgr/kcmkttsd.desktop @@ -91,7 +91,7 @@ Comment[tr]=Metinden Konuşmaya Kontrol Modülü Comment[uk]=Модуль керування синтезом мовлення з тексту Comment[vi]=Mô đun Điều khiển Văn bản sang Tiếng nói Comment[zh_TW]=文字轉語音控制模組 -ServiceTypes=Application,KCModule +ServiceTypes=Application,TDECModule DocPath=kttsd NoDisplay=false StartupNotify=false diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 46a395e..e9cbd86 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -107,7 +107,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kttsd, KCMKttsMgrFactory("kttsd") ) KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kcmkttsmgr_kspeechsink"), - KCModule(KCMKttsMgrFactory::instance(), parent, name) + TDECModule(KCMKttsMgrFactory::instance(), parent, name) { // kdDebug() << "KCMKttsMgr contructor running." << endl; @@ -240,7 +240,7 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) m_kttsmgrw->keepAudioPath->setURL(locateLocal("data", "kttsd/audio/")); // Object for the KTTSD configuration. - m_config = new KConfig("kttsdrc"); + m_config = new TDEConfig("kttsdrc"); // Load configuration. load(); @@ -1059,7 +1059,7 @@ void KCMKttsMgr::init(){ */ int KCMKttsMgr::buttons() { // kdDebug() << "KCMKttsMgr::buttons: Running"<< endl; - return KCModule::Ok|KCModule::Apply|KCModule::Help|KCModule::Default; + return TDECModule::Ok|TDECModule::Apply|TDECModule::Help|TDECModule::Default; } /** @@ -2707,7 +2707,7 @@ KttsCheckListItem::KttsCheckListItem( TQListView *parent, /*virtual*/ /*void resizeEvent( TQResizeEvent ev ) { - dynamic_cast<KCModule>(resizeEvent(ev)); + dynamic_cast<TDECModule>(resizeEvent(ev)); updateGeometry(); } */ diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index be03565..57312be 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -41,7 +41,7 @@ class PlugInConf; class KttsFilterConf; class KListViewItem; class TDEAboutData; -class KConfig; +class TDEConfig; class TQPopupMenu; /** @@ -50,7 +50,7 @@ class TQPopupMenu; */ class KCMKttsMgr : - public KCModule, + public TDECModule, public KSpeech_stub, virtual public KSpeechSink { @@ -326,7 +326,7 @@ class KCMKttsMgr : /** * Object holding all the configuration */ - KConfig *m_config; + TDEConfig *m_config; /** * KTTS Job Manager. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index 199ce65..63ba784 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KCMKttsMgrWidget</class> <author>Gary Cramblitt</author> -<widget class="KCModule"> +<widget class="TDECModule"> <property name="name"> <cstring>KCMKttsMgrWidget</cstring> </property> diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index de97a6c..685e1f7 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -60,7 +60,7 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ TQString relativePath = *it; if ( !relativePath.isEmpty() ) { - KConfig* config = new KConfig(relativePath, true, false, "data"); + TDEConfig* config = new TDEConfig(relativePath, true, false, "data"); config->setGroup( TQString::fromLatin1("!Global!") ); TQString icon = config->readEntry(TQString::fromLatin1("IconName"), TQString::fromLatin1("misc")); @@ -90,7 +90,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) TQListViewItem* item = 0; TQString eventSrc = m_eventSrcNames[index]; TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); - KConfig* config = new KConfig( configFilename, true, false, "data" ); + TDEConfig* config = new TDEConfig( configFilename, true, false, "data" ); TQStringList eventNames = config->groupList(); uint eventNamesCount = eventNames.count(); for (uint ndx = 0; ndx < eventNamesCount; ++ndx) diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 91fff38..c8293e4 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -64,7 +64,7 @@ FilterMgr::~FilterMgr() * @param config Settings object. * @return False if FilterMgr is not ready to filter. */ -bool FilterMgr::init(KConfig *config, const TQString& /*configGroup*/) +bool FilterMgr::init(TDEConfig *config, const TQString& /*configGroup*/) { // Load each of the filters and initialize. config->setGroup("General"); diff --git a/kttsd/kttsd/filtermgr.h b/kttsd/kttsd/filtermgr.h index dda9821..d4adc78 100644 --- a/kttsd/kttsd/filtermgr.h +++ b/kttsd/kttsd/filtermgr.h @@ -32,7 +32,7 @@ // KTTS includes. #include "filterproc.h" -class KConfig; +class TDEConfig; class TalkerCode; typedef TQPtrList<KttsFilterProc> FilterList; @@ -62,7 +62,7 @@ class FilterMgr : public KttsFilterProc * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Returns True if this filter is a Sentence Boundary Detector. diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index 68d045c..ff8ed68 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -1325,7 +1325,7 @@ uttIterator Speaker::deleteUtterance(uttIterator it) // kio (KIOJob): stat file:///home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav // kio (KIOJob): error 11 /home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav // kio (KIOJob): This seems to be a suitable case for trying to rename before stat+[list+]copy+del - // KIO::move(it->audioUrl, dest, false); + // TDEIO::move(it->audioUrl, dest, false); } else TQFile::remove(it->audioUrl); diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index c5e658f..716b0ae 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -75,7 +75,7 @@ bool SpeechData::readConfig(){ // Load configuration delete config; //config = TDEGlobal::config(); - config = new KConfig("kttsdrc"); + config = new TDEConfig("kttsdrc"); // Set the group general for the configuration of KTTSD itself (no plug ins) config->setGroup("General"); diff --git a/kttsd/kttsd/speechdata.h b/kttsd/kttsd/speechdata.h index 65e02a3..4d4d727 100644 --- a/kttsd/kttsd/speechdata.h +++ b/kttsd/kttsd/speechdata.h @@ -569,7 +569,7 @@ class SpeechData : public TQObject { /** * Configuration */ - KConfig *config; + TDEConfig *config; /** * True if at least one XML Transformer plugin for html is enabled. diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index d544ad3..c3771e7 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -54,7 +54,7 @@ TalkerMgr::~TalkerMgr() /** * Load all the configured synth plugins, populating loadedPlugIns structure. */ -int TalkerMgr::loadPlugIns(KConfig* config) +int TalkerMgr::loadPlugIns(TDEConfig* config) { // kdDebug() << "Running: TalkerMgr::loadPlugIns()" << endl; int good = 0; @@ -298,7 +298,7 @@ bool TalkerMgr::supportsMarkup(const TQString& talker, const uint /*markupType*/ TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl"); } -bool TalkerMgr::autoconfigureTalker(const TQString& langCode, KConfig* config) +bool TalkerMgr::autoconfigureTalker(const TQString& langCode, TDEConfig* config) { // Not yet implemented. // return false; diff --git a/kttsd/kttsd/talkermgr.h b/kttsd/kttsd/talkermgr.h index 8c79596..a6eee93 100644 --- a/kttsd/kttsd/talkermgr.h +++ b/kttsd/kttsd/talkermgr.h @@ -51,7 +51,7 @@ public: /** * Load all the configured plug ins populating loadedPlugIns */ - int loadPlugIns(KConfig* config); + int loadPlugIns(TDEConfig* config); /** * Get a list of the talkers configured in KTTS. @@ -133,12 +133,12 @@ public: /** * Try to automatically configure a Talker in the specified language. * @param langCode Two-letter language code. - * @param config KConfig to be updated if successful. + * @param config TDEConfig to be updated if successful. * @return True if successful. * - * If successful, the KConfig rc file is updated but the talker has not been loaded. + * If successful, the TDEConfig rc file is updated but the talker has not been loaded. */ - bool autoconfigureTalker(const TQString& langCode, KConfig* config); + bool autoconfigureTalker(const TQString& langCode, TDEConfig* config); private: diff --git a/kttsd/kttsd/threadedplugin.cpp b/kttsd/kttsd/threadedplugin.cpp index 5df0c0f..48df0c9 100644 --- a/kttsd/kttsd/threadedplugin.cpp +++ b/kttsd/kttsd/threadedplugin.cpp @@ -71,7 +71,7 @@ ThreadedPlugIn::~ThreadedPlugIn() /** * Initialize the speech plugin. */ -bool ThreadedPlugIn::init(KConfig *config, const TQString &configGroup) +bool ThreadedPlugIn::init(TDEConfig *config, const TQString &configGroup) { bool stat = m_plugin->init(config, configGroup); m_supportsSynth = m_plugin->supportsSynth(); diff --git a/kttsd/kttsd/threadedplugin.h b/kttsd/kttsd/threadedplugin.h index 1a1b13e..86b9330 100644 --- a/kttsd/kttsd/threadedplugin.h +++ b/kttsd/kttsd/threadedplugin.h @@ -55,7 +55,7 @@ class ThreadedPlugIn : public PlugInProc, public TQThread /** * Initializate the speech plugin. */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Say a text. Synthesize and audibilize it. diff --git a/kttsd/kttsjobmgr/Makefile.am b/kttsd/kttsjobmgr/Makefile.am index 98727e0..8c208aa 100644 --- a/kttsd/kttsjobmgr/Makefile.am +++ b/kttsd/kttsjobmgr/Makefile.am @@ -35,6 +35,6 @@ noinst_HEADERS = kde_services_DATA = kttsjobmgr.desktop # This rc file should never have been installed. -# createGUI not supported within a KCModule. +# createGUI not supported within a TDECModule. install-data-local: rm -f $(DESTDIR)$(kde_datadir)/kttsjobmgr/kttsjobmgrui.rc diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 7a021d8..6dbc288 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -92,7 +92,7 @@ int main (int argc, char *argv[]) dlg.setIcon(TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small)); // Get SysTray and ShowMainWindow options. - KConfig* config = new KConfig("kttsdrc"); + TDEConfig* config = new TDEConfig("kttsdrc"); config->setGroup("General"); bool embedInSysTray = config->readBoolEntry("EmbedInSysTray", true); // Can only hide main window if we are in the system tray, otherwise, no way diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp index b4f8a1d..00e42e1 100644 --- a/kttsd/libkttsd/filterconf.cpp +++ b/kttsd/libkttsd/filterconf.cpp @@ -66,11 +66,11 @@ KttsFilterConf::~KttsFilterConf(){ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. */ -void KttsFilterConf::load(KConfig* /*config*/, const TQString& /*configGroup*/){ +void KttsFilterConf::load(TDEConfig* /*config*/, const TQString& /*configGroup*/){ // kdDebug() << "KttsFilterConf::load: Running" << endl; } @@ -80,11 +80,11 @@ void KttsFilterConf::load(KConfig* /*config*/, const TQString& /*configGroup*/){ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ -void KttsFilterConf::save(KConfig* /*config*/, const TQString& /*configGroup*/){ +void KttsFilterConf::save(TDEConfig* /*config*/, const TQString& /*configGroup*/){ // kdDebug() << "KttsFilterConf::save: Running" << endl; } diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h index 9b52c31..606813c 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -58,7 +58,7 @@ class KDE_EXPORT KttsFilterConf : public TQWidget{ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. * @@ -67,7 +67,7 @@ class KDE_EXPORT KttsFilterConf : public TQWidget{ * any instance-specific parameters to load, but it may still wish * to load parameters that apply to all instances of the plugin. */ - virtual void load(KConfig *config, const TQString &configGroup); + virtual void load(TDEConfig *config, const TQString &configGroup); /** * This function gets called when the user wants to save the settings in @@ -75,11 +75,11 @@ class KDE_EXPORT KttsFilterConf : public TQWidget{ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ - virtual void save(KConfig *config, const TQString &configGroup); + virtual void save(TDEConfig *config, const TQString &configGroup); /** * This function is called to set the settings in the module to sensible diff --git a/kttsd/libkttsd/filterproc.cpp b/kttsd/libkttsd/filterproc.cpp index 2759a4b..0847879 100644 --- a/kttsd/libkttsd/filterproc.cpp +++ b/kttsd/libkttsd/filterproc.cpp @@ -54,7 +54,7 @@ KttsFilterProc::~KttsFilterProc() * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ -bool KttsFilterProc::init(KConfig* /*config*/, const TQString& /*configGroup*/){ +bool KttsFilterProc::init(TDEConfig* /*config*/, const TQString& /*configGroup*/){ // kdDebug() << "PlugInProc::init: Running" << endl; return false; } diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h index 46ec6be..73b1566 100644 --- a/kttsd/libkttsd/filterproc.h +++ b/kttsd/libkttsd/filterproc.h @@ -34,7 +34,7 @@ #include "kdeexportfix.h" class TalkerCode; -class KConfig; +class TDEConfig; class KDE_EXPORT KttsFilterProc : virtual public TQObject { @@ -68,7 +68,7 @@ public: * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Returns True if this filter is a Sentence Boundary Detector. diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp index bd2fbd1..4e25693 100644 --- a/kttsd/libkttsd/notify.cpp +++ b/kttsd/libkttsd/notify.cpp @@ -149,7 +149,7 @@ static void notifypresent_init() /*static*/ TQString NotifyEvent::getEventSrcName(const TQString& eventSrc, TQString& iconName) { TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); - KConfig* config = new KConfig( configFilename, true, false, "data" ); + TDEConfig* config = new TDEConfig( configFilename, true, false, "data" ); config->setGroup( TQString::fromLatin1( "!Global!" ) ); TQString appDesc = config->readEntry( "Comment", i18n("No description available") ); iconName = config->readEntry( "IconName" ); @@ -164,7 +164,7 @@ static void notifypresent_init() { TQString eventName; TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); - KConfig* config = new KConfig( configFilename, true, false, "data" ); + TDEConfig* config = new TDEConfig( configFilename, true, false, "data" ); if ( config->hasGroup( event ) ) { config->setGroup( event ); diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp index 0674057..b076729 100644 --- a/kttsd/libkttsd/pluginconf.cpp +++ b/kttsd/libkttsd/pluginconf.cpp @@ -62,11 +62,11 @@ PlugInConf::~PlugInConf(){ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. */ -void PlugInConf::load(KConfig* /*config*/, const TQString& /*configGroup*/){ +void PlugInConf::load(TDEConfig* /*config*/, const TQString& /*configGroup*/){ kdDebug() << "PlugInConf::load: Running" << endl; } @@ -76,11 +76,11 @@ void PlugInConf::load(KConfig* /*config*/, const TQString& /*configGroup*/){ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. -* @param config Pointer to a KConfig object. +* @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. */ -void PlugInConf::save(KConfig* /*config*/, const TQString& /*configGroup*/){ +void PlugInConf::save(TDEConfig* /*config*/, const TQString& /*configGroup*/){ kdDebug() << "PlugInConf::save: Running" << endl; } diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h index 542d8cd..37081df 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -231,7 +231,7 @@ class KDE_EXPORT PlugInConf : public TQWidget{ * loaded, so it not necessary to call it in your constructor. * The plugin should read its configuration from the specified group * in the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * loading your configuration. * @@ -242,7 +242,7 @@ class KDE_EXPORT PlugInConf : public TQWidget{ * * @see loadandsavemethods */ - virtual void load(KConfig *config, const TQString &configGroup); + virtual void load(TDEConfig *config, const TQString &configGroup); /** * This function gets called when the user wants to save the settings in @@ -250,7 +250,7 @@ class KDE_EXPORT PlugInConf : public TQWidget{ * configuration is stored. The method is called when the user clicks "Apply" * or "Ok". The plugin should save its configuration in the specified * group of the specified config file. - * @param config Pointer to a KConfig object. + * @param config Pointer to a TDEConfig object. * @param configGroup Call config->setGroup with this argument before * saving your configuration. * @@ -258,7 +258,7 @@ class KDE_EXPORT PlugInConf : public TQWidget{ * it is not necessary to save the language code, unless your plugin needs it in * order to synthesize speech. */ - virtual void save(KConfig *config, const TQString &configGroup); + virtual void save(TDEConfig *config, const TQString &configGroup); /** * This function is called to set the settings in the module to sensible diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp index 53ab839..d50d668 100644 --- a/kttsd/libkttsd/pluginproc.cpp +++ b/kttsd/libkttsd/pluginproc.cpp @@ -45,7 +45,7 @@ PlugInProc::~PlugInProc(){ /** * Initializate the speech plugin. */ -bool PlugInProc::init(KConfig* /*config*/, const TQString& /*configGroup*/){ +bool PlugInProc::init(TDEConfig* /*config*/, const TQString& /*configGroup*/){ // kdDebug() << "PlugInProc::init: Running" << endl; return false; } diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index 0467302..f856193 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -119,7 +119,7 @@ * * Since the KDE library is not available from the @ref sayText and @ref synthText methods, * it is best if the plugin reads configuration settings in the @ref init method. -* The KConfig object is passed as an argument to @ref init . +* The TDEConfig object is passed as an argument to @ref init . * * If the synthesis engine requires a long initialization time (more than a second), * it is best if the plugin loads the speech engine from the @ref init method. @@ -264,7 +264,7 @@ class KDE_EXPORT PlugInProc : virtual public TQObject{ config->setGroup(configGroup); @endverbatim */ - virtual bool init(KConfig *config, const TQString &configGroup); + virtual bool init(TDEConfig *config, const TQString &configGroup); /** * Say a text. Synthesize and audibilize it. diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index 4c73290..0091215 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -317,7 +317,7 @@ void SelectTalkerDlg::loadTalkers(bool /*runningTalkers*/) KListView* lv = m_widget->talkersListView; lv->clear(); TQListViewItem* item; - KConfig* config = new KConfig("kttsdrc"); + TDEConfig* config = new TDEConfig("kttsdrc"); config->setGroup("General"); TQStringList talkerIDsList = config->readListEntry("TalkerIDs", ','); if (!talkerIDsList.isEmpty()) diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp index 1624735..145b9de 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -206,7 +206,7 @@ void GStreamerPlayer::setSinkName(const TQString &sinkName) { m_sinkName = sinkN void GStreamerPlayer::readConfig() { - KConfigGroup config(TDEGlobal::config(), "GStreamerPlayer"); + TDEConfigGroup config(TDEGlobal::config(), "GStreamerPlayer"); m_sinkName = config.readEntry("SinkName", TQString()); } 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. |