summaryrefslogtreecommitdiffstats
path: root/lib/cppparser
diff options
context:
space:
mode:
Diffstat (limited to 'lib/cppparser')
-rw-r--r--lib/cppparser/ast.cpp6
-rw-r--r--lib/cppparser/ast.h4
-rw-r--r--lib/cppparser/driver.cpp2
-rw-r--r--lib/cppparser/lexer.cpp2
-rw-r--r--lib/cppparser/parser.cpp6
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
index 326ee625..8f2f2ad7 100644
--- a/lib/cppparser/ast.cpp
+++ b/lib/cppparser/ast.cpp
@@ -136,7 +136,7 @@ AST::AST()
m_endLine( 0 ), m_endColumn( 0 )
{
#ifndef CPPPARSER_NO_CHILDREN
- m_tqchildren.setAutoDelete( false );
+ m_children.setAutoDelete( false );
#endif
}
@@ -196,12 +196,12 @@ void AST::setParent( AST* parent )
#ifndef CPPPARSER_NO_CHILDREN
void AST::appendChild( AST* child )
{
- m_tqchildren.append( child );
+ m_children.append( child );
}
void AST::removeChild( AST* child )
{
- m_tqchildren.remove( child );
+ m_children.remove( child );
}
#endif
diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h
index c98c2fe7..5db231fd 100644
--- a/lib/cppparser/ast.h
+++ b/lib/cppparser/ast.h
@@ -263,7 +263,7 @@ public:
void getEndPosition( int* line, int* col ) const;
#ifndef CPPPARSER_NO_CHILDREN
- TQPtrList<AST> tqchildren() { return m_tqchildren; }
+ TQPtrList<AST> children() { return m_children; }
void appendChild( AST* child );
void removeChild( AST* child );
#endif
@@ -292,7 +292,7 @@ private:
int m_endLine, m_endColumn;
Slice m_slice;
#ifndef CPPPARSER_NO_CHILDREN
- TQPtrList<AST> m_tqchildren;
+ TQPtrList<AST> m_children;
#endif
private:
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index bcaea218..91945e53 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -383,7 +383,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep )
m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local );
if ( !TQFile::exists( file ) ) {
- Problem p( i18n( "Could not find include file %1" ).tqarg( dep.first ),
+ Problem p( i18n( "Could not find include file %1" ).arg( dep.first ),
lexer ? lexer->currentLine() : -1,
lexer ? lexer->currentColumn() : -1, Problem::Level_Warning );
addProblem( fileName, p );
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index c19408e6..0c24ceae 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -386,7 +386,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
TQString tokText = tok.text();
HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
if( str == ide ){
- //Problem p( i18n("unsafe use of macro '%1', macro is ignored").tqarg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning );
+ //Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning );
//m_driver->addProblem( m_driver->currentFileName(), p );
m_driver->removeMacro( ide );
// str = TQString();
diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp
index 9b0a0c1f..08b4e6bb 100644
--- a/lib/cppparser/parser.cpp
+++ b/lib/cppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
{ \
const Token& token = lex->lookAhead( 0 ); \
if( token != tk ){ \
- reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+ reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
return false; \
} \
nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
{ \
const Token& token = lex->lookAhead( 0 ); \
if( token != tk ){ \
- reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+ reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
} \
else \
nextToken(); \
@@ -139,7 +139,7 @@ bool Parser::reportError( const Error& err )
if( s.isEmpty() )
s = i18n( "<eof>" );
- m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
+ m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
}
return true;