diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-18 15:17:50 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-18 15:17:50 -0500 |
| commit | 986d31c6a0014de132a32c3a40052bd3d46b78ed (patch) | |
| tree | 74c2a777402655be6dc1d06e2b4376ce885e2341 | |
| parent | d4f2e5de0d9375d34168805ad659cfe0a2e24eb8 (diff) | |
| download | koffice-986d31c6.tar.gz koffice-986d31c6.zip | |
Fix references to Q_ULLONG and friends
| -rwxr-xr-x | kexi/doc/dev/CHANGELOG-Kexi-js | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlparser.y | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index e7470e45..326c12a3 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -5307,7 +5307,7 @@ TODO: update on lostfocus - KexiDB::Object::debugError() added for convenience - Object: serverErrorMsg(), serverResult(), serverResultName(), drv_clearServerResult() added -- virtual Q_ULLONG Connection::drv_lastInsertRowID() added - returns unique +- virtual TQ_ULLONG Connection::drv_lastInsertRowID() added - returns unique identifier of last inserted row. - DriverBehaviour::AUTO_INCREMENT_FIELD_OPTION added; autoinc field's option is now used in "CREATE TABLE" statement building; bool SPECIAL_AUTO_INCREMENT_DEF added diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y index ee8bba6b..1b74def7 100644 --- a/kexi/kexidb/parser/sqlparser.y +++ b/kexi/kexidb/parser/sqlparser.y @@ -1070,11 +1070,11 @@ aExpr9: val = (int)$1; else if ($1 <= UINT_MAX && $1 >= 0) val = (uint)$1; - else if ($1 <= (Q_LLONG)LLONG_MAX && $1 >= (Q_LLONG)LLONG_MIN) - val = (Q_LLONG)$1; + else if ($1 <= (TQ_LLONG)LLONG_MAX && $1 >= (TQ_LLONG)LLONG_MIN) + val = (TQ_LLONG)$1; // if ($1 < ULLONG_MAX) -// val = (Q_ULLONG)$1; +// val = (TQ_ULLONG)$1; //TODO ok? $$ = new ConstExpr( INTEGER_CONST, val ); |