diff --git a/src/lexer.ll b/src/lexer.ll index 5e7d049..c73f8db 100644 --- a/src/lexer.ll +++ b/src/lexer.ll @@ -140,7 +140,7 @@ public: YY_BUFFER_STATE buffer; int lastToken, thisToken; int lastPos, thisPos; - QString lastTokenData, thisTokenData; + TQString lastTokenData, thisTokenData; }; /* Declared in function.h, implemented here in lexer.l since this is where @@ -159,7 +159,7 @@ Lexer::Lexer(const TQString &expr) : m_private->lastPos = -1; m_private->thisToken = yylex(); - m_private->thisTokenData = QString(yytext); + m_private->thisTokenData = TQString(yytext); if(yyCurTokenPos != 0) { @@ -187,7 +187,7 @@ int Lexer::nextType() m_private->lastToken = m_private->thisToken; m_private->thisToken = yylex(); - m_private->thisTokenData = QString(yytext); + m_private->thisTokenData = TQString(yytext); m_private->thisPos = yyCurTokenPos; return m_private->lastToken; diff --git a/src/parser.yy b/src/parser.yy index 9ab2c7d..450baca 100644 --- a/src/parser.yy +++ b/src/parser.yy @@ -316,7 +316,7 @@ VALUE: NUMBER { $$ = $1; } NUMBER: NUM { TDELocale *locale = TDEGlobal::locale(); - QChar decimal = locale->decimalSymbol()[0]; + TQChar decimal = locale->decimalSymbol()[0]; // Replace current decimal separator with US Decimal separator to be // evil.