rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 50 insertions, 50 deletions

diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index 015bed0..f33d771 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -123,9 +123,9 @@ int main(int argc, char *argv[])
                         TalkerCode* talkerCode = new TalkerCode( talker );
                         text = plugIn->convert( text, talkerCode, appId );
                         if ( args->isSet("break") ) 
-                            text.tqreplace( "\t", "\\t" );
+                            text.replace( "\t", "\\t" );
                         else
-                            text.tqreplace( "\t", "" );
+                            text.replace( "\t", "" );
                         cout << text.latin1() << endl;
                         delete config;
                         delete plugIn;
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 6beaba3..be6a244 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -156,7 +156,7 @@ void SbdConf::save(KConfig* config, const TQString& configGroup){
     config->writeEntry("SentenceDelimiterRegExp", m_widget->reLineEdit->text() );
     config->writeEntry("SentenceBoundary", m_widget->sbLineEdit->text() );
     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 +=
             " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
         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.
     langLView->setSorting(0);
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index 5c2662b..e7158dc 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -197,7 +197,7 @@
                                 <cstring>appIdLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>Application &amp;ID tqcontains:</string>
+                                <string>Application &amp;ID contains:</string>
                             </property>
                             <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp
index 6b0a1a4..d7e274c 100644
--- a/kttsd/filters/sbd/sbdproc.cpp
+++ b/kttsd/filters/sbd/sbdproc.cpp
@@ -277,8 +277,8 @@ TQString SbdThread::makeSentence( const TQString& text )
     if ( !e.isEmpty() ) s += e;
     // Escape ampersands and less thans.
     TQString newText = text;
-    newText.tqreplace(TQRegExp("&(?!amp;)"), "&amp;");
-    newText.tqreplace(TQRegExp("<(?!lt;)"), "&lt;");
+    newText.replace(TQRegExp("&(?!amp;)"), "&amp;");
+    newText.replace(TQRegExp("<(?!lt;)"), "&lt;");
     s += newText;
     if ( !e.isEmpty() ) s += "</emphasis>";
     if ( !p.isEmpty() ) s += "</prosody>";
@@ -351,7 +351,7 @@ TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re )
         case TQDomNode::TextNode: {                  // = 3
             TQString s = parsePlainText( n.toText().data(), re );
             // TQString d = s;
-            // d.tqreplace("\t", "\\t");
+            // d.replace("\t", "\\t");
             // kdDebug() << "SbdThread::parseSsmlNode: parsedPlainText = [" << d << "]" << endl;
             TQStringList sentenceList = TQStringList::split( '\t', s, false );
             int lastNdx = sentenceList.count() - 1;
@@ -457,13 +457,13 @@ TQString SbdThread::parseCode( const TQString& inputText )
 {
     TQString temp = inputText;
     // Replace newlines with tabs.
-    temp.tqreplace("\n","\t");
+    temp.replace("\n","\t");
     // Remove leading spaces.
-    temp.tqreplace(TQRegExp("\\t +"), "\t");
+    temp.replace(TQRegExp("\\t +"), "\t");
     // Remove trailing spaces.
-    temp.tqreplace(TQRegExp(" +\\t"), "\t");
+    temp.replace(TQRegExp(" +\\t"), "\t");
     // Remove blank lines.
-    temp.tqreplace(TQRegExp("\t\t+"),"\t");
+    temp.replace(TQRegExp("\t\t+"),"\t");
     return temp;
 }
 
@@ -474,16 +474,16 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r
     TQRegExp sentenceDelimiter = TQRegExp( re );
     TQString temp = inputText;
     // Replace sentence delimiters with tab.
-    temp.tqreplace(sentenceDelimiter, m_configuredSentenceBoundary);
+    temp.replace(sentenceDelimiter, m_configuredSentenceBoundary);
     // Replace remaining newlines with spaces.
-    temp.tqreplace("\n"," ");
-    temp.tqreplace("\r"," ");
+    temp.replace("\n"," ");
+    temp.replace("\r"," ");
     // Remove leading spaces.
-    temp.tqreplace(TQRegExp("\\t +"), "\t");
+    temp.replace(TQRegExp("\\t +"), "\t");
     // Remove trailing spaces.
-    temp.tqreplace(TQRegExp(" +\\t"), "\t");
+    temp.replace(TQRegExp(" +\\t"), "\t");
     // Remove blank lines.
-    temp.tqreplace(TQRegExp("\t\t+"),"\t");
+    temp.replace(TQRegExp("\t\t+"),"\t");
     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.
         TQString p = m_text.left( 500 );
-        if ( p.tqcontains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) )
+        if ( p.contains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) )
             textType = ttCode;
         else
             textType = ttPlain;
