diff options
Diffstat (limited to 'kexi/kexidb/parser/sqlscanner.l')
| -rw-r--r-- | kexi/kexidb/parser/sqlscanner.l | 14 |
1 files changed, 7 insertions, 7 deletions
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; } |