summaryrefslogtreecommitdiffstats
path: root/kexi/kexidb/parser/sqlscanner.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-25 05:28:35 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-25 05:28:35 +0000
commitf008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch)
tree8e9244c4d4957c36be81e15b566b4aa5ea26c982 /kexi/kexidb/parser/sqlscanner.cpp
parent1210f27b660efb7b37ff43ec68763e85a403471f (diff)
downloadkoffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz
koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kexi/kexidb/parser/sqlscanner.cpp')
-rw-r--r--kexi/kexidb/parser/sqlscanner.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp
index c3984a39d..10fe70a29 100644
--- a/kexi/kexidb/parser/sqlscanner.cpp
+++ b/kexi/kexidb/parser/sqlscanner.cpp
@@ -512,8 +512,8 @@ char *yytext;
#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);
/* *** Please reflect changes to this file in ../driver_p.cpp *** */
#define YY_NEVER_INTERACTIVE 1
@@ -822,10 +822,10 @@ YY_RULE_SETUP
#line 91 "sqlscanner.l"
{
//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;
@@ -1097,7 +1097,7 @@ YY_RULE_SETUP
#line 273 "sqlscanner.l"
{
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 */
@@ -1109,7 +1109,7 @@ YY_RULE_SETUP
{
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"));
@@ -1124,8 +1124,8 @@ YY_RULE_SETUP
{
KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl;
ECOUNT;
- yylval.stringValue = new QString(QString::fromUtf8(yytext+1, yyleng-2));
- return QUERY_PARAMETER;
+ yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2));
+ return TQUERY_PARAMETER;
}
YY_BREAK
case 41: