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 | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'kexi')
66 files changed, 243 insertions, 243 deletions
diff --git a/kexi/3rdparty/kexisql/src/build.c b/kexi/3rdparty/kexisql/src/build.c index 2fb19064..1dece406 100644 --- a/kexi/3rdparty/kexisql/src/build.c +++ b/kexi/3rdparty/kexisql/src/build.c @@ -526,7 +526,7 @@ void sqliteStartTable( /* Begin generating the code that will insert the table record into ** the SQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -1461,7 +1461,7 @@ void sqliteDeferForeignKey(Parse *pParse, int isDeferred){ ** Create a new index for an SQL table. pIndex is the name of the index ** and pTable is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -1531,7 +1531,7 @@ void sqliteCreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNITQUE constraint. We have to invent our + ** dealing with a primary key or UNIQUE constraint. We have to invent our ** own name. */ if( pName && !db->init.busy ){ @@ -1673,7 +1673,7 @@ void sqliteCreateIndex( ** we don't want to recreate it. ** ** If pTable==0 it means this index is generated as a primary key - ** or UNITQUE constraint of a CREATE TABLE statement. Since the table + ** or UNIQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -1767,7 +1767,7 @@ void sqliteDropIndex(Parse *pParse, SrcList *pName){ goto exit_drop_index; } if( pIndex->autoIndex ){ - sqliteErrorMsg(pParse, "index associated with UNITQUE " + sqliteErrorMsg(pParse, "index associated with UNIQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } diff --git a/kexi/3rdparty/kexisql/src/func.c b/kexi/3rdparty/kexisql/src/func.c index 0fcc291e..e21e8c8b 100644 --- a/kexi/3rdparty/kexisql/src/func.c +++ b/kexi/3rdparty/kexisql/src/func.c @@ -285,7 +285,7 @@ static void versionFunc(sqlite_func *context, int argc, const char **argv){ ** change. This function may disappear. Do not write code that depends ** on this function. ** -** Implementation of the TQUOTE() function. This function takes a single +** Implementation of the QUOTE() function. This function takes a single ** argument. If the argument is numeric, the return value is the same as ** the argument. If the argument is NULL, the return value is the string ** "NULL". Otherwise, the argument is enclosed in single quotes with diff --git a/kexi/3rdparty/kexisql/src/insert.c b/kexi/3rdparty/kexisql/src/insert.c index e8d5e567..660a2a56 100644 --- a/kexi/3rdparty/kexisql/src/insert.c +++ b/kexi/3rdparty/kexisql/src/insert.c @@ -567,7 +567,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNITQUE constraints are all checked. If a constraint fails, +** CHECK, and UNIQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -595,7 +595,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNITQUE REPLACE The other row that conflicts with the row +** UNIQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -753,7 +753,7 @@ void sqliteGenerateConstraintChecks( } } - /* Test all UNITQUE constraints by creating entries for each UNITQUE + /* Test all UNIQUE constraints by creating entries for each UNIQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -777,7 +777,7 @@ void sqliteGenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( pParse->db->onError!=OE_Default ){ @@ -843,7 +843,7 @@ void sqliteGenerateConstraintChecks( default: assert(0); } contAddr = sqliteVdbeCurrentAddr(v); -#if NULL_DISTINCT_FOR_UNITQUE +#if NULL_DISTINCT_FOR_UNIQUE sqliteVdbeChangeP2(v, jumpInst1, contAddr); #endif sqliteVdbeChangeP2(v, jumpInst2, contAddr); diff --git a/kexi/3rdparty/kexisql/src/main.c b/kexi/3rdparty/kexisql/src/main.c index 4fc118c8..c883f2ea 100644 --- a/kexi/3rdparty/kexisql/src/main.c +++ b/kexi/3rdparty/kexisql/src/main.c @@ -90,7 +90,7 @@ int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){ db->init.iDb = 0; }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNITQUE + ** was created to be the PRIMARY KEY or to fulfill a UNIQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. diff --git a/kexi/3rdparty/kexisql/src/parse.c b/kexi/3rdparty/kexisql/src/parse.c index 2fd6ae39..46353691 100644 --- a/kexi/3rdparty/kexisql/src/parse.c +++ b/kexi/3rdparty/kexisql/src/parse.c @@ -711,7 +711,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* FLOAT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNITQUE => nothing */ + 0, /* UNIQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* COLLATE => nothing */ @@ -840,7 +840,7 @@ static const char *yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "INTEGER", "CONSTRAINT", "DEFAULT", - "FLOAT", "NULL", "PRIMARY", "UNITQUE", + "FLOAT", "NULL", "PRIMARY", "UNIQUE", "CHECK", "REFERENCES", "COLLATE", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", @@ -935,7 +935,7 @@ static const char *yyRuleName[] = { /* 53 */ "ccons ::= NULL onconf", /* 54 */ "ccons ::= NOT NULL onconf", /* 55 */ "ccons ::= PRIMARY KEY sortorder onconf", - /* 56 */ "ccons ::= UNITQUE onconf", + /* 56 */ "ccons ::= UNIQUE onconf", /* 57 */ "ccons ::= CHECK LP expr RP onconf", /* 58 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 59 */ "ccons ::= defer_subclause", @@ -962,7 +962,7 @@ static const char *yyRuleName[] = { /* 80 */ "conslist ::= tcons", /* 81 */ "tcons ::= CONSTRAINT nm", /* 82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf", - /* 83 */ "tcons ::= UNITQUE LP idxlist RP onconf", + /* 83 */ "tcons ::= UNIQUE LP idxlist RP onconf", /* 84 */ "tcons ::= CHECK expr onconf", /* 85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 86 */ "defer_subclause_opt ::=", @@ -1115,7 +1115,7 @@ static const char *yyRuleName[] = { /* 233 */ "expritem ::= expr", /* 234 */ "expritem ::=", /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf", - /* 236 */ "uniqueflag ::= UNITQUE", + /* 236 */ "uniqueflag ::= UNIQUE", /* 237 */ "uniqueflag ::=", /* 238 */ "idxlist_opt ::=", /* 239 */ "idxlist_opt ::= LP idxlist RP", @@ -2183,7 +2183,7 @@ static void yy_reduce( #line 191 "parse.y" {sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);} #line 2185 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 57: /* No destructor defined for CHECK */ @@ -2342,7 +2342,7 @@ static void yy_reduce( #line 238 "parse.y" {sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);} #line 2344 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ /* No destructor defined for LP */ /* No destructor defined for RP */ break; @@ -3428,7 +3428,7 @@ static void yy_reduce( #line 740 "parse.y" { yygotominor.yy372 = OE_Abort; } #line 3430 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 237: #line 741 "parse.y" diff --git a/kexi/3rdparty/kexisql/src/parse.h b/kexi/3rdparty/kexisql/src/parse.h index 35949283..188a336c 100644 --- a/kexi/3rdparty/kexisql/src/parse.h +++ b/kexi/3rdparty/kexisql/src/parse.h @@ -92,7 +92,7 @@ #define TK_FLOAT 92 #define TK_NULL 93 #define TK_PRIMARY 94 -#define TK_UNITQUE 95 +#define TK_UNIQUE 95 #define TK_CHECK 96 #define TK_REFERENCES 97 #define TK_COLLATE 98 diff --git a/kexi/3rdparty/kexisql/src/sqliteInt.h b/kexi/3rdparty/kexisql/src/sqliteInt.h index 3f8858e0..dd0710f9 100644 --- a/kexi/3rdparty/kexisql/src/sqliteInt.h +++ b/kexi/3rdparty/kexisql/src/sqliteInt.h @@ -45,16 +45,16 @@ /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNITQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNITQUE. This is the way Informix and SQL Server +** a UNIQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNIQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNITQUE 1 +#define NULL_DISTINCT_FOR_UNIQUE 1 /* ** The maximum number of attached databases. This must be at least 2 @@ -563,7 +563,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNITQUE constraint violation are removed so that the new insert or +** a UNIQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -623,7 +623,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ Index *pNext; /* The next index associated with the same table */ }; diff --git a/kexi/3rdparty/kexisql/src/tokenize.c b/kexi/3rdparty/kexisql/src/tokenize.c index 40fe48ef..68cb9f99 100644 --- a/kexi/3rdparty/kexisql/src/tokenize.c +++ b/kexi/3rdparty/kexisql/src/tokenize.c @@ -130,7 +130,7 @@ static Keyword aKeywordTable[] = { { "TRANSACTION", TK_TRANSACTION, }, { "TRIGGER", TK_TRIGGER, }, { "UNION", TK_UNION, }, - { "UNITQUE", TK_UNITQUE, }, + { "UNIQUE", TK_UNIQUE, }, { "UPDATE", TK_UPDATE, }, { "USING", TK_USING, }, { "VACUUM", TK_VACUUM, }, diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c index 9f31e9cf..fb52ef38 100644 --- a/kexi/3rdparty/kexisql/src/vdbe.c +++ b/kexi/3rdparty/kexisql/src/vdbe.c @@ -2741,7 +2741,7 @@ case OP_IsUnique: { /* The last four bytes of the key are different from R. Convert the ** last four bytes of the key into an integer and push it onto the ** stack. (These bytes are the record number of an entry that - ** violates a UNITQUE constraint.) + ** violates a UNIQUE constraint.) */ pTos++; pTos->i = v; diff --git a/kexi/3rdparty/kexisql3/src/alter.c b/kexi/3rdparty/kexisql3/src/alter.c index 72ebd6c7..eba01e29 100644 --- a/kexi/3rdparty/kexisql3/src/alter.c +++ b/kexi/3rdparty/kexisql3/src/alter.c @@ -231,7 +231,7 @@ static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){ #ifndef SQLITE_OMIT_TRIGGER /* Now, if the table is not stored in the temp database, reload any temp - ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBTQUERY is defined. + ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined. */ if( (zWhere=whereTempTriggers(pParse, pTab)) ){ sqlite3VdbeOp3(v, OP_ParseSchema, 1, 0, zWhere, P3_DYNAMIC); @@ -407,7 +407,7 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ pDflt = 0; } - /* Check that the new column is not specified as PRIMARY KEY or UNITQUE. + /* Check that the new column is not specified as PRIMARY KEY or UNIQUE. ** If there is a NOT NULL constraint, then the default value for the ** column must not be NULL. */ @@ -416,7 +416,7 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ return; } if( pNew->pIndex ){ - sqlite3ErrorMsg(pParse, "Cannot add a UNITQUE column"); + sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column"); return; } if( pCol->notNull && !pDflt ){ diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c index 212be42e..472d63a6 100644 --- a/kexi/3rdparty/kexisql3/src/btree.c +++ b/kexi/3rdparty/kexisql3/src/btree.c @@ -3644,7 +3644,7 @@ static void assemblePage( /* Forward reference */ static int balance(MemPage*, int); -#ifndef SQLITE_OMIT_TQUICKBALANCE +#ifndef SQLITE_OMIT_QUICKBALANCE /* ** This version of balance() handles the common special case where ** a new entry is being inserted on the extreme right-end of the @@ -3732,7 +3732,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ releasePage(pNew); return balance(pParent, 0); } -#endif /* SQLITE_OMIT_TQUICKBALANCE */ +#endif /* SQLITE_OMIT_QUICKBALANCE */ /* ** The ISAUTOVACUUM macro is used within balance_nonroot() to determine @@ -3822,7 +3822,7 @@ static int balance_nonroot(MemPage *pPage){ assert( pParent ); TRACE(("BALANCE: begin page %d child of %d\n", pPage->pgno, pParent->pgno)); -#ifndef SQLITE_OMIT_TQUICKBALANCE +#ifndef SQLITE_OMIT_QUICKBALANCE /* ** A special case: If a new entry has just been inserted into a ** table (that is, a btree with integer keys and all data at the leaves) diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c index 67ed7975..429213da 100644 --- a/kexi/3rdparty/kexisql3/src/build.c +++ b/kexi/3rdparty/kexisql3/src/build.c @@ -746,7 +746,7 @@ void sqlite3StartTable( /* Begin generating the code that will insert the table record into ** the SQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -2011,7 +2011,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ ** Create a new index for an SQL table. pName1.pName2 is the name of the index ** and pTblList is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -2104,7 +2104,7 @@ void sqlite3CreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNITQUE constraint. We have to invent our + ** dealing with a primary key or UNIQUE constraint. We have to invent our ** own name. */ if( pName ){ @@ -2211,12 +2211,12 @@ void sqlite3CreateIndex( if( pTab==pParse->pNewTable ){ /* This routine has been called to create an automatic index as a - ** result of a PRIMARY KEY or UNITQUE clause on a column definition, or - ** a PRIMARY KEY or UNITQUE clause following the column definitions. + ** result of a PRIMARY KEY or UNIQUE clause on a column definition, or + ** a PRIMARY KEY or UNIQUE clause following the column definitions. ** i.e. one of: ** ** CREATE TABLE t(x PRIMARY KEY, y); - ** CREATE TABLE t(x, y, UNITQUE(x, y)); + ** CREATE TABLE t(x, y, UNIQUE(x, y)); ** ** Either way, check to see if the table already has such an index. If ** so, don't bother creating this one. This only applies to @@ -2285,7 +2285,7 @@ void sqlite3CreateIndex( ** we don't want to recreate it. ** ** If pTblName==0 it means this index is generated as a primary key - ** or UNITQUE constraint of a CREATE TABLE statement. Since the table + ** or UNIQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -2309,11 +2309,11 @@ void sqlite3CreateIndex( if( pStart && pEnd ){ /* A named index with an explicit CREATE INDEX statement */ zStmt = sqlite3MPrintf("CREATE%s INDEX %.*s", - onError==OE_None ? "" : " UNITQUE", + onError==OE_None ? "" : " UNIQUE", pEnd->z - pName->z + 1, pName->z); }else{ - /* An automatic index created by a PRIMARY KEY or UNITQUE constraint */ + /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */ /* zStmt = sqlite3MPrintf(""); */ zStmt = 0; } @@ -2428,7 +2428,7 @@ void sqlite3DropIndex(Parse *pParse, SrcList *pName){ goto exit_drop_index; } if( pIndex->autoIndex ){ - sqlite3ErrorMsg(pParse, "index associated with UNITQUE " + sqlite3ErrorMsg(pParse, "index associated with UNIQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c index 8d9cfbbd..45f7fc2f 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); diff --git a/kexi/3rdparty/kexisql3/src/func.c b/kexi/3rdparty/kexisql3/src/func.c index 3e50d8fb..e154c284 100644 --- a/kexi/3rdparty/kexisql3/src/func.c +++ b/kexi/3rdparty/kexisql3/src/func.c @@ -545,7 +545,7 @@ static void versionFunc( ** change. This function may disappear. Do not write code that depends ** on this function. ** -** Implementation of the TQUOTE() function. This function takes a single +** Implementation of the QUOTE() function. This function takes a single ** argument. If the argument is numeric, the return value is the same as ** the argument. If the argument is NULL, the return value is the string ** "NULL". Otherwise, the argument is enclosed in single quotes with diff --git a/kexi/3rdparty/kexisql3/src/insert.c b/kexi/3rdparty/kexisql3/src/insert.c index 7b8735a1..28d4236e 100644 --- a/kexi/3rdparty/kexisql3/src/insert.c +++ b/kexi/3rdparty/kexisql3/src/insert.c @@ -746,7 +746,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNITQUE constraints are all checked. If a constraint fails, +** CHECK, and UNIQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -774,7 +774,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNITQUE REPLACE The other row that conflicts with the row +** UNIQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -927,7 +927,7 @@ void sqlite3GenerateConstraintChecks( } } - /* Test all UNITQUE constraints by creating entries for each UNITQUE + /* Test all UNIQUE constraints by creating entries for each UNIQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -951,7 +951,7 @@ void sqlite3GenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( onError==OE_Default ){ @@ -1015,7 +1015,7 @@ void sqlite3GenerateConstraintChecks( break; } } -#if NULL_DISTINCT_FOR_UNITQUE +#if NULL_DISTINCT_FOR_UNIQUE sqlite3VdbeJumpHere(v, jumpInst1); #endif sqlite3VdbeJumpHere(v, jumpInst2); diff --git a/kexi/3rdparty/kexisql3/src/keywordhash.h b/kexi/3rdparty/kexisql3/src/keywordhash.h index 708440a2..9beb5fbd 100644 --- a/kexi/3rdparty/kexisql3/src/keywordhash.h +++ b/kexi/3rdparty/kexisql3/src/keywordhash.h @@ -8,8 +8,8 @@ static int keywordCode(const char *z, int n){ "CASECASTCOLLATECOLUMNCOMMITCONFLICTCONSTRAINTERSECTCREATECROSS" "CURRENT_DATECURRENT_TIMESTAMPLANDESCDETACHDISTINCTDROPRAGMATCH" "FAILIMITFROMFULLGROUPDATEIMMEDIATEINSERTINSTEADINTOFFSETISNULL" - "JOINORDEREPLACEOUTERESTRICTPRIMARYTQUERYRIGHTROLLBACKROWHENUNION" - "UNITQUEUSINGVACUUMVALUESVIEWHERE"; + "JOINORDEREPLACEOUTERESTRICTPRIMARYQUERYRIGHTROLLBACKROWHENUNION" + "UNIQUEUSINGVACUUMVALUESVIEWHERE"; static const unsigned char aHash[127] = { 91, 80, 106, 90, 0, 4, 0, 0, 113, 0, 83, 0, 0, 94, 44, 76, 92, 0, 105, 108, 96, 0, 0, 10, 0, 0, @@ -76,8 +76,8 @@ static int keywordCode(const char *z, int n){ TK_FROM, TK_JOIN_KW, TK_GROUP, TK_UPDATE, TK_IMMEDIATE, TK_INSERT, TK_INSTEAD, TK_INTO, TK_OF, TK_OFFSET, TK_SET, TK_ISNULL, TK_JOIN, TK_ORDER, TK_REPLACE, - TK_JOIN_KW, TK_RESTRICT, TK_PRIMARY, TK_TQUERY, TK_JOIN_KW, - TK_ROLLBACK, TK_ROW, TK_WHEN, TK_UNION, TK_UNITQUE, + TK_JOIN_KW, TK_RESTRICT, TK_PRIMARY, TK_QUERY, TK_JOIN_KW, + TK_ROLLBACK, TK_ROW, TK_WHEN, TK_UNION, TK_UNIQUE, TK_USING, TK_VACUUM, TK_VALUES, TK_VIEW, TK_WHERE, }; int h, i; diff --git a/kexi/3rdparty/kexisql3/src/parse.c b/kexi/3rdparty/kexisql3/src/parse.c index 7c1fe420..668f0012 100644 --- a/kexi/3rdparty/kexisql3/src/parse.c +++ b/kexi/3rdparty/kexisql3/src/parse.c @@ -682,7 +682,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* CONST_FUNC => nothing */ 0, /* SEMI => nothing */ 30, /* EXPLAIN => ID */ - 30, /* TQUERY => ID */ + 30, /* QUERY => ID */ 30, /* PLAN => ID */ 30, /* BEGIN => ID */ 0, /* TRANSACTION => nothing */ @@ -770,7 +770,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* DEFAULT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNITQUE => nothing */ + 0, /* UNIQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* COLLATE => nothing */ @@ -910,7 +910,7 @@ static const char *const yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "CONSTRAINT", "DEFAULT", "NULL", - "PRIMARY", "UNITQUE", "CHECK", "REFERENCES", + "PRIMARY", "UNIQUE", "CHECK", "REFERENCES", "COLLATE", "AUTOINCR", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", "ALL", @@ -962,7 +962,7 @@ static const char *const yyRuleName[] = { /* 5 */ "ecmd ::= explain cmdx SEMI", /* 6 */ "explain ::=", /* 7 */ "explain ::= EXPLAIN", - /* 8 */ "explain ::= EXPLAIN TQUERY PLAN", + /* 8 */ "explain ::= EXPLAIN QUERY PLAN", /* 9 */ "cmd ::= BEGIN transtype trans_opt", /* 10 */ "trans_opt ::=", /* 11 */ "trans_opt ::= TRANSACTION", @@ -1011,7 +1011,7 @@ static const char *const yyRuleName[] = { /* 54 */ "ccons ::= NULL onconf", /* 55 */ "ccons ::= NOT NULL onconf", /* 56 */ "ccons ::= PRIMARY KEY sortorder onconf autoinc", - /* 57 */ "ccons ::= UNITQUE onconf", + /* 57 */ "ccons ::= UNIQUE onconf", /* 58 */ "ccons ::= CHECK LP expr RP onconf", /* 59 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 60 */ "ccons ::= defer_subclause", @@ -1040,7 +1040,7 @@ static const char *const yyRuleName[] = { /* 83 */ "conslist ::= tcons", /* 84 */ "tcons ::= CONSTRAINT nm", /* 85 */ "tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf", - /* 86 */ "tcons ::= UNITQUE LP idxlist RP onconf", + /* 86 */ "tcons ::= UNIQUE LP idxlist RP onconf", /* 87 */ "tcons ::= CHECK expr onconf", /* 88 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 89 */ "defer_subclause_opt ::=", @@ -1199,7 +1199,7 @@ static const char *const yyRuleName[] = { /* 242 */ "expritem ::= expr", /* 243 */ "expritem ::=", /* 244 */ "cmd ::= CREATE uniqueflag INDEX nm dbnm ON nm LP idxlist RP onconf", - /* 245 */ "uniqueflag ::= UNITQUE", + /* 245 */ "uniqueflag ::= UNIQUE", /* 246 */ "uniqueflag ::=", /* 247 */ "idxlist_opt ::=", /* 248 */ "idxlist_opt ::= LP idxlist RP", diff --git a/kexi/3rdparty/kexisql3/src/parse.h b/kexi/3rdparty/kexisql3/src/parse.h index b96836ce..fcedda58 100644 --- a/kexi/3rdparty/kexisql3/src/parse.h +++ b/kexi/3rdparty/kexisql3/src/parse.h @@ -10,7 +10,7 @@ #define TK_CONST_FUNC 10 #define TK_SEMI 11 #define TK_EXPLAIN 12 -#define TK_TQUERY 13 +#define TK_QUERY 13 #define TK_PLAN 14 #define TK_BEGIN 15 #define TK_TRANSACTION 16 @@ -98,7 +98,7 @@ #define TK_DEFAULT 98 #define TK_NULL 99 #define TK_PRIMARY 100 -#define TK_UNITQUE 101 +#define TK_UNIQUE 101 #define TK_CHECK 102 #define TK_REFERENCES 103 #define TK_COLLATE 104 diff --git a/kexi/3rdparty/kexisql3/src/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c index a0c7be87..b3222a82 100644 --- a/kexi/3rdparty/kexisql3/src/prepare.c +++ b/kexi/3rdparty/kexisql3/src/prepare.c @@ -77,7 +77,7 @@ int sqlite3InitCallback(void *pInit, int argc, char **argv, char **azColName){ } }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNITQUE + ** was created to be the PRIMARY KEY or to fulfill a UNIQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c index 7cb7b176..86b22c38 100644 --- a/kexi/3rdparty/kexisql3/src/select.c +++ b/kexi/3rdparty/kexisql3/src/select.c @@ -518,7 +518,7 @@ static int selectInnerLoop( break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY /* If we are creating a set for an "expr IN (SELECT ...)" construct, ** then there should be a single item on the stack. Write this ** item into the set table with bogus data. @@ -562,7 +562,7 @@ static int selectInnerLoop( } break; } -#endif /* #ifndef SQLITE_OMIT_SUBTQUERY */ +#endif /* #ifndef SQLITE_OMIT_SUBQUERY */ /* Send the data to the callback function or to a subroutine. In the ** case of a subroutine, the subroutine itself is responsible for @@ -671,7 +671,7 @@ static void generateSortTail( sqlite3VdbeAddOp(v, OP_Insert, iParm, 0); break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case SRT_Set: { assert( nColumn==1 ); sqlite3VdbeAddOp(v, OP_NotNull, -1, sqlite3VdbeCurrentAddr(v)+3); @@ -773,7 +773,7 @@ static const char *columnType(NameContext *pNC, Expr *pExpr){ } break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_SELECT: { NameContext sNC; Select *pS = pExpr->pSelect; @@ -1058,7 +1058,7 @@ static int prepSelectStmt(Parse *pParse, Select *p){ return 0; } if( pFrom->zName==0 ){ -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY /* A sub-query in the FROM clause of a SELECT */ assert( pFrom->pSelect!=0 ); if( pFrom->zAlias==0 ){ @@ -2664,7 +2664,7 @@ int sqlite3Select( ** only a single column may be output. */ assert( eDest!=SRT_Exists || pEList->nExpr==1 ); -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY if( (eDest==SRT_Mem || eDest==SRT_Set) && pEList->nExpr>1 ){ sqlite3ErrorMsg(pParse, "only a single result allowed for " "a SELECT that is part of an expression"); @@ -2692,7 +2692,7 @@ int sqlite3Select( /* Generate code for all sub-queries in the FROM clause */ -#if !defined(SQLITE_OMIT_SUBTQUERY) || !defined(SQLITE_OMIT_VIEW) +#if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) for(i=0; i<pTabList->nSrc; i++){ const char *zSavedAuthContext = 0; int needRestoreContext; @@ -3098,7 +3098,7 @@ int sqlite3Select( generateSortTail(pParse, p, v, pEList->nExpr, eDest, iParm); } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY /* If this was a subquery, we have now converted the subquery into a ** temporary table. So delete the subquery structure from the parent ** to prevent this subquery from being evaluated again and to force the diff --git a/kexi/3rdparty/kexisql3/src/sqliteInt.h b/kexi/3rdparty/kexisql3/src/sqliteInt.h index 153b537b..796653e7 100644 --- a/kexi/3rdparty/kexisql3/src/sqliteInt.h +++ b/kexi/3rdparty/kexisql3/src/sqliteInt.h @@ -104,16 +104,16 @@ /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNITQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNITQUE. This is the way Informix and SQL Server +** a UNIQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNIQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNITQUE 1 +#define NULL_DISTINCT_FOR_UNIQUE 1 /* ** The maximum number of attached databases. This must be at least 2 @@ -700,7 +700,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNITQUE constraint violation are removed so that the new insert or +** a UNIQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -779,7 +779,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ char *zColAff; /* String defining the affinity of each column */ Index *pNext; /* The next index associated with the same table */ diff --git a/kexi/3rdparty/kexisql3/src/vacuum.c b/kexi/3rdparty/kexisql3/src/vacuum.c index 8f22c7f8..6f544a6b 100644 --- a/kexi/3rdparty/kexisql3/src/vacuum.c +++ b/kexi/3rdparty/kexisql3/src/vacuum.c @@ -212,8 +212,8 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ " FROM sqlite_master WHERE sql LIKE 'CREATE INDEX %' ", 0); if( rc!=SQLITE_OK ) goto end_of_vacuum; rc = execExecSql(db, - "SELECT 'CREATE UNITQUE INDEX vacuum_db.' || substr(sql,21,100000000) " - " FROM sqlite_master WHERE sql LIKE 'CREATE UNITQUE INDEX %'", 0); + "SELECT 'CREATE UNIQUE INDEX vacuum_db.' || substr(sql,21,100000000) " + " FROM sqlite_master WHERE sql LIKE 'CREATE UNIQUE INDEX %'", 0); if( rc!=SQLITE_OK ) goto end_of_vacuum; rc = execExecSql(db, "SELECT 'CREATE VIEW vacuum_db.' || substr(sql,13,100000000) " diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c index 8ff95946..e70c0d2d 100644 --- a/kexi/3rdparty/kexisql3/src/vdbe.c +++ b/kexi/3rdparty/kexisql3/src/vdbe.c @@ -1676,7 +1676,7 @@ case OP_BitNot: { /* same as TK_BITNOT, no-push */ */ /* ** The magic Explain opcode are only inserted when explain==2 (which -** is to say when the EXPLAIN TQUERY PLAN syntax is used.) +** is to say when the EXPLAIN QUERY PLAN syntax is used.) ** This opcode records information from the optimizer. It is the ** the same as a no-op. This opcodesnever appears in a real VM program. */ @@ -2956,7 +2956,7 @@ case OP_IsUnique: { /* no-push */ } /* The final varint of the key is different from R. Push it onto - ** the stack. (The record number of an entry that violates a UNITQUE + ** the stack. (The record number of an entry that violates a UNIQUE ** constraint.) */ pTos++; diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c index c0457ffc..a4b0c5fc 100644 --- a/kexi/3rdparty/kexisql3/src/where.c +++ b/kexi/3rdparty/kexisql3/src/where.c @@ -170,7 +170,7 @@ struct ExprMaskSet { #define WHERE_IDX_ONLY 0x0800 /* Use index only - omit table */ #define WHERE_ORDERBY 0x1000 /* Output will appear in correct order */ #define WHERE_REVERSE 0x2000 /* Scan in reverse order */ -#define WHERE_UNITQUE 0x4000 /* Selects no more than one row */ +#define WHERE_UNIQUE 0x4000 /* Selects no more than one row */ /* ** Initialize a preallocated WhereClause structure. @@ -747,7 +747,7 @@ or_not_possible: ** clause and the match can still be a success. ** ** All terms of the ORDER BY that match against the index must be either -** ASC or DESC. (Terms of the ORDER BY clause past the end of a UNITQUE +** ASC or DESC. (Terms of the ORDER BY clause past the end of a UNIQUE ** index do not need to satisfy this constraint.) The *pbRev value is ** set to 1 if the ORDER BY clause is all DESC and it is set to 0 if ** the ORDER BY clause is all ASC. @@ -915,7 +915,7 @@ static double bestIndex( if( pTerm->operator & WO_EQ ){ /* Rowid== is always the best pick. Look no further. Because only ** a single row is generated, output is always in sorted order */ - *pFlags = WHERE_ROWID_EQ | WHERE_UNITQUE; + *pFlags = WHERE_ROWID_EQ | WHERE_UNIQUE; *pnEq = 1; TRACE(("... best is rowid\n")); return 0.0; @@ -1007,7 +1007,7 @@ static double bestIndex( nEq = i; if( pProbe->onError!=OE_None && (flags & WHERE_COLUMN_IN)==0 && nEq==pProbe->nColumn ){ - flags |= WHERE_UNITQUE; + flags |= WHERE_UNIQUE; } TRACE(("...... nEq=%d inMult=%.9g cost=%.9g\n", nEq, inMultiplier, cost)); @@ -1169,7 +1169,7 @@ static void codeEqualityTerm( if( pX->op!=TK_IN ){ assert( pX->op==TK_EQ ); sqlite3ExprCode(pParse, pX->pRight); -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY }else{ int iTab; int *aIn; @@ -1514,7 +1514,7 @@ WhereInfo *sqlite3WhereBegin( /* If the total query only selects a single row, then the ORDER BY ** clause is irrelevant. */ - if( (andFlags & WHERE_UNITQUE)!=0 && ppOrderBy ){ + if( (andFlags & WHERE_UNIQUE)!=0 && ppOrderBy ){ *ppOrderBy = 0; } diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index a5b962da..9037b041 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -671,7 +671,7 @@ TQString Connection::currentDatabase() const bool Connection::useTemporaryDatabaseIfNeeded(TQString &tmpdbName) { - if (!m_driver->isFileDriver() && m_driver->beh->USING_DATABASE_RETQUIRED_TO_CONNECT + if (!m_driver->isFileDriver() && m_driver->beh->USING_DATABASE_REQUIRED_TO_CONNECT && !isDatabaseUsed()) { //we have no db used, but it is required by engine to have used any! tmpdbName = anyAvailableDatabaseName(); @@ -884,8 +884,8 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem sql += ", "; TQString v = escapeIdentifier(field->name()) + " "; const bool autoinc = field->isAutoIncrement(); - const bool pk = field->isPrimaryKey() || (autoinc && m_driver->beh->AUTO_INCREMENT_RETQUIRES_PK); -//TODO: warning: ^^^^^ this allows only one autonumber per table when AUTO_INCREMENT_RETQUIRES_PK==true! + const bool pk = field->isPrimaryKey() || (autoinc && m_driver->beh->AUTO_INCREMENT_REQUIRES_PK); +//TODO: warning: ^^^^^ this allows only one autonumber per table when AUTO_INCREMENT_REQUIRES_PK==true! if (autoinc && m_driver->beh->SPECIAL_AUTO_INCREMENT_DEF) { if (pk) v += m_driver->beh->AUTO_INCREMENT_TYPE + " " + m_driver->beh->AUTO_INCREMENT_PK_FIELD_OPTION; @@ -918,7 +918,7 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem if (pk) v += " PRIMARY KEY"; if (!pk && field->isUniqueKey()) - v += " UNITQUE"; + v += " UNIQUE"; ///@todo IS this ok for all engines?: if (!autoinc && !field->isPrimaryKey() && field->isNotNull()) if (!autoinc && !pk && field->isNotNull()) v += " NOT NULL"; //only add not null option if no autocommit is set @@ -2481,7 +2481,7 @@ bool Connection::resultExists(const TQString& sql, bool &success, bool addLimitT { KexiDB::Cursor *cursor; //optimization - if (m_driver->beh->SELECT_1_SUBTQUERY_SUPPORTED) { + if (m_driver->beh->SELECT_1_SUBQUERY_SUPPORTED) { //this is at least for sqlite if (addLimitTo1 && sql.left(6).upper() == "SELECT") m_sql = TQString("SELECT 1 FROM (") + sql + ") LIMIT 1"; // is this safe?; @@ -3279,7 +3279,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf if (b.isEmpty()) { // empty row inserting requested: if (!getROWID && !pkey) { - KexiDBWarn << "MASTER TABLE's PKEY RETQUIRED FOR INSERTING EMPTY ROWS: INSERT CANCELLED" << endl; + KexiDBWarn << "MASTER TABLE's PKEY REQUIRED FOR INSERTING EMPTY ROWS: INSERT CANCELLED" << endl; setError(ERR_INSERT_NO_MASTER_TABLES_PKEY, i18n("Could not insert row because master table has no primary key defined.")); return false; diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp index 75c30cfa..b5f095e2 100644 --- a/kexi/kexidb/cursor.cpp +++ b/kexi/kexidb/cursor.cpp @@ -166,7 +166,7 @@ bool Cursor::open() //luci: WHAT_EXACTLY_SHOULD_THAT_BE? // if (!m_readAhead) // jowenn: to ensure before first state, without cluttering implementation code - if (m_conn->driver()->beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY) { + if (m_conn->driver()->beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY) { // KexiDBDbg << "READ AHEAD:" << endl; m_readAhead = getNextRecord(); //true if any record in this query // KexiDBDbg << "READ AHEAD = " << m_readAhead << endl; diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index d760a004..8e08b83f 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -49,12 +49,12 @@ DriverBehaviour::DriverBehaviour() , AUTO_INCREMENT_FIELD_OPTION("AUTO_INCREMENT") , AUTO_INCREMENT_PK_FIELD_OPTION("AUTO_INCREMENT PRIMARY KEY") , SPECIAL_AUTO_INCREMENT_DEF(false) - , AUTO_INCREMENT_RETQUIRES_PK(false) + , AUTO_INCREMENT_REQUIRES_PK(false) , ROW_ID_FIELD_RETURNS_LAST_AUTOINCREMENTED_VALUE(false) - , TQUOTATION_MARKS_FOR_IDENTIFIER('"') - , USING_DATABASE_RETQUIRED_TO_CONNECT(true) - , _1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY(false) - , SELECT_1_SUBTQUERY_SUPPORTED(false) + , QUOTATION_MARKS_FOR_IDENTIFIER('"') + , USING_DATABASE_REQUIRED_TO_CONNECT(true) + , _1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY(false) + , SELECT_1_SUBQUERY_SUPPORTED(false) , SQL_KEYWORDS(0) { } @@ -350,7 +350,7 @@ TQCString Driver::escapeIdentifier(const TQCString& str, int options) const return quote + TQCString(str).replace( quote, "\"\"" ) + quote; } else if (needOuterQuotes) { - const char quote = beh->TQUOTATION_MARKS_FOR_IDENTIFIER.latin1(); + const char quote = beh->QUOTATION_MARKS_FOR_IDENTIFIER.latin1(); return quote + drv_escapeIdentifier(str) + quote; } else { return drv_escapeIdentifier(str); diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h index 3c69a687..96f271b2 100644 --- a/kexi/kexidb/driver.h +++ b/kexi/kexidb/driver.h @@ -319,7 +319,7 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object Implement escaping for any character like " or ' as your database engine requires. Do not append or prepend any quotation marks characters - it is automatically done by escapeIdentifier() using - DriverBehaviour::TQUOTATION_MARKS_FOR_IDENTIFIER. + DriverBehaviour::QUOTATION_MARKS_FOR_IDENTIFIER. */ virtual TQString drv_escapeIdentifier( const TQString& str ) const = 0; diff --git a/kexi/kexidb/driver_p.h b/kexi/kexidb/driver_p.h index 7a9be4ee..daf34a2c 100644 --- a/kexi/kexidb/driver_p.h +++ b/kexi/kexidb/driver_p.h @@ -72,7 +72,7 @@ class KEXI_DB_EXPORT DriverBehaviour /*! True if autoincrement requires field to be declared as primary key. This is true for SQLite. False by default. */ - bool AUTO_INCREMENT_RETQUIRES_PK : 1; + bool AUTO_INCREMENT_REQUIRES_PK : 1; /*! Name of a field (or built-in function) with autoincremented unique value, typically returned by Connection::drv_lastInsertRowID(). @@ -114,7 +114,7 @@ class KEXI_DB_EXPORT DriverBehaviour /*! Quotation marks used for escaping identifier (see Driver::escapeIdentifier()). Default value is '"'. Change it for your driver. */ - TQChar TQUOTATION_MARKS_FOR_IDENTIFIER; + TQChar QUOTATION_MARKS_FOR_IDENTIFIER; /*! True if using database is requied to perform real connection. This is true for may engines, e.g. for PostgreSQL, where connections @@ -122,16 +122,16 @@ class KEXI_DB_EXPORT DriverBehaviour This flag is unused for file-based db drivers, by default set to true and used for all other db drivers. */ - bool USING_DATABASE_RETQUIRED_TO_CONNECT : 1; + bool USING_DATABASE_REQUIRED_TO_CONNECT : 1; /*! True if before we know whether the fetched result of executed query is empty or not, we need to fetch first record. Particularly, it's true for SQLite. The flag is used in Cursor::open(). By default this flag is false. */ - bool _1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY : 1; + bool _1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY : 1; /*! True if "SELECT 1 from (subquery)" is supported. False by default. Used in Connection::resultExists() for optimization. It's set to true for SQLite driver. */ - bool SELECT_1_SUBTQUERY_SUPPORTED : 1; + bool SELECT_1_SUBQUERY_SUPPORTED : 1; /*! Keywords that need to be escaped for the driver. Set this before calling Driver::initSQLKeywords. */ diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 0f2bcf9b..0d2fe99b 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -63,9 +63,9 @@ MySqlDriver::MySqlDriver(TQObject *parent, const char *name, const TQStringList beh->ROW_ID_FIELD_NAME="LAST_INSERT_ID()"; beh->ROW_ID_FIELD_RETURNS_LAST_AUTOINCREMENTED_VALUE=true; - beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=false; - beh->USING_DATABASE_RETQUIRED_TO_CONNECT=false; - beh->TQUOTATION_MARKS_FOR_IDENTIFIER='`'; + beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=false; + beh->USING_DATABASE_REQUIRED_TO_CONNECT=false; + beh->QUOTATION_MARKS_FOR_IDENTIFIER='`'; beh->SQL_KEYWORDS = keywords; initSQLKeywords(331); diff --git a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp index 89aad061..e06adb5e 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp @@ -177,7 +177,7 @@ namespace KexiDB { "MASTER_SSL_KEY", "MASTER_USER", "MAX_CONNECTIONS_PER_HOUR", - "MAX_TQUERIES_PER_HOUR", + "MAX_QUERIES_PER_HOUR", "MAX_ROWS", "MAX_UPDATES_PER_HOUR", "MEDIUM", @@ -246,7 +246,7 @@ namespace KexiDB { "REPAIR", "REPEATABLE", "REPLICATION", - "RETQUIRE", + "REQUIRE", "RESET", "RESTORE", "RETURNS", diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.h b/kexi/kexidb/drivers/pqxx/pqxxconnection.h index 7e7cdf69..2773e08d 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxconnection.h +++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef PTQXXCONNECTION_H -#define PTQXXCONNECTION_H +#ifndef PQXXCONNECTION_H +#define PQXXCONNECTION_H #include <tqstringlist.h> diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h b/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h index 2d33e410..3adf09d9 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h +++ b/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h @@ -27,8 +27,8 @@ // Copyright: See COPYING file that comes with this distribution // // -#ifndef PTQXXSQLCONNECTIONINTERNAL_H -#define PTQXXSQLCONNECTIONINTERNAL_H +#ifndef PQXXSQLCONNECTIONINTERNAL_H +#define PQXXSQLCONNECTIONINTERNAL_H #include <kexidb/connection_p.h> #include <pqxx/pqxx> diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp index 3b5de6f9..4ae03ced 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp @@ -44,7 +44,7 @@ static TQByteArray pgsqlByteaToByteArray(const pqxx::result::field& r) pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement, uint options): Cursor(conn,statement, options) { -// KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query statement" << endl; +// KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query statement" << endl; my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql; m_options = Buffered; m_res = 0; @@ -57,7 +57,7 @@ pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement pqxxSqlCursor::pqxxSqlCursor(Connection* conn, QuerySchema& query, uint options ) : Cursor( conn, query, options ) { -// KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query schema" << endl; +// KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query schema" << endl; my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql; m_options = Buffered; m_res = 0; diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h index 8a61978d..0a0fb2d5 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXIDB_CURSOR_PTQXX_H -#define KEXIDB_CURSOR_PTQXX_H +#ifndef KEXIDB_CURSOR_PQXX_H +#define KEXIDB_CURSOR_PQXX_H #include <kexidb/cursor.h> #include <kexidb/connection.h> diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index 8967bc5e..fea3fa57 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -47,7 +47,7 @@ pqxxSqlDriver::pqxxSqlDriver( TQObject *parent, const char *name, const TQString beh->AUTO_INCREMENT_FIELD_OPTION = ""; beh->AUTO_INCREMENT_PK_FIELD_OPTION = "PRIMARY KEY"; beh->ALWAYS_AVAILABLE_DATABASE_NAME = "template1"; - beh->TQUOTATION_MARKS_FOR_IDENTIFIER = '"'; + beh->QUOTATION_MARKS_FOR_IDENTIFIER = '"'; beh->SQL_KEYWORDS = keywords; initSQLKeywords(233); diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.h b/kexi/kexidb/drivers/pqxx/pqxxdriver.h index 8ea7b1fa..c7a0fed9 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.h +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXIDB_DRIVER_PTQXX_H -#define KEXIDB_DRIVER_PTQXX_H +#ifndef KEXIDB_DRIVER_PQXX_H +#define KEXIDB_DRIVER_PQXX_H #include <tqstringlist.h> diff --git a/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h b/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h index 1421f5a4..232454d3 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h +++ b/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h @@ -22,8 +22,8 @@ // Description: // // -#ifndef PTQXXPREPAREDSTATEMENT_H -#define PTQXXPREPAREDSTATEMENT_H +#ifndef PQXXPREPAREDSTATEMENT_H +#define PQXXPREPAREDSTATEMENT_H #include <kexidb/preparedstatement.h> #include <kexidb/connection_p.h> diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp index fc356558..d0b7cf45 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp @@ -66,11 +66,11 @@ SQLiteDriver::SQLiteDriver( TQObject *parent, const char *name, const TQStringLi beh->AUTO_INCREMENT_FIELD_OPTION = ""; //not available beh->AUTO_INCREMENT_TYPE = "INTEGER"; beh->AUTO_INCREMENT_PK_FIELD_OPTION = "PRIMARY KEY"; - beh->AUTO_INCREMENT_RETQUIRES_PK = true; + beh->AUTO_INCREMENT_REQUIRES_PK = true; beh->ROW_ID_FIELD_NAME = "OID"; - beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=true; - beh->TQUOTATION_MARKS_FOR_IDENTIFIER='"'; - beh->SELECT_1_SUBTQUERY_SUPPORTED = true; + beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=true; + beh->QUOTATION_MARKS_FOR_IDENTIFIER='"'; + beh->SELECT_1_SUBQUERY_SUPPORTED = true; beh->SQL_KEYWORDS = keywords; initSQLKeywords(29); diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index b60cd505..fabdf603 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -564,7 +564,7 @@ bool ConstExpr::validate(ParseInfo& parseInfo) //========================================= QueryParameterExpr::QueryParameterExpr(const TQString& message) -: ConstExpr( TQUERY_PARAMETER, message ) +: ConstExpr( QUERY_PARAMETER, message ) , m_type(Field::Text) { m_cl = KexiDBExpr_QueryParameter; diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index b12000ac..79b38aca 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -598,7 +598,7 @@ TQString Field::debugString() const if (m_constraints & Field::AutoInc) dbg += " AUTOINC"; if (m_constraints & Field::Unique) - dbg += " UNITQUE"; + dbg += " UNIQUE"; if (m_constraints & Field::PrimaryKey) dbg += " PKEY"; if (m_constraints & Field::ForeignKey) diff --git a/kexi/kexidb/indexschema.cpp b/kexi/kexidb/indexschema.cpp index dc01ae0e..def58c65 100644 --- a/kexi/kexidb/indexschema.cpp +++ b/kexi/kexidb/indexschema.cpp @@ -157,7 +157,7 @@ TQString IndexSchema::debugString() + (m_isForeignKey ? "FOREIGN KEY " : "") + (m_isAutoGenerated ? "AUTOGENERATED " : "") + (m_primary ? "PRIMARY " : "") - + ((!m_primary) && m_unique ? "UNITQUE " : "") + + ((!m_primary) && m_unique ? "UNIQUE " : "") + FieldList::debugString(); } diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h index 54306af2..b93a88a4 100644 --- a/kexi/kexidb/indexschema.h +++ b/kexi/kexidb/indexschema.h @@ -118,7 +118,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData Auto-generated index is one-field index that was automatically generated for CREATE TABLE statement when the field has - UNITQUE or PRIMARY KEY constraint enabled. + UNIQUE or PRIMARY KEY constraint enabled. Any newly created IndexSchema object has this flag set to false. @@ -137,16 +137,16 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData /*! Sets PRIMARY KEY flag. \sa isPrimary(). Note: Setting PRIMARY KEY on (true), - UNITQUE flag will be also implicity set. */ + UNIQUE flag will be also implicity set. */ void setPrimaryKey(bool set); /*! \return true if this is unique index. This can be one or multifield. */ bool isUnique() const; - /*! Sets UNITQUE flag. \sa isUnique(). - Note: Setting UNITQUE off (false), PRIMARY KEY flag will - be also implicity set off, because this UNITQUE + /*! Sets UNIQUE flag. \sa isUnique(). + Note: Setting UNIQUE off (false), PRIMARY KEY flag will + be also implicity set off, because this UNIQUE is the requirement for PRIMARY KEYS. */ void setUnique(bool set); diff --git a/kexi/kexidb/keywords.cpp b/kexi/kexidb/keywords.cpp index b1680097..05563497 100644 --- a/kexi/kexidb/keywords.cpp +++ b/kexi/kexidb/keywords.cpp @@ -82,7 +82,7 @@ namespace KexiDB { "THEN", "TRANSACTION", "UNION", - "UNITQUE", + "UNIQUE", "UPDATE", "USING", "VALUES", diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp index 05728d00..a15f8017 100644 --- a/kexi/kexidb/lookupfieldschema.cpp +++ b/kexi/kexidb/lookupfieldschema.cpp @@ -169,7 +169,7 @@ LookupFieldSchema *LookupFieldSchema::loadFromDom(const TQDomElement& lookupEl) | <type>table|query|sql|valuelist|fieldlist</type> #required because there can be table and query with the same name "fieldlist" (basically a list of column names of a table/query, "Field List" as in MSA) - <name>string</name> #table/query name, etc. or KEXISQL SELECT TQUERY + <name>string</name> #table/query name, etc. or KEXISQL SELECT QUERY <values><value>...</value> #for "valuelist" type <value>...</value> </values> diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index c7c3aa99..c3d2f53d 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -174,12 +174,12 @@ DISTINCT = 363, DOMAIN_TOKEN = 364, SQL_DOUBLE = 365, - DOUBLE_TQUOTED_STRING = 366, + DOUBLE_QUOTED_STRING = 366, DROP = 367, ELSE = 368, END = 369, END_EXEC = 370, - ETQUAL = 371, + EQUAL = 371, ESCAPE = 372, EXCEPT = 373, SQL_EXCEPTION = 374, @@ -296,7 +296,7 @@ PARTIAL = 485, SQL_PASCAL = 486, PERSISTENT = 487, - CTQL_PI = 488, + CQL_PI = 488, PLI = 489, POSITION = 490, PRECISION = 491, @@ -308,8 +308,8 @@ PROCEDURE = 497, PRODUCT = 498, PUBLIC = 499, - TQUARTER = 500, - TQUIT = 501, + QUARTER = 500, + QUIT = 501, RAND = 502, READ_ONLY = 503, REAL = 504, @@ -381,7 +381,7 @@ TWO_DIGITS = 570, UCASE = 571, UNION = 572, - UNITQUE = 573, + UNIQUE = 573, SQL_UNKNOWN = 574, UPDATE = 575, UPPER = 576, @@ -389,7 +389,7 @@ USER = 578, IDENTIFIER = 579, IDENTIFIER_DOT_ASTERISK = 580, - TQUERY_PARAMETER = 581, + QUERY_PARAMETER = 581, USING = 582, VALUE = 583, VALUES = 584, @@ -524,12 +524,12 @@ #define DISTINCT 363 #define DOMAIN_TOKEN 364 #define SQL_DOUBLE 365 -#define DOUBLE_TQUOTED_STRING 366 +#define DOUBLE_QUOTED_STRING 366 #define DROP 367 #define ELSE 368 #define END 369 #define END_EXEC 370 -#define ETQUAL 371 +#define EQUAL 371 #define ESCAPE 372 #define EXCEPT 373 #define SQL_EXCEPTION 374 @@ -646,7 +646,7 @@ #define PARTIAL 485 #define SQL_PASCAL 486 #define PERSISTENT 487 -#define CTQL_PI 488 +#define CQL_PI 488 #define PLI 489 #define POSITION 490 #define PRECISION 491 @@ -658,8 +658,8 @@ #define PROCEDURE 497 #define PRODUCT 498 #define PUBLIC 499 -#define TQUARTER 500 -#define TQUIT 501 +#define QUARTER 500 +#define QUIT 501 #define RAND 502 #define READ_ONLY 503 #define REAL 504 @@ -731,7 +731,7 @@ #define TWO_DIGITS 570 #define UCASE 571 #define UNION 572 -#define UNITQUE 573 +#define UNIQUE 573 #define SQL_UNKNOWN 574 #define UPDATE 575 #define UPPER 576 @@ -739,7 +739,7 @@ #define USER 578 #define IDENTIFIER 579 #define IDENTIFIER_DOT_ASTERISK 580 -#define TQUERY_PARAMETER 581 +#define QUERY_PARAMETER 581 #define USING 582 #define VALUE 583 #define VALUES 584 @@ -1290,8 +1290,8 @@ static const char *const yytname[] = "DEC", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "SQL_DELETE", "DESC", "DESCRIBE", "DESCRIPTOR", "DIAGNOSTICS", "DICTIONARY", "DIRECTORY", "DISCONNECT", "DISPLACEMENT", "DISTINCT", "DOMAIN_TOKEN", - "SQL_DOUBLE", "DOUBLE_TQUOTED_STRING", "DROP", "ELSE", "END", "END_EXEC", - "ETQUAL", "ESCAPE", "EXCEPT", "SQL_EXCEPTION", "EXEC", "EXECUTE", + "SQL_DOUBLE", "DOUBLE_QUOTED_STRING", "DROP", "ELSE", "END", "END_EXEC", + "EQUAL", "ESCAPE", "EXCEPT", "SQL_EXCEPTION", "EXEC", "EXECUTE", "EXISTS", "EXP", "EXPONENT", "EXTERNAL", "EXTRACT", "SQL_FALSE", "FETCH", "FIRST", "SQL_FLOAT", "FLOOR", "FN", "FOR", "FOREIGN", "FORTRAN", "FOUND", "FOUR_DIGITS", "FROM", "FULL", "GET", "GLOBAL", "GO", "GOTO", @@ -1308,7 +1308,7 @@ static const char *const yytname[] = "NOW", "SQL_NULL", "SQL_IS", "SQL_IS_NULL", "SQL_IS_NOT_NULL", "NULLIF", "NUMERIC", "OCTET_LENGTH", "ODBC", "OF", "SQL_OFF", "SQL_ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", "OVERLAPS", "PAGE", - "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CTQL_PI", "PLI", "POSITION", + "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CQL_PI", "PLI", "POSITION", "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PRODUCT", "PUBLIC", "QUARTER", "QUIT", "RAND", "READ_ONLY", "REAL", "REFERENCES", "REPEAT", "REPLACE", "RESTRICT", "REVOKE", "RIGHT", @@ -1322,7 +1322,7 @@ static const char *const yytname[] = "TAN", "TEMPORARY", "THEN", "THREE_DIGITS", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TINYINT", "TO", "TO_CHAR", "TO_DATE", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRUNCATE", - "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNITQUE", "SQL_UNKNOWN", + "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNIQUE", "SQL_UNKNOWN", "UPDATE", "UPPER", "USAGE", "USER", "IDENTIFIER", "IDENTIFIER_DOT_ASTERISK", "QUERY_PARAMETER", "USING", "VALUE", "VALUES", "VARBINARY", "VARCHAR", "VARYING", "VENDOR", "VIEW", "WEEK", "WHEN", diff --git a/kexi/kexidb/parser/sqlparser.h b/kexi/kexidb/parser/sqlparser.h index 6f2b6534..f9bd290e 100644 --- a/kexi/kexidb/parser/sqlparser.h +++ b/kexi/kexidb/parser/sqlparser.h @@ -154,12 +154,12 @@ bool parseData(KexiDB::Parser *p, const char *data); DISTINCT = 363, DOMAIN_TOKEN = 364, SQL_DOUBLE = 365, - DOUBLE_TQUOTED_STRING = 366, + DOUBLE_QUOTED_STRING = 366, DROP = 367, ELSE = 368, END = 369, END_EXEC = 370, - ETQUAL = 371, + EQUAL = 371, ESCAPE = 372, EXCEPT = 373, SQL_EXCEPTION = 374, @@ -276,7 +276,7 @@ bool parseData(KexiDB::Parser *p, const char *data); PARTIAL = 485, SQL_PASCAL = 486, PERSISTENT = 487, - CTQL_PI = 488, + CQL_PI = 488, PLI = 489, POSITION = 490, PRECISION = 491, @@ -288,8 +288,8 @@ bool parseData(KexiDB::Parser *p, const char *data); PROCEDURE = 497, PRODUCT = 498, PUBLIC = 499, - TQUARTER = 500, - TQUIT = 501, + QUARTER = 500, + QUIT = 501, RAND = 502, READ_ONLY = 503, REAL = 504, @@ -361,7 +361,7 @@ bool parseData(KexiDB::Parser *p, const char *data); TWO_DIGITS = 570, UCASE = 571, UNION = 572, - UNITQUE = 573, + UNIQUE = 573, SQL_UNKNOWN = 574, UPDATE = 575, UPPER = 576, @@ -369,7 +369,7 @@ bool parseData(KexiDB::Parser *p, const char *data); USER = 578, IDENTIFIER = 579, IDENTIFIER_DOT_ASTERISK = 580, - TQUERY_PARAMETER = 581, + QUERY_PARAMETER = 581, USING = 582, VALUE = 583, VALUES = 584, @@ -504,12 +504,12 @@ bool parseData(KexiDB::Parser *p, const char *data); #define DISTINCT 363 #define DOMAIN_TOKEN 364 #define SQL_DOUBLE 365 -#define DOUBLE_TQUOTED_STRING 366 +#define DOUBLE_QUOTED_STRING 366 #define DROP 367 #define ELSE 368 #define END 369 #define END_EXEC 370 -#define ETQUAL 371 +#define EQUAL 371 #define ESCAPE 372 #define EXCEPT 373 #define SQL_EXCEPTION 374 @@ -626,7 +626,7 @@ bool parseData(KexiDB::Parser *p, const char *data); #define PARTIAL 485 #define SQL_PASCAL 486 #define PERSISTENT 487 -#define CTQL_PI 488 +#define CQL_PI 488 #define PLI 489 #define POSITION 490 #define PRECISION 491 @@ -638,8 +638,8 @@ bool parseData(KexiDB::Parser *p, const char *data); #define PROCEDURE 497 #define PRODUCT 498 #define PUBLIC 499 -#define TQUARTER 500 -#define TQUIT 501 +#define QUARTER 500 +#define QUIT 501 #define RAND 502 #define READ_ONLY 503 #define REAL 504 @@ -711,7 +711,7 @@ bool parseData(KexiDB::Parser *p, const char *data); #define TWO_DIGITS 570 #define UCASE 571 #define UNION 572 -#define UNITQUE 573 +#define UNIQUE 573 #define SQL_UNKNOWN 574 #define UPDATE 575 #define UPPER 576 @@ -719,7 +719,7 @@ bool parseData(KexiDB::Parser *p, const char *data); #define USER 578 #define IDENTIFIER 579 #define IDENTIFIER_DOT_ASTERISK 580 -#define TQUERY_PARAMETER 581 +#define QUERY_PARAMETER 581 #define USING 582 #define VALUE 583 #define VALUES 584 diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index 10fe70a2..f59b5096 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -1125,7 +1125,7 @@ YY_RULE_SETUP KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl; ECOUNT; yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2)); - return TQUERY_PARAMETER; + return QUERY_PARAMETER; } YY_BREAK case 41: diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index 8c5f1a1f..31727bd5 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -1600,7 +1600,7 @@ TQValueVector<int> QuerySchema::pkeyFieldsOrder() } } KexiDBDbg << "QuerySchema::pkeyFieldsOrder(): " << d->pkeyFieldsCount - << " OUT OF " << pkey->fieldCount() << " PKEY'S FIELDS FOUND IN TQUERY " << name() << endl; + << " OUT OF " << pkey->fieldCount() << " PKEY'S FIELDS FOUND IN QUERY " << name() << endl; return *d->pkeyFieldsOrder; } diff --git a/kexi/kexidb/queryschema.h b/kexi/kexidb/queryschema.h index 6681ddd3..eedcb6a1 100644 --- a/kexi/kexidb/queryschema.h +++ b/kexi/kexidb/queryschema.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXIDB_TQUERY_H -#define KEXIDB_TQUERY_H +#ifndef KEXIDB_QUERY_H +#define KEXIDB_QUERY_H #include <tqvaluevector.h> #include <tqstring.h> diff --git a/kexi/kexidb/queryschemaparameter.h b/kexi/kexidb/queryschemaparameter.h index 96168719..5d8eb77c 100644 --- a/kexi/kexidb/queryschemaparameter.h +++ b/kexi/kexidb/queryschemaparameter.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXIDB_TQUERYSCHEMAPARAMETER_H -#define KEXIDB_TQUERYSCHEMAPARAMETER_H +#ifndef KEXIDB_QUERYSCHEMAPARAMETER_H +#define KEXIDB_QUERYSCHEMAPARAMETER_H #include "queryschema.h" diff --git a/kexi/migration/pqxx/pqxxmigrate.h b/kexi/migration/pqxx/pqxxmigrate.h index 6202c0db..f156bfd4 100644 --- a/kexi/migration/pqxx/pqxxmigrate.h +++ b/kexi/migration/pqxx/pqxxmigrate.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef PTQXXIMPORT_H -#define PTQXXIMPORT_H +#ifndef PQXXIMPORT_H +#define PQXXIMPORT_H #include <migration/keximigrate.h> diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 37e30e04..c5c46560 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -63,7 +63,7 @@ bool Options::assign( TQMap<TQString,TQString>& args ) if (args.contains("textQuote")) textQuote = args["textQuote"]; else - textQuote = (mode==File) ? KEXICSV_DEFAULT_FILE_TEXT_TQUOTE : KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE; + textQuote = (mode==File) ? KEXICSV_DEFAULT_FILE_TEXT_QUOTE : KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE; bool ok; itemId = args["itemId"].toInt(&ok); @@ -95,7 +95,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, //! @todo look at rowCount whether the data is really large; //! if so: avoid copying to clipboard (or ask user) because of system memory -//! @todo OPTIMIZATION: use fieldsExpanded(true /*UNITQUE*/) +//! @todo OPTIMIZATION: use fieldsExpanded(true /*UNIQUE*/) //! @todo OPTIMIZATION? (avoid multiple data retrieving) look for already fetched data within KexiProject.. KexiDB::QuerySchema* query = tableOrQuery.query(); diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 4a11d1d7..72292afc 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -424,8 +424,8 @@ TQString KexiCSVExportWizard::defaultDelimiter() const TQString KexiCSVExportWizard::defaultTextQuote() const { if (m_options.mode==KexiCSVExport::Clipboard) - return KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE; - return KEXICSV_DEFAULT_FILE_TEXT_TQUOTE; + return KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE; + return KEXICSV_DEFAULT_FILE_TEXT_QUOTE; } #include "kexicsvexportwizard.moc" diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 0e5f6e4c..3f1cb6a3 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -156,7 +156,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, m_cancelled( false ), m_adjustRows( true ), m_startline( 0 ), - m_textquote( TQString(KEXICSV_DEFAULT_FILE_TEXT_TQUOTE)[0] ), + m_textquote( TQString(KEXICSV_DEFAULT_FILE_TEXT_QUOTE)[0] ), m_mode(mode), m_prevSelectedCol(-1), m_columnsAdjusted(false), @@ -554,9 +554,9 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS bool insideQuote = false; //characters by priority - const int CH_TAB_AFTER_TQUOTE = 500; - const int CH_SEMICOLON_AFTER_TQUOTE = 499; - const int CH_COMMA_AFTER_TQUOTE = 498; + const int CH_TAB_AFTER_QUOTE = 500; + const int CH_SEMICOLON_AFTER_QUOTE = 499; + const int CH_COMMA_AFTER_QUOTE = 498; const int CH_TAB = 200; // \t const int CH_SEMICOLON = 199; // ; const int CH_COMMA = 198; // , @@ -588,15 +588,15 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS } else if (c=='\t') { tabs++; - detectedDelimiter = TQMAX( prevChar=='"' ? CH_TAB_AFTER_TQUOTE : CH_TAB, detectedDelimiter ); + detectedDelimiter = TQMAX( prevChar=='"' ? CH_TAB_AFTER_QUOTE : CH_TAB, detectedDelimiter ); } else if (c==';') { semicolons++; - detectedDelimiter = TQMAX( prevChar=='"' ? CH_SEMICOLON_AFTER_TQUOTE : CH_SEMICOLON, detectedDelimiter ); + detectedDelimiter = TQMAX( prevChar=='"' ? CH_SEMICOLON_AFTER_QUOTE : CH_SEMICOLON, detectedDelimiter ); } else if (c==',') { commas++; - detectedDelimiter = TQMAX( prevChar=='"' ? CH_COMMA_AFTER_TQUOTE : CH_COMMA, detectedDelimiter ); + detectedDelimiter = TQMAX( prevChar=='"' ? CH_COMMA_AFTER_QUOTE : CH_COMMA, detectedDelimiter ); } prevChar = c; } @@ -634,11 +634,11 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS return ","; } //now return the winning character by looking at CH_* symbol - if (detectedDelimiter == CH_TAB_AFTER_TQUOTE || detectedDelimiter == CH_TAB) + if (detectedDelimiter == CH_TAB_AFTER_QUOTE || detectedDelimiter == CH_TAB) return "\t"; - if (detectedDelimiter == CH_SEMICOLON_AFTER_TQUOTE || detectedDelimiter == CH_SEMICOLON) + if (detectedDelimiter == CH_SEMICOLON_AFTER_QUOTE || detectedDelimiter == CH_SEMICOLON) return ";"; - if (detectedDelimiter == CH_COMMA_AFTER_TQUOTE || detectedDelimiter == CH_COMMA) + if (detectedDelimiter == CH_COMMA_AFTER_QUOTE || detectedDelimiter == CH_COMMA) return ","; return KEXICSV_DEFAULT_FILE_DELIMITER; //<-- default @@ -647,7 +647,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, int &maxColumn, bool inGUI) { - enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, + enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; field = TQString(); const bool ignoreDups = m_ignoreDuplicates->isChecked(); @@ -717,7 +717,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i case S_START : if (x == m_textquote) { - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == delimiter) { @@ -745,10 +745,10 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i state = S_MAYBE_NORMAL_FIELD; } break; - case S_TQUOTED_FIELD : + case S_QUOTED_FIELD : if (x == m_textquote) { - state = S_MAYBE_END_OF_TQUOTED_FIELD; + state = S_MAYBE_END_OF_QUOTED_FIELD; } /*allow \n inside quoted fields else if (x == '\n') @@ -774,11 +774,11 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i field += x; } break; - case S_MAYBE_END_OF_TQUOTED_FIELD : + case S_MAYBE_END_OF_QUOTED_FIELD : if (x == m_textquote) { field += x; //no, this was just escaped quote character - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == delimiter || x == '\n') { @@ -800,10 +800,10 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; - case S_END_OF_TQUOTED_FIELD : + case S_END_OF_QUOTED_FIELD : if (x == delimiter || x == '\n') { setText(row - m_startline, column, field, inGUI); @@ -824,14 +824,14 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = TQString(); - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; break; } case S_NORMAL_FIELD : diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h index 76f76d31..388e6246 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.h +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h @@ -27,8 +27,8 @@ class KLineEdit; class KActiveLabel; class TQLabel; -#define KEXICSV_DEFAULT_FILE_TEXT_TQUOTE "\"" -#define KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE "" +#define KEXICSV_DEFAULT_FILE_TEXT_QUOTE "\"" +#define KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE "" #define KEXICSV_DEFAULT_FILE_DELIMITER "," #define KEXICSV_DEFAULT_CLIPBOARD_DELIMITER "\t" #define KEXICSV_DEFAULT_FILE_DELIMITER_INDEX 0 diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h index afa9163d..98e2c6fe 100644 --- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h +++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef _KEXI_DYNAMIC_TQUERY_PARAMETER_DIALOG_H_ -#define _KEXI_DYNAMIC_TQUERY_PARAMETER_DIALOG_H_ +#ifndef _KEXI_DYNAMIC_QUERY_PARAMETER_DIALOG_H_ +#define _KEXI_DYNAMIC_QUERY_PARAMETER_DIALOG_H_ #include <kdialogbase.h> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 9da1a92a..b08daaf0 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -56,14 +56,14 @@ #include "kexiquerypart.h" -//! @todo remove KEXI_NO_TQUERY_TOTALS later -#define KEXI_NO_TQUERY_TOTALS +//! @todo remove KEXI_NO_QUERY_TOTALS later +#define KEXI_NO_QUERY_TOTALS //! indices for table columns #define COLUMN_ID_COLUMN 0 #define COLUMN_ID_TABLE 1 #define COLUMN_ID_VISIBLE 2 -#ifdef KEXI_NO_TQUERY_TOTALS +#ifdef KEXI_NO_QUERY_TOTALS # define COLUMN_ID_SORTING 3 # define COLUMN_ID_CRITERIA 4 #else @@ -226,7 +226,7 @@ KexiQueryDesignerGuiEditor::initTableColumns() col3->field()->setNotNull( true ); d->data->addColumn(col3); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS KexiTableViewColumn *col4 = new KexiTableViewColumn("totals", KexiDB::Field::Enum, i18n("Totals"), i18n("Describes a way of computing totals for a given field or expression.")); TQValueVector<TQString> totalsTypes; @@ -1200,7 +1200,7 @@ KexiQueryDesignerGuiEditor::createNewRow(const TQString& tableName, const TQStri (*newItem)[COLUMN_ID_COLUMN]=key; (*newItem)[COLUMN_ID_TABLE]=tableName; (*newItem)[COLUMN_ID_VISIBLE]=TQVariant(visible, 1); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS (*newItem)[COLUMN_ID_TOTALS]=TQVariant(0); #endif return newItem; @@ -1422,7 +1422,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int d->data->updateRowEditBuffer(item, COLUMN_ID_TABLE, TQVariant(), false/*!allowSignals*/); d->data->updateRowEditBuffer(item, COLUMN_ID_VISIBLE, TQVariant(false,1));//invisible d->data->updateRowEditBuffer(item, COLUMN_ID_SORTING, TQVariant()); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant());//remove totals #endif d->data->updateRowEditBuffer(item, COLUMN_ID_CRITERIA, TQVariant());//remove crit. @@ -1500,7 +1500,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int } d->data->updateRowEditBuffer(item, COLUMN_ID_TABLE, TQVariant(tableName), false/*!allowSignals*/); d->data->updateRowEditBuffer(item, COLUMN_ID_VISIBLE, TQVariant(true,1)); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant(0)); #endif if (!sortingAllowed(fieldName, tableName)) { @@ -1533,7 +1533,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int if (!item->at(COLUMN_ID_COLUMN).toString().isEmpty()) d->data->updateRowEditBuffer(item, COLUMN_ID_COLUMN, TQVariant(), false/*!allowSignals*/); d->data->updateRowEditBuffer(item, COLUMN_ID_VISIBLE, TQVariant(false,1));//invisible -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant());//remove totals #endif d->data->updateRowEditBuffer(item, COLUMN_ID_CRITERIA, TQVariant());//remove crit. @@ -1560,7 +1560,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int saveOldValue = false; createPropertySet( d->dataTable->dataAwareObject()->currentRow(), item->at(COLUMN_ID_TABLE).toString(), item->at(COLUMN_ID_COLUMN).toString(), true ); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant(0));//totals #endif propertySetSwitched(); @@ -1568,7 +1568,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int KoProperty::Set &set = *propertySet(); set["visible"].setValue(newValue, saveOldValue); } -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS else if (colnum==COLUMN_ID_TOTALS) { //TODO: //unused yet diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h index f85125c6..fd469f18 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.h +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYDESIGNERGUIEDITOR_H -#define KEXITQUERYDESIGNERGUIEDITOR_H +#ifndef KEXIQUERYDESIGNERGUIEDITOR_H +#define KEXIQUERYDESIGNERGUIEDITOR_H #include <tqguardedptr.h> #include <tqsplitter.h> diff --git a/kexi/plugins/queries/kexiquerydesignersql.h b/kexi/plugins/queries/kexiquerydesignersql.h index fe535b0d..6f4503ed 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.h +++ b/kexi/plugins/queries/kexiquerydesignersql.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYDESIGNERSQL_H -#define KEXITQUERYDESIGNERSQL_H +#ifndef KEXIQUERYDESIGNERSQL_H +#define KEXIQUERYDESIGNERSQL_H #include <kexiviewbase.h> #include "kexiquerypart.h" diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h index 6c828c39..c5903638 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYDESIGNERSQLHISTORY_H -#define KEXITQUERYDESIGNERSQLHISTORY_H +#ifndef KEXIQUERYDESIGNERSQLHISTORY_H +#define KEXIQUERYDESIGNERSQLHISTORY_H #include <tqscrollview.h> #include <tqdatetime.h> diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h index 1fb2063c..f404e6e6 100644 --- a/kexi/plugins/queries/kexiquerypart.h +++ b/kexi/plugins/queries/kexiquerypart.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYPART_H -#define KEXITQUERYPART_H +#ifndef KEXIQUERYPART_H +#define KEXIQUERYPART_H #include <tqmap.h> diff --git a/kexi/plugins/queries/kexiqueryview.h b/kexi/plugins/queries/kexiqueryview.h index e089bfc4..7eb65f1e 100644 --- a/kexi/plugins/queries/kexiqueryview.h +++ b/kexi/plugins/queries/kexiqueryview.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYVIEW_H -#define KEXITQUERYVIEW_H +#ifndef KEXIQUERYVIEW_H +#define KEXIQUERYVIEW_H #include <kexidatatable.h> diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index f830926f..5dab927b 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -34,7 +34,7 @@ #include <kexidb/connection.h> #ifdef KEXI_SHOW_UNIMPLEMENTED -#define ADD_DEFINETQUERY_ROW +#define ADD_DEFINEQUERY_ROW #endif //! @internal @@ -50,7 +50,7 @@ class KexiDataSourceComboBox::Private } int firstTableIndex() const { int index = 1; //skip empty row -#ifdef ADD_DEFINETQUERY_ROW +#ifdef ADD_DEFINEQUERY_ROW index++; /*skip 'define query' row*/ #endif return index; @@ -123,7 +123,7 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool //special item: empty insertItem(""); -#ifdef ADD_DEFINETQUERY_ROW +#ifdef ADD_DEFINEQUERY_ROW //special item: define query insertItem(i18n("Define Query...")); #endif @@ -194,7 +194,7 @@ void KexiDataSourceComboBox::slotNewItemStored(KexiPart::Item& item) //insert a new item, maintaining sort order and splitting to tables and queries if (item.mimeType()=="kexi/table") { int i = 1; /*skip empty row*/ -#ifdef ADD_DEFINETQUERY_ROW +#ifdef ADD_DEFINEQUERY_ROW i++; /*skip 'define query' row*/ #endif for (; i < d->firstQueryIndex() && name>=text(i); i++) @@ -217,7 +217,7 @@ int KexiDataSourceComboBox::findItem(const TQString& mimeType, const TQString& n int i, end; if (mimeType=="kexi/table") { i = 0; -#ifdef ADD_DEFINETQUERY_ROW +#ifdef ADD_DEFINEQUERY_ROW i++; //skip 'define query' #endif end = d->firstQueryIndex(); diff --git a/kexi/widget/kexiquerydesignersqleditor.h b/kexi/widget/kexiquerydesignersqleditor.h index a0bd4bee..c85bec6c 100644 --- a/kexi/widget/kexiquerydesignersqleditor.h +++ b/kexi/widget/kexiquerydesignersqleditor.h @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYDESIGNERSQLEDITOR_H -#define KEXITQUERYDESIGNERSQLEDITOR_H +#ifndef KEXIQUERYDESIGNERSQLEDITOR_H +#define KEXIQUERYDESIGNERSQLEDITOR_H #include "kexieditor.h" diff --git a/kexi/widget/kexiqueryparameters.h b/kexi/widget/kexiqueryparameters.h index 986c1ce9..00bd0b67 100644 --- a/kexi/widget/kexiqueryparameters.h +++ b/kexi/widget/kexiqueryparameters.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KEXITQUERYPARAMETERS_H -#define KEXITQUERYPARAMETERS_H +#ifndef KEXIQUERYPARAMETERS_H +#define KEXIQUERYPARAMETERS_H #include <kexidb/queryschema.h> |