diff options
Diffstat (limited to 'kttsd')
86 files changed, 159 insertions, 159 deletions
diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index 65017b7..0de06cc 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory<KateKttsdPlugin>( "ktexteditor_kttsd" ) ) -KateKttsdPlugin::KateKttsdPlugin( TQObject *tqparent, const char* name, const TQStringList& ) - : KTextEditor::Plugin ( (KTextEditor::Document*) tqparent, name ) +KateKttsdPlugin::KateKttsdPlugin( TQObject *parent, const char* name, const TQStringList& ) + : KTextEditor::Plugin ( (KTextEditor::Document*) parent, name ) { } @@ -80,7 +80,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n void KateKttsdPluginView::slotReadOut() { - KTextEditor::View *v = (KTextEditor::View*)tqparent(); + KTextEditor::View *v = (KTextEditor::View*)parent(); KTextEditor::SelectionInterface *si = KTextEditor::selectionInterface( v->document() ); TQString text; diff --git a/kttsd/app-plugins/kate/katekttsd.h b/kttsd/app-plugins/kate/katekttsd.h index cfcc750..d8f5512 100644 --- a/kttsd/app-plugins/kate/katekttsd.h +++ b/kttsd/app-plugins/kate/katekttsd.h @@ -31,7 +31,7 @@ class KateKttsdPlugin : public KTextEditor::Plugin, public KTextEditor::PluginVi TQ_OBJECT public: - KateKttsdPlugin( TQObject *tqparent = 0, + KateKttsdPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~KateKttsdPlugin(); diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h index 31e9243..d321528 100644 --- a/kttsd/compat/interfaces/kspeech/kspeech.h +++ b/kttsd/compat/interfaces/kspeech/kspeech.h @@ -207,8 +207,8 @@ * "kttsd", object "KSpeech". * @verbatim - MyPart::MyPart(TQWidget *tqparent, const char *name) : - KParts::ReadOnlyPart(tqparent, name), + MyPart::MyPart(TQWidget *parent, const char *name) : + KParts::ReadOnlyPart(parent, name), DCOPStub("kttsd", "KSpeech") { @endverbatim * @@ -293,8 +293,8 @@ * receiving object. * @verbatim - MyPart::MyPart(TQWidget *tqparent, const char *name) : - KParts::ReadOnlyPart(tqparent, name), + MyPart::MyPart(TQWidget *parent, const char *name) : + KParts::ReadOnlyPart(parent, name), DCOPObject("mypart_kspeechsink") { @endverbatim * diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index be6a244..0460521 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -56,8 +56,8 @@ /** * Constructor */ -SbdConf::SbdConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name) +SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name) { // kdDebug() << "SbdConf::SbdConf: Running" << endl; diff --git a/kttsd/filters/sbd/sbdconf.h b/kttsd/filters/sbd/sbdconf.h index f2610c4..d2e2ae0 100644 --- a/kttsd/filters/sbd/sbdconf.h +++ b/kttsd/filters/sbd/sbdconf.h @@ -49,7 +49,7 @@ class SbdConf : public KttsFilterConf /** * Constructor */ - SbdConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + SbdConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index d7e274c..107e6b3 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -41,8 +41,8 @@ /** * Constructor. */ -SbdThread::SbdThread( TQObject *tqparent, const char *name ) : - TQObject( tqparent, name ), +SbdThread::SbdThread( TQObject *parent, const char *name ) : + TQObject( parent, name ), TQThread() { } @@ -562,11 +562,11 @@ bool SbdThread::event ( TQEvent * e ) /** * Constructor. */ -SbdProc::SbdProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterProc(tqparent, name) +SbdProc::SbdProc( TQObject *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterProc(parent, name) { // kdDebug() << "SbdProc::SbdProc: Running" << endl; - m_sbdThread = new SbdThread( tqparent, *name + "_thread" ); + m_sbdThread = new SbdThread( parent, *name + "_thread" ); connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); } diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h index 49f7b09..0c1e7aa 100644 --- a/kttsd/filters/sbd/sbdproc.h +++ b/kttsd/filters/sbd/sbdproc.h @@ -69,7 +69,7 @@ class SbdThread: public TQObject, public TQThread /** * Constructor. */ - SbdThread( TQObject *tqparent = 0, const char *name = 0); + SbdThread( TQObject *parent = 0, const char *name = 0); /** * Destructor. @@ -247,7 +247,7 @@ class SbdProc : virtual public KttsFilterProc /** * Constructor. */ - SbdProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + SbdProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 7954b13..ab71382 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -59,8 +59,8 @@ /** * Constructor */ -StringReplacerConf::StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name), +StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name), m_editDlg(0), m_editWidget(0) { diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.h b/kttsd/filters/stringreplacer/stringreplacerconf.h index 4de870c..fe99f3f 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.h +++ b/kttsd/filters/stringreplacer/stringreplacerconf.h @@ -49,7 +49,7 @@ class StringReplacerConf : public KttsFilterConf /** * Constructor */ - StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index 3715654..f3628f1 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -44,8 +44,8 @@ /** * Constructor. */ -StringReplacerProc::StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList& ) : - KttsFilterProc(tqparent, name) +StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, const TQStringList& ) : + KttsFilterProc(parent, name) { } diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h index 175bda8..0fffbc9 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.h +++ b/kttsd/filters/stringreplacer/stringreplacerproc.h @@ -44,7 +44,7 @@ public: /** * Constructor. */ - StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index cbdbfb2..350f845 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -49,8 +49,8 @@ /** * Constructor */ -TalkerChooserConf::TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name) +TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name) { // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl; diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h index be501a2..56dc326 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.h +++ b/kttsd/filters/talkerchooser/talkerchooserconf.h @@ -51,7 +51,7 @@ class TalkerChooserConf : public KttsFilterConf /** * Constructor */ - TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp index 30ef605..2ea8134 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp @@ -38,8 +38,8 @@ /** * Constructor. */ -TalkerChooserProc::TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) : - KttsFilterProc(tqparent, name) +TalkerChooserProc::TalkerChooserProc( TQObject *parent, const char *name, const TQStringList& /*args*/ ) : + KttsFilterProc(parent, name) { // kdDebug() << "TalkerChooserProc::TalkerChooserProc: Running" << endl; } diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.h b/kttsd/filters/talkerchooser/talkerchooserproc.h index a422000..35096b7 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.h +++ b/kttsd/filters/talkerchooser/talkerchooserproc.h @@ -37,7 +37,7 @@ public: /** * Constructor. */ - TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 8247a01..c143f21 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -43,8 +43,8 @@ /** * Constructor */ -XmlTransformerConf::XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name) +XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name) { // kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl; diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.h b/kttsd/filters/xmltransformer/xmltransformerconf.h index c10b90b..29c985a 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.h +++ b/kttsd/filters/xmltransformer/xmltransformerconf.h @@ -46,7 +46,7 @@ class XmlTransformerConf : public KttsFilterConf /** * Constructor */ - XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 27c4cd4..272b6ca 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -44,8 +44,8 @@ /** * Constructor. */ -XmlTransformerProc::XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList& ) : - KttsFilterProc(tqparent, name) +XmlTransformerProc::XmlTransformerProc( TQObject *parent, const char *name, const TQStringList& ) : + KttsFilterProc(parent, name) { m_xsltProc = 0; } diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h index 4f8b82b..96eefab 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.h +++ b/kttsd/filters/xmltransformer/xmltransformerproc.h @@ -42,7 +42,7 @@ public: /** * Constructor. */ - XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index f97e263..200d419 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -34,8 +34,8 @@ // KTTS includes. #include "addtalker.h" -AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent, const char* name, WFlags fl) - : AddTalkerWidget(tqparent,name,fl) +AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char* name, WFlags fl) + : AddTalkerWidget(parent,name,fl) { // Build maps. setSynthToLangMap(synthToLangMap); diff --git a/kttsd/kcmkttsmgr/addtalker.h b/kttsd/kcmkttsmgr/addtalker.h index 0c3f703..bb969d5 100644 --- a/kttsd/kcmkttsmgr/addtalker.h +++ b/kttsd/kcmkttsmgr/addtalker.h @@ -42,10 +42,10 @@ public: /** * Constructor. * @param synthToLangMap TQMap of supported language codes indexed by synthesizer. - * @param tqparent Inherited KDialog parameter. + * @param parent Inherited KDialog parameter. * @param name Inherited KDialog parameter. */ - AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index e60a720..c81feea 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -104,10 +104,10 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kttsd, KCMKttsMgrFactory("kttsd") ) * Makes the list of plug ins. * And the languages acording to the plug ins. */ -KCMKttsMgr::KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &) : +KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kcmkttsmgr_kspeechsink"), - KCModule(KCMKttsMgrFactory::instance(), tqparent, name) + KCModule(KCMKttsMgrFactory::instance(), parent, name) { // kdDebug() << "KCMKttsMgr contructor running." << endl; @@ -2396,7 +2396,7 @@ void KCMKttsMgr::slotNotifyListView_selectionChanged() bool defaultItem = ( item->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyRemoveButton->setEnabled( !defaultItem ); } else { - bool defaultItem = ( item->tqparent()->text(nlvcEventSrc) == "default" ); + bool defaultItem = ( item->parent()->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyPresentComboBox->setEnabled( defaultItem ); if ( defaultItem ) m_kttsmgrw->notifyPresentComboBox->setCurrentItem( NotifyPresent::present( item->text( nlvcEvent ) ) ); @@ -2558,7 +2558,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( } // No duplicates. item = lv->findItem( event, nlvcEvent ); - if ( !item || item->tqparent() != parentItem ) + if ( !item || item->parent() != parentItem ) item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, eventSrc, event, actionName, talkerCode.getTalkerCode()); if ( action == NotifyAction::DoNotSpeak ) @@ -2644,7 +2644,7 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked() { TQListViewItem* item = m_kttsmgrw->notifyListView->selectedItem(); if (!item) return; - TQListViewItem* parentItem = item->tqparent(); + TQListViewItem* parentItem = item->parent(); delete item; if (parentItem) { @@ -2688,16 +2688,16 @@ void KCMKttsMgr::slotNotifySaveButton_clicked() // ---------------------------------------------------------------------------- -KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, +KttsCheckListItem::KttsCheckListItem( TQListView *parent, TQListViewItem *after, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(tqparent, after, text, tt), + TQCheckListItem(parent, after, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } -KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, +KttsCheckListItem::KttsCheckListItem( TQListView *parent, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(tqparent, text, tt), + TQCheckListItem(parent, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } /*virtual*/ void KttsCheckListItem::stateChange(bool) diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index 5edb02e..0754287 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -58,7 +58,7 @@ class KCMKttsMgr : TQ_OBJECT public: - KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &); + KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &); ~KCMKttsMgr(); @@ -514,10 +514,10 @@ class KCMKttsMgr : class KttsCheckListItem : public TQCheckListItem { public: - KttsCheckListItem( TQListView *tqparent, + KttsCheckListItem( TQListView *parent, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); - KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, + KttsCheckListItem( TQListView *parent, TQListViewItem *after, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 921d296..4c5c1c1 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -36,8 +36,8 @@ #include "utils.h" #include "selectevent.h" -SelectEvent::SelectEvent(TQWidget* tqparent, const char* name, WFlags fl, const TQString& initEventSrc) - : SelectEventWidget(tqparent,name,fl) +SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQString& initEventSrc) + : SelectEventWidget(parent,name,fl) { // Load list of event sources (applications). TQStringList fullpaths = diff --git a/kttsd/kcmkttsmgr/selectevent.h b/kttsd/kcmkttsmgr/selectevent.h index f7ce996..720efda 100644 --- a/kttsd/kcmkttsmgr/selectevent.h +++ b/kttsd/kcmkttsmgr/selectevent.h @@ -34,11 +34,11 @@ class SelectEvent : public SelectEventWidget public: /** * Constructor. - * @param tqparent Inherited KDialog parameter. + * @param parent Inherited KDialog parameter. * @param name Inherited KDialog parameter. * @param initEventSrc Event source to start with. */ - SelectEvent(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0, + SelectEvent(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0, const TQString& initEventSrc = TQString() ); /** diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 41e521d..5e4065a 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -37,8 +37,8 @@ /** * Constructor. */ -FilterMgr::FilterMgr( TQObject *tqparent, const char *name) : - KttsFilterProc(tqparent, name) +FilterMgr::FilterMgr( TQObject *parent, const char *name) : + KttsFilterProc(parent, name) { // kdDebug() << "FilterMgr::FilterMgr: Running" << endl; m_state = fsIdle; diff --git a/kttsd/kttsd/filtermgr.h b/kttsd/kttsd/filtermgr.h index 539329b..fab8719 100644 --- a/kttsd/kttsd/filtermgr.h +++ b/kttsd/kttsd/filtermgr.h @@ -46,7 +46,7 @@ class FilterMgr : public KttsFilterProc /** * Constructor. */ - FilterMgr(TQObject *tqparent = 0, const char *name = 0); + FilterMgr(TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 211d757..de4320c 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -49,9 +49,9 @@ * Note that most of the real tts work occurs in Speaker. */ -KTTSD::KTTSD(const TQCString& objId, TQObject *tqparent, const char *name) : +KTTSD::KTTSD(const TQCString& objId, TQObject *parent, const char *name) : DCOPObject(objId), - TQObject(tqparent, name) + TQObject(parent, name) { // kdDebug() << "KTTSD::KTTSD Running" << endl; m_speaker = 0; @@ -1096,9 +1096,9 @@ TQString KTTSD::fixNullString(const TQString &talker) const // kspeech is obsolete. Applications should use KSpeech instead. // Constructor. -kspeech::kspeech(const TQCString& objId, TQObject *tqparent, const char *name) : +kspeech::kspeech(const TQCString& objId, TQObject *parent, const char *name) : DCOPObject(objId), - TQObject(tqparent, name), + TQObject(parent, name), m_kttsd("KSpeech") { } diff --git a/kttsd/kttsd/kttsd.h b/kttsd/kttsd/kttsd.h index c082f1d..d0fb97f 100644 --- a/kttsd/kttsd/kttsd.h +++ b/kttsd/kttsd/kttsd.h @@ -49,7 +49,7 @@ class KTTSD : public TQObject, virtual public KSpeech * Create objects, speechData and speaker. * Start thread */ - KTTSD(const TQCString& objId, TQObject *tqparent=0, const char *name=0); + KTTSD(const TQCString& objId, TQObject *parent=0, const char *name=0); /** * Destructor. @@ -638,7 +638,7 @@ class kspeech : public TQObject, virtual public KSpeech public: // Constructor. - kspeech(const TQCString& objId, TQObject *tqparent=0, const char *name=0); + kspeech(const TQCString& objId, TQObject *parent=0, const char *name=0); // Destructor. ~kspeech(); diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index b38f0a0..13efc10 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -107,8 +107,8 @@ * Loads plugins. */ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, - TQObject *tqparent, const char *name) : - TQObject(tqparent, name), + TQObject *parent, const char *name) : + TQObject(parent, name), m_speechData(speechData), m_talkerMgr(talkerMgr) { diff --git a/kttsd/kttsd/speaker.h b/kttsd/kttsd/speaker.h index 9ae1921..662020e 100644 --- a/kttsd/kttsd/speaker.h +++ b/kttsd/kttsd/speaker.h @@ -119,7 +119,7 @@ class Speaker : public TQObject{ * Calls load plug ins */ Speaker(SpeechData* speechData, TalkerMgr* talkerMgr, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); /** * Destructor diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index 4e244fb..8d6264b 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -37,8 +37,8 @@ /** * Constructor. */ -TalkerMgr::TalkerMgr(TQObject *tqparent, const char *name) : - TQObject( tqparent, name ) +TalkerMgr::TalkerMgr(TQObject *parent, const char *name) : + TQObject( parent, name ) { m_loadedPlugIns.setAutoDelete(true); } diff --git a/kttsd/kttsd/talkermgr.h b/kttsd/kttsd/talkermgr.h index 2f3ce95..8c79596 100644 --- a/kttsd/kttsd/talkermgr.h +++ b/kttsd/kttsd/talkermgr.h @@ -41,7 +41,7 @@ public: /** * Constructor. */ - TalkerMgr(TQObject *tqparent = 0, const char *name = 0); + TalkerMgr(TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsd/threadedplugin.cpp b/kttsd/kttsd/threadedplugin.cpp index 6158588..5df0c0f 100644 --- a/kttsd/kttsd/threadedplugin.cpp +++ b/kttsd/kttsd/threadedplugin.cpp @@ -33,8 +33,8 @@ * Constructor. */ ThreadedPlugIn::ThreadedPlugIn(PlugInProc* plugin, - TQObject *tqparent /*= 0*/, const char *name /*= 0*/): - PlugInProc(tqparent, name), + TQObject *parent /*= 0*/, const char *name /*= 0*/): + PlugInProc(parent, name), TQThread(), m_plugin(plugin), m_filename(TQString()), diff --git a/kttsd/kttsd/threadedplugin.h b/kttsd/kttsd/threadedplugin.h index c2ee0d6..1a1b13e 100644 --- a/kttsd/kttsd/threadedplugin.h +++ b/kttsd/kttsd/threadedplugin.h @@ -45,7 +45,7 @@ class ThreadedPlugIn : public PlugInProc, public TQThread /** * Constructor. */ - ThreadedPlugIn(PlugInProc* plugin, TQObject *tqparent = 0, const char *name = 0); + ThreadedPlugIn(PlugInProc* plugin, TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index a9ddb96..2d6477e 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -65,10 +65,10 @@ KttsJobMgrFactory::~KttsJobMgrFactory() s_instance = 0; } -TQObject *KttsJobMgrFactory::createObject(TQObject *tqparent, const char *name, const char*, +TQObject *KttsJobMgrFactory::createObject(TQObject *parent, const char *name, const char*, const TQStringList& ) { - TQObject *obj = new KttsJobMgrPart((TQWidget*)tqparent, name); + TQObject *obj = new KttsJobMgrPart((TQWidget*)parent, name); emit objectCreated(obj); return obj; } @@ -86,10 +86,10 @@ KAboutData *KttsJobMgrFactory::aboutData() return about; } -KttsJobMgrPart::KttsJobMgrPart(TQWidget *tqparent, const char *name) : +KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kttsjobmgr_kspeechsink"), - KParts::ReadOnlyPart(TQT_TQOBJECT(tqparent), name) + KParts::ReadOnlyPart(TQT_TQOBJECT(parent), name) { // Initialize some variables. m_selectOnTextSet = false; @@ -101,7 +101,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *tqparent, const char *name) : KGlobal::locale()->insertCatalogue("kttsd"); // Create a TQVBox to host everything. - TQVBox* vBox = new TQVBox(tqparent); + TQVBox* vBox = new TQVBox(parent); vBox->setMargin(6); // Create a splitter to contain the Job List View and the current sentence. @@ -1013,8 +1013,8 @@ ASYNC KttsJobMgrPart::textRemoved(const TQCString&, const uint jobNum) autoSelectInJobListView(); } -KttsJobMgrBrowserExtension::KttsJobMgrBrowserExtension(KttsJobMgrPart *tqparent) - : KParts::BrowserExtension(tqparent, "KttsJobMgrBrowserExtension") +KttsJobMgrBrowserExtension::KttsJobMgrBrowserExtension(KttsJobMgrPart *parent) + : KParts::BrowserExtension(parent, "KttsJobMgrBrowserExtension") { } diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h index 216531d..506b551 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.h +++ b/kttsd/kttsjobmgr/kttsjobmgr.h @@ -42,7 +42,7 @@ public: KttsJobMgrFactory() {}; virtual ~KttsJobMgrFactory(); - virtual TQObject* createObject(TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); @@ -61,7 +61,7 @@ class KttsJobMgrPart: Q_OBJECT TQ_OBJECT public: - KttsJobMgrPart(TQWidget *tqparent, const char *name); + KttsJobMgrPart(TQWidget *parent, const char *name); virtual ~KttsJobMgrPart(); protected: @@ -293,7 +293,7 @@ class KttsJobMgrBrowserExtension : public KParts::BrowserExtension TQ_OBJECT friend class KttsJobMgrPart; public: - KttsJobMgrBrowserExtension(KttsJobMgrPart *tqparent); + KttsJobMgrBrowserExtension(KttsJobMgrPart *parent); virtual ~KttsJobMgrBrowserExtension(); }; diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index f4f2935..c1ce347 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -135,7 +135,7 @@ int main (int argc, char *argv[]) /* KttsToolTip class */ -KttsToolTip::KttsToolTip ( TQWidget* tqparent ) : TQToolTip(tqparent) +KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) { } @@ -163,10 +163,10 @@ KttsToolTip::KttsToolTip ( TQWidget* tqparent ) : TQToolTip(tqparent) /* KttsMgrTray class */ -KttsMgrTray::KttsMgrTray(TQWidget *tqparent): +KttsMgrTray::KttsMgrTray(TQWidget *parent): DCOPStub("kttsd", "KSpeech"), DCOPObject("kkttsmgr_kspeechsink"), - KSystemTray(tqparent, "kttsmgrsystemtray") + KSystemTray(parent, "kttsmgrsystemtray") { TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small); setPixmap (icon); @@ -200,7 +200,7 @@ KttsMgrTray::KttsMgrTray(TQWidget *tqparent): "textFinished(TQCString,uint)", false); // Install an event filter so we can check when KTTSMgr becomes inconified to the systray. - tqparent->installEventFilter(this); + parent->installEventFilter(this); } } diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h index af7765c..a2a99df 100644 --- a/kttsd/kttsmgr/kttsmgr.h +++ b/kttsd/kttsmgr/kttsmgr.h @@ -39,7 +39,7 @@ class KttsToolTip: public TQToolTip { public: - KttsToolTip ( TQWidget* tqparent ); + KttsToolTip ( TQWidget* parent ); protected: virtual void maybeTip ( const TQPoint & p ); @@ -51,7 +51,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee TQ_OBJECT public: - KttsMgrTray(TQWidget *tqparent=0); + KttsMgrTray(TQWidget *parent=0); ~KttsMgrTray(); void setExitWhenFinishedSpeaking(); diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp index bfeb1f5..e98435c 100644 --- a/kttsd/libkttsd/filterconf.cpp +++ b/kttsd/libkttsd/filterconf.cpp @@ -42,7 +42,7 @@ /** * Constructor */ -KttsFilterConf::KttsFilterConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){ +KttsFilterConf::KttsFilterConf( TQWidget *parent, const char *name) : TQWidget(parent, name){ // kdDebug() << "KttsFilterConf::KttsFilterConf: Running" << endl; TQString systemPath(getenv("PATH")); // kdDebug() << "Path is " << systemPath << endl; diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h index c508532..dc3023f 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -42,7 +42,7 @@ class KDE_EXPORT KttsFilterConf : public TQWidget{ /** * Constructor */ - KttsFilterConf( TQWidget *tqparent = 0, const char *name = 0); + KttsFilterConf( TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kttsd/libkttsd/filterproc.cpp b/kttsd/libkttsd/filterproc.cpp index 9daf281..2759a4b 100644 --- a/kttsd/libkttsd/filterproc.cpp +++ b/kttsd/libkttsd/filterproc.cpp @@ -31,8 +31,8 @@ /** * Constructor. */ -KttsFilterProc::KttsFilterProc( TQObject *tqparent, const char *name) : - TQObject(tqparent, name) +KttsFilterProc::KttsFilterProc( TQObject *parent, const char *name) : + TQObject(parent, name) { // kdDebug() << "KttsFilterProc::KttsFilterProc: Running" << endl; } diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h index 3484061..0c279fb 100644 --- a/kttsd/libkttsd/filterproc.h +++ b/kttsd/libkttsd/filterproc.h @@ -52,7 +52,7 @@ public: /** * Constructor. */ - KttsFilterProc( TQObject *tqparent, const char *name ); + KttsFilterProc( TQObject *parent, const char *name ); /** * Destructor. diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h index a0b8311..2d391dc 100644 --- a/kttsd/libkttsd/player.h +++ b/kttsd/libkttsd/player.h @@ -67,8 +67,8 @@ public: virtual void setPeriods(uint periods) {Q_UNUSED(periods); } protected: - Player(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) : - TQObject(tqparent, name) { + Player(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) : + TQObject(parent, name) { Q_UNUSED(args); } diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp index 8138547..ce68916 100644 --- a/kttsd/libkttsd/pluginconf.cpp +++ b/kttsd/libkttsd/pluginconf.cpp @@ -36,7 +36,7 @@ /** * Constructor */ -PlugInConf::PlugInConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){ +PlugInConf::PlugInConf( TQWidget *parent, const char *name) : TQWidget(parent, name){ kdDebug() << "PlugInConf::PlugInConf: Running" << endl; KGlobal::locale()->insertCatalogue("kttsd"); TQString systemPath(getenv("PATH")); diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h index b76ec21..8758552 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -215,7 +215,7 @@ class KDE_EXPORT PlugInConf : public TQWidget{ /** * Constructor */ - PlugInConf( TQWidget *tqparent = 0, const char *name = 0); + PlugInConf( TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp index 39c523b..bcd79fd 100644 --- a/kttsd/libkttsd/pluginproc.cpp +++ b/kttsd/libkttsd/pluginproc.cpp @@ -31,7 +31,7 @@ /** * Constructor */ -PlugInProc::PlugInProc( TQObject *tqparent, const char *name) : TQObject(tqparent, name){ +PlugInProc::PlugInProc( TQObject *parent, const char *name) : TQObject(parent, name){ // kdDebug() << "PlugInProc::PlugInProc: Running" << endl; } diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index ab156b3..2132e47 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -242,7 +242,7 @@ class KDE_EXPORT PlugInProc : virtual public TQObject{ /** * Constructor. */ - PlugInProc( TQObject *tqparent = 0, const char *name = 0); + PlugInProc( TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index 99a2b03..c06c3ff 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -45,14 +45,14 @@ #include "selecttalkerdlg.moc" SelectTalkerDlg::SelectTalkerDlg( - TQWidget* tqparent, + TQWidget* parent, const char* name, const TQString& caption, const TQString& talkerCode, bool runningTalkers) : KDialogBase( - tqparent, + parent, name, true, caption, diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h index 2ac7c30..d7b0021 100644 --- a/kttsd/libkttsd/selecttalkerdlg.h +++ b/kttsd/libkttsd/selecttalkerdlg.h @@ -47,7 +47,7 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase public: /** * Constructor. - * @param tqparent The tqparent for this dialog. + * @param parent The parent for this dialog. * @param name Name for this dialog. * @param caption Displayed title for this dialog. * @param talkerCode A suggested starting Talker Code. @@ -56,7 +56,7 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase * (which may not yet have been Applied). */ SelectTalkerDlg( - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = "selecttalkerdialog", const TQString& caption = i18n("Select Talker"), const TQString& talkerCode = TQString(), diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp index 14f0b83..6af8baf 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -34,8 +34,8 @@ /** * Constructor. */ -Stretcher::Stretcher(TQObject *tqparent, const char *name) : - TQObject(tqparent, name) +Stretcher::Stretcher(TQObject *parent, const char *name) : + TQObject(parent, name) { m_state = 0; m_stretchProc = 0; diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h index e0c7e72..dc85e46 100644 --- a/kttsd/libkttsd/stretcher.h +++ b/kttsd/libkttsd/stretcher.h @@ -39,7 +39,7 @@ class KDE_EXPORT Stretcher : public TQObject{ /** * Constructor. */ - Stretcher(TQObject *tqparent = 0, const char *name = 0); + Stretcher(TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp index 155f2aa..70ca3eb 100644 --- a/kttsd/libkttsd/testplayer.cpp +++ b/kttsd/libkttsd/testplayer.cpp @@ -44,9 +44,9 @@ /** * Constructor. */ -TestPlayer::TestPlayer(TQObject *tqparent, const char *name, +TestPlayer::TestPlayer(TQObject *parent, const char *name, const int playerOption, const float audioStretchFactor, const TQString &sinkName) : - TQObject(tqparent, name) + TQObject(parent, name) { m_playerOption = playerOption; m_audioStretchFactor = audioStretchFactor; diff --git a/kttsd/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h index c95c369..b11d6cb 100644 --- a/kttsd/libkttsd/testplayer.h +++ b/kttsd/libkttsd/testplayer.h @@ -40,7 +40,7 @@ class KDE_EXPORT TestPlayer : public TQObject{ * @param playerOption * @param audioStretchFactor */ - TestPlayer(TQObject *tqparent = 0, const char *name = 0, + TestPlayer(TQObject *parent = 0, const char *name = 0, const int playerOption = 0, const float audioStretchFactor = 1.0, const TQString &sinkName = TQString()); diff --git a/kttsd/players/akodeplayer/akodeplayer.cpp b/kttsd/players/akodeplayer/akodeplayer.cpp index a0d38bb..13f6cf3 100644 --- a/kttsd/players/akodeplayer/akodeplayer.cpp +++ b/kttsd/players/akodeplayer/akodeplayer.cpp @@ -29,8 +29,8 @@ using namespace aKode; // public methods //////////////////////////////////////////////////////////////////////////////// -aKodePlayer::aKodePlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +aKodePlayer::aKodePlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_player(0) {} diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h index 13fe8de..c5d1c69 100644 --- a/kttsd/players/akodeplayer/akodeplayer.h +++ b/kttsd/players/akodeplayer/akodeplayer.h @@ -34,7 +34,7 @@ class KDE_EXPORT aKodePlayer : public Player TQ_OBJECT public: - aKodePlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + aKodePlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); virtual ~aKodePlayer(); // virtual void play(const FileHandle &file = FileHandle::null()); diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp index 5c435d8..fbec8aa 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -128,8 +128,8 @@ TQString AlsaPlayer::timestamp() const // public methods //////////////////////////////////////////////////////////////////////////////// -AlsaPlayer::AlsaPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +AlsaPlayer::AlsaPlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_currentVolume(1.0), m_pcmName("default"), m_defPeriodSize(128), diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h index 7dedc87..1d25cec 100644 --- a/kttsd/players/alsaplayer/alsaplayer.h +++ b/kttsd/players/alsaplayer/alsaplayer.h @@ -69,7 +69,7 @@ class KDE_EXPORT AlsaPlayer : public Player, TQThread TQ_OBJECT public: - AlsaPlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + AlsaPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); ~AlsaPlayer(); virtual void startPlay(const TQString& file); diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index 63652de..7f80691 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -40,8 +40,8 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -ArtsPlayer::ArtsPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +ArtsPlayer::ArtsPlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_dispatcher(0), m_server(0), m_factory(0), diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h index 307999a..971c56d 100644 --- a/kttsd/players/artsplayer/artsplayer.h +++ b/kttsd/players/artsplayer/artsplayer.h @@ -46,7 +46,7 @@ class KDE_EXPORT ArtsPlayer : public Player TQ_OBJECT public: - ArtsPlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + ArtsPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); ~ArtsPlayer(); // virtual void play(const FileHandle &file = FileHandle::null()); diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp index ae06557..bfd62d0 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -29,8 +29,8 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -GStreamerPlayer::GStreamerPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +GStreamerPlayer::GStreamerPlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_initialized(false), m_pipeline(0), m_source(0), diff --git a/kttsd/players/gstplayer/gstreamerplayer.h b/kttsd/players/gstplayer/gstreamerplayer.h index 066b493..14a054a 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.h +++ b/kttsd/players/gstplayer/gstreamerplayer.h @@ -31,7 +31,7 @@ class GStreamerPlayer : public Player TQ_OBJECT public: - GStreamerPlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + GStreamerPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); virtual ~GStreamerPlayer(); // virtual void play(const FileHandle &file = FileHandle::null()); diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 968c20d..9045f14 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -41,8 +41,8 @@ #include "commandconf.h" /** Constructor */ -CommandConf::CommandConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "CommandConf::CommandConf: Running" << endl; m_commandProc = 0; diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h index 4607718..2ab9810 100644 --- a/kttsd/plugins/command/commandconf.h +++ b/kttsd/plugins/command/commandconf.h @@ -40,7 +40,7 @@ class CommandConf : public PlugInConf { public: /** Constructor */ - CommandConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + CommandConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~CommandConf(); diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index d8b35d2..d1eb223 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -39,8 +39,8 @@ #include "commandproc.moc" /** Constructor */ -CommandProc::CommandProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInProc( tqparent, name ) +CommandProc::CommandProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : + PlugInProc( parent, name ) { kdDebug() << "CommandProc::CommandProc: Running" << endl; m_commandProc = 0; diff --git a/kttsd/plugins/command/commandproc.h b/kttsd/plugins/command/commandproc.h index 0faf1f4..71eb8be 100644 --- a/kttsd/plugins/command/commandproc.h +++ b/kttsd/plugins/command/commandproc.h @@ -33,7 +33,7 @@ class CommandProc : public PlugInProc{ public: /** Constructor */ - CommandProc( TQObject* tqparent = 0, const char* name = 0, + CommandProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index b3cd27d..a755ac8 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -48,8 +48,8 @@ #include "eposconf.moc" /** Constructor */ -EposConf::EposConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "EposConf::EposConf: Running" << endl; m_eposProc = 0; diff --git a/kttsd/plugins/epos/eposconf.h b/kttsd/plugins/epos/eposconf.h index 667d445..bfbe346 100644 --- a/kttsd/plugins/epos/eposconf.h +++ b/kttsd/plugins/epos/eposconf.h @@ -47,7 +47,7 @@ class EposConf : public PlugInConf { public: /** Constructor */ - EposConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~EposConf(); diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index ae7973c..670a1c4 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -43,8 +43,8 @@ #include "eposproc.moc" /** Constructor */ -EposProc::EposProc( TQObject* tqparent, const char* name, const TQStringList& ) : - PlugInProc( tqparent, name ){ +EposProc::EposProc( TQObject* parent, const char* name, const TQStringList& ) : + PlugInProc( parent, name ){ kdDebug() << "EposProc::EposProc: Running" << endl; m_state = psIdle; m_waitingStop = false; diff --git a/kttsd/plugins/epos/eposproc.h b/kttsd/plugins/epos/eposproc.h index 0689481..e0fe6d3 100644 --- a/kttsd/plugins/epos/eposproc.h +++ b/kttsd/plugins/epos/eposproc.h @@ -43,7 +43,7 @@ class EposProc : public PlugInProc{ /** * Constructor */ - EposProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index 54542ab..10a3ad9 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -57,8 +57,8 @@ #include "festivalintconf.moc" /** Constructor */ -FestivalIntConf::FestivalIntConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "FestivalIntConf::FestivalIntConf: Running" << endl; m_festProc = 0; diff --git a/kttsd/plugins/festivalint/festivalintconf.h b/kttsd/plugins/festivalint/festivalintconf.h index 3379719..9af75c2 100644 --- a/kttsd/plugins/festivalint/festivalintconf.h +++ b/kttsd/plugins/festivalint/festivalintconf.h @@ -60,7 +60,7 @@ class FestivalIntConf : public PlugInConf { public: /** Constructor */ - FestivalIntConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FestivalIntConf(); diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index bc37d1e..6e3a9f3 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -43,8 +43,8 @@ #include "festivalintproc.moc" /** Constructor */ -FestivalIntProc::FestivalIntProc( TQObject* tqparent, const char* name, const TQStringList& ) : - PlugInProc( tqparent, name ){ +FestivalIntProc::FestivalIntProc( TQObject* parent, const char* name, const TQStringList& ) : + PlugInProc( parent, name ){ // kdDebug() << "FestivalIntProc::FestivalIntProc: Running" << endl; m_ready = true; m_writingStdin = false; diff --git a/kttsd/plugins/festivalint/festivalintproc.h b/kttsd/plugins/festivalint/festivalintproc.h index e70127f..71fe6e4 100644 --- a/kttsd/plugins/festivalint/festivalintproc.h +++ b/kttsd/plugins/festivalint/festivalintproc.h @@ -47,7 +47,7 @@ class FestivalIntProc : public PlugInProc{ /** * Constructor */ - FestivalIntProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 060e45c..076fcb0 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -42,8 +42,8 @@ #include "fliteconf.moc" /** Constructor */ -FliteConf::FliteConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "FliteConf::FliteConf: Running" << endl; m_fliteProc = 0; diff --git a/kttsd/plugins/flite/fliteconf.h b/kttsd/plugins/flite/fliteconf.h index 75e3b89..ca84926 100644 --- a/kttsd/plugins/flite/fliteconf.h +++ b/kttsd/plugins/flite/fliteconf.h @@ -46,7 +46,7 @@ class FliteConf : public PlugInConf { public: /** Constructor */ - FliteConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FliteConf(); diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index e8185d5..238cf26 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -36,8 +36,8 @@ #include "fliteproc.moc" /** Constructor */ -FliteProc::FliteProc( TQObject* tqparent, const char* name, const TQStringList& ) : - PlugInProc( tqparent, name ){ +FliteProc::FliteProc( TQObject* parent, const char* name, const TQStringList& ) : + PlugInProc( parent, name ){ kdDebug() << "FliteProc::FliteProc: Running" << endl; m_state = psIdle; m_waitingStop = false; diff --git a/kttsd/plugins/flite/fliteproc.h b/kttsd/plugins/flite/fliteproc.h index 6b44e45..00d9c51 100644 --- a/kttsd/plugins/flite/fliteproc.h +++ b/kttsd/plugins/flite/fliteproc.h @@ -41,7 +41,7 @@ class FliteProc : public PlugInProc{ /** * Constructor */ - FliteProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 1da6f44..87f12b4 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -40,8 +40,8 @@ #include "freettsconfigwidget.h" /** Constructor */ -FreeTTSConf::FreeTTSConf( TQWidget* tqparent, const char* name, const TQStringList&/*args*/) : - PlugInConf( tqparent, name ) { +FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList&/*args*/) : + PlugInConf( parent, name ) { // kdDebug() << "FreeTTSConf::FreeTTSConf: Running" << endl; m_freettsProc = 0; diff --git a/kttsd/plugins/freetts/freettsconf.h b/kttsd/plugins/freetts/freettsconf.h index 62e2e7a..7095da5 100644 --- a/kttsd/plugins/freetts/freettsconf.h +++ b/kttsd/plugins/freetts/freettsconf.h @@ -37,7 +37,7 @@ class FreeTTSConf : public PlugInConf { public: /** Constructor */ - FreeTTSConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FreeTTSConf(); diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index c3de342..e99cd73 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -27,8 +27,8 @@ #include "freettsproc.h" /** Constructor */ -FreeTTSProc::FreeTTSProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInProc( tqparent, name ) { +FreeTTSProc::FreeTTSProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : + PlugInProc( parent, name ) { kdDebug() << "Running: FreeTTSProc::FreeTTSProc" << endl; m_state = psIdle; m_waitingStop = false; diff --git a/kttsd/plugins/freetts/freettsproc.h b/kttsd/plugins/freetts/freettsproc.h index 15ad5f5..8383f53 100644 --- a/kttsd/plugins/freetts/freettsproc.h +++ b/kttsd/plugins/freetts/freettsproc.h @@ -34,7 +34,7 @@ public: /** * Constructor */ - FreeTTSProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 1d4a2cc..798455c 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -203,8 +203,8 @@ class HadifixConfPrivate { }; /** Constructor */ -HadifixConf::HadifixConf( TQWidget* tqparent, const char* name, const TQStringList &) : - PlugInConf( tqparent, name ){ +HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) : + PlugInConf( parent, name ){ // kdDebug() << "HadifixConf::HadifixConf: Running" << endl; TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout"); tqlayout->tqsetAlignment (TQt::AlignTop); diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h index 7eb7b30..8f56126 100644 --- a/kttsd/plugins/hadifix/hadifixconf.h +++ b/kttsd/plugins/hadifix/hadifixconf.h @@ -16,7 +16,7 @@ class HadifixConf : public PlugInConf { public: /** Constructor */ - HadifixConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixConf(); diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index ad2cf21..4c3f85f 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -75,8 +75,8 @@ class HadifixProcPrivate { }; /** Constructor */ -HadifixProc::HadifixProc( TQObject* tqparent, const char* name, const TQStringList &) : - PlugInProc( tqparent, name ){ +HadifixProc::HadifixProc( TQObject* parent, const char* name, const TQStringList &) : + PlugInProc( parent, name ){ // kdDebug() << "HadifixProc::HadifixProc: Running" << endl; d = 0; } diff --git a/kttsd/plugins/hadifix/hadifixproc.h b/kttsd/plugins/hadifix/hadifixproc.h index 4fbf03b..b26e2df 100644 --- a/kttsd/plugins/hadifix/hadifixproc.h +++ b/kttsd/plugins/hadifix/hadifixproc.h @@ -38,7 +38,7 @@ class HadifixProc : public PlugInProc{ }; /** Constructor */ - HadifixProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixProc(); |