From c04ba2b3810f5a0187b3ca3b89661d0befca9e08 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 11 Jan 2024 10:29:46 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kttsd/app-plugins/kate/katekttsd.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 34 ++-- kttsd/filters/sbd/sbdproc.cpp | 4 +- .../filters/stringreplacer/stringreplacerconf.cpp | 64 ++++---- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 32 ++-- .../filters/xmltransformer/xmltransformerconf.cpp | 24 +-- .../filters/xmltransformer/xmltransformerproc.cpp | 12 +- kttsd/kcmkttsmgr/addtalker.cpp | 8 +- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 178 ++++++++++----------- kttsd/kcmkttsmgr/selectevent.cpp | 2 +- kttsd/kttsd/filtermgr.cpp | 10 +- kttsd/kttsd/kttsd.cpp | 40 ++--- kttsd/kttsd/speaker.cpp | 26 +-- kttsd/kttsd/speechdata.cpp | 8 +- kttsd/kttsd/ssmlconvert.cpp | 4 +- kttsd/kttsjobmgr/kttsjobmgr.cpp | 30 ++-- kttsd/kttsmgr/kttsmgr.cpp | 12 +- kttsd/libkttsd/selecttalkerdlg.cpp | 60 +++---- kttsd/libkttsd/stretcher.cpp | 4 +- kttsd/players/artsplayer/artsplayer.cpp | 4 +- kttsd/plugins/command/commandconf.cpp | 26 +-- kttsd/plugins/command/commandproc.cpp | 16 +- kttsd/plugins/epos/eposconf.cpp | 54 +++---- kttsd/plugins/epos/eposproc.cpp | 32 ++-- kttsd/plugins/festivalint/festivalintconf.cpp | 78 ++++----- kttsd/plugins/festivalint/festivalintproc.cpp | 16 +- kttsd/plugins/flite/fliteconf.cpp | 12 +- kttsd/plugins/flite/fliteproc.cpp | 16 +- kttsd/plugins/freetts/freettsconf.cpp | 12 +- kttsd/plugins/freetts/freettsproc.cpp | 16 +- kttsd/plugins/hadifix/hadifixconf.cpp | 18 +-- kttsd/plugins/hadifix/hadifixproc.cpp | 16 +- 32 files changed, 435 insertions(+), 435 deletions(-) (limited to 'kttsd') diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index fbb56ac..d5ca9d9 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -74,7 +74,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n view->insertChildClient( this ); setInstance( KGenericFactory::instance() ); TDEGlobal::locale()->insertCatalogue("kttsd"); - (void) new TDEAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); + (void) new TDEAction( i18n("Speak Text"), "kttsd", 0, this, TQ_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); setXMLFile( "tdetexteditor_kttsdui.rc" ); } diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index f718664..005f8c3 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -73,24 +73,24 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args m_widget->reButton->setEnabled( m_reEditorInstalled ); if ( m_reEditorInstalled ) - connect( m_widget->reButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReButton_clicked()) ); + connect( m_widget->reButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReButton_clicked()) ); - connect( m_widget->reLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->sbLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLanguageBrowseButton_clicked())); - connect(m_widget->loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoadButton_clicked())); - connect(m_widget->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveButton_clicked())); - connect(m_widget->clearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearButton_clicked())); + connect( m_widget->reLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->sbLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLanguageBrowseButton_clicked())); + connect(m_widget->loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoadButton_clicked())); + connect(m_widget->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveButton_clicked())); + connect(m_widget->clearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearButton_clicked())); // Set up defaults. defaults(); diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index ba4f3b7..357a95b 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -567,7 +567,7 @@ SbdProc::SbdProc( TQObject *parent, const char *name, const TQStringList& /*args { // kdDebug() << "SbdProc::SbdProc: Running" << endl; m_sbdThread = new SbdThread( parent, *name + "_thread" ); - connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); + connect( m_sbdThread, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotSbdThreadFilteringFinished()) ); } /** @@ -753,7 +753,7 @@ bool SbdProc::init(TDEConfig* config, const TQString& configGroup){ delete m_sbdThread; m_sbdThread = new SbdThread(); m_sbdThread->setConfiguredSbRegExp( m_configuredRe ); - connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); + connect( m_sbdThread, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotSbdThreadFilteringFinished()) ); m_state = fsIdle; emit filteringStopped(); } diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index a57b5c8..e226f68 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -74,30 +74,30 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons layout->addWidget(m_widget); m_widget->substLView->setSortColumn(-1); - connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLanguageBrowseButton_clicked())); - connect(m_widget->addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddButton_clicked())); - connect(m_widget->upButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUpButton_clicked())); - connect(m_widget->downButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDownButton_clicked())); - connect(m_widget->editButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditButton_clicked())); - connect(m_widget->removeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveButton_clicked())); - connect(m_widget->loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoadButton_clicked())); - connect(m_widget->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveButton_clicked())); - connect(m_widget->clearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearButton_clicked())); - connect(m_widget->substLView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(enableDisableButtons())); - connect(m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); + connect(m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLanguageBrowseButton_clicked())); + connect(m_widget->addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddButton_clicked())); + connect(m_widget->upButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUpButton_clicked())); + connect(m_widget->downButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDownButton_clicked())); + connect(m_widget->editButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditButton_clicked())); + connect(m_widget->removeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveButton_clicked())); + connect(m_widget->loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoadButton_clicked())); + connect(m_widget->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveButton_clicked())); + connect(m_widget->clearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearButton_clicked())); + connect(m_widget->substLView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(enableDisableButtons())); + connect(m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); // Determine if tdeutils Regular Expression Editor is installed. m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); @@ -581,14 +581,14 @@ void StringReplacerConf::addOrEditSubstitution(bool isAdd) m_editWidget->substLineEdit->setText( item->text(3) ); } // The match box may not be blank. - connect( m_editWidget->matchLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMatchLineEdit_textChanged(const TQString&)) ); - connect( m_editWidget->regexpRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTypeButtonGroup_clicked()) ); - connect( m_editWidget->wordRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTypeButtonGroup_clicked()) ); - connect( m_editWidget->matchButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMatchButton_clicked()) ); + connect( m_editWidget->matchLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMatchLineEdit_textChanged(const TQString&)) ); + connect( m_editWidget->regexpRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTypeButtonGroup_clicked()) ); + connect( m_editWidget->wordRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTypeButtonGroup_clicked()) ); + connect( m_editWidget->matchButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMatchButton_clicked()) ); // Display the box in a dialog. m_editDlg = new KDialogBase( KDialogBase::Swallow, diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 676a25d..350c77d 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -65,23 +65,23 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); m_widget->reEditorButton->setEnabled(m_reEditorInstalled); - connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->reLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->reEditorButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotReEditorButton_clicked())); - connect(m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->talkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTalkerButton_clicked())); + connect(m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->reLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->reEditorButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotReEditorButton_clicked())); + connect(m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->talkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTalkerButton_clicked())); - connect(m_widget->loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoadButton_clicked())); - connect(m_widget->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveButton_clicked())); - connect(m_widget->clearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearButton_clicked())); + connect(m_widget->loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoadButton_clicked())); + connect(m_widget->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveButton_clicked())); + connect(m_widget->clearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearButton_clicked())); // Set up defaults. defaults(); diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 0a27174..2f3538f 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -59,18 +59,18 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons defaults(); // Connect signals. - connect( m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect( m_widget->xsltPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->xsltprocPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->rootElementLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->doctypeLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect( m_widget->xsltPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->xsltprocPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->rootElementLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->doctypeLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); } /** diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 9a279b9..b341337 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -250,12 +250,12 @@ bool XmlTransformerProc::init(TDEConfig* config, const TQString& configGroup) // m_xsltProc->args() << endl; m_state = fsFiltering; - connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_xsltProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_xsltProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_xsltProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_xsltProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_xsltProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); if (!m_xsltProc->start(TDEProcess::NotifyOnExit, static_cast(TDEProcess::Stdout | TDEProcess::Stderr))) { diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index 8de3429..170c7a6 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -65,10 +65,10 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char applyFilter(); // Connect widgets to slots. - connect(languageRadioButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyFilter())); - connect(synthesizerRadioButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyFilter())); - connect(languageSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(applyFilter())); - connect(synthesizerSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(applyFilter())); + connect(languageRadioButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyFilter())); + connect(synthesizerRadioButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyFilter())); + connect(languageSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(applyFilter())); + connect(synthesizerSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(applyFilter())); } AddTalker::~AddTalker() diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 03c7b85..8cbd792 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -163,13 +163,13 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) // Construct a popup menu for the Sentence Boundary Detector buttons on Filter tab. m_sbdPopmenu = new TQPopupMenu( m_kttsmgrw, "SbdPopupMenu" ); - m_sbdPopmenu->insertItem( i18n("&Edit..."), this, TQT_SLOT(slot_configureSbdFilter()), 0, sbdBtnEdit ); + m_sbdPopmenu->insertItem( i18n("&Edit..."), this, TQ_SLOT(slot_configureSbdFilter()), 0, sbdBtnEdit ); m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("go-up", TDEIcon::Small), - i18n("U&p"), this, TQT_SLOT(slot_higherSbdFilterPriority()), 0, sbdBtnUp ); + i18n("U&p"), this, TQ_SLOT(slot_higherSbdFilterPriority()), 0, sbdBtnUp ); m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("go-down", TDEIcon::Small), - i18n("Do&wn"), this, TQT_SLOT(slot_lowerSbdFilterPriority()), 0, sbdBtnDown ); - m_sbdPopmenu->insertItem( i18n("&Add..."), this, TQT_SLOT(slot_addSbdFilter()), 0, sbdBtnAdd ); - m_sbdPopmenu->insertItem( i18n("&Remove"), this, TQT_SLOT(slot_removeSbdFilter()), 0, sbdBtnRemove ); + i18n("Do&wn"), this, TQ_SLOT(slot_lowerSbdFilterPriority()), 0, sbdBtnDown ); + m_sbdPopmenu->insertItem( i18n("&Add..."), this, TQ_SLOT(slot_addSbdFilter()), 0, sbdBtnAdd ); + m_sbdPopmenu->insertItem( i18n("&Remove"), this, TQ_SLOT(slot_removeSbdFilter()), 0, sbdBtnRemove ); m_kttsmgrw->sbdButton->setPopup( m_sbdPopmenu ); // If aRts is available, enable its radio button. @@ -248,94 +248,94 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) // Connect the signals from the KCMKtssMgrWidget to this class. // Talker tab. - connect(m_kttsmgrw->addTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_addTalker())); - connect(m_kttsmgrw->higherTalkerPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_higherTalkerPriority())); - connect(m_kttsmgrw->lowerTalkerPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_lowerTalkerPriority())); - connect(m_kttsmgrw->removeTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_removeTalker())); - connect(m_kttsmgrw->configureTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_configureTalker())); - connect(m_kttsmgrw->talkersList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateTalkerButtons())); + connect(m_kttsmgrw->addTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_addTalker())); + connect(m_kttsmgrw->higherTalkerPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_higherTalkerPriority())); + connect(m_kttsmgrw->lowerTalkerPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_lowerTalkerPriority())); + connect(m_kttsmgrw->removeTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_removeTalker())); + connect(m_kttsmgrw->configureTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_configureTalker())); + connect(m_kttsmgrw->talkersList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateTalkerButtons())); // Filter tab. - connect(m_kttsmgrw->addFilterButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_addNormalFilter())); - connect(m_kttsmgrw->higherFilterPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_higherNormalFilterPriority())); - connect(m_kttsmgrw->lowerFilterPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_lowerNormalFilterPriority())); - connect(m_kttsmgrw->removeFilterButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_removeNormalFilter())); - connect(m_kttsmgrw->configureFilterButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_configureNormalFilter())); - connect(m_kttsmgrw->filtersList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateFilterButtons())); - //connect(m_kttsmgrw->filtersList, TQT_SIGNAL(stateChanged()), - // this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->sbdsList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateSbdButtons())); + connect(m_kttsmgrw->addFilterButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_addNormalFilter())); + connect(m_kttsmgrw->higherFilterPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_higherNormalFilterPriority())); + connect(m_kttsmgrw->lowerFilterPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_lowerNormalFilterPriority())); + connect(m_kttsmgrw->removeFilterButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_removeNormalFilter())); + connect(m_kttsmgrw->configureFilterButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_configureNormalFilter())); + connect(m_kttsmgrw->filtersList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateFilterButtons())); + //connect(m_kttsmgrw->filtersList, TQ_SIGNAL(stateChanged()), + // this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->sbdsList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateSbdButtons())); // Audio tab. - connect(m_kttsmgrw->gstreamerRadioButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGstreamerRadioButton_toggled(bool))); - connect(m_kttsmgrw->alsaRadioButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAlsaRadioButton_toggled(bool))); - connect(m_kttsmgrw->pcmComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPcmComboBox_activated())); - connect(m_kttsmgrw->akodeRadioButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAkodeRadioButton_toggled(bool))); - connect(m_kttsmgrw->timeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeBox_valueChanged(int))); - connect(m_kttsmgrw->timeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeSlider_valueChanged(int))); - connect(m_kttsmgrw->timeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->keepAudioCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(keepAudioCheckBox_toggled(bool))); - connect(m_kttsmgrw->keepAudioPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); + connect(m_kttsmgrw->gstreamerRadioButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGstreamerRadioButton_toggled(bool))); + connect(m_kttsmgrw->alsaRadioButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAlsaRadioButton_toggled(bool))); + connect(m_kttsmgrw->pcmComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPcmComboBox_activated())); + connect(m_kttsmgrw->akodeRadioButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAkodeRadioButton_toggled(bool))); + connect(m_kttsmgrw->timeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeBox_valueChanged(int))); + connect(m_kttsmgrw->timeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeSlider_valueChanged(int))); + connect(m_kttsmgrw->timeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->keepAudioCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(keepAudioCheckBox_toggled(bool))); + connect(m_kttsmgrw->keepAudioPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); // General tab. - connect(m_kttsmgrw->enableKttsdCheckBox, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(enableKttsdToggled(bool))); + connect(m_kttsmgrw->enableKttsdCheckBox, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(enableKttsdToggled(bool))); // Notify tab. - connect(m_kttsmgrw->notifyEnableCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotNotifyEnableCheckBox_toggled(bool))); - connect(m_kttsmgrw->notifyExcludeEventsWithSoundCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->notifyAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyAddButton_clicked())); - connect(m_kttsmgrw->notifyRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyRemoveButton_clicked())); - connect(m_kttsmgrw->notifyClearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyClearButton_clicked())); - connect(m_kttsmgrw->notifyLoadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyLoadButton_clicked())); - connect(m_kttsmgrw->notifySaveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifySaveButton_clicked())); - connect(m_kttsmgrw->notifyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotNotifyListView_selectionChanged())); - connect(m_kttsmgrw->notifyPresentComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotNotifyPresentComboBox_activated(int))); - connect(m_kttsmgrw->notifyActionComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotNotifyActionComboBox_activated(int))); - connect(m_kttsmgrw->notifyTestButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyTestButton_clicked())); - connect(m_kttsmgrw->notifyMsgLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotNotifyMsgLineEdit_textChanged(const TQString&))); - connect(m_kttsmgrw->notifyTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyTalkerButton_clicked())); + connect(m_kttsmgrw->notifyEnableCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotNotifyEnableCheckBox_toggled(bool))); + connect(m_kttsmgrw->notifyExcludeEventsWithSoundCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->notifyAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyAddButton_clicked())); + connect(m_kttsmgrw->notifyRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyRemoveButton_clicked())); + connect(m_kttsmgrw->notifyClearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyClearButton_clicked())); + connect(m_kttsmgrw->notifyLoadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyLoadButton_clicked())); + connect(m_kttsmgrw->notifySaveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifySaveButton_clicked())); + connect(m_kttsmgrw->notifyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotNotifyListView_selectionChanged())); + connect(m_kttsmgrw->notifyPresentComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotNotifyPresentComboBox_activated(int))); + connect(m_kttsmgrw->notifyActionComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotNotifyActionComboBox_activated(int))); + connect(m_kttsmgrw->notifyTestButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyTestButton_clicked())); + connect(m_kttsmgrw->notifyMsgLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotNotifyMsgLineEdit_textChanged(const TQString&))); + connect(m_kttsmgrw->notifyTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyTalkerButton_clicked())); // Others. - connect(m_kttsmgrw, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( configChanged() ) ); - connect(m_kttsmgrw->mainTab, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(slotTabChanged())); + connect(m_kttsmgrw, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( configChanged() ) ); + connect(m_kttsmgrw->mainTab, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(slotTabChanged())); // Connect KTTSD DCOP signals to our slots. if (!connectDCOPSignal("kttsd", "KSpeech", @@ -2040,9 +2040,9 @@ void KCMKttsMgr::configureTalker() m_configDlg->setMainWidget(m_loadedTalkerPlugIn); m_configDlg->setHelp("configure-plugin", "kttsd"); m_configDlg->enableButtonOK(false); - connect(m_loadedTalkerPlugIn, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( slotConfigTalkerDlg_ConfigChanged() )); - connect(m_configDlg, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT( slotConfigTalkerDlg_DefaultClicked() )); - connect(m_configDlg, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT (slotConfigTalkerDlg_CancelClicked() )); + connect(m_loadedTalkerPlugIn, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( slotConfigTalkerDlg_ConfigChanged() )); + connect(m_configDlg, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT( slotConfigTalkerDlg_DefaultClicked() )); + connect(m_configDlg, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT (slotConfigTalkerDlg_CancelClicked() )); // Create a Player object for the plugin to use for testing. int playerOption = 0; TQString sinkName; @@ -2098,9 +2098,9 @@ void KCMKttsMgr::configureFilter() m_configDlg->setMainWidget(m_loadedFilterPlugIn); m_configDlg->setHelp("configure-filter", "kttsd"); m_configDlg->enableButtonOK(false); - connect(m_loadedFilterPlugIn, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( slotConfigFilterDlg_ConfigChanged() )); - connect(m_configDlg, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT( slotConfigFilterDlg_DefaultClicked() )); - connect(m_configDlg, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT (slotConfigFilterDlg_CancelClicked() )); + connect(m_loadedFilterPlugIn, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( slotConfigFilterDlg_ConfigChanged() )); + connect(m_configDlg, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT( slotConfigFilterDlg_DefaultClicked() )); + connect(m_configDlg, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT (slotConfigFilterDlg_CancelClicked() )); // Display the dialog. m_configDlg->exec(); } diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 3bbb37e..5b33fc2 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -79,7 +79,7 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ } } slotEventSrcComboBox_activated(eventSrcComboBox->currentItem()); - connect (eventSrcComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEventSrcComboBox_activated(int))); + connect (eventSrcComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEventSrcComboBox_activated(int))); } SelectEvent::~SelectEvent() { } diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 77725ce..c390b3b 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -202,7 +202,7 @@ void FilterMgr::nextFilter() { m_text = m_filterProc->getOutput(); m_filterProc->ackFinished(); - disconnect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); } // if ( m_filterProc->wasModified() ) // kdDebug() << "FilterMgr::nextFilter: Filter# " << m_filterIndex << " modified the text." << endl; @@ -239,10 +239,10 @@ void FilterMgr::nextFilter() if ( m_filterProc->supportsAsync() ) { // kdDebug() << "FilterMgr::nextFilter: calling asyncConvert on filter " << m_filterIndex << endl; - connect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + connect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); if ( !m_filterProc->asyncConvert( m_text, m_talkerCode, m_appId ) ) { - disconnect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); m_filterProc = 0; nextFilter(); } @@ -284,7 +284,7 @@ bool FilterMgr::event ( TQEvent * e ) void FilterMgr::waitForFinished() { if ( m_state != fsFiltering ) return; - disconnect(m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect(m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); m_async = false; m_filterProc->waitForFinished(); while ( m_state == fsFiltering ) @@ -321,7 +321,7 @@ void FilterMgr::stopFiltering() { if ( m_state != fsFiltering ) return; if ( m_async ) - disconnect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); m_filterProc->stopFiltering(); m_state = fsIdle; TQCustomEvent* ev = new TQCustomEvent(TQEvent::User + 302); diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 81b05f2..5d0b7e7 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -69,12 +69,12 @@ bool KTTSD::initializeSpeechData() if (!m_speechData) { m_speechData = new SpeechData(); - connect (m_speechData, TQT_SIGNAL(textSet(const TQCString&, const uint)), - this, TQT_SLOT(slotTextSet(const TQCString&, const uint))); - connect (m_speechData, TQT_SIGNAL(textAppended(const TQCString&, const uint, const int)), - this, TQT_SLOT(slotTextAppended(const TQCString&, const uint, const int))); - connect (m_speechData, TQT_SIGNAL(textRemoved(const TQCString&, const uint)), - this, TQT_SLOT(slotTextRemoved(const TQCString&, const uint))); + connect (m_speechData, TQ_SIGNAL(textSet(const TQCString&, const uint)), + this, TQ_SLOT(slotTextSet(const TQCString&, const uint))); + connect (m_speechData, TQ_SIGNAL(textAppended(const TQCString&, const uint, const int)), + this, TQ_SLOT(slotTextAppended(const TQCString&, const uint, const int))); + connect (m_speechData, TQ_SIGNAL(textRemoved(const TQCString&, const uint)), + this, TQ_SLOT(slotTextRemoved(const TQCString&, const uint))); // Hook KNotify signal. if (!connectDCOPSignal(0, 0, @@ -156,20 +156,20 @@ bool KTTSD::initializeSpeaker() // Create speaker object and load plug ins, checking for the return m_speaker = new Speaker(m_speechData, m_talkerMgr); - connect (m_speaker, TQT_SIGNAL(textStarted(const TQCString&, const uint)), - this, TQT_SLOT(slotTextStarted(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(textFinished(const TQCString&, const uint)), - this, TQT_SLOT(slotTextFinished(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(textResumed(const TQCString&, const uint)), - this, TQT_SLOT(slotTextResumed(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(sentenceStarted(TQString, TQString, const TQCString&, const uint, const uint)), - this, TQT_SLOT(slotSentenceStarted(TQString, TQString, const TQCString&, const uint, const uint))); - connect (m_speaker, TQT_SIGNAL(sentenceFinished(const TQCString&, const uint, const uint)), this, - TQT_SLOT(slotSentenceFinished(const TQCString&, const uint, const uint))); - connect (m_speaker, TQT_SIGNAL(textStopped(const TQCString&, const uint)), - this, TQT_SLOT(slotTextStopped(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(textPaused(const TQCString&, const uint)), - this, TQT_SLOT(slotTextPaused(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textStarted(const TQCString&, const uint)), + this, TQ_SLOT(slotTextStarted(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textFinished(const TQCString&, const uint)), + this, TQ_SLOT(slotTextFinished(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textResumed(const TQCString&, const uint)), + this, TQ_SLOT(slotTextResumed(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(sentenceStarted(TQString, TQString, const TQCString&, const uint, const uint)), + this, TQ_SLOT(slotSentenceStarted(TQString, TQString, const TQCString&, const uint, const uint))); + connect (m_speaker, TQ_SIGNAL(sentenceFinished(const TQCString&, const uint, const uint)), this, + TQ_SLOT(slotSentenceFinished(const TQCString&, const uint, const uint))); + connect (m_speaker, TQ_SIGNAL(textStopped(const TQCString&, const uint)), + this, TQ_SLOT(slotTextStopped(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textPaused(const TQCString&, const uint)), + this, TQ_SLOT(slotTextPaused(const TQCString&, const uint))); return true; } diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index dbff953..a0636ac 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -152,7 +152,7 @@ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, break; } // Connect timer timeout signal. - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); // Connect plugins to slots. TQPtrList plugins = m_talkerMgr->getLoadedPlugIns(); @@ -160,14 +160,14 @@ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, for (int ndx = 0; ndx < pluginsCount; ++ndx) { PlugInProc* speech = plugins.at(ndx); - connect(speech, TQT_SIGNAL(synthFinished()), - this, TQT_SLOT(slotSynthFinished())); - connect(speech, TQT_SIGNAL(sayFinished()), - this, TQT_SLOT(slotSayFinished())); - connect(speech, TQT_SIGNAL(stopped()), - this, TQT_SLOT(slotStopped())); - connect(speech, TQT_SIGNAL(error(bool, const TQString&)), - this, TQT_SLOT(slotError(bool, const TQString&))); + connect(speech, TQ_SIGNAL(synthFinished()), + this, TQ_SLOT(slotSynthFinished())); + connect(speech, TQ_SIGNAL(sayFinished()), + this, TQ_SLOT(slotSayFinished())); + connect(speech, TQ_SIGNAL(stopped()), + this, TQ_SLOT(slotStopped())); + connect(speech, TQ_SIGNAL(error(bool, const TQString&)), + this, TQ_SLOT(slotError(bool, const TQString&))); } } @@ -275,8 +275,8 @@ void Speaker::doUtterances() { // Create an XSLT transformer and transform the text. it->transformer = new SSMLConvert(); - connect(it->transformer, TQT_SIGNAL(transformFinished()), - this, TQT_SLOT(slotTransformFinished())); + connect(it->transformer, TQ_SIGNAL(transformFinished()), + this, TQ_SLOT(slotTransformFinished())); if (it->transformer->transform(it->sentence->text, it->plugin->getSsmlXsltFilename())) { @@ -345,8 +345,8 @@ void Speaker::doUtterances() else { it->audioStretcher = new Stretcher(); - connect(it->audioStretcher, TQT_SIGNAL(stretchFinished()), - this, TQT_SLOT(slotStretchFinished())); + connect(it->audioStretcher, TQ_SIGNAL(stretchFinished()), + this, TQ_SLOT(slotStretchFinished())); if (it->audioStretcher->stretch(it->audioUrl, makeSuggestedFilename(), m_audioStretchFactor)) { diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index e1edc75..2d39153 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -125,8 +125,8 @@ bool SpeechData::readConfig(){ pooledFilterMgr->job = 0; pooledFilterMgr->partNum = 0; // Connect signals from FilterMgr. - connect (filterMgr, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilterMgrFinished())); - connect (filterMgr, TQT_SIGNAL(filteringStopped()), this, TQT_SLOT(slotFilterMgrStopped())); + connect (filterMgr, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilterMgrFinished())); + connect (filterMgr, TQ_SIGNAL(filteringStopped()), this, TQ_SLOT(slotFilterMgrStopped())); m_pooledFilterMgrs.append(pooledFilterMgr); return true; @@ -1136,8 +1136,8 @@ void SpeechData::startJobFiltering(mlJob* job, const TQString& text, bool noSBD) filterMgr->init(config, "General"); pooledFilterMgr->filterMgr = filterMgr; // Connect signals from FilterMgr. - connect (filterMgr, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilterMgrFinished())); - connect (filterMgr, TQT_SIGNAL(filteringStopped()), this, TQT_SLOT(slotFilterMgrStopped())); + connect (filterMgr, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilterMgrFinished())); + connect (filterMgr, TQ_SIGNAL(filteringStopped()), this, TQ_SLOT(slotFilterMgrStopped())); m_pooledFilterMgrs.append(pooledFilterMgr); } // else kdDebug() << "SpeechData::startJobFiltering: re-using idle pooledFilterMgr for job " << jobNum << " part " << partNum << endl; diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 1625e4a..45923a1 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -239,8 +239,8 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename) // kdDebug() << "SSMLConvert::transform: executing command: " << // m_xsltProc->args() << endl; - connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_xsltProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!m_xsltProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) { kdDebug() << "SSMLConvert::transform: Error starting xsltproc" << endl; diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index d51aa17..a6a7072 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -180,60 +180,60 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : "Resume to make the job speakable, or click Later to move it " "down in the list.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_hold())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_hold())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, 0, true), i18n("Resume"), hbox1, "job_resume"); wt = i18n( "

