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

7 files changed, 40 insertions, 40 deletions

diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp
index ac5cfc5e..e83cd90e 100644
--- a/languages/java/JavaStoreWalker.cpp
+++ b/languages/java/JavaStoreWalker.cpp
@@ -1046,9 +1046,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 #line 264 "java.store.g"
 		
 										meth->setResultType( tp );
-										if( m.tqcontains("public") )
+										if( m.contains("public") )
 										    meth->setAccess( CodeModelItem::Public );
-										else if( m.tqcontains("protected") )
+										else if( m.contains("protected") )
 										    meth->setAccess( CodeModelItem::Protected );
 										else
 										    meth->setAccess( CodeModelItem::Private );
@@ -1096,14 +1096,14 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 #line 300 "java.store.g"
 		
 										attr->setType( tp );
-										if( m.tqcontains("public") )
+										if( m.contains("public") )
 										    attr->setAccess( CodeModelItem::Public );
-										else if( m.tqcontains("protected") )
+										else if( m.contains("protected") )
 										    attr->setAccess( CodeModelItem::Protected );
 										else
 										    attr->setAccess( CodeModelItem::Private );
 		
-										attr->setStatic( m.tqcontains("static") );
+										attr->setStatic( m.contains("static") );
 										
 #line 1109 "JavaStoreWalker.cpp"
 	}
@@ -1144,9 +1144,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 		_t = _t->getNextSibling();
 #line 247 "java.store.g"
 		
-										if( m.tqcontains("public") )
+										if( m.contains("public") )
 										    meth->setAccess( CodeModelItem::Public );
-										else if( m.tqcontains("protected") )
+										else if( m.contains("protected") )
 										    meth->setAccess( CodeModelItem::Protected );
 										else
 										    meth->setAccess( CodeModelItem::Private );
@@ -1212,9 +1212,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 #line 282 "java.store.g"
 		
 										meth->setResultType( tp );
-										if( m.tqcontains("public") )
+										if( m.contains("public") )
 										    meth->setAccess( CodeModelItem::Public );
-										else if( m.tqcontains("protected") )
+										else if( m.contains("protected") )
 										    meth->setAccess( CodeModelItem::Protected );
 										else
 										    meth->setAccess( CodeModelItem::Private );
diff --git a/languages/java/app_templates/superwaba/src-Makefile b/languages/java/app_templates/superwaba/src-Makefile
index f2a2a1ab..84b55ece 100644
--- a/languages/java/app_templates/superwaba/src-Makefile
+++ b/languages/java/app_templates/superwaba/src-Makefile
@@ -114,7 +114,7 @@ WABAEXTRADIR    = $(WABADIR)/superwaba
 ################################################################################
 # the classpath will have to tell java where to find the waba stuff.
 #
-# the CLASSPATH here is set to let java tqfind
+# the CLASSPATH here is set to let java find
 # - the classes it needs to produce the executable class files
 # - the waba.applet class, Warp.class, and Exegen.class
 #
@@ -198,7 +198,7 @@ $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES)
 # $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES)
 #	$(WARP) $(WARPFLAGS) $(PDBBASENAME) $(MAINCLASS) $(EXTRACLASSES)
 
-#  Below, we just tell make how to create foo.class if it can tqfind
+#  Below, we just tell make how to create foo.class if it can find
 #  foo.java
 
 %.class: %.java
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index e1f058c7..cdeae8b4 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -146,7 +146,7 @@ public:
 	m_fileList.pop_front();
     }
 
-    bool tqcontains( const TQString& fileName ) const
+    bool contains( const TQString& fileName ) const
     {
 	TQMutexLocker locker( &m_mutex );
 	TQValueList< TQPair<TQString, bool> >::ConstIterator it = m_fileList.begin();
@@ -199,7 +199,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk )
     TQString fn = deepCopy( fileName );
 
     bool added = false;
