rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

3 files changed, 12 insertions, 12 deletions

diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp
index 4f85ba50c..0c9710367 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/kioslave/trash/ktrash.cpp
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     TQCString restoreArg = args->getOption( "restore" );
     if ( !restoreArg.isEmpty() ) {
 
-        if (restoreArg.tqfind("system:/trash")==0) {
+        if (restoreArg.find("system:/trash")==0) {
             restoreArg.remove(0, 13);
             restoreArg.prepend("trash:");
         }
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index c847d9302..fb6927d3e 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -152,10 +152,10 @@ void TestTrash::setup()
     for ( TrashImpl::TrashDirMap::ConstIterator it = trashDirs.begin(); it != trashDirs.end() ; ++it ) {
         if ( it.key() == 0 ) {
             assert( it.data() == m_trashDir );
-            assert( topDirs.tqfind( 0 ) == topDirs.end() );
+            assert( topDirs.find( 0 ) == topDirs.end() );
             foundTrashDir = true;
         } else {
-            assert( topDirs.tqfind( it.key() ) != topDirs.end() );
+            assert( topDirs.find( it.key() ) != topDirs.end() );
             const TQString topdir = topDirs[it.key()];
             if ( TQFileInfo( topdir ).isWritable() ) {
                 writableTopDirs.append( it.key() );
@@ -383,7 +383,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat
     assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) );
     const TQString date = infoFile.readEntry( "DeletionDate" );
     assert( !date.isEmpty() );
-    assert( date.tqcontains( "T" ) );
+    assert( date.contains( "T" ) );
 }
 
 static void createTestFile( const TQString& path )
@@ -1104,7 +1104,7 @@ void TestTrash::listRootDir()
     assert( m_entryCount > 1 );
 
     kdDebug() << k_funcinfo << m_listResult << endl;
-    assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once
+    assert( m_listResult.contains( "." ) == 1 ); // found it, and only once
 }
 
 void TestTrash::listRecursiveRootDir()
@@ -1121,7 +1121,7 @@ void TestTrash::listRecursiveRootDir()
     assert( m_entryCount > 1 );
 
     kdDebug() << k_funcinfo << m_listResult << endl;
-    assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once
+    assert( m_listResult.contains( "." ) == 1 ); // found it, and only once
 }
 
 void TestTrash::listSubDir()
@@ -1138,8 +1138,8 @@ void TestTrash::listSubDir()
     assert( m_entryCount == 2 );
 
     kdDebug() << k_funcinfo << m_listResult << endl;
-    assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once
-    assert( m_listResult.tqcontains( "testfile" ) == 1 ); // found it, and only once
+    assert( m_listResult.contains( "." ) == 1 ); // found it, and only once
+    assert( m_listResult.contains( "testfile" ) == 1 ); // found it, and only once
 }
 
 void TestTrash::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp
index 80343c98a..8718dfe5f 100644
--- a/kioslave/trash/trashimpl.cpp
+++ b/kioslave/trash/trashimpl.cpp
@@ -898,7 +898,7 @@ TQString TrashImpl::trashDirectoryPath( int trashId ) const
     // and reusing a directory listing from the earlier instance.)
     if ( !m_trashDirectoriesScanned )
         scanTrashDirectories();
-    Q_ASSERT( m_trashDirectories.tqcontains( trashId ) );
+    Q_ASSERT( m_trashDirectories.contains( trashId ) );
     return m_trashDirectories[trashId];
 }
 
@@ -907,7 +907,7 @@ TQString TrashImpl::topDirectoryPath( int trashId ) const
     if ( !m_trashDirectoriesScanned )
         scanTrashDirectories();
     assert( trashId != 0 );
-    Q_ASSERT( m_topDirectories.tqcontains( trashId ) );
+    Q_ASSERT( m_topDirectories.contains( trashId ) );
     return m_topDirectories[trashId];
 }
 
@@ -939,7 +939,7 @@ bool TrashImpl::parseURL( const KURL& url, int& trashId, TQString& fileId, TQStr
     int start = 0;
     if ( path[0] == '/' ) // always true I hope
         start = 1;
-    int slashPos = path.tqfind( '-', 0 ); // don't match leading slash
+    int slashPos = path.find( '-', 0 ); // don't match leading slash
     if ( slashPos <= 0 )
         return false;
     bool ok = false;
@@ -948,7 +948,7 @@ bool TrashImpl::parseURL( const KURL& url, int& trashId, TQString& fileId, TQStr
     if ( !ok )
         return false;
     start = slashPos + 1;
-    slashPos = path.tqfind( '/', start );
+    slashPos = path.find( '/', start );
     if ( slashPos <= 0 ) {
         fileId = path.mid( start );
         relativePath = TQString::null;