@@ -515,7 +515,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r
     if ( re.isEmpty() ) re = m_configuredRe;
 
     // 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.
     switch ( textType )
@@ -603,7 +603,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){
     m_configuredRe = config->readEntry( "SentenceDelimiterRegExp", "([\\.\\?\\!\\:\\;])(\\s|$|(\\n *\\n))" );
     m_sbdThread->setConfiguredSbRegExp( m_configuredRe );
     TQString sb = config->readEntry( "SentenceBoundary", "\\1\t" );
-    sb.tqreplace( "\\t", "\t" );
+    sb.replace( "\\t", "\t" );
     m_sbdThread->setConfiguredSentenceBoundary( sb );
     m_appIdList = config->readListEntry( "AppID" );
     m_languageCodeList = config->readListEntry( "LanguageCodes" );
@@ -672,14 +672,14 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){
         TQString languageCode = talkerCode->languageCode();
         // kdDebug() << "StringReplacerProc::convert: converting " << inputText << 
         // " if language code " << languageCode << " matches " << m_languageCodeList << endl;
-        if ( !m_languageCodeList.tqcontains( languageCode ) )
+        if ( !m_languageCodeList.contains( languageCode ) )
         {
             if ( !talkerCode->countryCode().isEmpty() )
             {
                 languageCode += '_' + talkerCode->countryCode();
                 // kdDebug() << "StringReplacerProc::convert: converting " << inputText << 
                 // " 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;
         }
     }
@@ -692,7 +692,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){
         TQString appIdStr = appId;
         for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
         {
-            if ( appIdStr.tqcontains(m_appIdList[ndx]) )
+            if ( appIdStr.contains(m_appIdList[ndx]) )
             {
                 found = true;
                 break;
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index 8bce00d..7954b13 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -308,7 +308,7 @@ TQString StringReplacerConf::saveToFile(const TQString& filename)
     }
 
     // Application ID
-    TQString appId = m_widget->appIdLineEdit->text().tqreplace(" ", "");
+    TQString appId = m_widget->appIdLineEdit->text().replace(" ", "");
     if ( !appId.isEmpty() )
     {
         TQStringList appIdList = TQStringList::split(",", appId);
@@ -442,7 +442,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
         if (!countryCode.isEmpty()) language +=
             " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
         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.
     langLView->setSorting(0);
@@ -488,11 +488,11 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
     if (m_languageCodeList.count() > 1) language = i18n("Multiple Languages");
     if ( !s1.isEmpty() )
     {
-        s2.tqreplace( s1, language );
-        s2.tqreplace( i18n("Multiple Languages"), language );
+        s2.replace( s1, language );
+        s2.replace( i18n("Multiple Languages"), language );
     }
-    s2.tqreplace(" ()", "");
-    if ( !s2.tqcontains("(") && !language.isEmpty() ) s2 += " (" + language + ")";
+    s2.replace(" ()", "");
+    if ( !s2.contains("(") && !language.isEmpty() ) s2 += " (" + language + ")";
     m_widget->nameLineEdit->setText(s2);
     configChanged();
 }
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index 8d8f193..73c5954 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -102,7 +102,7 @@
                                 <cstring>appIdLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>Application &amp;ID tqcontains:</string>
+                                <string>Application &amp;ID contains:</string>
                             </property>
                             <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp
index 4cee1e7..3715654 100644
--- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp
@@ -180,14 +180,14 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
         TQString languageCode = talkerCode->languageCode();
         // kdDebug() << "StringReplacerProc::convert: converting " << inputText << 
         //    " if language code " << languageCode << " matches " << m_languageCodeList << endl;
-        if ( !m_languageCodeList.tqcontains( languageCode ) )
+        if ( !m_languageCodeList.contains( languageCode ) )
         {
             if ( !talkerCode->countryCode().isEmpty() )
             {
                 languageCode += '_' + talkerCode->countryCode();
                 // kdDebug() << "StringReplacerProc::convert: converting " << inputText << 
                 //    " 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;
         }
     }
@@ -200,7 +200,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
         TQString appIdStr = appId;
         for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
         {
-            if ( appIdStr.tqcontains(m_appIdList[ndx]) )
+            if ( appIdStr.contains(m_appIdList[ndx]) )
             {
                 found = true;
                 break;
@@ -217,7 +217,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
     for ( int index = 0; index < listCount; ++index )
     {
         //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;
     return newText;
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index b351df9..cbdbfb2 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -147,7 +147,7 @@ void TalkerChooserConf::save(KConfig* config, const TQString& configGroup){
     config->setGroup( configGroup );
     config->writeEntry( "UserFilterName", m_widget->nameLineEdit->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());
 }
 
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index 5401b72..1969489 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -84,7 +84,7 @@
                                 <cstring>reLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>Te&amp;xt tqcontains:</string>
+                                <string>Te&amp;xt contains:</string>
                             </property>
                             <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
@@ -102,7 +102,7 @@
                                 <cstring>appIdLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>Application &amp;ID tqcontains:</string>
+                                <string>Application &amp;ID contains:</string>
                             </property>
                             <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp
index 8d4aeb0..30ef605 100644
--- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp
@@ -107,7 +107,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){
 {
     if ( !m_re.isEmpty() )
     {
-        int pos = inputText.tqfind( TQRegExp(m_re) );
+        int pos = inputText.find( TQRegExp(m_re) );
         if ( pos < 0 ) return inputText;
     }
     // If appId doesn't match, return input unmolested.
@@ -119,7 +119,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){
         TQString appIdStr = appId;
         for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
         {
-            if ( appIdStr.tqcontains(m_appIdList[ndx]) )
+            if ( appIdStr.contains(m_appIdList[ndx]) )
             {
                 found = true;
                 break;
diff --git a/kttsd/filters/xhtml2ssml/Doxyfile b/kttsd/filters/xhtml2ssml/Doxyfile
index 6313df1..e3ad878 100644
--- a/kttsd/filters/xhtml2ssml/Doxyfile
+++ b/kttsd/filters/xhtml2ssml/Doxyfile
@@ -17,7 +17,7 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          is \
                          provides \
                          specifies \
-                         tqcontains \
+                         contains \
                          represents \
                          a \
                          an \
diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp b/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp
index 916ec48..2c065e0 100644
--- a/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp
+++ b/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp
@@ -97,7 +97,7 @@ bool XHTMLToSSMLParser::readFileConfigEntry(const TQString &line) {
     // break into TQStringList
     // the second parameter to split is the string, with all space simplified and all space around the : removed, i.e
     //  "something     :      somethingelse"   ->  "something:somethingelse"
-    TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().tqreplace(" :", ":").tqreplace(": ", ":"));
+    TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().replace(" :", ":").replace(": ", ":"));
     if(keyvalue.count() != 2)
         return false;
     m_xhtml2ssml[keyvalue[0]] = keyvalue[1];
diff --git a/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl b/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl
index f289252..2c1f3be 100644
--- a/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl
+++ b/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl
@@ -52,22 +52,22 @@
 </xsl:template>
 
 <!--  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:template>
 
 <!-- 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:template>
 
 <!-- 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:template>
 
 <!-- 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">
         <xsl:apply-templates/>
     </emphasis>
diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
index dd4bb54..8247a01 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
@@ -125,7 +125,7 @@ void XmlTransformerConf::save(KConfig* config, const TQString& configGroup){
     config->writeEntry( "XsltprocPath", realFilePath( m_widget->xsltprocPath->url() ) );
     config->writeEntry( "RootElement", m_widget->rootElementLineEdit->text() );
     config->writeEntry( "DocType", m_widget->doctypeLineEdit->text() );
-    config->writeEntry( "AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") );
+    config->writeEntry( "AppID", m_widget->appIdLineEdit->text().replace(" ", "") );
 }
 
 /** 
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index c011b80..63a83c3 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -215,7 +215,7 @@
                                 <cstring>appIdLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>and Application &amp;ID tqcontains:</string>
+                                <string>and Application &amp;ID contains:</string>
                             </property>
                             <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index f9fc2e6..27c4cd4 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -198,7 +198,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
         found = false;
         for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
         {
-            if ( appIdStr.tqcontains(m_appIdList[ndx]) )
+            if ( appIdStr.contains(m_appIdList[ndx]) )
             {
                 found = true;
                 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
     // processing instructions, which is OK because we don't speak those anyway.
     TQString text = inputText;
-    text.tqreplace(TQRegExp("&(?!amp;)"),"&amp;");
+    text.replace(TQRegExp("&(?!amp;)"),"&amp;");
     *wstream << text;
     inFile.close();
 #if KDE_VERSION >= KDE_MAKE_VERSION (3,3,0)