diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
| commit | 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch) | |
| tree | 4e85ad9cc0479892232125234c6b71c4f17ac611 /kexi/3rdparty/kexisql3/src/expr.c | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'kexi/3rdparty/kexisql3/src/expr.c')
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/expr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c index 8d9cfbbdf..45f7fc2fa 100644 --- a/kexi/3rdparty/kexisql3/src/expr.c +++ b/kexi/3rdparty/kexisql3/src/expr.c @@ -478,7 +478,7 @@ ExprList *sqlite3ExprListDup(ExprList *p){ ** called with a NULL argument. */ #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) \ - || !defined(SQLITE_OMIT_SUBTQUERY) + || !defined(SQLITE_OMIT_SUBQUERY) SrcList *sqlite3SrcListDup(SrcList *p){ SrcList *pNew; int i; @@ -698,7 +698,7 @@ static int exprNodeIsConstant(void *pArg, Expr *pExpr){ case TK_DOT: case TK_AGG_FUNCTION: case TK_AGG_COLUMN: -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_SELECT: case TK_EXISTS: #endif @@ -1190,7 +1190,7 @@ static int nameResolverStep(void *pArg, Expr *pExpr){ */ return is_agg; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_SELECT: case TK_EXISTS: #endif @@ -1273,7 +1273,7 @@ struct QueryCoder { ** of allowed values. The second form causes the SELECT to generate ** a temporary table. */ -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ int testAddr = 0; /* One-time test address */ Vdbe *v = sqlite3GetVdbe(pParse); @@ -1414,7 +1414,7 @@ void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ } return; } -#endif /* SQLITE_OMIT_SUBTQUERY */ +#endif /* SQLITE_OMIT_SUBQUERY */ /* ** Generate an instruction that will put the integer describe by @@ -1649,7 +1649,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3VdbeOp3(v, OP_Function, constMask, nExpr, (char*)pDef, P3_FUNCDEF); break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_EXISTS: case TK_SELECT: { sqlite3CodeSubselect(pParse, pExpr); |