1 files changed, 14 insertions, 14 deletions

diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp
index 15849ad1..2ac8d54b 100644
--- a/languages/cpp/tag_creator.cpp
+++ b/languages/cpp/tag_creator.cpp
@@ -47,10 +47,10 @@ void TagCreator::parseDeclaration( DeclarationAST* ast )
 {
 	if( ast->nodeType() == NodeType_AccessDeclaration ||
 	    m_currentAccess.isEmpty() ||
-	    m_currentAccess.contains("private")	||	///In order to correctly evaluate templates, the private members are necessary too
-	    m_currentAccess.contains("public") ||
-	    m_currentAccess.contains("protected") ||
-	    m_currentAccess.contains("signals") )
+	    m_currentAccess.tqcontains("private")	||	///In order to correctly evaluate templates, the private members are necessary too
+	    m_currentAccess.tqcontains("public") ||
+	    m_currentAccess.tqcontains("protected") ||
+	    m_currentAccess.tqcontains("signals") )
 	{
 		TreeParser::parseDeclaration( ast );
 	}
@@ -59,7 +59,7 @@ void TagCreator::parseDeclaration( DeclarationAST* ast )
 void TagCreator::parseTranslationUnit( const ParsedFile& ast )
 {
 	m_currentScope.clear();
-	m_currentAccess = TQString::null;
+	m_currentAccess = TQString();
 	m_inSlots = false;
 	m_inSignals = false;
 	m_anon = 0;
@@ -78,9 +78,9 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast )
 	ast.write( stream );
 	tag.setAttribute( "cppparsedfile", data );
 	tag.setAttribute( "includedFrom", ast.includedFrom() );
-	tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) );
-	tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) );
-	tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) );
+	tag.setAttribute( "skippedLines", TQString("%1").tqarg( ast.skippedLines()) );
+	tag.setAttribute( "macroValueHash", TQString("%1").tqarg( ast.usedMacros().valueHash()) );
+	tag.setAttribute( "macroIdHash", TQString("%1").tqarg( ast.usedMacros().idHash() ) );
 	
   	tag.setScope( m_currentScope );
   	if( !ast->comment().isEmpty() )
@@ -362,7 +362,7 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast )
 	checkTemplateDeclarator( tag );
 	
 	TQString arguments = tag.attribute( "a" ).toStringList().join( "," );
-tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) );
+tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.tqreplace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) );
 	
 	tagBuilder.setAccess( TagUtils::stringToAccess( m_currentAccess ) );
 	
@@ -469,7 +469,7 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast )
 	
 	tag.setFileName( m_fileName );
 
-	int i = className.find( '<' );
+	int i = className.tqfind( '<' );
 	TQString specialization;
 	
 	if( i != -1 ) {
@@ -748,7 +748,7 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator )
 			
 			TQString name;
 			if( param->declarator() ){
-				name = declaratorToString(param->declarator(), TQString::null, true );
+				name = declaratorToString(param->declarator(), TQString(), true );
 			}
 			
 			TQString type = typeOfDeclaration( param->typeSpec(), param->declarator() );
@@ -773,7 +773,7 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator )
 TQString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator )
 {
 	if( !typeSpec || !declarator )
-		return TQString::null;
+		return TQString();
 	
 	TQString text;
 	
@@ -862,7 +862,7 @@ int TagUtils::stringToAccess( const TQString & access )
 		<< "public slots" << "protected slots" << "private slots"
 		<< "signals";
 	
-	int idx = l.findIndex( access );
+	int idx = l.tqfindIndex( access );
 	return idx == -1 ? 0 : idx+1;
 }
 
@@ -878,7 +878,7 @@ TQString TagUtils::accessToString( int id )
 	if( l.at(id-1) != l.end() )
 		return l[ id-1 ];
 	
-	return TQString::null;
+	return TQString();
 }
 
 //kate: indent-mode csands; tab-width 4; space-indent off;