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 | |
| 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')
| -rw-r--r-- | kexi/3rdparty/kexisql/src/threadtest.c | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/parse.c | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp | 4 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlparser.cpp | 4 | ||||
| -rw-r--r-- | kexi/kexidb/queryschema.cpp | 2 |
5 files changed, 7 insertions, 7 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", diff --git a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp index 89dd8d77..89aad061 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp @@ -229,8 +229,8 @@ namespace KexiDB { "PROCESS", "PROCESSLIST", "PURGE", - "TQUERY", - "TQUICK", + "QUERY", + "QUICK", "RAID0", "RAID_CHUNKS", "RAID_CHUNKSIZE", diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index 57e386ee..091d516b 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -1310,7 +1310,7 @@ static const char *const yytname[] = "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", "OVERLAPS", "PAGE", "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CTQL_PI", "PLI", "POSITION", "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", - "PROCEDURE", "PRODUCT", "PUBLIC", "TQUARTER", "TQUIT", "RAND", "READ_ONLY", + "PROCEDURE", "PRODUCT", "PUBLIC", "QUARTER", "QUIT", "RAND", "READ_ONLY", "REAL", "REFERENCES", "REPEAT", "REPLACE", "RESTRICT", "REVOKE", "RIGHT", "ROLLBACK", "ROWS", "RPAD", "RTRIM", "SCHEMA", "SCREEN_WIDTH", "SCROLL", "SECOND", "SECONDS_BETWEEN", "SELECT", "SEQUENCE", "SETOPT", "SET", @@ -1324,7 +1324,7 @@ static const char *const yytname[] = "TO_DATE", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRUNCATE", "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNITQUE", "SQL_UNKNOWN", "UPDATE", "UPPER", "USAGE", "USER", "IDENTIFIER", - "IDENTIFIER_DOT_ASTERISK", "TQUERY_PARAMETER", "USING", "VALUE", "VALUES", + "IDENTIFIER_DOT_ASTERISK", "QUERY_PARAMETER", "USING", "VALUE", "VALUES", "VARBINARY", "VARCHAR", "VARYING", "VENDOR", "VIEW", "WEEK", "WHEN", "WHENEVER", "WHERE", "WHERE_CURRENT_OF", "WITH", "WORD_WRAPPED", "WORK", "WRAPPED", "XOR", "YEAR", "YEARS_BETWEEN", "SCAN_ERROR", "__LAST_TOKEN", diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index a82ca99a..b77f76a3 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -779,7 +779,7 @@ TQString QuerySchema::debugString() dbg.reserve(1024); //fields TableSchema *mt = masterTable(); - dbg = TQString("TQUERY ") + schemaDataDebugString() + "\n" + dbg = TQString("QUERY ") + schemaDataDebugString() + "\n" + "-masterTable=" + (mt ? mt->name() :"<NULL>") + "\n-COLUMNS:\n" + ((fieldCount()>0) ? FieldList::debugString() : "<NONE>") + "\n" |