Trinity Qt initial conversion

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

1 files changed, 35 insertions, 35 deletions

diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 184352d5..9b93384c 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -24,9 +24,9 @@
 #include "errors.h"
 
 // qt
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qasciidict.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqasciidict.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -132,7 +132,7 @@ bool Parser::reportError( const Error& err )
 	const Token& token = lex->lookAhead( 0 );
 	lex->getTokenPosition( token, &line, &col );
 
-	QString s = lex->lookAhead(0).text();
+	TQString s = lex->lookAhead(0).text();
 	s = s.left( 30 ).stripWhiteSpace();
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
@@ -143,7 +143,7 @@ bool Parser::reportError( const Error& err )
     return true;
 }
 
-bool Parser::reportError( const QString& msg )
+bool Parser::reportError( const TQString& msg )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::reportError()" << endl;
     if( m_problems < m_maxProblems ){
@@ -314,9 +314,9 @@ bool Parser::skipCommaExpression( AST::Node& node )
     if( !skipExpression(expr) )
 	return false;
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 
 	if( !skipExpression(expr) ){
@@ -468,7 +468,7 @@ bool Parser::parseDeclaration( DeclarationAST::Node& node )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::parseDeclaration()" << endl;
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == Token_comment ) {
 	comment += lex->lookAhead(0).text();
 	lex->nextToken();
@@ -830,9 +830,9 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo
 	return false;
     ast->addArgument( templArg );
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 
 	if( !parseTemplateArgument(templArg) ){
@@ -951,7 +951,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node )
 bool Parser::parseOperator( AST::Node& /*node*/ )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::parseOperator()" << endl;
-    QString text = lex->lookAhead(0).text();
+    TQString text = lex->lookAhead(0).text();
 
     switch( lex->lookAhead(0) ){
     case Token_new:
@@ -1394,7 +1394,7 @@ bool Parser::parseEnumSpecifier( TypeSpecifierAST::Node& node )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::parseEnumSpecifier()" << endl;
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == Token_comment ) {
 	comment += lex->lookAhead(0).text();
 	lex->nextToken();
@@ -1426,7 +1426,7 @@ bool Parser::parseEnumSpecifier( TypeSpecifierAST::Node& node )
     if( parseEnumerator(enumerator) ){
 	ast->addEnumerator( enumerator );
 
-	QString comment;
+	TQString comment;
 	while( lex->lookAhead(0) == ',' ){
 	    comment = "";
 	    advanceAndCheckTrailingComment( comment );
@@ -1472,9 +1472,9 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node )
     }
     ast->addTemplateParameter( param );
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 
 	if( !parseTemplateParameter(param) ){
@@ -1702,7 +1702,7 @@ bool Parser::parseInitDeclaratorList( InitDeclaratorListAST::Node& node )
     }
     ast->addInitDeclarator( decl );
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
 	comment = "";
 	advanceAndCheckTrailingComment( comment );
@@ -1777,9 +1777,9 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n
     }
     ast->addParameter( param );
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 
 	if( lex->lookAhead(0) == Token_ellipsis )
@@ -1878,7 +1878,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node )
 	}
     }
 
-    QString comment;
+    TQString comment;
     while (lex->lookAhead(0) == Token_comment) {
 	comment += lex->lookAhead(0).text();
 	lex->nextToken();
@@ -1942,7 +1942,7 @@ bool Parser::parseAccessSpecifier( AST::Node& node )
     return false;
 }
 
-void Parser::advanceAndCheckTrailingComment(QString& comment)
+void Parser::advanceAndCheckTrailingComment(TQString& comment)
 {
     Token t = lex->tokenAt( lex->index() );
     int previousTokenEndLine = 0;
@@ -1963,7 +1963,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::parseMemberSpecification()" << endl;
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == Token_comment ) {
 	comment += lex->lookAhead(0).text();
 	lex->nextToken();
@@ -2148,7 +2148,7 @@ bool Parser::parseEnumerator( EnumeratorAST::Node& node )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::parseEnumerator()" << endl;
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == Token_comment ) {
 	comment += lex->lookAhead(0).text();
 	lex->nextToken();
@@ -2226,9 +2226,9 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node )
     if( parseBaseSpecifier(baseSpec) ){
         bca->addBaseSpecifier( baseSpec );
 
-	QString comment;
+	TQString comment;
 	while( lex->lookAhead(0) == ',' ){
-	    comment = QString::null;
+	    comment = TQString::null;
 	    advanceAndCheckTrailingComment( comment );
 
 	    if( !parseBaseSpecifier(baseSpec) ){
@@ -2280,9 +2280,9 @@ bool Parser::parseMemInitializerList( AST::Node& /*node*/ )
 	return false;
     }
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 
 	if( parseMemInitializer(init) ){
@@ -2325,9 +2325,9 @@ bool Parser::parseTypeIdList( GroupAST::Node& node )
     GroupAST::Node ast = CreateNode<GroupAST>();
     ast->addNode( typeId );
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 	if( parseTypeId(typeId) ){
 	    if (!comment.isEmpty())
@@ -2991,7 +2991,7 @@ bool Parser::parseDeclarationStatement( StatementAST::Node& node )
     return true;
 }
 
-bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, QString& comment )
+bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& comment )
 {
     //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- "  << "Parser::parseDeclarationInternal()" << endl;
 
@@ -3231,9 +3231,9 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node )
     return true;
 }
 
-QString Parser::toString( int start, int end, const QString& sep ) const
+TQString Parser::toString( int start, int end, const TQString& sep ) const
 {
-    QStringList l;
+    TQStringList l;
 
     for( int i=start; i<end; ++i ){
 	l << lex->tokenAt(i).text();
@@ -3902,9 +3902,9 @@ bool Parser::parseCommaExpression( AST::Node& node )
     if( !parseAssignmentExpression(expr) )
         return false;
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 
         if( !parseAssignmentExpression(expr) )
@@ -4108,9 +4108,9 @@ bool Parser::parseIdentifierList( GroupAST::Node & node )
     ast->addNode( tk );
     lex->nextToken();
 
-    QString comment;
+    TQString comment;
     while( lex->lookAhead(0) == ',' ){
-	comment = QString::null;
+	comment = TQString::null;
 	advanceAndCheckTrailingComment( comment );
 	if( lex->lookAhead(0) == Token_identifier ){
 	    AST_FROM_TOKEN( tk, lex->index() );