-    if( !m_fileList->tqcontains(fn) ){
+    if( !m_fileList->contains(fn) ){
         m_fileList->push_back( fn, readFromDisk );
 	added = true;
     }
@@ -257,7 +257,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
 
     static_cast<KDevSourceProvider*>( m_driver->sourceProvider() )->setReadFromDisk( false );
 
-    if( m_unitDict.tqfind(fileName) != m_unitDict.end() ){
+    if( m_unitDict.find(fileName) != m_unitDict.end() ){
 	Unit* u = m_unitDict[ fileName ];
 	m_unitDict.remove( fileName );
 	delete( u );
@@ -266,7 +266,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
 
     m_unitDict.insert( fileName, unit );
 
-    if( m_fileList->tqcontains(fileName) ){
+    if( m_fileList->contains(fileName) ){
         kdDebug(9013) << "========================> FILE: " << fileName << " IN TQUEUE <=============" << endl;
     } else {
         KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) );
@@ -282,7 +282,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
 
 Unit* BackgroundParser::findUnit( const TQString& fileName )
 {
-    TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName );
+    TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName );
     return it != m_unitDict.end() ? *it : 0;
 }
 
diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp
index 9a4bccdf..7991028e 100644
--- a/languages/java/driver.cpp
+++ b/languages/java/driver.cpp
@@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName )
 {
     m_problems.remove( fileName );
 
-    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName );
+    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName );
     if( it != m_parsedUnits.end() ){
 	RefJavaAST unit = *it;
 	m_parsedUnits.remove( it );
@@ -110,7 +110,7 @@ void Driver::remove( const TQString & fileName )
 
 RefJavaAST Driver::takeTranslationUnit( const TQString& fileName )
 {
-    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName );
+    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName );
     RefJavaAST unit( *it );
     //m_parsedUnits.remove( it );
     m_parsedUnits[ fileName] = 0;
@@ -119,7 +119,7 @@ RefJavaAST Driver::takeTranslationUnit( const TQString& fileName )
 
 RefJavaAST Driver::translationUnit( const TQString& fileName ) const
 {
-    TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.tqfind( fileName );
+    TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.find( fileName );
     return it != m_parsedUnits.end() ? *it : RefJavaAST();
 }
 
@@ -130,7 +130,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem )
 
 TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName )
 {
-    TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName );
+    TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName );
     if( it != m_problems.end() )
         return it.data();
 
@@ -141,7 +141,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN
 
 TQValueList < Problem > Driver::problems( const TQString & fileName ) const
 {
-    TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName );
+    TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName );
     if( it != m_problems.end() )
 	return it.data();
     return TQValueList<Problem>();
@@ -152,7 +152,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc
     TQFileInfo fileInfo( fileName );
     TQString absFilePath = fileInfo.absFilePath();
 
