diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-18 23:43:22 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-18 23:43:22 +0000 |
| commit | f96e42380a9bc755141480d3809a9c7eeecb4539 (patch) | |
| tree | 2afc4371e5faf48a1f8dae25a7f752dbce17668f /kexi/3rdparty | |
| parent | 4534ffe29f468c46986d0b486b318b53f76115ad (diff) | |
| download | koffice-f96e42380a9bc755141480d3809a9c7eeecb4539.tar.gz koffice-f96e42380a9bc755141480d3809a9c7eeecb4539.zip | |
Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q*
This fixes the Kopete MSN protocol among other things
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kexi/3rdparty')
| -rw-r--r-- | kexi/3rdparty/kexisql/src/threadtest.c | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/parse.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kexi/3rdparty/kexisql/src/threadtest.c b/kexi/3rdparty/kexisql/src/threadtest.c index 89b84a10..89c79a4c 100644 --- a/kexi/3rdparty/kexisql/src/threadtest.c +++ b/kexi/3rdparty/kexisql/src/threadtest.c @@ -107,7 +107,7 @@ char **db_query(sqlite *db, const char *zFile, const char *zFormat, ...){ va_end(ap); memset(&sResult, 0, sizeof(sResult)); sResult.zFile = zFile; - if( verbose ) printf("TQUERY %s: %s\n", zFile, zSql); + if( verbose ) printf("QUERY %s: %s\n", zFile, zSql); rc = sqlite_exec(db, zSql, db_query_callback, &sResult, &zErrMsg); if( rc==SQLITE_SCHEMA ){ if( zErrMsg ) free(zErrMsg); diff --git a/kexi/3rdparty/kexisql3/src/parse.c b/kexi/3rdparty/kexisql3/src/parse.c index 5eda3e3f..7c1fe420 100644 --- a/kexi/3rdparty/kexisql3/src/parse.c +++ b/kexi/3rdparty/kexisql3/src/parse.c @@ -888,7 +888,7 @@ static const char *const yyTokenName[] = { "$", "END_OF_FILE", "ILLEGAL", "SPACE", "UNCLOSED_STRING", "COMMENT", "FUNCTION", "COLUMN", "AGG_FUNCTION", "AGG_COLUMN", "CONST_FUNC", "SEMI", - "EXPLAIN", "TQUERY", "PLAN", "BEGIN", + "EXPLAIN", "QUERY", "PLAN", "BEGIN", "TRANSACTION", "DEFERRED", "IMMEDIATE", "EXCLUSIVE", "COMMIT", "END", "ROLLBACK", "CREATE", "TABLE", "TEMP", "LP", "RP", |