By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Fix inadvertent TQ changes

koffice-TQ-fixes.diff (text/plain), 130.59 KB, created by Darrell on 2012-01-03 19:23:36 CST

(hide)

Description: Fix inadvertent TQ changes

Filename:

MIME Type:

Creator: Darrell

Created: 2012-01-03 19:23:36 CST

Size: 130.59 KB

patch

obsolete

>diff -urN koffice/chalk/core/tiles/kis_tileddatamanager.cc koffice.new/chalk/core/tiles/kis_tileddatamanager.cc >--- koffice/chalk/core/tiles/kis_tileddatamanager.cc 2011-08-17 20:24:32.000000000 -0500 >+++ koffice.new/chalk/core/tiles/kis_tileddatamanager.cc 2012-01-03 17:27:49.000000000 -0600 >@@ -837,7 +837,7 @@ > { > // Ahem, this is a bit not as good. The point is, this function needs the tile data, > // but it might be swapped out. This code swaps it in, but at function exit it might >- // be swapped out again! THIS MAKES THE RETURNED POINTER TQUITE VOLATILE >+ // be swapped out again! THIS MAKES THE RETURNED POINTER QUITE VOLATILE > return pixelPtrSafe(x, y, writable) -> data(); > } > >diff -urN koffice/filters/kword/mswrite/structures_generated.h koffice.new/filters/kword/mswrite/structures_generated.h >--- koffice/filters/kword/mswrite/structures_generated.h 2011-07-19 00:27:33.000000000 -0500 >+++ koffice.new/filters/kword/mswrite/structures_generated.h 2012-01-03 17:27:53.000000000 -0600 >@@ -70,7 +70,7 @@ > // > // Structure Fields: > // >- // name #RETQUIRED >+ // name #REQUIRED > // type #IMPLIED "Word" > // default #IMPLIED "" > // description #IMPLIED "" (also valid for Structures) >diff -urN koffice/filters/olefilters/powerpoint97/pptSlide.cpp koffice.new/filters/olefilters/powerpoint97/pptSlide.cpp >--- koffice/filters/olefilters/powerpoint97/pptSlide.cpp 2011-06-25 13:42:51.000000000 -0500 >+++ koffice.new/filters/olefilters/powerpoint97/pptSlide.cpp 2012-01-03 17:27:53.000000000 -0600 >@@ -97,7 +97,7 @@ > case OTHER_TEXT: > case CENTER_BODY_TEXT: > case HALF_BODY_TEXT: >- case TQUARTER_BODY_TEXT: >+ case QUARTER_BODY_TEXT: > TQStringList data(TQStringList::split(TQChar('\r'), text, true)); > for (j = 0; j < data.count(); j++) > { >diff -urN koffice/filters/olefilters/powerpoint97/pptSlide.h koffice.new/filters/olefilters/powerpoint97/pptSlide.h >--- koffice/filters/olefilters/powerpoint97/pptSlide.h 2011-06-25 13:42:51.000000000 -0500 >+++ koffice.new/filters/olefilters/powerpoint97/pptSlide.h 2012-01-03 17:27:53.000000000 -0600 >@@ -38,7 +38,7 @@ > #define CENTER_BODY_TEXT 5 //center body(subtitle in title slide) > #define CENTER_TITLE_TEXT 6 //center title(title in title slide) > #define HALF_BODY_TEXT 7 //half body(body in two-column slide) >-#define TQUARTER_BODY_TEXT 8 //quarter body(body in four-body slide) >+#define QUARTER_BODY_TEXT 8 //quarter body(body in four-body slide) > //-- > > //--char style types >diff -urN koffice/filters/olefilters/powerpoint97/pptdoc.cc koffice.new/filters/olefilters/powerpoint97/pptdoc.cc >--- koffice/filters/olefilters/powerpoint97/pptdoc.cc 2011-06-25 13:42:51.000000000 -0500 >+++ koffice.new/filters/olefilters/powerpoint97/pptdoc.cc 2012-01-03 17:27:53.000000000 -0600 >@@ -68,7 +68,7 @@ > case OTHER_TEXT: > case CENTER_BODY_TEXT: > case HALF_BODY_TEXT: >- case TQUARTER_BODY_TEXT: >+ case QUARTER_BODY_TEXT: > for (j = 0; j < data.count(); j++) > { > ourSlide.body.append(data[j]); >diff -urN koffice/filters/olefilters/powerpoint97/pptxml.cc koffice.new/filters/olefilters/powerpoint97/pptxml.cc >--- koffice/filters/olefilters/powerpoint97/pptxml.cc 2011-08-17 20:25:20.000000000 -0500 >+++ koffice.new/filters/olefilters/powerpoint97/pptxml.cc 2012-01-03 17:27:53.000000000 -0600 >@@ -258,7 +258,7 @@ > break; > case OTHER_TEXT: > case HALF_BODY_TEXT: >- case TQUARTER_BODY_TEXT: >+ case QUARTER_BODY_TEXT: > y = 130; > if(m_half) > { >diff -urN koffice/kexi/3rdparty/kexisql/src/build.c koffice.new/kexi/3rdparty/kexisql/src/build.c >--- koffice/kexi/3rdparty/kexisql/src/build.c 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/build.c 2012-01-03 17:28:05.000000000 -0600 >@@ -526,7 +526,7 @@ > /* 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 @@ > ** 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 @@ > ** 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 @@ > ** 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 @@ > 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 -urN koffice/kexi/3rdparty/kexisql/src/insert.c koffice.new/kexi/3rdparty/kexisql/src/insert.c >--- koffice/kexi/3rdparty/kexisql/src/insert.c 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/insert.c 2012-01-03 17:28:05.000000000 -0600 >@@ -567,7 +567,7 @@ > ** 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 @@ > ** 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 @@ > } > } > >- /* 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 @@ > > /* 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 @@ > 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 -urN koffice/kexi/3rdparty/kexisql/src/main.c koffice.new/kexi/3rdparty/kexisql/src/main.c >--- koffice/kexi/3rdparty/kexisql/src/main.c 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/main.c 2012-01-03 17:28:05.000000000 -0600 >@@ -90,7 +90,7 @@ > 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 -urN koffice/kexi/3rdparty/kexisql/src/parse.c koffice.new/kexi/3rdparty/kexisql/src/parse.c >--- koffice/kexi/3rdparty/kexisql/src/parse.c 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/parse.c 2012-01-03 17:28:05.000000000 -0600 >@@ -711,7 +711,7 @@ > 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 @@ > "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 @@ > /* 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 @@ > /* 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 @@ > /* 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 @@ > #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 @@ > #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 @@ > #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 -urN koffice/kexi/3rdparty/kexisql/src/parse.h koffice.new/kexi/3rdparty/kexisql/src/parse.h >--- koffice/kexi/3rdparty/kexisql/src/parse.h 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/parse.h 2012-01-03 17:28:05.000000000 -0600 >@@ -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 -urN koffice/kexi/3rdparty/kexisql/src/sqliteInt.h koffice.new/kexi/3rdparty/kexisql/src/sqliteInt.h >--- koffice/kexi/3rdparty/kexisql/src/sqliteInt.h 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/sqliteInt.h 2012-01-03 17:28:05.000000000 -0600 >@@ -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 @@ > ** 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 @@ > 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 -urN koffice/kexi/3rdparty/kexisql/src/tokenize.c koffice.new/kexi/3rdparty/kexisql/src/tokenize.c >--- koffice/kexi/3rdparty/kexisql/src/tokenize.c 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/tokenize.c 2012-01-03 17:28:05.000000000 -0600 >@@ -130,7 +130,7 @@ > { "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 -urN koffice/kexi/3rdparty/kexisql/src/vdbe.c koffice.new/kexi/3rdparty/kexisql/src/vdbe.c >--- koffice/kexi/3rdparty/kexisql/src/vdbe.c 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql/src/vdbe.c 2012-01-03 17:28:05.000000000 -0600 >@@ -2741,7 +2741,7 @@ > /* 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 -urN koffice/kexi/3rdparty/kexisql3/src/alter.c koffice.new/kexi/3rdparty/kexisql3/src/alter.c >--- koffice/kexi/3rdparty/kexisql3/src/alter.c 2011-07-19 00:27:26.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/alter.c 2012-01-03 17:28:05.000000000 -0600 >@@ -407,7 +407,7 @@ > 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 @@ > return; > } > if( pNew->pIndex ){ >- sqlite3ErrorMsg(pParse, "Cannot add a UNITQUE column"); >+ sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column"); > return; > } > if( pCol->notNull && !pDflt ){ >diff -urN koffice/kexi/3rdparty/kexisql3/src/btree.c koffice.new/kexi/3rdparty/kexisql3/src/btree.c >--- koffice/kexi/3rdparty/kexisql3/src/btree.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/btree.c 2012-01-03 17:28:05.000000000 -0600 >@@ -3930,13 +3930,13 @@ > } > szCell = (int*)&apCell[nMaxCells]; > aCopy[0] = (u8*)&szCell[nMaxCells]; >- assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ >+ assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ > for(i=1; i<NB; i++){ > aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; >- assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ >+ assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ > } > aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; >- assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ >+ assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ > #ifndef SQLITE_OMIT_AUTOVACUUM > if( pBt->autoVacuum ){ > aFrom = &aSpace[5*pBt->pageSize]; >diff -urN koffice/kexi/3rdparty/kexisql3/src/build.c koffice.new/kexi/3rdparty/kexisql3/src/build.c >--- koffice/kexi/3rdparty/kexisql3/src/build.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/build.c 2012-01-03 17:28:05.000000000 -0600 >@@ -746,7 +746,7 @@ > /* 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 @@ > ** 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 @@ > ** 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 @@ > > 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 @@ > ** 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 @@ > 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 @@ > 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 -urN koffice/kexi/3rdparty/kexisql3/src/insert.c koffice.new/kexi/3rdparty/kexisql3/src/insert.c >--- koffice/kexi/3rdparty/kexisql3/src/insert.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/insert.c 2012-01-03 17:28:05.000000000 -0600 >@@ -746,7 +746,7 @@ > ** 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 @@ > ** 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 @@ > } > } > >- /* 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 @@ > > /* 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 @@ > break; > } > } >-#if NULL_DISTINCT_FOR_UNITQUE >+#if NULL_DISTINCT_FOR_UNIQUE > sqlite3VdbeJumpHere(v, jumpInst1); > #endif > sqlite3VdbeJumpHere(v, jumpInst2); >diff -urN koffice/kexi/3rdparty/kexisql3/src/keywordhash.h koffice.new/kexi/3rdparty/kexisql3/src/keywordhash.h >--- koffice/kexi/3rdparty/kexisql3/src/keywordhash.h 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/keywordhash.h 2012-01-03 17:28:05.000000000 -0600 >@@ -9,7 +9,7 @@ > "CURRENT_DATECURRENT_TIMESTAMPLANDESCDETACHDISTINCTDROPRAGMATCH" > "FAILIMITFROMFULLGROUPDATEIMMEDIATEINSERTINSTEADINTOFFSETISNULL" > "JOINORDEREPLACEOUTERESTRICTPRIMARYTQUERYRIGHTROLLBACKROWHENUNION" >- "UNITQUEUSINGVACUUMVALUESVIEWHERE"; >+ "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, >@@ -77,7 +77,7 @@ > 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_ROLLBACK, TK_ROW, TK_WHEN, TK_UNION, TK_UNIQUE, > TK_USING, TK_VACUUM, TK_VALUES, TK_VIEW, TK_WHERE, > }; > int h, i; >diff -urN koffice/kexi/3rdparty/kexisql3/src/parse.c koffice.new/kexi/3rdparty/kexisql3/src/parse.c >--- koffice/kexi/3rdparty/kexisql3/src/parse.c 2011-09-19 00:27:35.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/parse.c 2012-01-03 17:28:05.000000000 -0600 >@@ -770,7 +770,7 @@ > 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 @@ > "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", >@@ -1011,7 +1011,7 @@ > /* 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 @@ > /* 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 @@ > /* 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 -urN koffice/kexi/3rdparty/kexisql3/src/parse.h koffice.new/kexi/3rdparty/kexisql3/src/parse.h >--- koffice/kexi/3rdparty/kexisql3/src/parse.h 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/parse.h 2012-01-03 17:28:05.000000000 -0600 >@@ -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 -urN koffice/kexi/3rdparty/kexisql3/src/prepare.c koffice.new/kexi/3rdparty/kexisql3/src/prepare.c >--- koffice/kexi/3rdparty/kexisql3/src/prepare.c 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/prepare.c 2012-01-03 17:28:05.000000000 -0600 >@@ -77,7 +77,7 @@ > } > }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 -urN koffice/kexi/3rdparty/kexisql3/src/sqliteInt.h koffice.new/kexi/3rdparty/kexisql3/src/sqliteInt.h >--- koffice/kexi/3rdparty/kexisql3/src/sqliteInt.h 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/sqliteInt.h 2012-01-03 17:28:05.000000000 -0600 >@@ -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 @@ > ** 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 @@ > 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 -urN koffice/kexi/3rdparty/kexisql3/src/vacuum.c koffice.new/kexi/3rdparty/kexisql3/src/vacuum.c >--- koffice/kexi/3rdparty/kexisql3/src/vacuum.c 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/vacuum.c 2012-01-03 17:28:05.000000000 -0600 >@@ -212,8 +212,8 @@ > " 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 -urN koffice/kexi/3rdparty/kexisql3/src/vdbe.c koffice.new/kexi/3rdparty/kexisql3/src/vdbe.c >--- koffice/kexi/3rdparty/kexisql3/src/vdbe.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/vdbe.c 2012-01-03 17:28:05.000000000 -0600 >@@ -2956,7 +2956,7 @@ > } > > /* 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 -urN koffice/kexi/3rdparty/kexisql3/src/where.c koffice.new/kexi/3rdparty/kexisql3/src/where.c >--- koffice/kexi/3rdparty/kexisql3/src/where.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi/3rdparty/kexisql3/src/where.c 2012-01-03 17:28:05.000000000 -0600 >@@ -170,7 +170,7 @@ > #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 @@ > ** 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 @@ > 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 @@ > 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)); > >@@ -1514,7 +1514,7 @@ > /* 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 -urN koffice/kexi/kexidb/connection.cpp koffice.new/kexi/kexidb/connection.cpp >--- koffice/kexi/kexidb/connection.cpp 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/connection.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -671,7 +671,7 @@ > > 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 @@ > 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 @@ > 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 @@ > { > 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 @@ > 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 -urN koffice/kexi/kexidb/cursor.cpp koffice.new/kexi/kexidb/cursor.cpp >--- koffice/kexi/kexidb/cursor.cpp 2011-06-25 13:42:17.000000000 -0500 >+++ koffice.new/kexi/kexidb/cursor.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -166,7 +166,7 @@ > > //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 -urN koffice/kexi/kexidb/driver.cpp koffice.new/kexi/kexidb/driver.cpp >--- koffice/kexi/kexidb/driver.cpp 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/driver.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -49,12 +49,12 @@ > , 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 @@ > 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 -urN koffice/kexi/kexidb/driver.h koffice.new/kexi/kexidb/driver.h >--- koffice/kexi/kexidb/driver.h 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/driver.h 2012-01-03 17:28:02.000000000 -0600 >@@ -319,7 +319,7 @@ > 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 -urN koffice/kexi/kexidb/driver_p.h koffice.new/kexi/kexidb/driver_p.h >--- koffice/kexi/kexidb/driver_p.h 2011-06-25 13:42:17.000000000 -0500 >+++ koffice.new/kexi/kexidb/driver_p.h 2012-01-03 17:28:02.000000000 -0600 >@@ -72,7 +72,7 @@ > > /*! 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 @@ > /*! 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 @@ > 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 -urN koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp koffice.new/kexi/kexidb/drivers/mySQL/mysqldriver.cpp >--- koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/drivers/mySQL/mysqldriver.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -63,9 +63,9 @@ > > 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 -urN koffice/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp koffice.new/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp >--- koffice/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp 2011-09-19 00:27:35.000000000 -0500 >+++ koffice.new/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -177,7 +177,7 @@ > "MASTER_SSL_KEY", > "MASTER_USER", > "MAX_CONNECTIONS_PER_HOUR", >- "MAX_TQUERIES_PER_HOUR", >+ "MAX_QUERIES_PER_HOUR", > "MAX_ROWS", > "MAX_UPDATES_PER_HOUR", > "MEDIUM", >diff -urN koffice/kexi/kexidb/drivers/pqxx/pqxxcursor.h koffice.new/kexi/kexidb/drivers/pqxx/pqxxcursor.h >--- koffice/kexi/kexidb/drivers/pqxx/pqxxcursor.h 2011-06-25 13:42:16.000000000 -0500 >+++ koffice.new/kexi/kexidb/drivers/pqxx/pqxxcursor.h 2012-01-03 17:28:02.000000000 -0600 >@@ -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 -urN koffice/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp koffice.new/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp >--- koffice/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp 2011-08-17 20:24:53.000000000 -0500 >+++ koffice.new/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -47,7 +47,7 @@ > 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 -urN koffice/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp koffice.new/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp >--- koffice/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp 2011-08-17 20:24:53.000000000 -0500 >+++ koffice.new/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -66,11 +66,11 @@ > 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 -urN koffice/kexi/kexidb/expression.cpp koffice.new/kexi/kexidb/expression.cpp >--- koffice/kexi/kexidb/expression.cpp 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/expression.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -568,7 +568,7 @@ > > //========================================= > QueryParameterExpr::QueryParameterExpr(const TQString& message) >-: ConstExpr( TQUERY_PARAMETER, message ) >+: ConstExpr( QUERY_PARAMETER, message ) > , m_type(Field::Text) > { > m_cl = KexiDBExpr_QueryParameter; >diff -urN koffice/kexi/kexidb/field.cpp koffice.new/kexi/kexidb/field.cpp >--- koffice/kexi/kexidb/field.cpp 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/field.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -598,7 +598,7 @@ > 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 -urN koffice/kexi/kexidb/indexschema.cpp koffice.new/kexi/kexidb/indexschema.cpp >--- koffice/kexi/kexidb/indexschema.cpp 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/indexschema.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -157,7 +157,7 @@ > + (m_isForeignKey ? "FOREIGN KEY " : "") > + (m_isAutoGenerated ? "AUTOGENERATED " : "") > + (m_primary ? "PRIMARY " : "") >- + ((!m_primary) && m_unique ? "UNITQUE " : "") >+ + ((!m_primary) && m_unique ? "UNIQUE " : "") > + FieldList::debugString(); > } > >diff -urN koffice/kexi/kexidb/indexschema.h koffice.new/kexi/kexidb/indexschema.h >--- koffice/kexi/kexidb/indexschema.h 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/indexschema.h 2012-01-03 17:28:02.000000000 -0600 >@@ -118,7 +118,7 @@ > 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 @@ > > /*! 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 -urN koffice/kexi/kexidb/keywords.cpp koffice.new/kexi/kexidb/keywords.cpp >--- koffice/kexi/kexidb/keywords.cpp 2011-06-25 13:42:17.000000000 -0500 >+++ koffice.new/kexi/kexidb/keywords.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -82,7 +82,7 @@ > "THEN", > "TRANSACTION", > "UNION", >- "UNITQUE", >+ "UNIQUE", > "UPDATE", > "USING", > "VALUES", >diff -urN koffice/kexi/kexidb/parser/sqlparser.cpp koffice.new/kexi/kexidb/parser/sqlparser.cpp >--- koffice/kexi/kexidb/parser/sqlparser.cpp 2011-09-19 00:27:35.000000000 -0500 >+++ koffice.new/kexi/kexidb/parser/sqlparser.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -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 @@ > "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 @@ > "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 @@ > "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 -urN koffice/kexi/kexidb/parser/sqlparser.h koffice.new/kexi/kexidb/parser/sqlparser.h >--- koffice/kexi/kexidb/parser/sqlparser.h 2011-08-17 20:24:53.000000000 -0500 >+++ koffice.new/kexi/kexidb/parser/sqlparser.h 2012-01-03 17:28:02.000000000 -0600 >@@ -154,12 +154,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, >@@ -276,7 +276,7 @@ > PARTIAL = 485, > SQL_PASCAL = 486, > PERSISTENT = 487, >- CTQL_PI = 488, >+ CQL_PI = 488, > PLI = 489, > POSITION = 490, > PRECISION = 491, >@@ -288,8 +288,8 @@ > 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 @@ > TWO_DIGITS = 570, > UCASE = 571, > UNION = 572, >- UNITQUE = 573, >+ UNIQUE = 573, > SQL_UNKNOWN = 574, > UPDATE = 575, > UPPER = 576, >@@ -369,7 +369,7 @@ > USER = 578, > IDENTIFIER = 579, > IDENTIFIER_DOT_ASTERISK = 580, >- TQUERY_PARAMETER = 581, >+ QUERY_PARAMETER = 581, > USING = 582, > VALUE = 583, > VALUES = 584, >@@ -504,12 +504,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 >@@ -626,7 +626,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 >@@ -638,8 +638,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 >@@ -711,7 +711,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 >@@ -719,7 +719,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 >diff -urN koffice/kexi/kexidb/parser/sqlscanner.cpp koffice.new/kexi/kexidb/parser/sqlscanner.cpp >--- koffice/kexi/kexidb/parser/sqlscanner.cpp 2011-06-25 13:42:15.000000000 -0500 >+++ koffice.new/kexi/kexidb/parser/sqlscanner.cpp 2012-01-03 17:28:02.000000000 -0600 >@@ -1125,7 +1125,7 @@ > 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 -urN koffice/kexi/kexidb/queryschema.h koffice.new/kexi/kexidb/queryschema.h >--- koffice/kexi/kexidb/queryschema.h 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi/kexidb/queryschema.h 2012-01-03 17:28:02.000000000 -0600 >@@ -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 -urN koffice/kexi/kexidb/queryschemaparameter.h koffice.new/kexi/kexidb/queryschemaparameter.h >--- koffice/kexi/kexidb/queryschemaparameter.h 2011-06-25 13:42:17.000000000 -0500 >+++ koffice.new/kexi/kexidb/queryschemaparameter.h 2012-01-03 17:28:02.000000000 -0600 >@@ -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 -urN koffice/kexi/plugins/importexport/csv/kexicsvexport.cpp koffice.new/kexi/plugins/importexport/csv/kexicsvexport.cpp >--- koffice/kexi/plugins/importexport/csv/kexicsvexport.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/importexport/csv/kexicsvexport.cpp 2012-01-03 17:28:04.000000000 -0600 >@@ -63,7 +63,7 @@ > 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 @@ > //! @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 -urN koffice/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp koffice.new/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp >--- koffice/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp 2012-01-03 17:28:04.000000000 -0600 >@@ -424,8 +424,8 @@ > 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 -urN koffice/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp koffice.new/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp >--- koffice/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp 2012-01-03 17:28:04.000000000 -0600 >@@ -156,7 +156,7 @@ > 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), >diff -urN koffice/kexi/plugins/importexport/csv/kexicsvwidgets.h koffice.new/kexi/plugins/importexport/csv/kexicsvwidgets.h >--- koffice/kexi/plugins/importexport/csv/kexicsvwidgets.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/importexport/csv/kexicsvwidgets.h 2012-01-03 17:28:04.000000000 -0600 >@@ -27,8 +27,8 @@ > 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 -urN koffice/kexi/plugins/queries/kexidynamicqueryparameterdialog.h koffice.new/kexi/plugins/queries/kexidynamicqueryparameterdialog.h >--- koffice/kexi/plugins/queries/kexidynamicqueryparameterdialog.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexidynamicqueryparameterdialog.h 2012-01-03 17:28:04.000000000 -0600 >@@ -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 -urN koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp koffice.new/kexi/plugins/queries/kexiquerydesignerguieditor.cpp >--- koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexiquerydesignerguieditor.cpp 2012-01-03 17:28:04.000000000 -0600 >@@ -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 @@ > 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 @@ > (*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 @@ > 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 @@ > } > 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 @@ > 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 @@ > 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 @@ > 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 -urN koffice/kexi/plugins/queries/kexiquerydesignerguieditor.h koffice.new/kexi/plugins/queries/kexiquerydesignerguieditor.h >--- koffice/kexi/plugins/queries/kexiquerydesignerguieditor.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexiquerydesignerguieditor.h 2012-01-03 17:28:04.000000000 -0600 >@@ -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 -urN koffice/kexi/plugins/queries/kexiquerydesignersql.h koffice.new/kexi/plugins/queries/kexiquerydesignersql.h >--- koffice/kexi/plugins/queries/kexiquerydesignersql.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexiquerydesignersql.h 2012-01-03 17:28:04.000000000 -0600 >@@ -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 -urN koffice/kexi/plugins/queries/kexiquerydesignersqlhistory.h koffice.new/kexi/plugins/queries/kexiquerydesignersqlhistory.h >--- koffice/kexi/plugins/queries/kexiquerydesignersqlhistory.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexiquerydesignersqlhistory.h 2012-01-03 17:28:04.000000000 -0600 >@@ -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 -urN koffice/kexi/plugins/queries/kexiquerypart.h koffice.new/kexi/plugins/queries/kexiquerypart.h >--- koffice/kexi/plugins/queries/kexiquerypart.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexiquerypart.h 2012-01-03 17:28:04.000000000 -0600 >@@ -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 -urN koffice/kexi/plugins/queries/kexiqueryview.h koffice.new/kexi/plugins/queries/kexiqueryview.h >--- koffice/kexi/plugins/queries/kexiqueryview.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi/plugins/queries/kexiqueryview.h 2012-01-03 17:28:04.000000000 -0600 >@@ -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 -urN koffice/kexi/widget/kexiquerydesignersqleditor.h koffice.new/kexi/widget/kexiquerydesignersqleditor.h >--- koffice/kexi/widget/kexiquerydesignersqleditor.h 2011-08-17 20:24:50.000000000 -0500 >+++ koffice.new/kexi/widget/kexiquerydesignersqleditor.h 2012-01-03 17:28:02.000000000 -0600 >@@ -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 -urN koffice/kexi/widget/kexiqueryparameters.h koffice.new/kexi/widget/kexiqueryparameters.h >--- koffice/kexi/widget/kexiqueryparameters.h 2011-08-17 20:24:50.000000000 -0500 >+++ koffice.new/kexi/widget/kexiqueryparameters.h 2012-01-03 17:28:02.000000000 -0600 >@@ -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> > >diff -urN koffice/kexi.new/3rdparty/kexisql/src/build.c koffice.new/kexi.new/3rdparty/kexisql/src/build.c >--- koffice/kexi.new/3rdparty/kexisql/src/build.c 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/build.c 2012-01-03 17:28:12.000000000 -0600 >@@ -526,7 +526,7 @@ > /* 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 @@ > ** 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 @@ > ** 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 @@ > ** 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 @@ > 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 -urN koffice/kexi.new/3rdparty/kexisql/src/insert.c koffice.new/kexi.new/3rdparty/kexisql/src/insert.c >--- koffice/kexi.new/3rdparty/kexisql/src/insert.c 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/insert.c 2012-01-03 17:28:12.000000000 -0600 >@@ -567,7 +567,7 @@ > ** 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 @@ > ** 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 @@ > } > } > >- /* 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 @@ > > /* 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 @@ > 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 -urN koffice/kexi.new/3rdparty/kexisql/src/main.c koffice.new/kexi.new/3rdparty/kexisql/src/main.c >--- koffice/kexi.new/3rdparty/kexisql/src/main.c 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/main.c 2012-01-03 17:28:11.000000000 -0600 >@@ -90,7 +90,7 @@ > 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 -urN koffice/kexi.new/3rdparty/kexisql/src/parse.c koffice.new/kexi.new/3rdparty/kexisql/src/parse.c >--- koffice/kexi.new/3rdparty/kexisql/src/parse.c 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/parse.c 2012-01-03 17:28:11.000000000 -0600 >@@ -711,7 +711,7 @@ > 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 @@ > "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 @@ > /* 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 @@ > /* 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 @@ > /* 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 @@ > #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 @@ > #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 @@ > #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 -urN koffice/kexi.new/3rdparty/kexisql/src/parse.h koffice.new/kexi.new/3rdparty/kexisql/src/parse.h >--- koffice/kexi.new/3rdparty/kexisql/src/parse.h 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/parse.h 2012-01-03 17:28:12.000000000 -0600 >@@ -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 -urN koffice/kexi.new/3rdparty/kexisql/src/sqliteInt.h koffice.new/kexi.new/3rdparty/kexisql/src/sqliteInt.h >--- koffice/kexi.new/3rdparty/kexisql/src/sqliteInt.h 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/sqliteInt.h 2012-01-03 17:28:12.000000000 -0600 >@@ -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 @@ > ** 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 @@ > 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 -urN koffice/kexi.new/3rdparty/kexisql/src/tokenize.c koffice.new/kexi.new/3rdparty/kexisql/src/tokenize.c >--- koffice/kexi.new/3rdparty/kexisql/src/tokenize.c 2011-06-25 13:42:18.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/tokenize.c 2012-01-03 17:28:11.000000000 -0600 >@@ -130,7 +130,7 @@ > { "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 -urN koffice/kexi.new/3rdparty/kexisql/src/vdbe.c koffice.new/kexi.new/3rdparty/kexisql/src/vdbe.c >--- koffice/kexi.new/3rdparty/kexisql/src/vdbe.c 2011-08-17 20:24:54.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql/src/vdbe.c 2012-01-03 17:28:11.000000000 -0600 >@@ -2741,7 +2741,7 @@ > /* 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 -urN koffice/kexi.new/3rdparty/kexisql3/src/alter.c koffice.new/kexi.new/3rdparty/kexisql3/src/alter.c >--- koffice/kexi.new/3rdparty/kexisql3/src/alter.c 2011-07-19 00:27:26.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/alter.c 2012-01-03 17:28:12.000000000 -0600 >@@ -407,7 +407,7 @@ > 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 @@ > return; > } > if( pNew->pIndex ){ >- sqlite3ErrorMsg(pParse, "Cannot add a UNITQUE column"); >+ sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column"); > return; > } > if( pCol->notNull && !pDflt ){ >diff -urN koffice/kexi.new/3rdparty/kexisql3/src/btree.c koffice.new/kexi.new/3rdparty/kexisql3/src/btree.c >--- koffice/kexi.new/3rdparty/kexisql3/src/btree.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/btree.c 2012-01-03 17:28:12.000000000 -0600 >@@ -3930,13 +3930,13 @@ > } > szCell = (int*)&apCell[nMaxCells]; > aCopy[0] = (u8*)&szCell[nMaxCells]; >- assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ >+ assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ > for(i=1; i<NB; i++){ > aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; >- assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ >+ assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ > } > aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; >- assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ >+ assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ > #ifndef SQLITE_OMIT_AUTOVACUUM > if( pBt->autoVacuum ){ > aFrom = &aSpace[5*pBt->pageSize]; >diff -urN koffice/kexi.new/3rdparty/kexisql3/src/build.c koffice.new/kexi.new/3rdparty/kexisql3/src/build.c >--- koffice/kexi.new/3rdparty/kexisql3/src/build.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/build.c 2012-01-03 17:28:12.000000000 -0600 >@@ -746,7 +746,7 @@ > /* 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 @@ > ** 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 @@ > ** 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 @@ > > 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 @@ > ** 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 @@ > 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 @@ > 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 -urN koffice/kexi.new/3rdparty/kexisql3/src/insert.c koffice.new/kexi.new/3rdparty/kexisql3/src/insert.c >--- koffice/kexi.new/3rdparty/kexisql3/src/insert.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/insert.c 2012-01-03 17:28:12.000000000 -0600 >@@ -746,7 +746,7 @@ > ** 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 @@ > ** 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 @@ > } > } > >- /* 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 @@ > > /* 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 @@ > break; > } > } >-#if NULL_DISTINCT_FOR_UNITQUE >+#if NULL_DISTINCT_FOR_UNIQUE > sqlite3VdbeJumpHere(v, jumpInst1); > #endif > sqlite3VdbeJumpHere(v, jumpInst2); >diff -urN koffice/kexi.new/3rdparty/kexisql3/src/keywordhash.h koffice.new/kexi.new/3rdparty/kexisql3/src/keywordhash.h >--- koffice/kexi.new/3rdparty/kexisql3/src/keywordhash.h 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/keywordhash.h 2012-01-03 17:28:12.000000000 -0600 >@@ -9,7 +9,7 @@ > "CURRENT_DATECURRENT_TIMESTAMPLANDESCDETACHDISTINCTDROPRAGMATCH" > "FAILIMITFROMFULLGROUPDATEIMMEDIATEINSERTINSTEADINTOFFSETISNULL" > "JOINORDEREPLACEOUTERESTRICTPRIMARYTQUERYRIGHTROLLBACKROWHENUNION" >- "UNITQUEUSINGVACUUMVALUESVIEWHERE"; >+ "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, >@@ -77,7 +77,7 @@ > 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_ROLLBACK, TK_ROW, TK_WHEN, TK_UNION, TK_UNIQUE, > TK_USING, TK_VACUUM, TK_VALUES, TK_VIEW, TK_WHERE, > }; > int h, i; >diff -urN koffice/kexi.new/3rdparty/kexisql3/src/parse.c koffice.new/kexi.new/3rdparty/kexisql3/src/parse.c >--- koffice/kexi.new/3rdparty/kexisql3/src/parse.c 2011-09-19 00:27:35.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/parse.c 2012-01-03 17:28:12.000000000 -0600 >@@ -770,7 +770,7 @@ > 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 @@ > "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", >@@ -1011,7 +1011,7 @@ > /* 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 @@ > /* 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 @@ > /* 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 -urN koffice/kexi.new/3rdparty/kexisql3/src/parse.h koffice.new/kexi.new/3rdparty/kexisql3/src/parse.h >--- koffice/kexi.new/3rdparty/kexisql3/src/parse.h 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/parse.h 2012-01-03 17:28:12.000000000 -0600 >@@ -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 -urN koffice/kexi.new/3rdparty/kexisql3/src/prepare.c koffice.new/kexi.new/3rdparty/kexisql3/src/prepare.c >--- koffice/kexi.new/3rdparty/kexisql3/src/prepare.c 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/prepare.c 2012-01-03 17:28:12.000000000 -0600 >@@ -77,7 +77,7 @@ > } > }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 -urN koffice/kexi.new/3rdparty/kexisql3/src/sqliteInt.h koffice.new/kexi.new/3rdparty/kexisql3/src/sqliteInt.h >--- koffice/kexi.new/3rdparty/kexisql3/src/sqliteInt.h 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/sqliteInt.h 2012-01-03 17:28:12.000000000 -0600 >@@ -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 @@ > ** 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 @@ > 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 -urN koffice/kexi.new/3rdparty/kexisql3/src/vacuum.c koffice.new/kexi.new/3rdparty/kexisql3/src/vacuum.c >--- koffice/kexi.new/3rdparty/kexisql3/src/vacuum.c 2011-06-25 13:42:19.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/vacuum.c 2012-01-03 17:28:12.000000000 -0600 >@@ -212,8 +212,8 @@ > " 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 -urN koffice/kexi.new/3rdparty/kexisql3/src/vdbe.c koffice.new/kexi.new/3rdparty/kexisql3/src/vdbe.c >--- koffice/kexi.new/3rdparty/kexisql3/src/vdbe.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/vdbe.c 2012-01-03 17:28:12.000000000 -0600 >@@ -2956,7 +2956,7 @@ > } > > /* 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 -urN koffice/kexi.new/3rdparty/kexisql3/src/where.c koffice.new/kexi.new/3rdparty/kexisql3/src/where.c >--- koffice/kexi.new/3rdparty/kexisql3/src/where.c 2011-08-17 20:24:55.000000000 -0500 >+++ koffice.new/kexi.new/3rdparty/kexisql3/src/where.c 2012-01-03 17:28:12.000000000 -0600 >@@ -170,7 +170,7 @@ > #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 @@ > ** 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 @@ > 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 @@ > 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)); > >@@ -1514,7 +1514,7 @@ > /* 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 -urN koffice/kexi.new/kexidb/connection.cpp koffice.new/kexi.new/kexidb/connection.cpp >--- koffice/kexi.new/kexidb/connection.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/connection.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -671,7 +671,7 @@ > > 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 @@ > 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 @@ > 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 @@ > { > 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 @@ > 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 -urN koffice/kexi.new/kexidb/cursor.cpp koffice.new/kexi.new/kexidb/cursor.cpp >--- koffice/kexi.new/kexidb/cursor.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/cursor.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -166,7 +166,7 @@ > > //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 -urN koffice/kexi.new/kexidb/driver.cpp koffice.new/kexi.new/kexidb/driver.cpp >--- koffice/kexi.new/kexidb/driver.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/driver.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -49,12 +49,12 @@ > , 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 @@ > 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 -urN koffice/kexi.new/kexidb/driver.h koffice.new/kexi.new/kexidb/driver.h >--- koffice/kexi.new/kexidb/driver.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/driver.h 2012-01-03 17:28:09.000000000 -0600 >@@ -318,7 +318,7 @@ > 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 -urN koffice/kexi.new/kexidb/driver_p.h koffice.new/kexi.new/kexidb/driver_p.h >--- koffice/kexi.new/kexidb/driver_p.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/driver_p.h 2012-01-03 17:28:09.000000000 -0600 >@@ -72,7 +72,7 @@ > > /*! 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 @@ > /*! 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 @@ > 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 -urN koffice/kexi.new/kexidb/drivers/mySQL/mysqldriver.cpp koffice.new/kexi.new/kexidb/drivers/mySQL/mysqldriver.cpp >--- koffice/kexi.new/kexidb/drivers/mySQL/mysqldriver.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/drivers/mySQL/mysqldriver.cpp 2012-01-03 17:28:08.000000000 -0600 >@@ -63,9 +63,9 @@ > > 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 -urN koffice/kexi.new/kexidb/drivers/pqxx/pqxxcursor.h koffice.new/kexi.new/kexidb/drivers/pqxx/pqxxcursor.h >--- koffice/kexi.new/kexidb/drivers/pqxx/pqxxcursor.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/drivers/pqxx/pqxxcursor.h 2012-01-03 17:28:08.000000000 -0600 >@@ -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 -urN koffice/kexi.new/kexidb/drivers/pqxx/pqxxdriver.cpp koffice.new/kexi.new/kexidb/drivers/pqxx/pqxxdriver.cpp >--- koffice/kexi.new/kexidb/drivers/pqxx/pqxxdriver.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/drivers/pqxx/pqxxdriver.cpp 2012-01-03 17:28:08.000000000 -0600 >@@ -47,7 +47,7 @@ > 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 -urN koffice/kexi.new/kexidb/drivers/sqlite/sqlitedriver.cpp koffice.new/kexi.new/kexidb/drivers/sqlite/sqlitedriver.cpp >--- koffice/kexi.new/kexidb/drivers/sqlite/sqlitedriver.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/drivers/sqlite/sqlitedriver.cpp 2012-01-03 17:28:08.000000000 -0600 >@@ -66,11 +66,11 @@ > 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 -urN koffice/kexi.new/kexidb/expression.cpp koffice.new/kexi.new/kexidb/expression.cpp >--- koffice/kexi.new/kexidb/expression.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/expression.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -568,7 +568,7 @@ > > //========================================= > QueryParameterExpr::QueryParameterExpr(const TQString& message) >-: ConstExpr( TQUERY_PARAMETER, message ) >+: ConstExpr( QUERY_PARAMETER, message ) > , m_type(Field::Text) > { > m_cl = KexiDBExpr_QueryParameter; >diff -urN koffice/kexi.new/kexidb/field.cpp koffice.new/kexi.new/kexidb/field.cpp >--- koffice/kexi.new/kexidb/field.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/field.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -598,7 +598,7 @@ > 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 -urN koffice/kexi.new/kexidb/indexschema.cpp koffice.new/kexi.new/kexidb/indexschema.cpp >--- koffice/kexi.new/kexidb/indexschema.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/indexschema.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -157,7 +157,7 @@ > + (m_isForeignKey ? "FOREIGN KEY " : "") > + (m_isAutoGenerated ? "AUTOGENERATED " : "") > + (m_primary ? "PRIMARY " : "") >- + ((!m_primary) && m_unique ? "UNITQUE " : "") >+ + ((!m_primary) && m_unique ? "UNIQUE " : "") > + FieldList::debugString(); > } > >diff -urN koffice/kexi.new/kexidb/indexschema.h koffice.new/kexi.new/kexidb/indexschema.h >--- koffice/kexi.new/kexidb/indexschema.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/indexschema.h 2012-01-03 17:28:09.000000000 -0600 >@@ -118,7 +118,7 @@ > 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 @@ > > /*! 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 -urN koffice/kexi.new/kexidb/keywords.cpp koffice.new/kexi.new/kexidb/keywords.cpp >--- koffice/kexi.new/kexidb/keywords.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/keywords.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -82,7 +82,7 @@ > "THEN", > "TRANSACTION", > "UNION", >- "UNITQUE", >+ "UNIQUE", > "UPDATE", > "USING", > "VALUES", >diff -urN koffice/kexi.new/kexidb/parser/sqlparser.cpp koffice.new/kexi.new/kexidb/parser/sqlparser.cpp >--- koffice/kexi.new/kexidb/parser/sqlparser.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/parser/sqlparser.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -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 @@ > "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 @@ > "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 @@ > "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 -urN koffice/kexi.new/kexidb/parser/sqlparser.h koffice.new/kexi.new/kexidb/parser/sqlparser.h >--- koffice/kexi.new/kexidb/parser/sqlparser.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/parser/sqlparser.h 2012-01-03 17:28:09.000000000 -0600 >@@ -154,12 +154,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, >@@ -276,7 +276,7 @@ > PARTIAL = 485, > SQL_PASCAL = 486, > PERSISTENT = 487, >- CTQL_PI = 488, >+ CQL_PI = 488, > PLI = 489, > POSITION = 490, > PRECISION = 491, >@@ -288,8 +288,8 @@ > 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 @@ > TWO_DIGITS = 570, > UCASE = 571, > UNION = 572, >- UNITQUE = 573, >+ UNIQUE = 573, > SQL_UNKNOWN = 574, > UPDATE = 575, > UPPER = 576, >@@ -369,7 +369,7 @@ > USER = 578, > IDENTIFIER = 579, > IDENTIFIER_DOT_ASTERISK = 580, >- TQUERY_PARAMETER = 581, >+ QUERY_PARAMETER = 581, > USING = 582, > VALUE = 583, > VALUES = 584, >@@ -504,12 +504,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 >@@ -626,7 +626,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 >@@ -638,8 +638,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 >@@ -711,7 +711,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 >@@ -719,7 +719,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 >diff -urN koffice/kexi.new/kexidb/parser/sqlscanner.cpp koffice.new/kexi.new/kexidb/parser/sqlscanner.cpp >--- koffice/kexi.new/kexidb/parser/sqlscanner.cpp 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/parser/sqlscanner.cpp 2012-01-03 17:28:09.000000000 -0600 >@@ -1125,7 +1125,7 @@ > 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 -urN koffice/kexi.new/kexidb/queryschema.h koffice.new/kexi.new/kexidb/queryschema.h >--- koffice/kexi.new/kexidb/queryschema.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/queryschema.h 2012-01-03 17:28:08.000000000 -0600 >@@ -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 -urN koffice/kexi.new/kexidb/queryschemaparameter.h koffice.new/kexi.new/kexidb/queryschemaparameter.h >--- koffice/kexi.new/kexidb/queryschemaparameter.h 2012-01-03 16:24:45.000000000 -0600 >+++ koffice.new/kexi.new/kexidb/queryschemaparameter.h 2012-01-03 17:28:08.000000000 -0600 >@@ -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 -urN koffice/kexi.new/plugins/importexport/csv/kexicsvexport.cpp koffice.new/kexi.new/plugins/importexport/csv/kexicsvexport.cpp >--- koffice/kexi.new/plugins/importexport/csv/kexicsvexport.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/importexport/csv/kexicsvexport.cpp 2012-01-03 17:28:11.000000000 -0600 >@@ -63,7 +63,7 @@ > 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 @@ > //! @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 -urN koffice/kexi.new/plugins/importexport/csv/kexicsvexportwizard.cpp koffice.new/kexi.new/plugins/importexport/csv/kexicsvexportwizard.cpp >--- koffice/kexi.new/plugins/importexport/csv/kexicsvexportwizard.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/importexport/csv/kexicsvexportwizard.cpp 2012-01-03 17:28:11.000000000 -0600 >@@ -424,8 +424,8 @@ > 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 -urN koffice/kexi.new/plugins/importexport/csv/kexicsvimportdialog.cpp koffice.new/kexi.new/plugins/importexport/csv/kexicsvimportdialog.cpp >--- koffice/kexi.new/plugins/importexport/csv/kexicsvimportdialog.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/importexport/csv/kexicsvimportdialog.cpp 2012-01-03 17:28:11.000000000 -0600 >@@ -156,7 +156,7 @@ > 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), >diff -urN koffice/kexi.new/plugins/importexport/csv/kexicsvwidgets.h koffice.new/kexi.new/plugins/importexport/csv/kexicsvwidgets.h >--- koffice/kexi.new/plugins/importexport/csv/kexicsvwidgets.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/importexport/csv/kexicsvwidgets.h 2012-01-03 17:28:11.000000000 -0600 >@@ -27,8 +27,8 @@ > 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 -urN koffice/kexi.new/plugins/queries/kexidynamicqueryparameterdialog.h koffice.new/kexi.new/plugins/queries/kexidynamicqueryparameterdialog.h >--- koffice/kexi.new/plugins/queries/kexidynamicqueryparameterdialog.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexidynamicqueryparameterdialog.h 2012-01-03 17:28:11.000000000 -0600 >@@ -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 -urN koffice/kexi.new/plugins/queries/kexiquerydesignerguieditor.cpp koffice.new/kexi.new/plugins/queries/kexiquerydesignerguieditor.cpp >--- koffice/kexi.new/plugins/queries/kexiquerydesignerguieditor.cpp 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexiquerydesignerguieditor.cpp 2012-01-03 17:28:11.000000000 -0600 >@@ -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 @@ > 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 @@ > (*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 @@ > 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 @@ > } > 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 @@ > 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 @@ > 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 @@ > 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 -urN koffice/kexi.new/plugins/queries/kexiquerydesignerguieditor.h koffice.new/kexi.new/plugins/queries/kexiquerydesignerguieditor.h >--- koffice/kexi.new/plugins/queries/kexiquerydesignerguieditor.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexiquerydesignerguieditor.h 2012-01-03 17:28:11.000000000 -0600 >@@ -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 -urN koffice/kexi.new/plugins/queries/kexiquerydesignersql.h koffice.new/kexi.new/plugins/queries/kexiquerydesignersql.h >--- koffice/kexi.new/plugins/queries/kexiquerydesignersql.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexiquerydesignersql.h 2012-01-03 17:28:11.000000000 -0600 >@@ -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 -urN koffice/kexi.new/plugins/queries/kexiquerydesignersqlhistory.h koffice.new/kexi.new/plugins/queries/kexiquerydesignersqlhistory.h >--- koffice/kexi.new/plugins/queries/kexiquerydesignersqlhistory.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexiquerydesignersqlhistory.h 2012-01-03 17:28:11.000000000 -0600 >@@ -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 -urN koffice/kexi.new/plugins/queries/kexiquerypart.h koffice.new/kexi.new/plugins/queries/kexiquerypart.h >--- koffice/kexi.new/plugins/queries/kexiquerypart.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexiquerypart.h 2012-01-03 17:28:11.000000000 -0600 >@@ -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 -urN koffice/kexi.new/plugins/queries/kexiqueryview.h koffice.new/kexi.new/plugins/queries/kexiqueryview.h >--- koffice/kexi.new/plugins/queries/kexiqueryview.h 2011-08-17 20:24:46.000000000 -0500 >+++ koffice.new/kexi.new/plugins/queries/kexiqueryview.h 2012-01-03 17:28:11.000000000 -0600 >@@ -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 -urN koffice/kexi.new/widget/kexiquerydesignersqleditor.h koffice.new/kexi.new/widget/kexiquerydesignersqleditor.h >--- koffice/kexi.new/widget/kexiquerydesignersqleditor.h 2012-01-03 16:24:46.000000000 -0600 >+++ koffice.new/kexi.new/widget/kexiquerydesignersqleditor.h 2012-01-03 17:28:09.000000000 -0600 >@@ -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 -urN koffice/kexi.new/widget/kexiqueryparameters.h koffice.new/kexi.new/widget/kexiqueryparameters.h >--- koffice/kexi.new/widget/kexiqueryparameters.h 2012-01-03 16:24:46.000000000 -0600 >+++ koffice.new/kexi.new/widget/kexiqueryparameters.h 2012-01-03 17:28:09.000000000 -0600 >@@ -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> > >diff -urN koffice/lib/kformula/kformulacompatibility.cc koffice.new/lib/kformula/kformulacompatibility.cc >--- koffice/lib/kformula/kformulacompatibility.cc 2011-06-25 13:42:26.000000000 -0500 >+++ koffice.new/lib/kformula/kformulacompatibility.cc 2012-01-03 17:28:13.000000000 -0600 >@@ -45,7 +45,7 @@ > const BoxType OF_LSUP = '6' + UNUSED_OFFSET; > const BoxType OF_LSUB = '%' + UNUSED_OFFSET; > //const BoxType PAREN = '('; >-//const BoxType ETQUAL = '='; >+//const BoxType EQUAL = '='; > //const BoxType MORE = '>'; > //const BoxType LESS = '<'; > //const BoxType ABS = '|'; View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]