From 52eaa0b5bf6708a9594235d7f9e384107f98c9fb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 23 Sep 2023 12:52:57 +0900 Subject: [PATCH] Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro (cherry picked from commit 01c7da13c011db4911efbe11e5401e70ca2998a4) --- src/lexer.ll | 6 +++--- src/parser.yy | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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.