From 49e49d1876484adcc6c4f264b44b7f4cee28acc2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 26 Sep 2023 11:50:58 +0900 Subject: Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro --- kexi/kexidb/drivers/pqxx/pqxxcursor.cpp | 2 +- kexi/kexidb/parser/sqlscanner.l | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kexi/kexidb') diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp index 77746a13..4d5011f9 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp @@ -239,7 +239,7 @@ TQVariant pqxxSqlCursor::pValue(uint pos)const } else if (f->type() == Field::Boolean ) { - return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false); + return TQString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false); } else if (f->typeGroup() == Field::BLOBGroup) { diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l index b16a615d..75e122c0 100644 --- a/kexi/kexidb/parser/sqlscanner.l +++ b/kexi/kexidb/parser/sqlscanner.l @@ -31,8 +31,8 @@ #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext -extern void setError(const QString& errDesc); -extern void setError(const QString& errName, const QString& errDesc); +extern void setError(const TQString& errDesc); +extern void setError(const TQString& errName, const TQString& errDesc); %} @@ -90,10 +90,10 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit} {integer} { //TODO: what about hex or octal values? - //we're using QString:toLongLong() here because atoll() is not so portable: + //we're using TQString:toLongLong() here because atoll() is not so portable: ECOUNT; bool ok; - yylval.integerValue = QString(yytext).toLongLong( &ok ); + yylval.integerValue = TQString(yytext).toLongLong( &ok ); if (!ok) { setError(i18n("Invalid integer number"),i18n("This integer number may be too large.")); return SCAN_ERROR; @@ -272,7 +272,7 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit} (['][^']*[']|["][^\"]*["]) { ECOUNT; - yylval.stringValue = new QString(QString::fromUtf8(yytext+1, yyleng-2)); + yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2)); return CHARACTER_STRING_LITERAL; /* "ZZZ" sentinel for script */ @@ -281,7 +281,7 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit} {identifier} { KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl; ECOUNT; - yylval.stringValue = new QString(QString::fromUtf8(yytext, yyleng)); + yylval.stringValue = new TQString(TQString::fromUtf8(yytext, yyleng)); if (yytext[0]>='0' && yytext[0]<='9') { setError(i18n("Invalid identifier"), i18n("Identifiers should start with a letter or '_' character")); @@ -293,7 +293,7 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit} {query_parameter} { KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl; ECOUNT; - yylval.stringValue = new QString(QString::fromUtf8(yytext+1, yyleng-2)); + yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2)); return QUERY_PARAMETER; } -- cgit v1.2.1