From 92994ee2036ac7c4c68747f67dbc0ecbaf4c250c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:52:23 -0600 Subject: Remove additional unneeded tq method conversions --- kttsd/plugins/command/commandconf.cpp | 12 ++++++------ kttsd/plugins/epos/eposconf.cpp | 12 ++++++------ kttsd/plugins/epos/eposconfwidget.ui | 8 ++++---- kttsd/plugins/epos/eposproc.cpp | 6 +++--- kttsd/plugins/festivalint/festivalintconf.cpp | 12 ++++++------ kttsd/plugins/festivalint/festivalintconfwidget.ui | 4 ++-- kttsd/plugins/festivalint/festivalintproc.cpp | 6 +++--- kttsd/plugins/flite/fliteconf.cpp | 12 ++++++------ kttsd/plugins/flite/fliteconfwidget.ui | 2 +- kttsd/plugins/freetts/freettsconf.cpp | 12 ++++++------ kttsd/plugins/freetts/freettsconfigwidget.ui | 2 +- kttsd/plugins/hadifix/hadifixconf.cpp | 22 +++++++++++----------- kttsd/plugins/hadifix/hadifixproc.cpp | 6 +++--- kttsd/plugins/hadifix/voicefileui.ui.h | 4 ++-- 14 files changed, 60 insertions(+), 60 deletions(-) (limited to 'kttsd/plugins') diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index d10b051..9e04749 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -127,12 +127,12 @@ TQString CommandConf::getTalkerCode() "" "" "") - .tqarg(m_languageCode) - .tqarg("fixed") - .tqarg("neutral") - .tqarg("medium") - .tqarg("medium") - .tqarg("Command"); + .arg(m_languageCode) + .arg("fixed") + .arg("neutral") + .arg("medium") + .arg("medium") + .arg("Command"); } } return TQString(); diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index 889916c..7a0ca17 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -194,12 +194,12 @@ TQString EposConf::getTalkerCode() "" "" "") - .tqarg(m_languageCode) - .tqarg("fixed") - .tqarg("neutral") - .tqarg("medium") - .tqarg(rate) - .tqarg("Epos TTS Synthesis System"); + .arg(m_languageCode) + .arg("fixed") + .arg("neutral") + .arg("medium") + .arg(rate) + .arg("Epos TTS Synthesis System"); } } return TQString(); diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui index 8bbf8fc..28acdad 100644 --- a/kttsd/plugins/epos/eposconfwidget.ui +++ b/kttsd/plugins/epos/eposconfwidget.ui @@ -345,7 +345,7 @@ Epos server executable path: - + AlignVCenter @@ -370,7 +370,7 @@ Epos client executable path: - + AlignVCenter @@ -500,7 +500,7 @@ Epos server: - + AlignVCenter|AlignLeft @@ -525,7 +525,7 @@ Epos client: - + AlignVCenter|AlignLeft diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index c5b49c0..5ccf568 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -210,7 +210,7 @@ void EposProc::synth( *m_eposProc << eposClientExePath; // Language. if (!eposLanguage.isEmpty()) - *m_eposProc << TQString("--language=%1").tqarg(eposLanguage); + *m_eposProc << TQString("--language=%1").arg(eposLanguage); // Rate (speed). // Map 50% to 200% onto 0 to 1000. // slider = alpha * (log(percent)-log(50)) @@ -221,10 +221,10 @@ void EposProc::synth( slider = slider - 500; // Map -500 to 500 onto 45 to -45 then shift to 130 to 40 (85 midpoint). float stretchValue = (-float(slider) * 45.0 / 500.0) + 85.0; - TQString timeMsg = TQString("--init_t=%1").tqarg(stretchValue, 0, 'f', 3); + TQString timeMsg = TQString("--init_t=%1").arg(stretchValue, 0, 'f', 3); *m_eposProc << timeMsg; // Pitch. Map 50% to 200% onto 50 to 200. easy. - TQString pitchMsg = TQString("--init_f=%1").tqarg(pitch); + TQString pitchMsg = TQString("--init_f=%1").arg(pitch); *m_eposProc << pitchMsg; // Output file. if (!suggestedFilename.isEmpty()) diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index d40b68c..920bfbc 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -229,12 +229,12 @@ TQString FestivalIntConf::getTalkerCode() "" "" "") - .tqarg(voiceTemp.languageCode) - .tqarg(voiceTemp.code) - .tqarg(voiceTemp.gender) - .tqarg(volume) - .tqarg(rate) - .tqarg("Festival Interactive"); + .arg(voiceTemp.languageCode) + .arg(voiceTemp.code) + .arg(voiceTemp.gender) + .arg(volume) + .arg(rate) + .arg("Festival Interactive"); return normalTalkerCode; } diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui index c6b8b4b..bb0b9bf 100644 --- a/kttsd/plugins/festivalint/festivalintconfwidget.ui +++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui @@ -94,7 +94,7 @@ &Festival executable: - + AlignVCenter|AlignRight @@ -143,7 +143,7 @@ &Select voice: - + AlignVCenter|AlignRight diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index 6cf06e5..e11511b 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -268,11 +268,11 @@ void FestivalIntProc::synth( slider = slider - 500; // Map -500 to 500 onto 0.15 to -0.15. float stretchValue = -float(slider) * 0.15 / 500.0; - timeMsg = TQString("(set! hts_duration_stretch %1)").tqarg( + timeMsg = TQString("(set! hts_duration_stretch %1)").arg( stretchValue, 0, 'f', 3); } else - timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").tqarg( + timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").arg( 1.0/(float(time)/100.0), 0, 'f', 2); sendToFestival(timeMsg); m_runningTime = time; @@ -292,7 +292,7 @@ void FestivalIntProc::synth( } TQString pitchMsg = TQString( "(set! int_lr_params '((target_f0_mean %1) (target_f0_std 14)" - "(model_f0_mean 170) (model_f0_std 34)))").tqarg(pitchValue, 0, 10); + "(model_f0_mean 170) (model_f0_std 34)))").arg(pitchValue, 0, 10); sendToFestival(pitchMsg); m_runningPitch = pitch; } diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 7a1068a..c837209 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -115,12 +115,12 @@ TQString FliteConf::getTalkerCode() "" "" "") - .tqarg(m_languageCode) - .tqarg("fixed") - .tqarg("neutral") - .tqarg("medium") - .tqarg("medium") - .tqarg("Festival Lite (flite)"); + .arg(m_languageCode) + .arg("fixed") + .arg("neutral") + .arg("medium") + .arg("medium") + .arg("Festival Lite (flite)"); } } return TQString(); diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui index e2a3ba5..8efcbb1 100644 --- a/kttsd/plugins/flite/fliteconfwidget.ui +++ b/kttsd/plugins/flite/fliteconfwidget.ui @@ -111,7 +111,7 @@ &Flite executable path: - + AlignVCenter|AlignRight diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 81b63e7..4652c3c 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -119,12 +119,12 @@ TQString FreeTTSConf::getTalkerCode() "" "" "") - .tqarg(m_languageCode) - .tqarg("fixed") - .tqarg("neutral") - .tqarg("medium") - .tqarg("medium") - .tqarg("FreeTTS"); + .arg(m_languageCode) + .arg("fixed") + .arg("neutral") + .arg("medium") + .arg("medium") + .arg("FreeTTS"); } } return TQString(); diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui index e74a452..e71cb73 100644 --- a/kttsd/plugins/freetts/freettsconfigwidget.ui +++ b/kttsd/plugins/freetts/freettsconfigwidget.ui @@ -108,7 +108,7 @@ AutoText - + AlignVCenter|AlignRight diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 6ff806f..642e722 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -92,15 +92,15 @@ class HadifixConfPrivate { TQString name = TQFileInfo(*it).fileName(); gender = HadifixProc::determineGender(defaultMbrolaExec, *it); if (gender == HadifixProc::MaleGender) - configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").tqarg(name)); + configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").arg(name)); else if (gender == HadifixProc::FemaleGender) - configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name)); + configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name)); else { if (name == "de1") - configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name)); + configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name)); else { - configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").tqarg(name)); - configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").tqarg(name)); + configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").arg(name)); + configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").arg(name)); } } } @@ -284,12 +284,12 @@ TQString HadifixConf::getTalkerCode() "" "" "") - .tqarg(d->languageCode) - .tqarg(voiceCode) - .tqarg(gender) - .tqarg(volume) - .tqarg(rate) - .tqarg("Hadifix"); + .arg(d->languageCode) + .arg(voiceCode) + .arg(gender) + .arg(volume) + .arg(rate) + .arg("Hadifix"); } } return TQString(); diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 9f6a5d6..d7a7514 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -184,9 +184,9 @@ void HadifixProc::synth(TQString text, TQString mbrolaCommand = d->hadifixProc->quote(mbrola); mbrolaCommand += " -e"; //Ignore fatal errors on unkown diphone - mbrolaCommand += TQString(" -v %1").tqarg(volume/100.0); // volume ratio - mbrolaCommand += TQString(" -f %1").tqarg(pitch/100.0); // freqency ratio - mbrolaCommand += TQString(" -t %1").tqarg(1/(time/100.0)); // time ratio + mbrolaCommand += TQString(" -v %1").arg(volume/100.0); // volume ratio + mbrolaCommand += TQString(" -f %1").arg(pitch/100.0); // freqency ratio + mbrolaCommand += TQString(" -t %1").arg(1/(time/100.0)); // time ratio mbrolaCommand += " " + d->hadifixProc->quote(voice); mbrolaCommand += " - " + d->hadifixProc->quote(waveFilename); diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h index dfd177d..1d0033e 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui.h +++ b/kttsd/plugins/hadifix/voicefileui.ui.h @@ -24,12 +24,12 @@ void VoiceFileWidget::genderButton_clicked() } else if (gender == HadifixProc::NoGender) { KMessageBox::sorry (this, - i18n("The gender of the voice file %1 could not be detected.").tqarg(voiceFileURL->url()), + i18n("The gender of the voice file %1 could not be detected.").arg(voiceFileURL->url()), i18n("Trying to Determine the Gender - Hadifix Plug In")); } else { KMessageBox::detailedSorry (this, - i18n("The file %1 does not seem to be a voice file.").tqarg(voiceFileURL->url()), + i18n("The file %1 does not seem to be a voice file.").arg(voiceFileURL->url()), details, i18n("Trying to Determine the Gender - Hadifix Plug In")); } } -- cgit v1.2.1