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 --- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 12 ++++++------ kttsd/filters/sbd/sbdconf.h | 8 ++++---- kttsd/filters/sbd/sbdproc.cpp | 2 +- kttsd/filters/sbd/sbdproc.h | 4 ++-- kttsd/filters/stringreplacer/stringreplacerconf.cpp | 8 ++++---- kttsd/filters/stringreplacer/stringreplacerconf.h | 8 ++++---- kttsd/filters/stringreplacer/stringreplacerproc.cpp | 2 +- kttsd/filters/stringreplacer/stringreplacerproc.h | 2 +- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 12 ++++++------ kttsd/filters/talkerchooser/talkerchooserconf.h | 8 ++++---- kttsd/filters/talkerchooser/talkerchooserproc.cpp | 2 +- kttsd/filters/talkerchooser/talkerchooserproc.h | 2 +- kttsd/filters/xmltransformer/xmltransformerconf.cpp | 8 ++++---- kttsd/filters/xmltransformer/xmltransformerconf.h | 8 ++++---- kttsd/filters/xmltransformer/xmltransformerproc.cpp | 2 +- kttsd/filters/xmltransformer/xmltransformerproc.h | 2 +- 17 files changed, 46 insertions(+), 46 deletions(-) (limited to 'kttsd/filters') 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, -- cgit v1.2.3