Resumes a paused job or changes a Queued job to Waiting. If the job is the " "top speakable job in the list, it begins speaking.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_resume())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_resume())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("edit-redo", TDEIcon::Small, 0, true), i18n("R&estart"), hbox1, "job_restart"); wt = i18n( "

Rewinds a job to the beginning and changes its state to Waiting. If the job " "is the top speakable job in the list, it begins speaking.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_restart())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_restart())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("edittrash", TDEIcon::Small, 0, true), i18n("Re&move"), hbox1, "job_remove"); wt = i18n( "

Deletes the job. If it is currently speaking, it stops speaking. The next " "speakable job in the list begins speaking.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_remove())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_remove())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("go-down", TDEIcon::Small, 0, true), i18n("&Later"), hbox1, "job_later"); wt = i18n( "

Moves a job downward in the list so that it will be spoken later. If the job " "is currently speaking, its state changes to Paused.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_move())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_move())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2leftarrow", TDEIcon::Small, 0, true), i18n("Pre&vious Part"), hbox2, "part_prevpart"); wt = i18n( "

Rewinds a multi-part job to the previous part.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_prev_par())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_prev_par())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1leftarrow", TDEIcon::Small, 0, true), i18n("&Previous Sentence"), hbox2, "job_prevsentence"); wt = i18n( "