-    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( absFilePath );
+    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( absFilePath );
 
     if( force && it != m_parsedUnits.end() ){
 	takeTranslationUnit( absFilePath );
diff --git a/languages/java/java.store.g b/languages/java/java.store.g
index d7e28c22..b69b7323 100644
--- a/languages/java/java.store.g
+++ b/languages/java/java.store.g
@@ -245,9 +245,9 @@ ctorDef returns [ FunctionDom meth ]				{
 		m=modifiers methodHead[meth] slist
 		)
 								{
-								if( m.tqcontains("public") )
+								if( m.contains("public") )
 								    meth->setAccess( CodeModelItem::Public );
-								else if( m.tqcontains("protected") )
+								else if( m.contains("protected") )
 								    meth->setAccess( CodeModelItem::Protected );
 								else
 								    meth->setAccess( CodeModelItem::Private );
@@ -263,9 +263,9 @@ methodDecl returns [ FunctionDom meth ]  			{
 	:	#(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth])
 								{
 								meth->setResultType( tp );
-								if( m.tqcontains("public") )
+								if( m.contains("public") )
 								    meth->setAccess( CodeModelItem::Public );
-								else if( m.tqcontains("protected") )
+								else if( m.contains("protected") )
 								    meth->setAccess( CodeModelItem::Protected );
 								else
 								    meth->setAccess( CodeModelItem::Private );
@@ -281,9 +281,9 @@ methodDef returns [ FunctionDom meth ]  			{
 	:	#(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth] (slist)?)
 								{
 								meth->setResultType( tp );
-								if( m.tqcontains("public") )
+								if( m.contains("public") )
 								    meth->setAccess( CodeModelItem::Public );
-								else if( m.tqcontains("protected") )
+								else if( m.contains("protected") )
 								    meth->setAccess( CodeModelItem::Protected );
 								else
 								    meth->setAccess( CodeModelItem::Private );
@@ -299,14 +299,14 @@ variableDef returns [ VariableDom attr ] 			{
 	:	#(VARIABLE_DEF m=modifiers tp=typeSpec variableDeclarator[attr] varInitializer)
 								{
 								attr->setType( tp );
-								if( m.tqcontains("public") )
+								if( m.contains("public") )
 								    attr->setAccess( CodeModelItem::Public );
-								else if( m.tqcontains("protected") )
+								else if( m.contains("protected") )
 								    attr->setAccess( CodeModelItem::Protected );
 								else
 								    attr->setAccess( CodeModelItem::Private );
 
-								attr->setStatic( m.tqcontains("static") );
+								attr->setStatic( m.contains("static") );
 								}
 	;
 
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index e8f62fa1..68a22250 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -273,7 +273,7 @@ void JavaSupportPart::activePartChanged(KParts::Part *part)
 	m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() );
         TQFileInfo fi( m_activeFileName );
         TQString ext = fi.extension();
-        if (fileExtensions().tqcontains(ext))
+        if (fileExtensions().contains(ext))
             enabled = true;
     }
 
@@ -395,7 +395,7 @@ void JavaSupportPart::savedFile(const KURL &fileName)
     kdDebug(9013) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl;
 
     TQStringList projectFileList = project()->allFiles();
-    if (projectFileList.tqcontains(fileName.mid ( m_projectDirectory.length() + 1 ))) {
+    if (projectFileList.contains(fileName.mid ( m_projectDirectory.length() + 1 ))) {
 	maybeParse( fileName );
 	emit addedSourceInfo( fileName );
     }
@@ -556,10 +556,10 @@ JavaSupportPart::parseProject( )
 
 	    if( isValidSource(absFilePath) ){
 		TQDateTime t = fileInfo.lastModified();
-		if( m_timestamp.tqcontains(absFilePath) && m_timestamp[absFilePath] == t )
+		if( m_timestamp.contains(absFilePath) && m_timestamp[absFilePath] == t )
 		    continue;
 
-		if( pcs.tqcontains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){
+		if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){
 		    stream.tqdevice()->at( pcs[absFilePath].second );
 		    FileDom file = codeModel()->create<FileModel>();
 		    file->read( stream );
@@ -607,7 +607,7 @@ void JavaSupportPart::maybeParse( const TQString& fileName )
 	return;
     }
 
-    TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path );
+    TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path );
     if( it != m_timestamp.end() && *it == t ){
 	return;
     }
@@ -666,12 +666,12 @@ TQStringList JavaSupportPart::modifiedFileList()
 
 	TQFileInfo fileInfo( m_projectDirectory, fileName );
 
-	if( !fileExtensions().tqcontains(fileInfo.extension()) )
+	if( !fileExtensions().contains(fileInfo.extension()) )
 	    continue;
 
 	TQDateTime t = fileInfo.lastModified();
 	TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() );
-	TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path );
+	TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path );
 	if( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t )
 	    continue;
 
@@ -787,7 +787,7 @@ void JavaSupportPart::removeWithReferences( const TQString & fileName )
 bool JavaSupportPart::isValidSource( const TQString& fileName ) const
 {
     TQFileInfo fileInfo( fileName );
-    return fileExtensions().tqcontains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore");
+    return fileExtensions().contains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore");
 }
 
 TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription )
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index f287f70d..d2237ad3 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -214,7 +214,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p
     }
 
     TQString msg = p.text();
-    msg = msg.tqreplace( TQRegExp("\n"), "" );
+    msg = msg.replace( TQRegExp("\n"), "" );
 
     new ProblemItem( this,
 		     levelToString( p.level() ),