rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

8 files changed, 20 insertions, 20 deletions

diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 01a19461..e0bf399d 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -176,7 +176,7 @@ void FormatDialog::check_subformat( const TQString & format )
 
 void FormatDialog::setSelectedFormat( TQString fo )
 {
-   TQListBoxItem *item = lb_format->tqfindItem( fo );
+   TQListBoxItem *item = lb_format->findItem( fo );
 
    if( item )
    {
@@ -728,7 +728,7 @@ TQString ImgSaver::extension( const KURL& url )
 {
    TQString extension = url.fileName();
 
-   int dotPos = extension.tqfindRev( '.' );
+   int dotPos = extension.findRev( '.' );
    if( dotPos > 0 )
    {
       int len = extension.length();
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 94faa083..5205f1b1 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -56,7 +56,7 @@ void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& re
    kdDebug(28000) << "ImageNameCombo: Removing " << path << endl;
    TQString select = currentText();
    
-   if( items.tqcontains( path ))
+   if( items.contains( path ))
    {
       kdDebug(28000) << "ImageNameCombo: Item exists-> deleting" << endl;
       items.remove( path );
@@ -74,7 +74,7 @@ void ImageNameCombo::rewriteList( KFileTreeBranch *branch, const TQString& selTe
       insertItem( branch->pixmap(), *it );
    }
 
-   int index = items.tqfindIndex( selText );
+   int index = items.findIndex( selText );
    setCurrentItem( index );
 }
 
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 97d8310f..99f86a4f 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -163,7 +163,7 @@ EngineError KadmosDialog::findClassifiers()
         if( name.startsWith( "ttf" ) )
         {
             TQString lang = name.mid(3,2);
-            if( allCountries.tqcontains(lang) )
+            if( allCountries.contains(lang) )
             {
                 TQString lngCountry = locale->twoAlphaToCountryName(lang);
                 if( lngCountry.isEmpty() )
@@ -188,7 +188,7 @@ EngineError KadmosDialog::findClassifiers()
         else if( name.startsWith( "hand" ) )
         {
             TQString lang = name.mid(4,2);
-            if( allCountries.tqcontains(lang) )
+            if( allCountries.contains(lang) )
             {
                 TQString lngCountry = locale->twoAlphaToCountryName(lang);
                 if( lngCountry.isEmpty() )
@@ -461,7 +461,7 @@ TQString KadmosDialog::getSelClassifierName() const
      /* Get the long text from the combo box */
      TQString selLang = m_cbLang->currentText();
      TQString trans;
-     if( fType != "norm" && m_longCountry2short.tqcontains( selLang ))
+     if( fType != "norm" && m_longCountry2short.contains( selLang ))
      {
          TQString langType = m_longCountry2short[selLang];
          trans = fType+langType+".rec";
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index b453045a..49271414 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -207,7 +207,7 @@ TQString KookaPreferences::tryFindBinary( const TQString& bin, const TQString& c
     if( res != "notFound" )
     {
         TQFileInfo fi( res );
-        if( fi.exists() && fi.isExecutable() && !fi.isDir() && res.tqcontains(bin) )
+        if( fi.exists() && fi.isExecutable() && !fi.isDir() && res.contains(bin) )
         {
             return res;
         }
@@ -272,7 +272,7 @@ void KookaPreferences::checkOCRBinarySilent( const TQString& cmd )
 #endif
 bool KookaPreferences::checkOCRBinIntern( const TQString& cmd, const TQString& tool, bool show_msg )
 {
-   if( ! cmd.tqcontains( tool )) return false;
+   if( ! cmd.contains( tool )) return false;
 
    bool ret = true;
    TQFileInfo fi( cmd );
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 54d37244..83ef30da 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -890,7 +890,7 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr )
 			{
 			    /* Read one line per character */
 			    TQString charLine = stream.readLine();
-			    int semiPos = charLine.tqfind(';');
+			    int semiPos = charLine.find(';');
 			    if( semiPos == -1 )
 			    {
 				kdDebug(28000) << "invalid line: " << charLine << endl;
@@ -906,7 +906,7 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr )
 
                                 // find the amount of alternatives.
                                 int altCount = 0;
-                                int h = results.tqfind(',');  // search the first comma
+                                int h = results.find(',');  // search the first comma
                                 if( h > -1 ) {
                                     // kdDebug(28000) << "Results of count search: " << results.left(h) << endl;
                                     altCount = results.left(h).toInt();
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index 8465d09c..26785b4c 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -75,11 +75,11 @@ void ocrResEdit::slSelectWord( int line, const ocrWord& word )
    if( line < paragraphs() )
    {
       TQString editLine = text(line);
-      int cnt = editLine.tqcontains( word);
+      int cnt = editLine.contains( word);
 
       if( cnt > 0 )
       {
-	 int pos = editLine.tqfind(word);
+	 int pos = editLine.find(word);
 	 setCursorPosition( line, pos );
 	 setSelection( line, pos, line, pos + word.length());
       }
@@ -96,11 +96,11 @@ void ocrResEdit::slReplaceWord( int line, const TQString& wordFrom,
     if( line < paragraphs() )
     {
         TQString editLine = text(line);
-        int cnt = editLine.tqcontains( wordFrom );
+        int cnt = editLine.contains( wordFrom );
 
         if( cnt > 0 )
         {
-            int pos = editLine.tqfind(wordFrom);
+            int pos = editLine.find(wordFrom);
             setSelection( line, pos, line, pos+wordFrom.length());
 
             TQColor saveCol = this->color();
diff --git a/kooka/ocrword.cpp b/kooka/ocrword.cpp
index 2260e770..92993bfd 100644
--- a/kooka/ocrword.cpp
+++ b/kooka/ocrword.cpp
@@ -76,7 +76,7 @@ TQStringList ocrWordList::stringList()
          * decided. Solution:  KSpell should treat dash-linked words correctly.
          * We live with the problem here that dashes bring confusion ;-)
          */
-        if( (*it).tqcontains( rx ) )
+        if( (*it).contains( rx ) )
             res += TQStringList::split( rx, (*it) );
         else
 #endif
@@ -95,9 +95,9 @@ bool ocrWordList::updateOCRWord( const TQString& from, const TQString& to )
     {
         TQString word = (*it);
         kdDebug(28000) <<  "updateOCRWord in list: Comparing word " << word << endl;
-        if( word.tqcontains( from, true ) ) // case sensitive search
+        if( word.contains( from, true ) ) // case sensitive search
         {
-            word.tqreplace( from, to );
+            word.replace( from, to );
             *it = ocrWord( word );
             res = true;
             break;
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 230acae1..fbda481f 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -420,7 +420,7 @@ TQString ScanPackager::itemDirectory( const KFileTreeViewItem* item, bool relati
    if( ! item->isDir() )
    {
       // Cut off the filename in case it is not a dir
-      relativUrl.truncate( relativUrl.tqfindRev( '/' )+1);
+      relativUrl.truncate( relativUrl.findRev( '/' )+1);
    }
    else
    {
@@ -464,7 +464,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString )
    kdDebug(28000) << "Trying to decode directory string " << dirString << endl;
 
    TQString searchFor = TQString::tqfromLatin1(" - ");
-   int pos = dirString.tqfind( searchFor );
+   int pos = dirString.find( searchFor );
 
    if( pos > -1 )
    {