Rewinds a job to the previous sentence.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_prev_sen())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_prev_sen())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1rightarrow", TDEIcon::Small, 0, true), i18n("&Next Sentence"), hbox2, "job_nextsentence"); wt = i18n( "

Advances a job to the next sentence.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_next_sen())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_next_sen())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2rightarrow", TDEIcon::Small, 0, true), i18n("Ne&xt Part"), hbox2, "part_nextpart"); wt = i18n( "

Advances a multi-part job to the next part.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_next_par())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_next_par())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("klipper", TDEIcon::Small, 0, true), i18n("&Speak Clipboard"), hbox3, "speak_clipboard"); @@ -242,7 +242,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : "to Waiting. If the job is the topmost in the list, it begins speaking. " "The job will be spoken by the topmost Talker in the Talkers tab.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_speak_clipboard())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_speak_clipboard())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("document-open", TDEIcon::Small, 0, true), i18n("Spea&k File"), hbox3, "speak_file"); wt = i18n( @@ -250,20 +250,20 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : "You must click the Resume button before the job will be speakable. " "The job will be spoken by the topmost Talker in the Talkers tab.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_speak_file())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_speak_file())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("translate", TDEIcon::Small, 0, true), i18n("Change Talker"), hbox3, "job_changetalker"); wt = i18n( "

Prompts you with a list of your configured Talkers from the Talkers tab. " "The job will be spoken using the selected Talker.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_change_talker())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_change_talker())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("reload_page", TDEIcon::Small, 0, true), i18n("&Refresh"), hbox3, "refresh"); wt = i18n( "

Refresh the list of jobs.

"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_refresh())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_refresh())); // Disable job buttons until a job is selected. enableJobActions(false); @@ -291,8 +291,8 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : // Set the main widget for the part. setWidget(vBox); - connect(m_jobListView, TQT_SIGNAL(selectionChanged(TQListViewItem* )), - this, TQT_SLOT(slot_selectionChanged(TQListViewItem* ))); + connect(m_jobListView, TQ_SIGNAL(selectionChanged(TQListViewItem* )), + this, TQ_SLOT(slot_selectionChanged(TQListViewItem* ))); // Fill the Job List View. refreshJobListView(); diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 713b270..6a369f0 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -179,18 +179,18 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent): if (id != -1) contextMenu()->changeTitle(id, icon, "KTTSMgr"); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("klipper", TDEIcon::Small), - i18n("&Speak Clipboard Contents"), this, TQT_SLOT(speakClipboardSelected())); + i18n("&Speak Clipboard Contents"), this, TQ_SLOT(speakClipboardSelected())); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("process-stop", TDEIcon::Small), - i18n("&Hold"), this, TQT_SLOT(holdSelected())); + i18n("&Hold"), this, TQ_SLOT(holdSelected())); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("application-x-executable", TDEIcon::Small), - i18n("Resume"), this, TQT_SLOT(resumeSelected())); + i18n("Resume"), this, TQ_SLOT(resumeSelected())); id = contextMenu()->insertSeparator(); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::Small), - i18n("KTTS &Handbook"), this, TQT_SLOT(helpSelected())); + i18n("KTTS &Handbook"), this, TQ_SLOT(helpSelected())); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::Small), - i18n("&About KTTSMgr"), this, TQT_SLOT(aboutSelected())); + i18n("&About KTTSMgr"), this, TQ_SLOT(aboutSelected())); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected())); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitSelected())); // If --autoexit option given, exit when speaking stops. TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("autoexit")) diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index bdab6d6..c5a33f3 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -111,36 +111,36 @@ SelectTalkerDlg::SelectTalkerDlg( applyTalkerCodeToControls(); enableDisableControls(); - connect(m_widget->useDefaultRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged())); - connect(m_widget->useClosestMatchRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged())); - connect(m_widget->useSpecificTalkerRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged())); - - connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLanguageBrowseButton_clicked())); - - connect(m_widget->synthComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->genderComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->volumeComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->rateComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - - connect(m_widget->synthCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->genderCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->volumeCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->rateCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - - connect(m_widget->talkersListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotTalkersListView_selectionChanged())); + connect(m_widget->useDefaultRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged())); + connect(m_widget->useClosestMatchRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged())); + connect(m_widget->useSpecificTalkerRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged())); + + connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLanguageBrowseButton_clicked())); + + connect(m_widget->synthComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->genderComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->volumeComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->rateComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + + connect(m_widget->synthCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->genderCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->volumeCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->rateCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + + connect(m_widget->talkersListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotTalkersListView_selectionChanged())); m_widget->talkersListView->setMinimumHeight( 120 ); } diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp index c6c50e5..ccc3565 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -63,8 +63,8 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename, m_stretchProc = new TDEProcess; TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3); *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr; - connect(m_stretchProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_stretchProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!m_stretchProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) { kdDebug() << "Stretcher::stretch: Error starting audio stretcher process. Is sox installed?" << endl; diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index cb0c03e..fac97e1 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -87,7 +87,7 @@ void ArtsPlayer::startPlay(const TQString &file) m_playobject = m_factory->createPlayObject(m_currentURL, false); if(m_playobject->object().isNull()) - connect(m_playobject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(playObjectCreated())); + connect(m_playobject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(playObjectCreated())); else playObjectCreated(); } @@ -254,7 +254,7 @@ void ArtsPlayer::setupPlayer() m_dispatcher = new KArtsDispatcher; m_server = new KArtsServer; setupArtsObjects(); - connect(m_server, TQT_SIGNAL(restartedServer()), TQT_SLOT(setupArtsObjects())); + connect(m_server, TQ_SIGNAL(restartedServer()), TQ_SLOT(setupArtsObjects())); } void ArtsPlayer::setupVolumeControl() diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 6fc2792..2144b52 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -60,16 +60,16 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList m_widget->characterCodingBox->insertStringList(m_codecList); defaults(); - connect(m_widget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->stdInButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->urlReq, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->commandTestButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCommandTest_clicked())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->stdInButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->urlReq, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->commandTestButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCommandTest_clicked())); } /** Destructor */ @@ -147,7 +147,7 @@ void CommandConf::slotCommandTest_clicked() else { m_commandProc = new CommandProc(); - connect (m_commandProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_commandProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. @@ -167,7 +167,7 @@ void CommandConf::slotCommandTest_clicked() m_progressDlg->setAllowCancel(true); // TODO: Do codec names contain non-ASCII characters? - connect (m_commandProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_commandProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_commandProc->synth( testMsg, tmpWaveFile, @@ -179,7 +179,7 @@ void CommandConf::slotCommandTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_commandProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_commandProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_commandProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index 1be0d2d..e0f04ec 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -290,14 +290,14 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile m_commandProc->setEnvironment("LANG", language + "." + codec->mimeName()); m_commandProc->setEnvironment("LC_CTYPE", language + "." + codec->mimeName()); *m_commandProc << command; - connect(m_commandProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_commandProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_commandProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_commandProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_commandProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_commandProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_commandProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_commandProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); // 4. start the process diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index 64e5b6e..9340fa5 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -68,30 +68,30 @@ EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*ar defaults(); - connect(m_widget->eposServerPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposClientPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeBox_valueChanged(int))); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencyBox_valueChanged(int))); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeSlider_valueChanged(int))); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencySlider_valueChanged(int))); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposServerOptions, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposClientOptions, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposTest, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEposTest_clicked())); + connect(m_widget->eposServerPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposClientPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeBox_valueChanged(int))); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencyBox_valueChanged(int))); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeSlider_valueChanged(int))); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencySlider_valueChanged(int))); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposServerOptions, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposClientOptions, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposTest, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEposTest_clicked())); } /** Destructor */ @@ -214,7 +214,7 @@ void EposConf::slotEposTest_clicked() else { m_eposProc = new EposProc(); - connect (m_eposProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_eposProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "eposplugin-"), ".wav"); @@ -234,7 +234,7 @@ void EposConf::slotEposTest_clicked() // TODO: Whenever server options change, the server must be restarted. // TODO: Do codec names contain non-ASCII characters? - connect (m_eposProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_eposProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_eposProc->synth( testMsg, tmpWaveFile, @@ -251,7 +251,7 @@ void EposConf::slotEposTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_eposProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_eposProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_eposProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index 8d91c66..27d96f0 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -89,10 +89,10 @@ bool EposProc::init(TDEConfig* config, const TQString& configGroup) *m_eposServerProc << m_eposServerExePath; if (!m_eposServerOptions.isEmpty()) *m_eposServerProc << m_eposServerOptions; - connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); m_eposServerProc->start(TDEProcess::DontCare, TDEProcess::AllOutput); } @@ -173,10 +173,10 @@ void EposProc::synth( *m_eposServerProc << eposServerExePath; if (!eposServerOptions.isEmpty()) *m_eposServerProc << eposServerOptions; - connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); m_eposServerProc->start(TDEProcess::DontCare, TDEProcess::AllOutput); kdDebug() << "EposProc:: Epos server process started" << endl; } @@ -234,14 +234,14 @@ void EposProc::synth( *m_eposProc << "-"; // Read from StdIn. if (!suggestedFilename.isEmpty()) *m_eposProc << " >" + suggestedFilename; - connect(m_eposProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_eposProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_eposProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_eposProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_eposProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_eposProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_eposProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_eposProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); if (suggestedFilename.isEmpty()) m_state = psSaying; else diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index c38bbd5..81e346c 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -81,37 +81,37 @@ FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQSt // defaults(); - connect(m_widget->festivalPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotFestivalPath_textChanged())); - connect(m_widget->selectVoiceCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotSelectVoiceCombo_activated())); - connect(m_widget->selectVoiceCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->testButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTest_clicked())); - connect(m_widget->rescan, TQT_SIGNAL(clicked()), this, TQT_SLOT(scanVoices())); - connect(m_widget->volumeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(volumeBox_valueChanged(int))); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeBox_valueChanged(int))); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencyBox_valueChanged(int))); - connect(m_widget->volumeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(volumeSlider_valueChanged(int))); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeSlider_valueChanged(int))); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencySlider_valueChanged(int))); - connect(m_widget->volumeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->volumeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->preloadCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); + connect(m_widget->festivalPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotFestivalPath_textChanged())); + connect(m_widget->selectVoiceCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotSelectVoiceCombo_activated())); + connect(m_widget->selectVoiceCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->testButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTest_clicked())); + connect(m_widget->rescan, TQ_SIGNAL(clicked()), this, TQ_SLOT(scanVoices())); + connect(m_widget->volumeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(volumeBox_valueChanged(int))); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeBox_valueChanged(int))); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencyBox_valueChanged(int))); + connect(m_widget->volumeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(volumeSlider_valueChanged(int))); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeSlider_valueChanged(int))); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencySlider_valueChanged(int))); + connect(m_widget->volumeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->volumeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->preloadCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); } /** Destructor */ @@ -430,10 +430,10 @@ void FestivalIntConf::scanVoices() else { m_festProc = new FestivalIntProc(); - connect (m_festProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_festProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } - connect (m_festProc, TQT_SIGNAL(queryVoicesFinished(const TQStringList&)), - this, TQT_SLOT(slotQueryVoicesFinished(const TQStringList&))); + connect (m_festProc, TQ_SIGNAL(queryVoicesFinished(const TQStringList&)), + this, TQ_SLOT(slotQueryVoicesFinished(const TQStringList&))); m_festProc->queryVoices(exePath); // Display progress dialog modally. @@ -444,8 +444,8 @@ void FestivalIntConf::scanVoices() // Festival responds with the list. When Festival responds with list, // the progress dialog is closed. - disconnect (m_festProc, TQT_SIGNAL(queryVoicesFinished(const TQStringList&)), - this, TQT_SLOT(slotQueryVoicesFinished(const TQStringList&))); + disconnect (m_festProc, TQ_SIGNAL(queryVoicesFinished(const TQStringList&)), + this, TQ_SLOT(slotQueryVoicesFinished(const TQStringList&))); if (!m_progressDlg->wasCancelled()) m_festProc->stopText(); delete m_progressDlg; m_progressDlg = 0; @@ -552,7 +552,7 @@ void FestivalIntConf::slotTest_clicked() else { m_festProc = new FestivalIntProc(); - connect (m_festProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_festProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "festivalintplugin-"), ".wav"); @@ -581,7 +581,7 @@ void FestivalIntConf::slotTest_clicked() m_progressDlg->setAllowCancel(true); // kdDebug() << "FestivalIntConf::slotTest_clicked: calling synth with voiceCode: " << voiceCode << " time percent: " << m_widget->timeBox->value() << endl; - connect (m_festProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_festProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_festProc->synth( realFilePath(m_widget->festivalPath->url()), testMsg, @@ -596,7 +596,7 @@ void FestivalIntConf::slotTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_festProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_festProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_festProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index 1258317..da5e71b 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -184,14 +184,14 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin m_festProc->setEnvironment("LANG", languageCode + "." + codec->mimeName()); m_festProc->setEnvironment("LC_CTYPE", languageCode + "." + codec->mimeName()); // kdDebug() << "FestivalIntProc::startEngine: setting LANG = LC_CTYPE = " << languageCode << "." << codec->mimeName() << endl; - connect(m_festProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_festProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_festProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_festProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess*))); + connect(m_festProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_festProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_festProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_festProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess*))); } if (!m_festProc->isRunning()) { diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 1e15e68..aa33e04 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -57,9 +57,9 @@ FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /* defaults(); - connect(m_widget->flitePath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->fliteTest, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFliteTest_clicked())); + connect(m_widget->flitePath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->fliteTest, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFliteTest_clicked())); } /** Destructor */ @@ -135,7 +135,7 @@ void FliteConf::slotFliteTest_clicked() else { m_fliteProc = new FliteProc(); - connect (m_fliteProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_fliteProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "fliteplugin-"), ".wav"); @@ -154,7 +154,7 @@ void FliteConf::slotFliteTest_clicked() m_progressDlg->setAllowCancel(true); // Play an English test. Flite only supports English. - connect (m_fliteProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_fliteProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_fliteProc->synth( testMsg, tmpWaveFile, @@ -163,7 +163,7 @@ void FliteConf::slotFliteTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_fliteProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_fliteProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_fliteProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index 9ebadd6..269290f 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -112,14 +112,14 @@ void FliteProc::synth( } // kdDebug()<< "FliteProc::synth: Creating Flite object" << endl; m_fliteProc = new TDEProcess; - connect(m_fliteProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_fliteProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_fliteProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_fliteProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_fliteProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_fliteProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_fliteProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_fliteProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); if (synthFilename.isNull()) m_state = psSaying; else diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 5be75f0..6b47758 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -55,9 +55,9 @@ FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList defaults(); - connect(m_widget->freettsPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->freettsTest, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFreeTTSTest_clicked())); + connect(m_widget->freettsPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->freettsTest, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFreeTTSTest_clicked())); } /** Destructor */ @@ -163,7 +163,7 @@ void FreeTTSConf::slotFreeTTSTest_clicked() else { m_freettsProc = new FreeTTSProc(); - connect (m_freettsProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_freettsProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "freettsplugin-"), ".wav"); @@ -183,7 +183,7 @@ void FreeTTSConf::slotFreeTTSTest_clicked() // I think FreeTTS only officialy supports English, but if anyone knows of someone // whos built up a different language lexicon and has it working with FreeTTS gimme an email at ceruleanblaze@gmail.com - connect (m_freettsProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_freettsProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_freettsProc->synth( testMsg, tmpWaveFile, @@ -192,7 +192,7 @@ void FreeTTSConf::slotFreeTTSTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_freettsProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_freettsProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_freettsProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index 95bcd8a..3d5efdb 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -103,14 +103,14 @@ void FreeTTSProc::synth( } m_freettsProc = new TDEProcess; - connect(m_freettsProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_freettsProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_freettsProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_freettsProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_freettsProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_freettsProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_freettsProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_freettsProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); if (synthFilename.isNull()) m_state = psSaying; else diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 9b86384..7f0b51f 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -215,12 +215,12 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList TQString file = locate("data", "LICENSES/LGPL_V2"); i18n("This plugin is distributed under the terms of the GPL v2 or later."); - connect(d->configWidget->voiceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(voiceButton_clicked())); - connect(d->configWidget->testButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(testButton_clicked())); - connect(d->configWidget, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(configChanged (bool))); - connect(d->configWidget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(d->configWidget->voiceCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(voiceCombo_activated(int))); + connect(d->configWidget->voiceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(voiceButton_clicked())); + connect(d->configWidget->testButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(testButton_clicked())); + connect(d->configWidget, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(configChanged (bool))); + connect(d->configWidget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(d->configWidget->voiceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(voiceCombo_activated(int))); d->initializeCharacterCodes(); d->initializeVoices(); d->setDefaults(); @@ -330,7 +330,7 @@ void HadifixConf::testButton_clicked () { else { d->hadifixProc = new HadifixProc(); - connect (d->hadifixProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (d->hadifixProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "hadifixplugin-"), ".wav"); @@ -354,7 +354,7 @@ void HadifixConf::testButton_clicked () { // TQString testMsg = "K D E ist eine moderne grafische Arbeitsumgebung für UNIX-Computer."; TQString testMsg = testMessage(d->languageCode); - connect (d->hadifixProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (d->hadifixProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); d->hadifixProc->synth (testMsg, realFilePath(d->configWidget->hadifixURL->url()), d->configWidget->isMaleVoice(), @@ -369,7 +369,7 @@ void HadifixConf::testButton_clicked () { // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. d->progressDlg->exec(); - disconnect (d->hadifixProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (d->hadifixProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (d->progressDlg->wasCancelled()) d->hadifixProc->stopText(); delete d->progressDlg; d->progressDlg = 0; diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 3f2899f..51b1d24 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -197,10 +197,10 @@ void HadifixProc::synth(TQString text, *(d->hadifixProc) << command; // Connect signals from process. - connect(d->hadifixProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(d->hadifixProc, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotWroteStdin(TDEProcess *))); + connect(d->hadifixProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(d->hadifixProc, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotWroteStdin(TDEProcess *))); // Store off name of wave file to be generated. d->synthFilename = waveFilename; @@ -359,10 +359,10 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString HadifixProc speech; KShellProcess proc; proc << command; - connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &speech, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &speech, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &speech, TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &speech, TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); speech.stdOut = TQString(); speech.stdErr = TQString(); -- cgit v1.2.3