TDE
/
tdeaccessibility
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 389971def3
commit a53c68f02a
54 changed files with 213 additions and 213 deletions
Show Stats Download Patch File Download Diff File

10
kmouth/phrasebook/phrasebook.cpp
Unescape View File

@ -282,10 +282,10 @@ int PhraseBook::save (TQWidget *tqparent, const TQString &title, KURL &url, bool
bool result; bool result;
if (fdlg.currentFilter() == "*.phrasebook") { if (fdlg.currentFilter() == "*.phrasebook") {
if (url.fileName (false).tqcontains('.') == 0) { if (url.fileName (false).contains('.') == 0) {
url.setFileName (url.fileName(false) + ".phrasebook"); url.setFileName (url.fileName(false) + ".phrasebook");
} }
else if (url.fileName (false).right (11).tqcontains (".phrasebook", false) == 0) { else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) {
int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. " int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
"Do you wish to add <i>.phrasebook</i> to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); "Do you wish to add <i>.phrasebook</i> to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
if (filetype == KMessageBox::Cancel) { if (filetype == KMessageBox::Cancel) {
@ -298,7 +298,7 @@ int PhraseBook::save (TQWidget *tqparent, const TQString &title, KURL &url, bool
result = save (url, true); result = save (url, true);
} }
else if (fdlg.currentFilter() == "*.txt") { else if (fdlg.currentFilter() == "*.txt") {
if (url.fileName (false).right (11).tqcontains (".phrasebook", false) == 0) { if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) {
result = save (url, false); result = save (url, false);
} }
else { else {
@ -480,9 +480,9 @@ const char *PhraseBookDrag::format (int i) const {
TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const { TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const {
TQCString m(mime); TQCString m(mime);
m = m.lower(); m = m.lower();
if (m.tqcontains("xml-phrasebook")) if (m.contains("xml-phrasebook"))
return xmlphrasebook.tqencodedData(mime); return xmlphrasebook.tqencodedData(mime);
else if (m.tqcontains("xml")) else if (m.contains("xml"))
return xml.tqencodedData(mime); return xml.tqencodedData(mime);
else else
return plain.tqencodedData(mime); return plain.tqencodedData(mime);

2
kmouth/phrasebook/phrasebookdialog.cpp
Unescape View File

@ -383,7 +383,7 @@ TQString PhraseBookDialog::displayPath (TQString filename) {
TQFileInfo file(filename); TQFileInfo file(filename);
TQString path = file.dirPath(); TQString path = file.dirPath();
TQString dispPath = ""; TQString dispPath = "";
uint position = path.tqfind("/kmouth/books/")+TQString("/kmouth/books/").length(); uint position = path.find("/kmouth/books/")+TQString("/kmouth/books/").length();
while (path.length() > position) { while (path.length() > position) {
file.setFile(path); file.setFile(path);

22
kmouth/speech.cpp
Unescape View File

@ -51,7 +51,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
TQValueStack<bool> stack; // saved isdoublequote values during parsing of braces TQValueStack<bool> stack; // saved isdoublequote values during parsing of braces
bool issinglequote=false; // inside '...' ? bool issinglequote=false; // inside '...' ?
bool isdoublequote=false; // inside "..." ? bool isdoublequote=false; // inside "..." ?
int notqreplace=0; // nested braces when within ${...} int noreplace=0; // nested braces when within ${...}
TQString escText = KShellProcess::quote(text); TQString escText = KShellProcess::quote(text);
// character sequences that change the state or need to be otherwise processed // character sequences that change the state or need to be otherwise processed
@ -71,17 +71,17 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
if ((command[i]=='(') || (command[i]=='{')) { // (...) or {...} if ((command[i]=='(') || (command[i]=='{')) { // (...) or {...}
// assert(isdoublequote == false) // assert(isdoublequote == false)
stack.push(isdoublequote); stack.push(isdoublequote);
if (notqreplace > 0) if (noreplace > 0)
// count nested braces when within ${...} // count nested braces when within ${...}
notqreplace++; noreplace++;
i++; i++;
} }
else if (command[i]=='$') { // $(...) or ${...} else if (command[i]=='$') { // $(...) or ${...}
stack.push(isdoublequote); stack.push(isdoublequote);
isdoublequote = false; isdoublequote = false;
if ((notqreplace > 0) || (command[i+1]=='{')) if ((noreplace > 0) || (command[i+1]=='{'))
// count nested braces when within ${...} // count nested braces when within ${...}
notqreplace++; noreplace++;
i+=2; i+=2;
} }
else if ((command[i]==')') || (command[i]=='}')) { else if ((command[i]==')') || (command[i]=='}')) {
@ -90,9 +90,9 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
isdoublequote = stack.pop(); isdoublequote = stack.pop();
else else
qWarning("Parse error."); qWarning("Parse error.");
if (notqreplace > 0) if (noreplace > 0)
// count nested braces when within ${...} // count nested braces when within ${...}
notqreplace--; noreplace--;
i++; i++;
} }
else if (command[i]=='\'') { else if (command[i]=='\'') {
@ -107,7 +107,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
i+=2; i+=2;
else if (command[i]=='`') { else if (command[i]=='`') {
// Replace all `...` with safer $(...) // Replace all `...` with safer $(...)
command.tqreplace (i, 1, "$("); command.replace (i, 1, "$(");
TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)");
for (int i2=re_backticks.search(command,i+2); for (int i2=re_backticks.search(command,i+2);
i2!=-1; i2!=-1;
@ -115,7 +115,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
) )
{ {
if (command[i2] == '`') { if (command[i2] == '`') {
command.tqreplace (i2, 1, ")"); command.replace (i2, 1, ")");
i2=command.length(); // leave loop i2=command.length(); // leave loop
} }
else { else {
@ -126,7 +126,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
} }
// Leave i unchanged! We need to process "$(" // Leave i unchanged! We need to process "$("
} }
else if (notqreplace > 0) { // do not replace macros within ${...} else if (noreplace > 0) { // do not replace macros within ${...}
if (issinglequote) if (issinglequote)
i+=re_singlequote.matchedLength(); i+=re_singlequote.matchedLength();
else if (isdoublequote) else if (isdoublequote)
@ -161,7 +161,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text,
else if (issinglequote) else if (issinglequote)
v="'"+v+"'"; v="'"+v+"'";
command.tqreplace (i, match.length(), v); command.replace (i, match.length(), v);
i+=v.length(); i+=v.length();
} }
} }

8
kmouth/wordcompletion/klanguagebutton.cpp
Unescape View File

@ -60,12 +60,12 @@ static inline void checkInsertPos( TQPopupMenu *popup, const TQString & str,
static inline TQPopupMenu * checkInsertIndex( TQPopupMenu *popup, static inline TQPopupMenu * checkInsertIndex( TQPopupMenu *popup,
const TQStringList *tags, const TQString &submenu ) const TQStringList *tags, const TQString &submenu )
{ {
int pos = tags->tqfindIndex( submenu ); int pos = tags->findIndex( submenu );
TQPopupMenu *pi = 0; TQPopupMenu *pi = 0;
if ( pos != -1 ) if ( pos != -1 )
{ {
TQMenuItem *p = popup->tqfindItem( pos ); TQMenuItem *p = popup->findItem( pos );
pi = p ? p->popup() : 0; pi = p ? p->popup() : 0;
} }
if ( !pi ) if ( !pi )
@ -189,7 +189,7 @@ void KLanguageButton::clear()
bool KLanguageButton::containsTag( const TQString &str ) const bool KLanguageButton::containsTag( const TQString &str ) const
{ {
return m_tags->tqcontains( str ) > 0; return m_tags->contains( str ) > 0;
} }
TQString KLanguageButton::currentTag() const TQString KLanguageButton::currentTag() const
@ -228,7 +228,7 @@ void KLanguageButton::setCurrentItem( int i )
void KLanguageButton::setCurrentItem( const TQString &code ) void KLanguageButton::setCurrentItem( const TQString &code )
{ {
int i = m_tags->tqfindIndex( code ); int i = m_tags->findIndex( code );
if ( code.isNull() ) if ( code.isNull() )
i = 0; i = 0;
if ( i != -1 ) if ( i != -1 )

2
kmouth/wordcompletion/klanguagebuttonhelper.cpp
Unescape View File

@ -48,7 +48,7 @@ void loadLanguageList(KLanguageButton *combo)
it != langlist.end(); ++it ) it != langlist.end(); ++it )
{ {
TQString fpath = (*it).left((*it).length() - 14); TQString fpath = (*it).left((*it).length() - 14);
int index = fpath.tqfindRev('/'); int index = fpath.findRev('/');
TQString nid = fpath.mid(index + 1); TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it); KSimpleConfig entry(*it);

14
kmouth/wordcompletion/wordcompletion.cpp
Unescape View File

@ -46,7 +46,7 @@ TQString WordCompletion::makeCompletion(const TQString &text) {
d->lastText = text; d->lastText = text;
KCompletion::clear(); KCompletion::clear();
int border = text.tqfindRev(TQRegExp("\\W")); int border = text.findRev(TQRegExp("\\W"));
TQString suffix = text.right (text.length() - border - 1).lower(); TQString suffix = text.right (text.length() - border - 1).lower();
TQString prefix = text.left (border + 1); TQString prefix = text.left (border + 1);
@ -84,7 +84,7 @@ TQStringList WordCompletion::wordLists(const TQString &language) {
} }
TQString WordCompletion::languageOfWordList(const TQString &wordlist) { TQString WordCompletion::languageOfWordList(const TQString &wordlist) {
if (d->dictDetails.tqcontains(wordlist)) if (d->dictDetails.contains(wordlist))
return d->dictDetails[wordlist].language; return d->dictDetails[wordlist].language;
else else
return TQString(); return TQString();
@ -137,7 +137,7 @@ bool WordCompletion::setWordList(const TQString &wordlist) {
d->wordsToSave = false; d->wordsToSave = false;
d->map.clear(); d->map.clear();
bool result = d->dictDetails.tqcontains (wordlist); bool result = d->dictDetails.contains (wordlist);
if (result) if (result)
d->current = wordlist; d->current = wordlist;
else else
@ -177,13 +177,13 @@ void WordCompletion::addSentence (const TQString &sentence) {
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for (it = words.begin(); it != words.end(); ++it) { for (it = words.begin(); it != words.end(); ++it) {
if (!(*it).tqcontains(TQRegExp("\\d|_"))) { if (!(*it).contains(TQRegExp("\\d|_"))) {
TQString key = (*it).lower(); TQString key = (*it).lower();
if (d->map.tqcontains(key)) if (d->map.contains(key))
d->map[key] += 1; d->map[key] += 1;
else else
d->map[key] = 1; d->map[key] = 1;
if (d->addedWords.tqcontains(key)) if (d->addedWords.contains(key))
d->addedWords[key] += 1; d->addedWords[key] += 1;
else else
d->addedWords[key] = 1; d->addedWords[key] = 1;
@ -208,7 +208,7 @@ void WordCompletion::save () {
stream << "WPDictFile\n"; stream << "WPDictFile\n";
TQMap<TQString,int>::ConstIterator it; TQMap<TQString,int>::ConstIterator it;
for (it = d->map.begin(); it != d->map.end(); ++it) { for (it = d->map.begin(); it != d->map.end(); ++it) {
if (d->addedWords.tqcontains(it.key())) { if (d->addedWords.contains(it.key())) {
stream << it.key() << "\t" << d->addedWords[it.key()] << "\t1\n"; stream << it.key() << "\t" << d->addedWords[it.key()] << "\t1\n";
stream << it.key() << "\t" << it.data() - d->addedWords[it.key()] << "\t2\n"; stream << it.key() << "\t" << it.data() - d->addedWords[it.key()] << "\t2\n";
} }

34
kmouth/wordcompletion/wordlist.cpp
Unescape View File

@ -139,9 +139,9 @@ void addWords (WordMap &map, TQString line) {
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for (it = words.begin(); it != words.end(); ++it) { for (it = words.begin(); it != words.end(); ++it) {
if (!(*it).tqcontains(TQRegExp("\\d|_"))) { if (!(*it).contains(TQRegExp("\\d|_"))) {
TQString key = (*it).lower(); TQString key = (*it).lower();
if (map.tqcontains(key)) if (map.contains(key))
map[key] += 1; map[key] += 1;
else else
map[key] = 1; map[key] = 1;
@ -152,7 +152,7 @@ void addWords (WordMap &map, TQString line) {
void addWords (WordMap &map, WordMap add) { void addWords (WordMap &map, WordMap add) {
WordList::WordMap::ConstIterator it; WordList::WordMap::ConstIterator it;
for (it = add.begin(); it != add.end(); ++it) for (it = add.begin(); it != add.end(); ++it)
if (map.tqcontains(it.key())) if (map.contains(it.key()))
map[it.key()] += it.data(); map[it.key()] += it.data();
else else
map[it.key()] = it.data(); map[it.key()] = it.data();
@ -186,7 +186,7 @@ void addWordsFromFile (WordMap &map, TQString filename, TQTextStream::Encoding e
bool ok; bool ok;
int weight = list[1].toInt(&ok); int weight = list[1].toInt(&ok);
if (ok && (weight > 0)) { if (ok && (weight > 0)) {
if (map.tqcontains(list[0])) if (map.contains(list[0]))
map[list[0]] += weight; map[list[0]] += weight;
else else
map[list[0]] = weight; map[list[0]] = weight;
@ -261,7 +261,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) {
maxWeight = weight; maxWeight = weight;
for (iter = fileMap.begin(); iter != fileMap.end(); ++iter) for (iter = fileMap.begin(); iter != fileMap.end(); ++iter)
if (map.tqcontains(iter.key())) if (map.contains(iter.key()))
map[iter.key()] += iter.data() * factor; map[iter.key()] += iter.data() * factor;
else else
map[iter.key()] = iter.data() * factor; map[iter.key()] = iter.data() * factor;
@ -394,14 +394,14 @@ void loadAffFile(const TQString &filename, AffMap &prefixes, AffMap &suffixes) {
if (s.startsWith("PFX")) { if (s.startsWith("PFX")) {
AffList list; AffList list;
if (prefixes.tqcontains (fields[1][0])) if (prefixes.contains (fields[1][0]))
list = prefixes[fields[1][0]]; list = prefixes[fields[1][0]];
list << e; list << e;
prefixes[fields[1][0]] = list; prefixes[fields[1][0]] = list;
} }
else if (s.startsWith("SFX")) { else if (s.startsWith("SFX")) {
AffList list; AffList list;
if (suffixes.tqcontains (fields[1][0])) if (suffixes.contains (fields[1][0]))
list = suffixes[fields[1][0]]; list = suffixes[fields[1][0]];
list << e; list << e;
suffixes[fields[1][0]] = list; suffixes[fields[1][0]] = list;
@ -432,7 +432,7 @@ inline bool checkCondition (const TQString &word, const TQStringList &condition)
it != condition.end(); it != condition.end();
++it, ++idx) ++it, ++idx)
{ {
if ((*it).tqcontains(word[idx]) == ((*it)[0] == '^')) if ((*it).contains(word[idx]) == ((*it)[0] == '^'))
return false; return false;
} }
return true; return true;
@ -445,7 +445,7 @@ inline bool checkCondition (const TQString &word, const TQStringList &condition)
*/ */
inline void checkWord(const TQString &word, const TQString &modifiers, bool cross, const WordMap &map, WordMap &checkedMap, const AffMap &suffixes) { inline void checkWord(const TQString &word, const TQString &modifiers, bool cross, const WordMap &map, WordMap &checkedMap, const AffMap &suffixes) {
for (uint i = 0; i < modifiers.length(); i++) { for (uint i = 0; i < modifiers.length(); i++) {
if (suffixes.tqcontains(modifiers[i])) { if (suffixes.contains(modifiers[i])) {
AffList sList = suffixes[modifiers[i]]; AffList sList = suffixes[modifiers[i]];
AffList::ConstIterator sIt; AffList::ConstIterator sIt;
@ -454,7 +454,7 @@ inline void checkWord(const TQString &word, const TQString &modifiers, bool cros
&& (checkCondition(word, (*sIt).condition))) && (checkCondition(word, (*sIt).condition)))
{ {
TQString sWord = word.left(word.length()-(*sIt).charsToRemove) + (*sIt).add; TQString sWord = word.left(word.length()-(*sIt).charsToRemove) + (*sIt).add;
if (map.tqcontains(sWord)) if (map.contains(sWord))
checkedMap[sWord] = map[sWord]; checkedMap[sWord] = map[sWord];
} }
} }
@ -467,19 +467,19 @@ inline void checkWord(const TQString &word, const TQString &modifiers, bool cros
* @param modifiers discribes which pre- and suffixes are valid * @param modifiers discribes which pre- and suffixes are valid
*/ */
void checkWord (const TQString &word, const TQString &modifiers, const WordMap &map, WordMap &checkedMap, const AffMap &prefixes, const AffMap &suffixes) { void checkWord (const TQString &word, const TQString &modifiers, const WordMap &map, WordMap &checkedMap, const AffMap &prefixes, const AffMap &suffixes) {
if (map.tqcontains(word)) if (map.contains(word))
checkedMap[word] = map[word]; checkedMap[word] = map[word];
checkWord(word, modifiers, true, map, checkedMap, suffixes); checkWord(word, modifiers, true, map, checkedMap, suffixes);
for (uint i = 0; i < modifiers.length(); i++) { for (uint i = 0; i < modifiers.length(); i++) {
if (prefixes.tqcontains(modifiers[i])) { if (prefixes.contains(modifiers[i])) {
AffList pList = prefixes[modifiers[i]]; AffList pList = prefixes[modifiers[i]];
AffList::ConstIterator pIt; AffList::ConstIterator pIt;
for (pIt = pList.begin(); pIt != pList.end(); ++pIt) { for (pIt = pList.begin(); pIt != pList.end(); ++pIt) {
TQString pWord = (*pIt).add + word; TQString pWord = (*pIt).add + word;
if (map.tqcontains(pWord)) if (map.contains(pWord))
checkedMap[pWord] = map[pWord]; checkedMap[pWord] = map[pWord];
checkWord(pWord, modifiers, false, map, checkedMap, suffixes); checkWord(pWord, modifiers, false, map, checkedMap, suffixes);
@ -520,14 +520,14 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
while (!stream.atEnd()) { while (!stream.atEnd()) {
TQString s = stream.readLine(); TQString s = stream.readLine();
if (s.tqcontains("/")) { if (s.contains("/")) {
TQString word = s.left(s.tqfind("/")).lower(); TQString word = s.left(s.find("/")).lower();
TQString modifiers = s.right(s.length() - s.tqfind("/")); TQString modifiers = s.right(s.length() - s.find("/"));
checkWord(word, modifiers, map, checkedMap, prefixes, suffixes); checkWord(word, modifiers, map, checkedMap, prefixes, suffixes);
} }
else { else {
if (!s.isEmpty() && !s.isNull() && map.tqcontains(s.lower())) if (!s.isEmpty() && !s.isNull() && map.contains(s.lower()))
checkedMap[s.lower()] = map[s.lower()]; checkedMap[s.lower()] = map[s.lower()];
} }

2
ksayit/Doxyfile
Unescape View File

@ -16,7 +16,7 @@ ABBREVIATE_BRIEF = "The $name class" \
is \ is \
provides \ provides \
specifies \ specifies \
tqcontains \ contains \
represents \ represents \
a \ a \
an \ an \

2
ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
Unescape View File

@ -47,7 +47,7 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
fgets(cmdresult, 18, fp); fgets(cmdresult, 18, fp);
pclose(fp); pclose(fp);
} }
if ( !TQCString(cmdresult).tqcontains("kcmkttsd") ){ if ( !TQCString(cmdresult).contains("kcmkttsd") ){
TQString error = i18n("Control Center Module for KTTSD not found."); TQString error = i18n("Control Center Module for KTTSD not found.");
KMessageBox::sorry(this, error, i18n("Problem")); KMessageBox::sorry(this, error, i18n("Problem"));
return; return;

6
ksayit/src/docbookclasses.cpp
Unescape View File

@ -389,9 +389,9 @@ Author::~Author()
// { // {
// // canonify string // // canonify string
// TQString m_data = data; // TQString m_data = data;
// m_data.tqreplace( TQRegExp("\n"), "" ); // remove Newlines // m_data.replace( TQRegExp("\n"), "" ); // remove Newlines
// m_data.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces // m_data.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
// m_data.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs // m_data.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
// // split string "firstname surname" // // split string "firstname surname"
// TQString firstname = m_data.section(' ', 0, 0); // TQString firstname = m_data.section(' ', 0, 0);
// TQString surname = m_data.section(' ', 1, 1); // TQString surname = m_data.section(' ', 1, 1);

6
ksayit/src/docbookparser.cpp
Unescape View File

@ -479,9 +479,9 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it
TQString raw = node2raw(element); TQString raw = node2raw(element);
// remove <para> tags // remove <para> tags
raw.tqreplace( TQRegExp("</?(para|Para|PARA)/?>"),""); raw.replace( TQRegExp("</?(para|Para|PARA)/?>"),"");
raw.tqreplace( TQRegExp("^ "),"" ); raw.replace( TQRegExp("^ "),"" );
raw.tqreplace( TQRegExp("^\n"), "" ); raw.replace( TQRegExp("^\n"), "" );
para->setValue(KSayItGlobal::RAWDATA, raw); para->setValue(KSayItGlobal::RAWDATA, raw);
para->setValue(KSayItGlobal::RTFDATA, raw); para->setValue(KSayItGlobal::RTFDATA, raw);

12
ksayit/src/doctreeviewimpl.cpp
Unescape View File

@ -197,7 +197,7 @@ void DocTreeViewImpl::openFile(const KURL &url)
TQString line; TQString line;
int offset; int offset;
file.readLine( line, file.size() ); file.readLine( line, file.size() );
while( !file.atEnd() && (offset = line.tqfind("<book", 0, false)) < 0 ){ while( !file.atEnd() && (offset = line.find("<book", 0, false)) < 0 ){
header += line; header += line;
file.readLine( line, file.size() ); file.readLine( line, file.size() );
} }
@ -391,9 +391,9 @@ void DocTreeViewImpl::setEditMode(bool mode)
void DocTreeViewImpl::makeToSingleLine( TQString &content ) void DocTreeViewImpl::makeToSingleLine( TQString &content )
{ {
// canonify string // canonify string
content.tqreplace( TQRegExp("\n"), "" ); // remove Newlines content.replace( TQRegExp("\n"), "" ); // remove Newlines
content.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces content.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
content.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs content.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
} }
@ -594,8 +594,8 @@ TQString DocTreeViewImpl::getItemTitle( ListViewInterface *item )
title = ( item->getValue(KSayItGlobal::SPEAKERDATA) ).toString().left(32); title = ( item->getValue(KSayItGlobal::SPEAKERDATA) ).toString().left(32);
// canonify string // canonify string
title.tqreplace( TQRegExp("^( |\t|\n)+"), ""); title.replace( TQRegExp("^( |\t|\n)+"), "");
title.tqreplace( TQRegExp("( |\t|\n)$+"), ""); title.replace( TQRegExp("( |\t|\n)$+"), "");
} else { } else {
title = col0.left(32); title = col0.left(32);
} }

10
ksayit/src/fxpluginhandler.cpp
Unescape View File

@ -70,7 +70,7 @@ void FXPluginHandler::searchPlugins()
if ( factory ){ if ( factory ){
kdDebug(100200) << "FXPluginHandler::searchPlugins(): Plugin factory found." << endl; kdDebug(100200) << "FXPluginHandler::searchPlugins(): Plugin factory found." << endl;
// register found plugin // register found plugin
if ( !sRegistered.tqcontains( TQString(name) )){ if ( !sRegistered.contains( TQString(name) )){
sRegistered.append( TQString(name) ); sRegistered.append( TQString(name) );
plugin.name = name; plugin.name = name;
plugin.library = library; plugin.library = library;
@ -96,7 +96,7 @@ void FXPluginHandler::readConfiguration()
// unload all plugins and destroy the effect objects // unload all plugins and destroy the effect objects
lit = m_lstActivePlugins.begin(); lit = m_lstActivePlugins.begin();
while ( lit != m_lstActivePlugins.end() ){ while ( lit != m_lstActivePlugins.end() ){
mit = m_mapPluginList.tqfind( *lit ); mit = m_mapPluginList.find( *lit );
if ( mit!=m_mapPluginList.end() ){ if ( mit!=m_mapPluginList.end() ){
plugin = *mit; plugin = *mit;
if ( (plugin.p != NULL) && (plugin.EffectID == 0) ){ if ( (plugin.p != NULL) && (plugin.EffectID == 0) ){
@ -116,7 +116,7 @@ void FXPluginHandler::readConfiguration()
KLibFactory *factory = NULL; KLibFactory *factory = NULL;
for (lit=conf_active.begin(); lit!=conf_active.end(); ++lit){ // for all in config for (lit=conf_active.begin(); lit!=conf_active.end(); ++lit){ // for all in config
mit = m_mapPluginList.tqfind(*lit); mit = m_mapPluginList.find(*lit);
if( mit!=m_mapPluginList.end() ){ if( mit!=m_mapPluginList.end() ){
// plugin found in list of registered plugins // plugin found in list of registered plugins
plugin = *mit; plugin = *mit;
@ -146,7 +146,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname)
fx_struct plugin; fx_struct plugin;
// find plugin with name==pname in list and show its GUI // find plugin with name==pname in list and show its GUI
mit = m_mapPluginList.tqfind(pname); mit = m_mapPluginList.find(pname);
if ( mit != m_mapPluginList.end() ){ if ( mit != m_mapPluginList.end() ){
plugin = *mit; plugin = *mit;
if ( plugin.p != NULL ){ // plugin loaded if ( plugin.p != NULL ){ // plugin loaded
@ -198,7 +198,7 @@ void FXPluginHandler::activateEffect(const TQString &pname,
fx_struct plugin; fx_struct plugin;
// find plugin with name==pname // find plugin with name==pname
mit = m_mapPluginList.tqfind(pname); mit = m_mapPluginList.find(pname);
if ( mit!=m_mapPluginList.end() ){ if ( mit!=m_mapPluginList.end() ){
plugin = *mit; plugin = *mit;
if ( plugin.p != NULL ){ if ( plugin.p != NULL ){

2
ksayit/src/fxsetupimpl.cpp
Unescape View File

@ -109,7 +109,7 @@ void FX_SetupImpl::Init(TQStringList c_avail)
pushButton_removeAll->setEnabled(false); pushButton_removeAll->setEnabled(false);
for (sit=conf_active.begin(); sit!=conf_active.end(); ++sit){ for (sit=conf_active.begin(); sit!=conf_active.end(); ++sit){
it = c_avail.tqfind(*sit); it = c_avail.find(*sit);
if ( it!=c_avail.end() ){ // active plugin as per config-file in pluginlist found if ( it!=c_avail.end() ){ // active plugin as per config-file in pluginlist found
c_active.append(*sit); // append to active list c_active.append(*sit); // append to active list
c_avail.remove(*sit); // remove active plugin from the list of avail plugins c_avail.remove(*sit); // remove active plugin from the list of avail plugins

4
kttsd/compat/interfaces/kspeech/kspeech.h
Unescape View File

@ -441,7 +441,7 @@
* a Spanish synthesizer would likely be unintelligible). So the language * a Spanish synthesizer would likely be unintelligible). So the language
* attribute is said to have "priority". * attribute is said to have "priority".
* If an application does not specify a language attribute, a default one will be assumed. * If an application does not specify a language attribute, a default one will be assumed.
* The rest of the attributes are said to be "preferred". If %KTTSD cannot tqfind * The rest of the attributes are said to be "preferred". If %KTTSD cannot find
* a talker with the exact preferred attributes requested, the closest matching * a talker with the exact preferred attributes requested, the closest matching
* talker will likely still be understandable. * talker will likely still be understandable.
* *
@ -751,7 +751,7 @@ class KSpeech : virtual public DCOPObject {
* with a single space, and then replaces the sentence delimiters using * with a single space, and then replaces the sentence delimiters using
* the following statement: * the following statement:
@verbatim @verbatim
TQString::tqreplace(sentenceDelimiter, "\\1\t"); TQString::replace(sentenceDelimiter, "\\1\t");
@endverbatim @endverbatim
* *
* which replaces all sentence delimiters with a tab, but * which replaces all sentence delimiters with a tab, but

4
kttsd/filters/main.cpp
Unescape View File

@ -123,9 +123,9 @@ int main(int argc, char *argv[])
TalkerCode* talkerCode = new TalkerCode( talker ); TalkerCode* talkerCode = new TalkerCode( talker );
text = plugIn->convert( text, talkerCode, appId ); text = plugIn->convert( text, talkerCode, appId );
if ( args->isSet("break") ) if ( args->isSet("break") )
text.tqreplace( "\t", "\\t" ); text.replace( "\t", "\\t" );
else else
text.tqreplace( "\t", "" ); text.replace( "\t", "" );
cout << text.latin1() << endl; cout << text.latin1() << endl;
delete config; delete config;
delete plugIn; delete plugIn;

4
kttsd/filters/sbd/sbdconf.cpp
Unescape View File

@ -156,7 +156,7 @@ void SbdConf::save(KConfig* config, const TQString& configGroup){
config->writeEntry("SentenceDelimiterRegExp", m_widget->reLineEdit->text() ); config->writeEntry("SentenceDelimiterRegExp", m_widget->reLineEdit->text() );
config->writeEntry("SentenceBoundary", m_widget->sbLineEdit->text() ); config->writeEntry("SentenceBoundary", m_widget->sbLineEdit->text() );
config->writeEntry("LanguageCodes", m_languageCodeList ); config->writeEntry("LanguageCodes", m_languageCodeList );
config->writeEntry("AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); config->writeEntry("AppID", m_widget->appIdLineEdit->text().replace(" ", "") );
} }
/** /**
@ -257,7 +257,7 @@ void SbdConf::slotLanguageBrowseButton_clicked()
if (!countryCode.isEmpty()) language += if (!countryCode.isEmpty()) language +=
" (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
TQListViewItem* item = new KListViewItem(langLView, language, locale); TQListViewItem* item = new KListViewItem(langLView, language, locale);
if (m_languageCodeList.tqcontains(locale)) item->setSelected(true); if (m_languageCodeList.contains(locale)) item->setSelected(true);
} }
// Sort by language. // Sort by language.
langLView->setSorting(0); langLView->setSorting(0);

2
kttsd/filters/sbd/sbdconfwidget.ui
Unescape View File

@ -197,7 +197,7 @@
<cstring>appIdLabel</cstring> <cstring>appIdLabel</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Application &amp;ID tqcontains:</string> <string>Application &amp;ID contains:</string>
</property> </property>
<property name="tqalignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>

38
kttsd/filters/sbd/sbdproc.cpp
Unescape View File

@ -277,8 +277,8 @@ TQString SbdThread::makeSentence( const TQString& text )
if ( !e.isEmpty() ) s += e; if ( !e.isEmpty() ) s += e;
// Escape ampersands and less thans. // Escape ampersands and less thans.
TQString newText = text; TQString newText = text;
newText.tqreplace(TQRegExp("&(?!amp;)"), "&amp;"); newText.replace(TQRegExp("&(?!amp;)"), "&amp;");
newText.tqreplace(TQRegExp("<(?!lt;)"), "&lt;"); newText.replace(TQRegExp("<(?!lt;)"), "&lt;");
s += newText; s += newText;
if ( !e.isEmpty() ) s += "</emphasis>"; if ( !e.isEmpty() ) s += "</emphasis>";
if ( !p.isEmpty() ) s += "</prosody>"; if ( !p.isEmpty() ) s += "</prosody>";
@ -351,7 +351,7 @@ TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re )
case TQDomNode::TextNode: { // = 3 case TQDomNode::TextNode: { // = 3
TQString s = parsePlainText( n.toText().data(), re ); TQString s = parsePlainText( n.toText().data(), re );
// TQString d = s; // TQString d = s;
// d.tqreplace("\t", "\\t"); // d.replace("\t", "\\t");
// kdDebug() << "SbdThread::parseSsmlNode: parsedPlainText = [" << d << "]" << endl; // kdDebug() << "SbdThread::parseSsmlNode: parsedPlainText = [" << d << "]" << endl;
TQStringList sentenceList = TQStringList::split( '\t', s, false ); TQStringList sentenceList = TQStringList::split( '\t', s, false );
int lastNdx = sentenceList.count() - 1; int lastNdx = sentenceList.count() - 1;
@ -457,13 +457,13 @@ TQString SbdThread::parseCode( const TQString& inputText )
{ {
TQString temp = inputText; TQString temp = inputText;
// Replace newlines with tabs. // Replace newlines with tabs.
temp.tqreplace("\n","\t"); temp.replace("\n","\t");
// Remove leading spaces. // Remove leading spaces.
temp.tqreplace(TQRegExp("\\t +"), "\t"); temp.replace(TQRegExp("\\t +"), "\t");
// Remove trailing spaces. // Remove trailing spaces.
temp.tqreplace(TQRegExp(" +\\t"), "\t"); temp.replace(TQRegExp(" +\\t"), "\t");
// Remove blank lines. // Remove blank lines.
temp.tqreplace(TQRegExp("\t\t+"),"\t"); temp.replace(TQRegExp("\t\t+"),"\t");
return temp; return temp;
} }
@ -474,16 +474,16 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r
TQRegExp sentenceDelimiter = TQRegExp( re ); TQRegExp sentenceDelimiter = TQRegExp( re );
TQString temp = inputText; TQString temp = inputText;
// Replace sentence delimiters with tab. // Replace sentence delimiters with tab.
temp.tqreplace(sentenceDelimiter, m_configuredSentenceBoundary); temp.replace(sentenceDelimiter, m_configuredSentenceBoundary);
// Replace remaining newlines with spaces. // Replace remaining newlines with spaces.
temp.tqreplace("\n"," "); temp.replace("\n"," ");
temp.tqreplace("\r"," "); temp.replace("\r"," ");
// Remove leading spaces. // Remove leading spaces.
temp.tqreplace(TQRegExp("\\t +"), "\t"); temp.replace(TQRegExp("\\t +"), "\t");
// Remove trailing spaces. // Remove trailing spaces.
temp.tqreplace(TQRegExp(" +\\t"), "\t"); temp.replace(TQRegExp(" +\\t"), "\t");
// Remove blank lines. // Remove blank lines.
temp.tqreplace(TQRegExp("\t\t+"),"\t"); temp.replace(TQRegExp("\t\t+"),"\t");
return temp; return temp;
} }
@ -503,7 +503,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r
{ {
// Examine just the first 500 chars to see if it is code. // Examine just the first 500 chars to see if it is code.
TQString p = m_text.left( 500 ); TQString p = m_text.left( 500 );
if ( p.tqcontains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) ) if ( p.contains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) )
textType = ttCode; textType = ttCode;
else else
textType = ttPlain; textType = ttPlain;
@ -515,7 +515,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r
if ( re.isEmpty() ) re = m_configuredRe; if ( re.isEmpty() ) re = m_configuredRe;
// Replace spaces, tabs, and formfeeds with a single space. // Replace spaces, tabs, and formfeeds with a single space.
m_text.tqreplace(TQRegExp("[ \\t\\f]+"), " "); m_text.replace(TQRegExp("[ \\t\\f]+"), " ");
// Perform the filtering based on type of text. // Perform the filtering based on type of text.
switch ( textType ) switch ( textType )
@ -603,7 +603,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){
m_configuredRe = config->readEntry( "SentenceDelimiterRegExp", "([\\.\\?\\!\\:\\;])(\\s|$|(\\n *\\n))" ); m_configuredRe = config->readEntry( "SentenceDelimiterRegExp", "([\\.\\?\\!\\:\\;])(\\s|$|(\\n *\\n))" );
m_sbdThread->setConfiguredSbRegExp( m_configuredRe ); m_sbdThread->setConfiguredSbRegExp( m_configuredRe );
TQString sb = config->readEntry( "SentenceBoundary", "\\1\t" ); TQString sb = config->readEntry( "SentenceBoundary", "\\1\t" );
sb.tqreplace( "\\t", "\t" ); sb.replace( "\\t", "\t" );
m_sbdThread->setConfiguredSentenceBoundary( sb ); m_sbdThread->setConfiguredSentenceBoundary( sb );
m_appIdList = config->readListEntry( "AppID" ); m_appIdList = config->readListEntry( "AppID" );
m_languageCodeList = config->readListEntry( "LanguageCodes" ); m_languageCodeList = config->readListEntry( "LanguageCodes" );
@ -672,14 +672,14 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){
TQString languageCode = talkerCode->languageCode(); TQString languageCode = talkerCode->languageCode();
// kdDebug() << "StringReplacerProc::convert: converting " << inputText << // kdDebug() << "StringReplacerProc::convert: converting " << inputText <<
// " if language code " << languageCode << " matches " << m_languageCodeList << endl; // " if language code " << languageCode << " matches " << m_languageCodeList << endl;
if ( !m_languageCodeList.tqcontains( languageCode ) ) if ( !m_languageCodeList.contains( languageCode ) )
{ {
if ( !talkerCode->countryCode().isEmpty() ) if ( !talkerCode->countryCode().isEmpty() )
{ {
languageCode += '_' + talkerCode->countryCode(); languageCode += '_' + talkerCode->countryCode();
// kdDebug() << "StringReplacerProc::convert: converting " << inputText << // kdDebug() << "StringReplacerProc::convert: converting " << inputText <<
// " if language code " << languageCode << " matches " << m_languageCodeList << endl; // " if language code " << languageCode << " matches " << m_languageCodeList << endl;
if ( !m_languageCodeList.tqcontains( languageCode ) ) return false; if ( !m_languageCodeList.contains( languageCode ) ) return false;
} else return false; } else return false;
} }
} }
@ -692,7 +692,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){
TQString appIdStr = appId; TQString appIdStr = appId;
for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
{ {
if ( appIdStr.tqcontains(m_appIdList[ndx]) ) if ( appIdStr.contains(m_appIdList[ndx]) )
{ {
found = true; found = true;
break; break;

12
kttsd/filters/stringreplacer/stringreplacerconf.cpp
Unescape View File

@ -308,7 +308,7 @@ TQString StringReplacerConf::saveToFile(const TQString& filename)
} }
// Application ID // Application ID
TQString appId = m_widget->appIdLineEdit->text().tqreplace(" ", ""); TQString appId = m_widget->appIdLineEdit->text().replace(" ", "");
if ( !appId.isEmpty() ) if ( !appId.isEmpty() )
{ {
TQStringList appIdList = TQStringList::split(",", appId); TQStringList appIdList = TQStringList::split(",", appId);
@ -442,7 +442,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
if (!countryCode.isEmpty()) language += if (!countryCode.isEmpty()) language +=
" (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
item = new KListViewItem(langLView, language, locale); item = new KListViewItem(langLView, language, locale);
if (m_languageCodeList.tqcontains(locale)) item->setSelected(true); if (m_languageCodeList.contains(locale)) item->setSelected(true);
} }
// Sort by language. // Sort by language.
langLView->setSorting(0); langLView->setSorting(0);
@ -488,11 +488,11 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
if (m_languageCodeList.count() > 1) language = i18n("Multiple Languages"); if (m_languageCodeList.count() > 1) language = i18n("Multiple Languages");
if ( !s1.isEmpty() ) if ( !s1.isEmpty() )
{ {
s2.tqreplace( s1, language ); s2.replace( s1, language );
s2.tqreplace( i18n("Multiple Languages"), language ); s2.replace( i18n("Multiple Languages"), language );
} }
s2.tqreplace(" ()", ""); s2.replace(" ()", "");
if ( !s2.tqcontains("(") && !language.isEmpty() ) s2 += " (" + language + ")"; if ( !s2.contains("(") && !language.isEmpty() ) s2 += " (" + language + ")";
m_widget->nameLineEdit->setText(s2); m_widget->nameLineEdit->setText(s2);
configChanged(); configChanged();
} }

2
kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
Unescape View File

@ -102,7 +102,7 @@
<cstring>appIdLabel</cstring> <cstring>appIdLabel</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Application &amp;ID tqcontains:</string> <string>Application &amp;ID contains:</string>
</property> </property>
<property name="tqalignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>

8
kttsd/filters/stringreplacer/stringreplacerproc.cpp
Unescape View File

@ -180,14 +180,14 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
TQString languageCode = talkerCode->languageCode(); TQString languageCode = talkerCode->languageCode();
// kdDebug() << "StringReplacerProc::convert: converting " << inputText << // kdDebug() << "StringReplacerProc::convert: converting " << inputText <<
// " if language code " << languageCode << " matches " << m_languageCodeList << endl; // " if language code " << languageCode << " matches " << m_languageCodeList << endl;
if ( !m_languageCodeList.tqcontains( languageCode ) ) if ( !m_languageCodeList.contains( languageCode ) )
{ {
if ( !talkerCode->countryCode().isEmpty() ) if ( !talkerCode->countryCode().isEmpty() )
{ {
languageCode += '_' + talkerCode->countryCode(); languageCode += '_' + talkerCode->countryCode();
// kdDebug() << "StringReplacerProc::convert: converting " << inputText << // kdDebug() << "StringReplacerProc::convert: converting " << inputText <<
// " if language code " << languageCode << " matches " << m_languageCodeList << endl; // " if language code " << languageCode << " matches " << m_languageCodeList << endl;
if ( !m_languageCodeList.tqcontains( languageCode ) ) return inputText; if ( !m_languageCodeList.contains( languageCode ) ) return inputText;
} else return inputText; } else return inputText;
} }
} }
@ -200,7 +200,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
TQString appIdStr = appId; TQString appIdStr = appId;
for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
{ {
if ( appIdStr.tqcontains(m_appIdList[ndx]) ) if ( appIdStr.contains(m_appIdList[ndx]) )
{ {
found = true; found = true;
break; break;
@ -217,7 +217,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
for ( int index = 0; index < listCount; ++index ) for ( int index = 0; index < listCount; ++index )
{ {
//kdDebug() << "newtext = " << newText << " matching " << m_matchList[index].pattern() << " replacing with " << m_substList[index] << endl; //kdDebug() << "newtext = " << newText << " matching " << m_matchList[index].pattern() << " replacing with " << m_substList[index] << endl;
newText.tqreplace( m_matchList[index], m_substList[index] ); newText.replace( m_matchList[index], m_substList[index] );
} }
m_wasModified = true; m_wasModified = true;
return newText; return newText;

2
kttsd/filters/talkerchooser/talkerchooserconf.cpp
Unescape View File

@ -147,7 +147,7 @@ void TalkerChooserConf::save(KConfig* config, const TQString& configGroup){
config->setGroup( configGroup ); config->setGroup( configGroup );
config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() ); config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() );
config->writeEntry( "MatchRegExp", m_widget->reLineEdit->text() ); config->writeEntry( "MatchRegExp", m_widget->reLineEdit->text() );
config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().replace(" ", "") );
config->writeEntry( "TalkerCode", m_talkerCode.getTalkerCode()); config->writeEntry( "TalkerCode", m_talkerCode.getTalkerCode());
} }

4
kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
Unescape View File

@ -84,7 +84,7 @@
<cstring>reLabel</cstring> <cstring>reLabel</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Te&amp;xt tqcontains:</string> <string>Te&amp;xt contains:</string>
</property> </property>
<property name="tqalignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
@ -102,7 +102,7 @@
<cstring>appIdLabel</cstring> <cstring>appIdLabel</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Application &amp;ID tqcontains:</string> <string>Application &amp;ID contains:</string>
</property> </property>
<property name="tqalignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>

4
kttsd/filters/talkerchooser/talkerchooserproc.cpp
Unescape View File

@ -107,7 +107,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){
{ {
if ( !m_re.isEmpty() ) if ( !m_re.isEmpty() )
{ {
int pos = inputText.tqfind( TQRegExp(m_re) ); int pos = inputText.find( TQRegExp(m_re) );
if ( pos < 0 ) return inputText; if ( pos < 0 ) return inputText;
} }
// If appId doesn't match, return input unmolested. // If appId doesn't match, return input unmolested.
@ -119,7 +119,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){
TQString appIdStr = appId; TQString appIdStr = appId;
for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
{ {
if ( appIdStr.tqcontains(m_appIdList[ndx]) ) if ( appIdStr.contains(m_appIdList[ndx]) )
{ {
found = true; found = true;
break; break;

2
kttsd/filters/xhtml2ssml/Doxyfile
Unescape View File

@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \
is \ is \
provides \ provides \
specifies \ specifies \
tqcontains \ contains \
represents \ represents \
a \ a \
an \ an \

2
kttsd/filters/xhtml2ssml/xhtml2ssml.cpp
Unescape View File

@ -97,7 +97,7 @@ bool XHTMLToSSMLParser::readFileConfigEntry(const TQString &line) {
// break into TQStringList // break into TQStringList
// the second parameter to split is the string, with all space simplified and all space around the : removed, i.e // the second parameter to split is the string, with all space simplified and all space around the : removed, i.e
// "something : somethingelse" -> "something:somethingelse" // "something : somethingelse" -> "something:somethingelse"
TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().tqreplace(" :", ":").tqreplace(": ", ":")); TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().replace(" :", ":").replace(": ", ":"));
if(keyvalue.count() != 2) if(keyvalue.count() != 2)
return false; return false;
m_xhtml2ssml[keyvalue[0]] = keyvalue[1]; m_xhtml2ssml[keyvalue[0]] = keyvalue[1];

8
kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl
Unescape View File

@ -52,22 +52,22 @@
</xsl:template> </xsl:template>
<!-- H1, H2, H3, H4, H5, H6: ignore tag, speak content as sentence. --> <!-- H1, H2, H3, H4, H5, H6: ignore tag, speak content as sentence. -->
<xsl:template match="*[tqcontains('h1|h2|h3|h4|h5|h6|H1|H2|H3|H4|H5|H6|',concat(local-name(),'|'))]"> <xsl:template match="*[contains('h1|h2|h3|h4|h5|h6|H1|H2|H3|H4|H5|H6|',concat(local-name(),'|'))]">
<xsl:apply-templates/> <xsl:apply-templates/>
</xsl:template> </xsl:template>
<!-- DFN, LI, DD, DT: ignore tag, speak content. --> <!-- DFN, LI, DD, DT: ignore tag, speak content. -->
<xsl:template match="*[tqcontains('dfn|li|dd|dt|DFN|LI|DD|DT|',concat(local-name(),'|'))]"> <xsl:template match="*[contains('dfn|li|dd|dt|DFN|LI|DD|DT|',concat(local-name(),'|'))]">
<xsl:apply-templates/> <xsl:apply-templates/>
</xsl:template> </xsl:template>
<!-- PRE, CODE, TT; ignore tag, speak content. --> <!-- PRE, CODE, TT; ignore tag, speak content. -->
<xsl:template match="*[tqcontains('pre|code|tt|PRE|CODE|TT|',concat(local-name(),'|'))]"> <xsl:template match="*[contains('pre|code|tt|PRE|CODE|TT|',concat(local-name(),'|'))]">
<xsl:apply-templates/> <xsl:apply-templates/>
</xsl:template> </xsl:template>
<!-- EM, STRONG, I, B, S, STRIKE, U: speak emphasized. --> <!-- EM, STRONG, I, B, S, STRIKE, U: speak emphasized. -->
<xsl:template match="*[tqcontains('em|strong|i|b|s|strike|EM|STRONG|I|B|S|STRIKE|',concat(local-name(),'|'))]"> <xsl:template match="*[contains('em|strong|i|b|s|strike|EM|STRONG|I|B|S|STRIKE|',concat(local-name(),'|'))]">
<emphasis level="strong"> <emphasis level="strong">
<xsl:apply-templates/> <xsl:apply-templates/>
</emphasis> </emphasis>

2
kttsd/filters/xmltransformer/xmltransformerconf.cpp
Unescape View File

@ -125,7 +125,7 @@ void XmlTransformerConf::save(KConfig* config, const TQString& configGroup){
config->writeEntry( "XsltprocPath", realFilePath( m_widget->xsltprocPath->url() ) ); config->writeEntry( "XsltprocPath", realFilePath( m_widget->xsltprocPath->url() ) );
config->writeEntry( "RootElement", m_widget->rootElementLineEdit->text() ); config->writeEntry( "RootElement", m_widget->rootElementLineEdit->text() );
config->writeEntry( "DocType", m_widget->doctypeLineEdit->text() ); config->writeEntry( "DocType", m_widget->doctypeLineEdit->text() );
config->writeEntry( "AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); config->writeEntry( "AppID", m_widget->appIdLineEdit->text().replace(" ", "") );
} }
/** /**

2
kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
Unescape View File

@ -215,7 +215,7 @@
<cstring>appIdLabel</cstring> <cstring>appIdLabel</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>and Application &amp;ID tqcontains:</string> <string>and Application &amp;ID contains:</string>
</property> </property>
<property name="tqalignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>

4
kttsd/filters/xmltransformer/xmltransformerproc.cpp
Unescape View File

@ -198,7 +198,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
found = false; found = false;
for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
{ {
if ( appIdStr.tqcontains(m_appIdList[ndx]) ) if ( appIdStr.contains(m_appIdList[ndx]) )
{ {
found = true; found = true;
break; break;
@ -227,7 +227,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
// This will change & inside a CDATA section, which is not good, and also within comments and // This will change & inside a CDATA section, which is not good, and also within comments and
// processing instructions, which is OK because we don't speak those anyway. // processing instructions, which is OK because we don't speak those anyway.
TQString text = inputText; TQString text = inputText;
text.tqreplace(TQRegExp("&(?!amp;)"),"&amp;"); text.replace(TQRegExp("&(?!amp;)"),"&amp;");
*wstream << text; *wstream << text;
inFile.close(); inFile.close();
#if KDE_VERSION >= KDE_MAKE_VERSION (3,3,0) #if KDE_VERSION >= KDE_MAKE_VERSION (3,3,0)

4
kttsd/kcmkttsmgr/addtalker.cpp
Unescape View File

@ -46,7 +46,7 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent, const ch
// Default to user's desktop language. // Default to user's desktop language.
TQString languageCode = KGlobal::locale()->defaultLanguage(); TQString languageCode = KGlobal::locale()->defaultLanguage();
// If there is not a synth that supports the locale, try stripping country code. // If there is not a synth that supports the locale, try stripping country code.
if (!m_langToSynthMap.tqcontains(languageCode)) if (!m_langToSynthMap.contains(languageCode))
{ {
TQString countryCode; TQString countryCode;
TQString charSet; TQString charSet;
@ -55,7 +55,7 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent, const ch
languageCode = twoAlpha; languageCode = twoAlpha;
} }
// If there is still not a synth that supports the language code, default to "other". // If there is still not a synth that supports the language code, default to "other".
if (!m_langToSynthMap.tqcontains(languageCode)) languageCode = "other"; if (!m_langToSynthMap.contains(languageCode)) languageCode = "other";
// Select the language in the language combobox. // Select the language in the language combobox.
TQString language = languageCodeToLanguage(languageCode); TQString language = languageCodeToLanguage(languageCode);

22
kttsd/kcmkttsmgr/kcmkttsmgr.cpp
Unescape View File

@ -430,7 +430,7 @@ void KCMKttsMgr::load()
loadNotifyEventsFromFile( locateLocal("config", "kttsd_notifyevents.xml"), true ); loadNotifyEventsFromFile( locateLocal("config", "kttsd_notifyevents.xml"), true );
slotNotifyEnableCheckBox_toggled( m_kttsmgrw->notifyEnableCheckBox->isChecked() ); slotNotifyEnableCheckBox_toggled( m_kttsmgrw->notifyEnableCheckBox->isChecked() );
// Auto-expand and position on the Default item. // Auto-expand and position on the Default item.
TQListViewItem* item = m_kttsmgrw->notifyListView->tqfindItem( "default", nlvcEventSrc ); TQListViewItem* item = m_kttsmgrw->notifyListView->findItem( "default", nlvcEventSrc );
if ( item ) if ( item )
if ( item->childCount() > 0 ) item = item->firstChild(); if ( item->childCount() > 0 ) item = item->firstChild();
if ( item ) m_kttsmgrw->notifyListView->ensureItemVisible( item ); if ( item ) m_kttsmgrw->notifyListView->ensureItemVisible( item );
@ -542,7 +542,7 @@ void KCMKttsMgr::load()
// All plugins support "Other". // All plugins support "Other".
// TODO: Eventually, this should not be necessary, since all plugins will know // TODO: Eventually, this should not be necessary, since all plugins will know
// the languages they support and report them in call to getSupportedLanguages(). // the languages they support and report them in call to getSupportedLanguages().
if (!languageCodes.tqcontains("other")) languageCodes.append("other"); if (!languageCodes.contains("other")) languageCodes.append("other");
// Add supported language codes to synthesizer-to-language map. // Add supported language codes to synthesizer-to-language map.
m_synthToLangMap[synthName] = languageCodes; m_synthToLangMap[synthName] = languageCodes;
@ -822,7 +822,7 @@ void KCMKttsMgr::save()
if (groupName.left(7) == "Talker_") if (groupName.left(7) == "Talker_")
{ {
TQString groupTalkerID = groupName.mid(7); TQString groupTalkerID = groupName.mid(7);
if (!talkerIDsList.tqcontains(groupTalkerID)) m_config->deleteGroup(groupName); if (!talkerIDsList.contains(groupTalkerID)) m_config->deleteGroup(groupName);
} }
} }
@ -862,7 +862,7 @@ void KCMKttsMgr::save()
if (groupName.left(7) == "Filter_") if (groupName.left(7) == "Filter_")
{ {
TQString groupFilterID = groupName.mid(7); TQString groupFilterID = groupName.mid(7);
if (!filterIDsList.tqcontains(groupFilterID)) m_config->deleteGroup(groupName); if (!filterIDsList.contains(groupFilterID)) m_config->deleteGroup(groupName);
} }
} }
@ -1400,7 +1400,7 @@ void KCMKttsMgr::addFilter( bool sbd)
{ {
if (item->text(flvcMultiInstance) == "T") if (item->text(flvcMultiInstance) == "T")
{ {
if (!filterPlugInNames.tqcontains(item->text(flvcPlugInName))) if (!filterPlugInNames.contains(item->text(flvcPlugInName)))
filterPlugInNames.append(item->text(flvcPlugInName)); filterPlugInNames.append(item->text(flvcPlugInName));
} }
item = item->nextSibling(); item = item->nextSibling();
@ -2482,9 +2482,9 @@ void KCMKttsMgr::slotNotifyTestButton_clicked()
break; break;
case NotifyAction::SpeakCustom: case NotifyAction::SpeakCustom:
msg = m_kttsmgrw->notifyMsgLineEdit->text(); msg = m_kttsmgrw->notifyMsgLineEdit->text();
msg.tqreplace("%a", i18n("sample application")); msg.replace("%a", i18n("sample application"));
msg.tqreplace("%e", i18n("sample event")); msg.replace("%e", i18n("sample event"));
msg.tqreplace("%m", i18n("sample notification message")); msg.replace("%m", i18n("sample notification message"));
break; break;
} }
if (!msg.isEmpty()) sayMessage(msg, item->text(nlvcTalker)); if (!msg.isEmpty()) sayMessage(msg, item->text(nlvcTalker));
@ -2543,7 +2543,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem(
TQString talkerName = talkerCode.getTranslatedDescription(); TQString talkerName = talkerCode.getTranslatedDescription();
if (!eventSrcName.isEmpty() && !eventName.isEmpty() && !actionName.isEmpty() && !talkerName.isEmpty()) if (!eventSrcName.isEmpty() && !eventName.isEmpty() && !actionName.isEmpty() && !talkerName.isEmpty())
{ {
TQListViewItem* parentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName); TQListViewItem* parentItem = lv->findItem(eventSrcName, nlvcEventSrcName);
if (!parentItem) if (!parentItem)
{ {
item = lv->lastItem(); item = lv->lastItem();
@ -2557,7 +2557,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem(
parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) );
} }
// No duplicates. // No duplicates.
item = lv->tqfindItem( event, nlvcEvent ); item = lv->findItem( event, nlvcEvent );
if ( !item || item->tqparent() != parentItem ) if ( !item || item->tqparent() != parentItem )
item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName,
eventSrc, event, actionName, talkerCode.getTalkerCode()); eventSrc, event, actionName, talkerCode.getTalkerCode());
@ -2599,7 +2599,7 @@ void KCMKttsMgr::slotNotifyAddButton_clicked()
int action = NotifyAction::DoNotSpeak; int action = NotifyAction::DoNotSpeak;
TQString msg; TQString msg;
TalkerCode talkerCode; TalkerCode talkerCode;
item = lv->tqfindItem( "default", nlvcEventSrc ); item = lv->findItem( "default", nlvcEventSrc );
if ( item ) if ( item )
{ {
if ( item->childCount() > 0 ) item = item->firstChild(); if ( item->childCount() > 0 ) item = item->firstChild();

6
kttsd/kcmkttsmgr/selectevent.cpp
Unescape View File

@ -67,7 +67,7 @@ SelectEvent::SelectEvent(TQWidget* tqparent, const char* name, WFlags fl, const
TQString description = config->readEntry( TQString::tqfromLatin1("Comment"), TQString description = config->readEntry( TQString::tqfromLatin1("Comment"),
i18n("No description available") ); i18n("No description available") );
delete config; delete config;
int index = relativePath.tqfind( '/' ); int index = relativePath.find( '/' );
TQString appname; TQString appname;
if ( index >= 0 ) if ( index >= 0 )
appname = relativePath.left( index ); appname = relativePath.left( index );
@ -136,8 +136,8 @@ TQString SelectEvent::getEvent()
// "/opt/kde3/share/apps/kwin/eventsrc" // "/opt/kde3/share/apps/kwin/eventsrc"
TQString SelectEvent::makeRelative( const TQString& fullPath ) TQString SelectEvent::makeRelative( const TQString& fullPath )
{ {
int slash = fullPath.tqfindRev( '/' ) - 1; int slash = fullPath.findRev( '/' ) - 1;
slash = fullPath.tqfindRev( '/', slash ); slash = fullPath.findRev( '/', slash );
if ( slash < 0 ) if ( slash < 0 )
return TQString(); return TQString();

4
kttsd/kttsd/filtermgr.cpp
Unescape View File

@ -116,8 +116,8 @@ bool FilterMgr::init(KConfig *config, const TQString& /*configGroup*/)
filterProc->init( config, groupName ); filterProc->init( config, groupName );
m_filterList.append( filterProc ); m_filterList.append( filterProc );
} }
if (config->readEntry("DocType").tqcontains("html") || if (config->readEntry("DocType").contains("html") ||
config->readEntry("RootElement").tqcontains("html")) config->readEntry("RootElement").contains("html"))
m_supportsHTML = true; m_supportsHTML = true;
} }
} }

16
kttsd/kttsd/kttsd.cpp
Unescape View File

@ -893,16 +893,16 @@ void KTTSD::notificationSignal( const TQString& event, const TQString& fromApp,
TQString msg; TQString msg;
TQString talker; TQString talker;
// Check for app-specific action. // Check for app-specific action.
if ( m_speechData->notifyAppMap.tqcontains( fromApp ) ) if ( m_speechData->notifyAppMap.contains( fromApp ) )
{ {
NotifyEventMap notifyEventMap = m_speechData->notifyAppMap[ fromApp ]; NotifyEventMap notifyEventMap = m_speechData->notifyAppMap[ fromApp ];
if ( notifyEventMap.tqcontains( event ) ) if ( notifyEventMap.contains( event ) )
{ {
found = true; found = true;
notifyOptions = notifyEventMap[ event ]; notifyOptions = notifyEventMap[ event ];
} else { } else {
// Check for app-specific default. // Check for app-specific default.
if ( notifyEventMap.tqcontains( "default" ) ) if ( notifyEventMap.contains( "default" ) )
{ {
found = true; found = true;
notifyOptions = notifyEventMap[ "default" ]; notifyOptions = notifyEventMap[ "default" ];
@ -965,14 +965,14 @@ void KTTSD::notificationSignal( const TQString& event, const TQString& fromApp,
break; break;
case NotifyAction::SpeakCustom: case NotifyAction::SpeakCustom:
msg = notifyOptions.customMsg; msg = notifyOptions.customMsg;
msg.tqreplace( "%a", fromApp ); msg.replace( "%a", fromApp );
msg.tqreplace( "%m", text ); msg.replace( "%m", text );
if ( msg.tqcontains( "%e" ) ) if ( msg.contains( "%e" ) )
{ {
if ( notifyOptions.eventName.isEmpty() ) if ( notifyOptions.eventName.isEmpty() )
msg.tqreplace( "%e", NotifyEvent::getEventName( fromApp, event ) ); msg.replace( "%e", NotifyEvent::getEventName( fromApp, event ) );
else else
msg.tqreplace( "%e", notifyOptions.eventName ); msg.replace( "%e", notifyOptions.eventName );
} }
break; break;
} }

2
kttsd/kttsd/speaker.cpp
Unescape View File

@ -926,7 +926,7 @@ bool Speaker::isSsml(const TQString &text)
} }
/** /**
* Determines the initial state of an utterance. If the utterance tqcontains * Determines the initial state of an utterance. If the utterance contains
* SSML, the state is set to usWaitingTransform. Otherwise, if the plugin * SSML, the state is set to usWaitingTransform. Otherwise, if the plugin
* supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay. * supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay.
* If an utterance has already been transformed, usWaitingTransform is * If an utterance has already been transformed, usWaitingTransform is

2
kttsd/kttsd/speaker.h
Unescape View File

@ -430,7 +430,7 @@ class Speaker : public TQObject{
bool isSsml(const TQString &text); bool isSsml(const TQString &text);
/** /**
* Determines the initial state of an utterance. If the utterance tqcontains * Determines the initial state of an utterance. If the utterance contains
* SSML, the state is set to usWaitingTransform. Otherwise, if the plugin * SSML, the state is set to usWaitingTransform. Otherwise, if the plugin
* supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay. * supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay.
* If an utterance has already been transformed, usWaitingTransform is * If an utterance has already been transformed, usWaitingTransform is

20
kttsd/kttsd/speechdata.cpp
Unescape View File

@ -423,24 +423,24 @@ TQStringList SpeechData::parseText(const TQString &text, const TQCString &appId
} }
// See if app has specified a custom sentence delimiter and use it, otherwise use default. // See if app has specified a custom sentence delimiter and use it, otherwise use default.
TQRegExp sentenceDelimiter; TQRegExp sentenceDelimiter;
if (sentenceDelimiters.tqfind(appId) != sentenceDelimiters.end()) if (sentenceDelimiters.find(appId) != sentenceDelimiters.end())
sentenceDelimiter = TQRegExp(sentenceDelimiters[appId]); sentenceDelimiter = TQRegExp(sentenceDelimiters[appId]);
else else
sentenceDelimiter = TQRegExp("([\\.\\?\\!\\:\\;]\\s)|(\\n *\\n)"); sentenceDelimiter = TQRegExp("([\\.\\?\\!\\:\\;]\\s)|(\\n *\\n)");
TQString temp = text; TQString temp = text;
// Replace spaces, tabs, and formfeeds with a single space. // Replace spaces, tabs, and formfeeds with a single space.
temp.tqreplace(TQRegExp("[ \\t\\f]+"), " "); temp.replace(TQRegExp("[ \\t\\f]+"), " ");
// Replace sentence delimiters with tab. // Replace sentence delimiters with tab.
temp.tqreplace(sentenceDelimiter, "\\1\t"); temp.replace(sentenceDelimiter, "\\1\t");
// Replace remaining newlines with spaces. // Replace remaining newlines with spaces.
temp.tqreplace("\n"," "); temp.replace("\n"," ");
temp.tqreplace("\r"," "); temp.replace("\r"," ");
// Remove leading spaces. // Remove leading spaces.
temp.tqreplace(TQRegExp("\\t +"), "\t"); temp.replace(TQRegExp("\\t +"), "\t");
// Remove trailing spaces. // Remove trailing spaces.
temp.tqreplace(TQRegExp(" +\\t"), "\t"); temp.replace(TQRegExp(" +\\t"), "\t");
// Remove blank lines. // Remove blank lines.
temp.tqreplace(TQRegExp("\t\t+"),"\t"); temp.replace(TQRegExp("\t\t+"),"\t");
// Split into sentences. // Split into sentences.
TQStringList tempList = TQStringList::split("\t", temp, false); TQStringList tempList = TQStringList::split("\t", temp, false);
@ -1032,7 +1032,7 @@ void SpeechData::moveTextLater(const uint jobNum)
if (job) if (job)
{ {
// Get index of the job. // Get index of the job.
uint index = textJobs.tqfindRef(job); uint index = textJobs.findRef(job);
// Move job down one position in the queue. // Move job down one position in the queue.
// kdDebug() << "In SpeechData::moveTextLater, moving jobNum " << movedJobNum << endl; // kdDebug() << "In SpeechData::moveTextLater, moving jobNum " << movedJobNum << endl;
if (textJobs.insert(index + 2, job)) textJobs.take(index); if (textJobs.insert(index + 2, job)) textJobs.take(index);
@ -1149,7 +1149,7 @@ void SpeechData::startJobFiltering(mlJob* job, const TQString& text, bool noSBD)
// Get TalkerCode structure of closest matching Talker. // Get TalkerCode structure of closest matching Talker.
pooledFilterMgr->talkerCode = m_talkerMgr->talkerToTalkerCode(job->talker); pooledFilterMgr->talkerCode = m_talkerMgr->talkerToTalkerCode(job->talker);
// Pass Sentence Boundary regular expression (if app overrode default); // Pass Sentence Boundary regular expression (if app overrode default);
if (sentenceDelimiters.tqfind(job->appId) != sentenceDelimiters.end()) if (sentenceDelimiters.find(job->appId) != sentenceDelimiters.end())
pooledFilterMgr->filterMgr->setSbRegExp(sentenceDelimiters[job->appId]); pooledFilterMgr->filterMgr->setSbRegExp(sentenceDelimiters[job->appId]);
pooledFilterMgr->filterMgr->asyncConvert(text, pooledFilterMgr->talkerCode, job->appId); pooledFilterMgr->filterMgr->asyncConvert(text, pooledFilterMgr->talkerCode, job->appId);
} }

6
kttsd/kttsd/ssmlconvert.cpp
Unescape View File

@ -66,10 +66,10 @@ void SSMLConvert::setTalkers(const TQStringList &talkers) {
TQString SSMLConvert::extractTalker(const TQString &talkercode) { TQString SSMLConvert::extractTalker(const TQString &talkercode) {
TQString t = talkercode.section("synthesizer=", 1, 1); TQString t = talkercode.section("synthesizer=", 1, 1);
t = t.section('"', 1, 1); t = t.section('"', 1, 1);
if(t.tqcontains("flite")) if(t.contains("flite"))
return "flite"; return "flite";
else else
return t.left(t.tqfind(" ")).lower(); return t.left(t.find(" ")).lower();
} }
/** /**
@ -132,7 +132,7 @@ TQString SSMLConvert::appropriateTalker(const TQString &text) const {
TQString lang = root.attribute("xml:lang"); TQString lang = root.attribute("xml:lang");
kdDebug() << "SSMLConvert::appropriateTalker: xml:lang found (" << lang << ")" << endl; kdDebug() << "SSMLConvert::appropriateTalker: xml:lang found (" << lang << ")" << endl;
/// If it is set to en*, then match all english speakers. They all sound the same anyways. /// If it is set to en*, then match all english speakers. They all sound the same anyways.
if(lang.tqcontains("en-")) { if(lang.contains("en-")) {
kdDebug() << "SSMLConvert::appropriateTalker: English" << endl; kdDebug() << "SSMLConvert::appropriateTalker: English" << endl;
lang = "en"; lang = "en";
} }

8
kttsd/kttsd/talkermgr.cpp
Unescape View File

@ -205,7 +205,7 @@ int TalkerMgr::talkerToPluginIndex(const TQString& talker) const
{ {
// kdDebug() << "TalkerMgr::talkerToPluginIndex: matching talker " << talker << " to closest matching plugin." << endl; // kdDebug() << "TalkerMgr::talkerToPluginIndex: matching talker " << talker << " to closest matching plugin." << endl;
// If we have a cached match, return that. // If we have a cached match, return that.
if (m_talkerToPlugInCache.tqcontains(talker)) if (m_talkerToPlugInCache.contains(talker))
return m_talkerToPlugInCache[talker]; return m_talkerToPlugInCache[talker];
else else
{ {
@ -223,7 +223,7 @@ int TalkerMgr::talkerToPluginIndex(const TQString& talker) const
* If a plugin has not been loaded to match the talker, returns the default * If a plugin has not been loaded to match the talker, returns the default
* plugin. * plugin.
* *
* TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains * TODO: When picking a talker, %KTTSD will automatically determine if text contains
* markup and pick a talker that supports that markup, if available. This * markup and pick a talker that supports that markup, if available. This
* overrides all other attributes, i.e, it is treated as an automatic "top priority" * overrides all other attributes, i.e, it is treated as an automatic "top priority"
* attribute. * attribute.
@ -244,7 +244,7 @@ PlugInProc* TalkerMgr::talkerToPlugin(const TQString& talker) const
* *
* The returned TalkerCode is a copy and should be destroyed by caller. * The returned TalkerCode is a copy and should be destroyed by caller.
* *
* TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains * TODO: When picking a talker, %KTTSD will automatically determine if text contains
* markup and pick a talker that supports that markup, if available. This * markup and pick a talker that supports that markup, if available. This
* overrides all other attributes, i.e, it is treated as an automatic "top priority" * overrides all other attributes, i.e, it is treated as an automatic "top priority"
* attribute. * attribute.
@ -325,7 +325,7 @@ bool TalkerMgr::autoconfigureTalker(const TQString& langCode, KConfig* config)
{ {
// See if this plugin supports the desired language. // See if this plugin supports the desired language.
TQStringList languageCodes = offers[i]->property("X-KDE-Languages").toStringList(); TQStringList languageCodes = offers[i]->property("X-KDE-Languages").toStringList();
if (languageCodes.tqcontains(languageCode)) if (languageCodes.contains(languageCode))
{ {
TQString desktopEntryName = offers[i]->desktopEntryName(); TQString desktopEntryName = offers[i]->desktopEntryName();

2
kttsd/kttsd/talkermgr.h
Unescape View File

@ -95,7 +95,7 @@ public:
* *
* The returned TalkerCode is a copy and should be destroyed by caller. * The returned TalkerCode is a copy and should be destroyed by caller.
* *
* TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains * TODO: When picking a talker, %KTTSD will automatically determine if text contains
* markup and pick a talker that supports that markup, if available. This * markup and pick a talker that supports that markup, if available. This
* overrides all other attributes, i.e, it is treated as an automatic "top priority" * overrides all other attributes, i.e, it is treated as an automatic "top priority"
* attribute. * attribute.

6
kttsd/kttsjobmgr/kttsjobmgr.cpp
Unescape View File

@ -490,7 +490,7 @@ void KttsJobMgrPart::slot_job_change_talker()
{ {
TQString talkerID = item->text(jlvcTalkerID); TQString talkerID = item->text(jlvcTalkerID);
TQStringList talkerIDs = m_talkerCodesToTalkerIDs.values(); TQStringList talkerIDs = m_talkerCodesToTalkerIDs.values();
int ndx = talkerIDs.tqfindIndex(talkerID); int ndx = talkerIDs.findIndex(talkerID);
TQString talkerCode; TQString talkerCode;
if (ndx >= 0) talkerCode = m_talkerCodesToTalkerIDs.keys()[ndx]; if (ndx >= 0) talkerCode = m_talkerCodesToTalkerIDs.keys()[ndx];
SelectTalkerDlg dlg(widget(), "selecttalkerdialog", i18n("Select Talker"), talkerCode, true); SelectTalkerDlg dlg(widget(), "selecttalkerdialog", i18n("Select Talker"), talkerCode, true);
@ -632,7 +632,7 @@ int KttsJobMgrPart::getCurrentJobPartCount()
*/ */
TQListViewItem* KttsJobMgrPart::findItemByJobNum(const uint jobNum) TQListViewItem* KttsJobMgrPart::findItemByJobNum(const uint jobNum)
{ {
return m_jobListView->tqfindItem(TQString::number(jobNum), jlvcJobNum); return m_jobListView->findItem(TQString::number(jobNum), jlvcJobNum);
} }
/** /**
@ -746,7 +746,7 @@ void KttsJobMgrPart::autoSelectInJobListView()
TQString KttsJobMgrPart::cachedTalkerCodeToTalkerID(const TQString& talkerCode) TQString KttsJobMgrPart::cachedTalkerCodeToTalkerID(const TQString& talkerCode)
{ {
// If in the cache, return that. // If in the cache, return that.
if (m_talkerCodesToTalkerIDs.tqcontains(talkerCode)) if (m_talkerCodesToTalkerIDs.contains(talkerCode))
return m_talkerCodesToTalkerIDs[talkerCode]; return m_talkerCodesToTalkerIDs[talkerCode];
else else
{ {

4
kttsd/libkttsd/notify.cpp
Unescape View File

@ -68,7 +68,7 @@ static void notifyaction_init()
/*static*/ int NotifyAction::action( const TQString& actionName ) /*static*/ int NotifyAction::action( const TQString& actionName )
{ {
notifyaction_init(); notifyaction_init();
return s_actionNames->tqfindIndex( actionName ); return s_actionNames->findIndex( actionName );
} }
/*static*/ TQString NotifyAction::actionDisplayName( const int action ) /*static*/ TQString NotifyAction::actionDisplayName( const int action )
@ -126,7 +126,7 @@ static void notifypresent_init()
/*static*/ int NotifyPresent::present( const TQString& presentName ) /*static*/ int NotifyPresent::present( const TQString& presentName )
{ {
notifypresent_init(); notifypresent_init();
return s_presentNames->tqfindIndex( presentName ); return s_presentNames->findIndex( presentName );
} }
/*static*/ TQString NotifyPresent::presentDisplayName( const int present ) /*static*/ TQString NotifyPresent::presentDisplayName( const int present )

2
kttsd/libkttsd/talkercode.cpp
Unescape View File

@ -304,7 +304,7 @@ void TalkerCode::normalize()
void TalkerCode::parseTalkerCode(const TQString &talkerCode) void TalkerCode::parseTalkerCode(const TQString &talkerCode)
{ {
TQString fullLanguageCode; TQString fullLanguageCode;
if (talkerCode.tqcontains("\"")) if (talkerCode.contains("\""))
{ {
fullLanguageCode = talkerCode.section("lang=", 1, 1); fullLanguageCode = talkerCode.section("lang=", 1, 1);
fullLanguageCode = fullLanguageCode.section('"', 1, 1); fullLanguageCode = fullLanguageCode.section('"', 1, 1);

10
kttsd/libkttsd/utils.cpp
Unescape View File

@ -41,7 +41,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
if(doc.startsWith("<?xml")) { if(doc.startsWith("<?xml")) {
// Look for ?> and strip everything off from there to the start - effectively removing // Look for ?> and strip everything off from there to the start - effectively removing
// <?xml...?> // <?xml...?>
int xmlStatementEnd = doc.tqfind("?>"); int xmlStatementEnd = doc.find("?>");
if(xmlStatementEnd == -1) { if(xmlStatementEnd == -1) {
kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n";
return false; return false;
@ -51,7 +51,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
} }
// Take off leading comments, if they exist. // Take off leading comments, if they exist.
while(doc.startsWith("<!--") || doc.startsWith(" <!--")) { while(doc.startsWith("<!--") || doc.startsWith(" <!--")) {
int commentStatementEnd = doc.tqfind("-->"); int commentStatementEnd = doc.find("-->");
if(commentStatementEnd == -1) { if(commentStatementEnd == -1) {
kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n";
return false; return false;
@ -61,7 +61,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
} }
// Take off the doctype statement if it exists. // Take off the doctype statement if it exists.
while(doc.startsWith("<!DOCTYPE") || doc.startsWith(" <!DOCTYPE")) { while(doc.startsWith("<!DOCTYPE") || doc.startsWith(" <!DOCTYPE")) {
int doctypeStatementEnd = doc.tqfind(">"); int doctypeStatementEnd = doc.find(">");
if(doctypeStatementEnd == -1) { if(doctypeStatementEnd == -1) {
kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n";
return false; return false;
@ -88,7 +88,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const
if(doc.startsWith("<?xml")) { if(doc.startsWith("<?xml")) {
// Look for ?> and strip everything off from there to the start - effectively removing // Look for ?> and strip everything off from there to the start - effectively removing
// <?xml...?> // <?xml...?>
int xmlStatementEnd = doc.tqfind("?>"); int xmlStatementEnd = doc.find("?>");
if(xmlStatementEnd == -1) { if(xmlStatementEnd == -1) {
kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n";
return false; return false;
@ -99,7 +99,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const
} }
// Take off leading comments, if they exist. // Take off leading comments, if they exist.
while(doc.startsWith("<!--")) { while(doc.startsWith("<!--")) {
int commentStatementEnd = doc.tqfind("-->"); int commentStatementEnd = doc.find("-->");
if(commentStatementEnd == -1) { if(commentStatementEnd == -1) {
kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n";
return false; return false;

2
kttsd/plugins/command/commandconf.cpp
Unescape View File

@ -121,7 +121,7 @@ TQString CommandConf::getTalkerCode()
{ {
// Must contain either text or file parameter, or StdIn checkbox must be checked, // Must contain either text or file parameter, or StdIn checkbox must be checked,
// otherwise, does nothing! // otherwise, does nothing!
if ((url.tqcontains("%t") > 0) || (url.tqcontains("%f") > 0) || m_widget->stdInButton->isChecked()) if ((url.contains("%t") > 0) || (url.contains("%f") > 0) || m_widget->stdInButton->isChecked())
{ {
return TQString( return TQString(
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"

28
kttsd/plugins/command/commandproc.cpp
Unescape View File

@ -72,8 +72,8 @@ bool CommandProc::init(KConfig *config, const TQString &configGroup){
m_stdin = config->readBoolEntry("StdIn", true); m_stdin = config->readBoolEntry("StdIn", true);
m_language = config->readEntry("LanguageCode", "en"); m_language = config->readEntry("LanguageCode", "en");
// Support separate synthesis if the TTS command tqcontains %w macro. // Support separate synthesis if the TTS command contains %w macro.
m_supportsSynth = (m_ttsCommand.tqcontains("%w")); m_supportsSynth = (m_ttsCommand.contains("%w"));
TQString codecString = config->readEntry("Codec", "Local"); TQString codecString = config->readEntry("Codec", "Local");
m_codec = codecNameToCodec(codecString); m_codec = codecNameToCodec(codecString);
@ -147,7 +147,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
TQString escText = KShellProcess::quote(text); TQString escText = KShellProcess::quote(text);
// 1.c) create a temporary file for the text, if %f macro is used. // 1.c) create a temporary file for the text, if %f macro is used.
if (command.tqcontains("%f")) if (command.contains("%f"))
{ {
KTempFile tempFile(locateLocal("tmp", "commandplugin-"), ".txt"); KTempFile tempFile(locateLocal("tmp", "commandplugin-"), ".txt");
TQTextStream* fs = tempFile.textStream(); TQTextStream* fs = tempFile.textStream();
@ -162,7 +162,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
TQValueStack<bool> stack; TQValueStack<bool> stack;
bool issinglequote=false; bool issinglequote=false;
bool isdoublequote=false; bool isdoublequote=false;
int notqreplace=0; int noreplace=0;
TQRegExp re_noquote("(\"|'|\\\\|`|\\$\\(|\\$\\{|\\(|\\{|\\)|\\}|%%|%t|%f|%l|%w)"); TQRegExp re_noquote("(\"|'|\\\\|`|\\$\\(|\\$\\{|\\(|\\{|\\)|\\}|%%|%t|%f|%l|%w)");
TQRegExp re_singlequote("('|%%|%t|%f|%l|%w)"); TQRegExp re_singlequote("('|%%|%t|%f|%l|%w)");
TQRegExp re_doublequote("(\"|\\\\|`|\\$\\(|\\$\\{|%%|%t|%f|%l|%w)"); TQRegExp re_doublequote("(\"|\\\\|`|\\$\\(|\\$\\{|%%|%t|%f|%l|%w)");
@ -178,18 +178,18 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
{ {
// assert(isdoublequote == false) // assert(isdoublequote == false)
stack.push(isdoublequote); stack.push(isdoublequote);
if (notqreplace > 0) if (noreplace > 0)
// count nested braces when within ${...} // count nested braces when within ${...}
notqreplace++; noreplace++;
i++; i++;
} }
else if (command[i]=='$') else if (command[i]=='$')
{ {
stack.push(isdoublequote); stack.push(isdoublequote);
isdoublequote = false; isdoublequote = false;
if ((notqreplace > 0) || (command[i+1]=='{')) if ((noreplace > 0) || (command[i+1]=='{'))
// count nested braces when within ${...} // count nested braces when within ${...}
notqreplace++; noreplace++;
i+=2; i+=2;
} }
else if ((command[i]==')') || (command[i]=='}')) else if ((command[i]==')') || (command[i]=='}'))
@ -199,9 +199,9 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
isdoublequote = stack.pop(); isdoublequote = stack.pop();
else else
qWarning("Parse error."); qWarning("Parse error.");
if (notqreplace > 0) if (noreplace > 0)
// count nested braces when within ${...} // count nested braces when within ${...}
notqreplace--; noreplace--;
i++; i++;
} }
else if (command[i]=='\'') else if (command[i]=='\'')
@ -219,7 +219,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
else if (command[i]=='`') else if (command[i]=='`')
{ {
// Replace all `...` with safer $(...) // Replace all `...` with safer $(...)
command.tqreplace (i, 1, "$("); command.replace (i, 1, "$(");
TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)");
for ( int i2=re_backticks.search(command,i+2); for ( int i2=re_backticks.search(command,i+2);
i2!=-1; i2!=-1;
@ -228,7 +228,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
{ {
if (command[i2] == '`') if (command[i2] == '`')
{ {
command.tqreplace (i2, 1, ")"); command.replace (i2, 1, ")");
i2=command.length(); // leave loop i2=command.length(); // leave loop
} }
else else
@ -239,7 +239,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
} }
// Leave i unchanged! We need to process "$(" // Leave i unchanged! We need to process "$("
} }
else if (notqreplace == 0) // do not replace macros within ${...} else if (noreplace == 0) // do not replace macros within ${...}
{ {
TQString match, v; TQString match, v;
@ -269,7 +269,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
else if (issinglequote) else if (issinglequote)
v="'"+v+"'"; v="'"+v+"'";
command.tqreplace (i, match.length(), v); command.replace (i, match.length(), v);
i+=v.length(); i+=v.length();
} }
else else

22
kttsd/plugins/festivalint/festivalintproc.cpp
Unescape View File

@ -257,7 +257,7 @@ void FestivalIntProc::synth(
// If we just started Festival, or rate changed, tell festival. // If we just started Festival, or rate changed, tell festival.
if (m_runningTime != time) { if (m_runningTime != time) {
TQString timeMsg; TQString timeMsg;
if (voiceCode.tqcontains("_hts") > 0) if (voiceCode.contains("_hts") > 0)
{ {
// Map 50% to 200% onto 0 to 1000. // Map 50% to 200% onto 0 to 1000.
// slider = alpha * (log(percent)-log(50)) // slider = alpha * (log(percent)-log(50))
@ -304,14 +304,14 @@ void FestivalIntProc::synth(
int len = saidText.length(); int len = saidText.length();
while (len > c_tooLong) while (len > c_tooLong)
{ {
len = saidText.tqfindRev(", ", len - (c_tooLong * 2 / 3), true); len = saidText.findRev(", ", len - (c_tooLong * 2 / 3), true);
if (len != -1) if (len != -1)
{ {
TQString c = saidText.mid(len+2, 1); TQString c = saidText.mid(len+2, 1);
if (c != c.upper()) if (c != c.upper())
{ {
saidText.tqreplace(len, 2, ". "); saidText.replace(len, 2, ". ");
saidText.tqreplace(len+2, 1, c.upper()); saidText.replace(len+2, 1, c.upper());
kdDebug() << "FestivalIntProc::synth: Splitting long sentence at " << len << endl; kdDebug() << "FestivalIntProc::synth: Splitting long sentence at " << len << endl;
// kdDebug() << saidText << endl; // kdDebug() << saidText << endl;
} }
@ -319,11 +319,11 @@ void FestivalIntProc::synth(
} }
// Encode quotation characters. // Encode quotation characters.
saidText.tqreplace("\\\"", "#!#!"); saidText.replace("\\\"", "#!#!");
saidText.tqreplace("\"", "\\\""); saidText.replace("\"", "\\\"");
saidText.tqreplace("#!#!", "\\\""); saidText.replace("#!#!", "\\\"");
// Remove certain comment characters. // Remove certain comment characters.
saidText.tqreplace("--", ""); saidText.replace("--", "");
// Ok, let's rock. // Ok, let's rock.
if (synthFilename.isNull()) if (synthFilename.isNull())
@ -502,7 +502,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
{ {
TQString buf = TQString::tqfromLatin1(buffer, buflen); TQString buf = TQString::tqfromLatin1(buffer, buflen);
// kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl; // kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl;
bool promptSeen = (buf.tqcontains("festival>") > 0); bool promptSeen = (buf.contains("festival>") > 0);
bool emitQueryVoicesFinished = false; bool emitQueryVoicesFinished = false;
TQStringList voiceCodesList; TQStringList voiceCodesList;
if (m_waitingQueryVoices && m_outputQueue.isEmpty()) if (m_waitingQueryVoices && m_outputQueue.isEmpty())
@ -515,7 +515,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
} else { } else {
if (buf.left(1) == "(") if (buf.left(1) == "(")
{ {
int rightParen = buf.tqfind(')'); int rightParen = buf.find(')');
if (rightParen > 0) if (rightParen > 0)
{ {
m_waitingQueryVoices = false; m_waitingQueryVoices = false;
@ -562,7 +562,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
if (emitQueryVoicesFinished) if (emitQueryVoicesFinished)
{ {
// kdDebug() << "FestivalIntProc::slotReceivedStdout: emitting queryVoicesFinished" << endl; // kdDebug() << "FestivalIntProc::slotReceivedStdout: emitting queryVoicesFinished" << endl;
m_supportsSSML = (voiceCodesList.tqcontains("rab_diphone")) ? ssYes : ssNo; m_supportsSSML = (voiceCodesList.contains("rab_diphone")) ? ssYes : ssNo;
emit queryVoicesFinished(voiceCodesList); emit queryVoicesFinished(voiceCodesList);
} }
} }

8
kttsd/plugins/flite/fliteproc.cpp
Unescape View File

@ -129,11 +129,11 @@ void FliteProc::synth(
// Encode quotation characters. // Encode quotation characters.
TQString saidText = text; TQString saidText = text;
/* /*
saidText.tqreplace("\\\"", "#!#!"); saidText.replace("\\\"", "#!#!");
saidText.tqreplace("\"", "\\\""); saidText.replace("\"", "\\\"");
saidText.tqreplace("#!#!", "\\\""); saidText.replace("#!#!", "\\\"");
// Remove certain comment characters. // Remove certain comment characters.
saidText.tqreplace("--", ""); saidText.replace("--", "");
saidText = "\"" + saidText + "\""; saidText = "\"" + saidText + "\"";
*/ */
saidText += "\n"; saidText += "\n";

2
kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl
Unescape View File

@ -113,7 +113,7 @@
</xsl:variable> </xsl:variable>
<!-- Look for first period and space and extract corresponding substring from original. --> <!-- Look for first period and space and extract corresponding substring from original. -->
<xsl:choose> <xsl:choose>
<xsl:when test="tqcontains($tmp, '. ')"> <xsl:when test="contains($tmp, '. ')">
<xsl:value-of select="substring($paragraph, 1, string-length(substring-before($tmp, '. '))+2)"/> <xsl:value-of select="substring($paragraph, 1, string-length(substring-before($tmp, '. '))+2)"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>

8
kttsd/plugins/hadifix/hadifixconfigui.ui.h
Unescape View File

@ -53,14 +53,14 @@ void HadifixConfigUI::init () {
void HadifixConfigUI::addVoice (const TQString &filename, bool isMale) { void HadifixConfigUI::addVoice (const TQString &filename, bool isMale) {
if (isMale) { if (isMale) {
if (!maleVoices.tqcontains(filename)) { if (!maleVoices.contains(filename)) {
int id = voiceCombo->count(); int id = voiceCombo->count();
maleVoices.insert (filename, id); maleVoices.insert (filename, id);
voiceCombo->insertItem (male, filename, id); voiceCombo->insertItem (male, filename, id);
} }
} }
else { else {
if (!femaleVoices.tqcontains(filename)) { if (!femaleVoices.contains(filename)) {
int id = voiceCombo->count(); int id = voiceCombo->count();
femaleVoices.insert (filename, id); femaleVoices.insert (filename, id);
voiceCombo->insertItem (female, filename, id); voiceCombo->insertItem (female, filename, id);
@ -93,7 +93,7 @@ TQString HadifixConfigUI::getVoiceFilename() {
int curr = voiceCombo->currentItem(); int curr = voiceCombo->currentItem();
TQString filename = voiceCombo->text(curr); TQString filename = voiceCombo->text(curr);
if (defaultVoices.tqcontains(curr)) if (defaultVoices.contains(curr))
filename = defaultVoices[curr]; filename = defaultVoices[curr];
return filename; return filename;
@ -103,7 +103,7 @@ bool HadifixConfigUI::isMaleVoice() {
int curr = voiceCombo->currentItem(); int curr = voiceCombo->currentItem();
TQString filename = getVoiceFilename(); TQString filename = getVoiceFilename();
if (maleVoices.tqcontains(filename)) if (maleVoices.contains(filename))
return maleVoices[filename] == curr; return maleVoices[filename] == curr;
else else
return false; return false;

4
kttsd/plugins/hadifix/hadifixproc.cpp
Unescape View File

@ -377,9 +377,9 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
else { else {
if (output != 0) if (output != 0)
*output = speech.stdOut; *output = speech.stdOut;
if (speech.stdOut.tqcontains("female", false)) if (speech.stdOut.contains("female", false))
result = FemaleGender; result = FemaleGender;
else if (speech.stdOut.tqcontains("male", false)) else if (speech.stdOut.contains("male", false))
result = MaleGender; result = MaleGender;
else else
result = NoGender; result = NoGender;

2
kttsd/plugins/hadifix/initialconfig.h
Unescape View File

@ -100,7 +100,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) {
// 2b) search near the hadifix data path // 2b) search near the hadifix data path
info.setFile(hadifixDataPath + "../../mbrola"); info.setFile(hadifixDataPath + "../../mbrola");
TQString mbrolaPath = info.dirPath (true) + "/mbrola"; TQString mbrolaPath = info.dirPath (true) + "/mbrola";
if (!list.tqcontains(mbrolaPath)) if (!list.contains(mbrolaPath))
list += mbrolaPath; list += mbrolaPath;
// 2c) broaden the search by adding subdirs (with a depth of 2) // 2c) broaden the search by adding subdirs (with a depth of 2)

Write Preview
Loading…
Cancel
Save