rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

5 files changed, 39 insertions, 39 deletions

diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index eceb656f..200ef9bb 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -72,13 +72,13 @@ class FunctionCompletion : public CustomCompleter {
             TQString fScope;
             int cutpos;
     
-            if((cutpos = function.tqfind('(')) != -1) {
+            if((cutpos = function.find('(')) != -1) {
                 args = function.right( function.length() - cutpos );
                 function = function.left( cutpos );
             } else {
                 return function;
             }
-            if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) {
+            if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) {
                 fScope = function.left( cutpos + 1 );
                 function = function.right( function.length() - cutpos - 1);
             }
@@ -103,7 +103,7 @@ class FunctionCompletion : public CustomCompleter {
         }
     
         virtual void removeItem ( const TQString &item ) {
-            FuncMap::iterator it = nameMap.tqfind( item );
+            FuncMap::iterator it = nameMap.find( item );
             if( it != nameMap.end() ) {
                 KCompletion::removeItem( *it );
                 revNameMap.remove( *it );
@@ -118,7 +118,7 @@ class FunctionCompletion : public CustomCompleter {
         }
     
         virtual void postProcessMatch ( TQString *match ) const  {
-            FuncMap::const_iterator it = revNameMap.tqfind( *match );
+            FuncMap::const_iterator it = revNameMap.find( *match );
             if( it != revNameMap.end() ) {
                 *match = *it;
             }
@@ -261,7 +261,7 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
         m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() );
         navigator->refreshNavBars(m_activeFileName);
         navigator->syncFunctionNavDelayed(200);
-/*        if ( languageSupport()->mimeTypes().tqfind(
+/*        if ( languageSupport()->mimeTypes().find(
             KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() )
             m_activeFileName = TQString();*/
     }
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 1eccf136..a06948ab 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -116,7 +116,7 @@ template <class ModelType, class ListItemType>
     
     if( c ) {
         KSharedPtr<ModelType> d( c );
-        typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.tqfind(d);
+        typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.find(d);
         if( it != map.end() ) {
             ( *it )->select();
             return true;
@@ -482,13 +482,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo
     TQString current = path.front();
     path.pop_front();
 
-    FolderBrowserItem* item = m_folders.tqcontains( current ) ? m_folders[ current ] : 0;
+    FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new FolderBrowserItem( m_widget, this, current );
-	if( listView()->removedText.tqcontains(current) )
+	if( listView()->removedText.contains(current) )
 	    item->setOpen( true );
 	m_folders.insert( current, item );
     }
@@ -507,13 +507,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo
 
 void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 {
-    NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
+    NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new NamespaceDomBrowserItem( this, ns );
-	if( listView()->removedText.tqcontains(ns->name()) )
+	if( listView()->removedText.contains(ns->name()) )
 	    item->setOpen( true );
 	m_namespaces.insert( ns->name(), item );
     }
@@ -547,13 +547,13 @@ void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 
 void FolderBrowserItem::processClass( ClassDom klass, bool remove )
 {
-    ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0;
+    ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new ClassDomBrowserItem( this, klass );
-	if( listView()->removedText.tqcontains(klass->name()) )
+	if( listView()->removedText.contains(klass->name()) )
 	    item->setOpen( true );
 	m_classes.insert( klass, item );
     }
@@ -584,13 +584,13 @@ void FolderBrowserItem::processClass( ClassDom klass, bool remove )
 
 void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 {
-    TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
+    TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new TypeAliasDomBrowserItem( this, typeAlias );
-	if( listView()->removedText.tqcontains(typeAlias->name()) )
+	if( listView()->removedText.contains(typeAlias->name()) )
 	    item->setOpen( true );
 	m_typeAliases.insert( typeAlias, item );
     }
@@ -607,7 +607,7 @@ void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 
 void FolderBrowserItem::processFunction( FunctionDom fun, bool remove )
 {
-    FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0;
+    FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -625,7 +625,7 @@ void FolderBrowserItem::processFunction( FunctionDom fun, bool remove )
 
 void FolderBrowserItem::processVariable( VariableDom var, bool remove )
 {
-    VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0;
+    VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -679,13 +679,13 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item)
 
 void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 {
-    NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
+    NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new NamespaceDomBrowserItem( this, ns );
-	if( listView()->removedText.tqcontains(ns->name()) )
+	if( listView()->removedText.contains(ns->name()) )
 	    item->setOpen( true );
 	m_namespaces.insert( ns->name(), item );
     }
@@ -719,13 +719,13 @@ void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 
 void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove )
 {
-    ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0;
+    ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new ClassDomBrowserItem( this, klass );
-	if( listView()->removedText.tqcontains(klass->name()) )
+	if( listView()->removedText.contains(klass->name()) )
 	    item->setOpen( true );
 	m_classes.insert( klass, item );
     }
@@ -756,13 +756,13 @@ void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove )
 
 void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 {
-    TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
+    TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new TypeAliasDomBrowserItem( this, typeAlias );
-	if( listView()->removedText.tqcontains(typeAlias->name()) )
+	if( listView()->removedText.contains(typeAlias->name()) )
 	    item->setOpen( true );
 	m_typeAliases.insert( typeAlias, item );
     }
@@ -779,7 +779,7 @@ void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool rem
 
 void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 {
-    FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0;
+    FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -797,7 +797,7 @@ void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 
 void NamespaceDomBrowserItem::processVariable( VariableDom var, bool remove )
 {
-    VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0;
+    VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -844,13 +844,13 @@ bool ClassDomBrowserItem::selectItem(ItemDom item)
 
 void ClassDomBrowserItem::processClass( ClassDom klass, bool remove )
 {
-    ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0;
+    ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new ClassDomBrowserItem( this, klass );
-	if( listView()->removedText.tqcontains(klass->name()) )
+	if( listView()->removedText.contains(klass->name()) )
 	    item->setOpen( true );
 	m_classes.insert( klass, item );
     }
@@ -881,13 +881,13 @@ void ClassDomBrowserItem::processClass( ClassDom klass, bool remove )
 
 void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 {
-    TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
+    TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new TypeAliasDomBrowserItem( this, typeAlias );
-	if( listView()->removedText.tqcontains(typeAlias->name()) )
+	if( listView()->removedText.contains(typeAlias->name()) )
 	    item->setOpen( true );
 	m_typeAliases.insert( typeAlias, item );
     }
@@ -904,7 +904,7 @@ void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove
 
 void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 {
-    FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0;
+    FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -922,7 +922,7 @@ void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 
 void ClassDomBrowserItem::processVariable( VariableDom var, bool remove )
 {
-    VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0;
+    VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0;
     if( !item ){
 	if( remove )
 	    return;
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index 1e2f7dfd..6374ce50 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -173,13 +173,13 @@ TQStringList DigraphView::splitLine(TQString str)
 
     while (!str.isEmpty()) {
         if (str[0] == '"') {
-            int pos = str.tqfind('"', 1);
+            int pos = str.find('"', 1);
             if (pos == -1)
                 pos = str.length();
             result << str.mid(1, pos-1);
             str.remove(0, pos+1);
         } else {
-            int pos = str.tqfind(' ');
+            int pos = str.find(' ');
             if (pos == -1)
                 pos = str.length();
             result << str.left(pos);
@@ -323,7 +323,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
     TQPtrListIterator<DigraphNode> it1(nodes);
     for (; it1.current(); ++it1) {
         TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
-        if (r.tqcontains(e->pos())) {
+        if (r.contains(e->pos())) {
             if (selNode) {
                 TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2,
                            selNode->w, selNode->h);
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 2eedf64d..2ce9d6b3 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -113,7 +113,7 @@ void HierarchyDialog::save()
             TQStringList baseClasses = it.data()->baseClassList();
             for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
             {
-                TQMap<TQString, TQString>::const_iterator baseIt = uclasses.tqfind(*bit);
+                TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit);
                 if (baseIt != uclasses.end())
                 {
                     TQString formattedParentName = ls->formatClassName(baseIt.data());
@@ -143,7 +143,7 @@ void HierarchyDialog::refresh()
         TQStringList baseClasses = it.data()->baseClassList();
         for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
         {
-            TQMap<TQString, TQString>::const_iterator baseIt = uclasses.tqfind(*bit);
+            TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit);
             if (baseIt != uclasses.end())
             {
                 TQString formattedParentName = ls->formatClassName(baseIt.data());
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 78415d8c..01bfe2d0 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -289,7 +289,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear)
     {
         TQMap<TQString, TQListViewItem*>::iterator it2 = it;
         ++it;
-        if ( !toLeave.tqcontains( it2.key() ) )
+        if ( !toLeave.contains( it2.key() ) )
         {
             if (it2.data())
             {
@@ -331,7 +331,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear)
     {
         TQMap<TQString, TQListViewItem*>::iterator it2 = itt;
         ++itt;
-        if ( !toLeave.tqcontains( it2.key() ) )
+        if ( !toLeave.contains( it2.key() ) )
         {
             if (it2.data())
             {
@@ -397,14 +397,14 @@ TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleS
     TQString fScope;
     int cutpos;
 
-    if((cutpos = function.tqfind('(')) != -1) {
+    if((cutpos = function.find('(')) != -1) {
         args = function.right( function.length() - cutpos );
         function = function.left( cutpos );
     } else {
         ret.addItem( function );
         return ret;
     }
-    if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) {
+    if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) {
         fScope = function.left( cutpos + 1 );
         function = function.right( function.length() - cutpos - 1);
     }