Fix inadvertent TQt string conversions

This closes Bug 782

9 files changed, 29 insertions, 29 deletions

diff --git a/kexi/3rdparty/kexisql/src/build.c b/kexi/3rdparty/kexisql/src/build.c
index 2fb19064..1dece406 100644
--- a/kexi/3rdparty/kexisql/src/build.c
+++ b/kexi/3rdparty/kexisql/src/build.c
@@ -526,7 +526,7 @@ void sqliteStartTable(
   /* Begin generating the code that will insert the table record into
   ** the SQLITE_MASTER table.  Note in particular that we must go ahead
   ** and allocate the record number for the table entry now.  Before any
-  ** PRIMARY KEY or UNITQUE keywords are parsed.  Those keywords will cause
+  ** PRIMARY KEY or UNIQUE keywords are parsed.  Those keywords will cause
   ** indices to be created and the table record must come before the 
   ** indices.  Hence, the record number for the table must be allocated
   ** now.
@@ -1461,7 +1461,7 @@ void sqliteDeferForeignKey(Parse *pParse, int isDeferred){
 ** Create a new index for an SQL table.  pIndex is the name of the index 
 ** and pTable is the name of the table that is to be indexed.  Both will 
 ** be NULL for a primary key or an index that is created to satisfy a
-** UNITQUE constraint.  If pTable and pIndex are NULL, use pParse->pNewTable
+** UNIQUE constraint.  If pTable and pIndex are NULL, use pParse->pNewTable
 ** as the table to be indexed.  pParse->pNewTable is a table that is
 ** currently being constructed by a CREATE TABLE statement.
 **
@@ -1531,7 +1531,7 @@ void sqliteCreateIndex(
   ** index, then we will continue to process this index.
   **
   ** If pName==0 it means that we are
-  ** dealing with a primary key or UNITQUE constraint.  We have to invent our
+  ** dealing with a primary key or UNIQUE constraint.  We have to invent our
   ** own name.
   */
   if( pName && !db->init.busy ){
@@ -1673,7 +1673,7 @@ void sqliteCreateIndex(
   ** we don't want to recreate it.
   **
   ** If pTable==0 it means this index is generated as a primary key
-  ** or UNITQUE constraint of a CREATE TABLE statement.  Since the table
+  ** or UNIQUE constraint of a CREATE TABLE statement.  Since the table
   ** has just been created, it contains no data and the index initialization
   ** step can be skipped.
   */
@@ -1767,7 +1767,7 @@ void sqliteDropIndex(Parse *pParse, SrcList *pName){
     goto exit_drop_index;
   }
   if( pIndex->autoIndex ){
-    sqliteErrorMsg(pParse, "index associated with UNITQUE "
+    sqliteErrorMsg(pParse, "index associated with UNIQUE "
       "or PRIMARY KEY constraint cannot be dropped", 0);
     goto exit_drop_index;
   }
diff --git a/kexi/3rdparty/kexisql/src/func.c b/kexi/3rdparty/kexisql/src/func.c
index 0fcc291e..e21e8c8b 100644
--- a/kexi/3rdparty/kexisql/src/func.c
+++ b/kexi/3rdparty/kexisql/src/func.c
@@ -285,7 +285,7 @@ static void versionFunc(sqlite_func *context, int argc, const char **argv){
 ** change.  This function may disappear.  Do not write code that depends
 ** on this function.
 **
-** Implementation of the TQUOTE() function.  This function takes a single
+** Implementation of the QUOTE() function.  This function takes a single
 ** argument.  If the argument is numeric, the return value is the same as
 ** the argument.  If the argument is NULL, the return value is the string
 ** "NULL".  Otherwise, the argument is enclosed in single quotes with
diff --git a/kexi/3rdparty/kexisql/src/insert.c b/kexi/3rdparty/kexisql/src/insert.c
index e8d5e567..660a2a56 100644
--- a/kexi/3rdparty/kexisql/src/insert.c
+++ b/kexi/3rdparty/kexisql/src/insert.c
@@ -567,7 +567,7 @@ insert_cleanup:
 ** aIdxUsed!=0 and aIdxUsed[i]!=0.
 **
 ** This routine also generates code to check constraints.  NOT NULL,
-** CHECK, and UNITQUE constraints are all checked.  If a constraint fails,
+** CHECK, and UNIQUE constraints are all checked.  If a constraint fails,
 ** then the appropriate action is performed.  There are five possible
 ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE.
 **
@@ -595,7 +595,7 @@ insert_cleanup:
 **                                value for that column.  If the default value
 **                                is NULL, the action is the same as ABORT.
 **
-**  UNITQUE           REPLACE      The other row that conflicts with the row
+**  UNIQUE           REPLACE      The other row that conflicts with the row
 **                                being inserted is removed.
 **
 **  CHECK            REPLACE      Illegal.  The results in an exception.
@@ -753,7 +753,7 @@ void sqliteGenerateConstraintChecks(
     }
   }
 
-  /* Test all UNITQUE constraints by creating entries for each UNITQUE
+  /* Test all UNIQUE constraints by creating entries for each UNIQUE
   ** index and making sure that duplicate entries do not already exist.
   ** Add the new records to the indices as we go.
   */
@@ -777,7 +777,7 @@ void sqliteGenerateConstraintChecks(
 
     /* Find out what action to take in case there is an indexing conflict */
     onError = pIdx->onError;
-    if( onError==OE_None ) continue;  /* pIdx is not a UNITQUE index */
+    if( onError==OE_None ) continue;  /* pIdx is not a UNIQUE index */
     if( overrideError!=OE_Default ){
       onError = overrideError;
     }else if( pParse->db->onError!=OE_Default ){
@@ -843,7 +843,7 @@ void sqliteGenerateConstraintChecks(
       default: assert(0);
     }
     contAddr = sqliteVdbeCurrentAddr(v);
-#if NULL_DISTINCT_FOR_UNITQUE
+#if NULL_DISTINCT_FOR_UNIQUE
     sqliteVdbeChangeP2(v, jumpInst1, contAddr);
 #endif
     sqliteVdbeChangeP2(v, jumpInst2, contAddr);
diff --git a/kexi/3rdparty/kexisql/src/main.c b/kexi/3rdparty/kexisql/src/main.c
index 4fc118c8..c883f2ea 100644
--- a/kexi/3rdparty/kexisql/src/main.c
+++ b/kexi/3rdparty/kexisql/src/main.c
@@ -90,7 +90,7 @@ int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){
         db->init.iDb = 0;
       }else{
         /* If the SQL column is blank it means this is an index that
-        ** was created to be the PRIMARY KEY or to fulfill a UNITQUE
+        ** was created to be the PRIMARY KEY or to fulfill a UNIQUE
         ** constraint for a CREATE TABLE.  The index should have already
         ** been created when we processed the CREATE TABLE.  All we have
         ** to do here is record the root page number for that index.
diff --git a/kexi/3rdparty/kexisql/src/parse.c b/kexi/3rdparty/kexisql/src/parse.c
index 2fd6ae39..46353691 100644
--- a/kexi/3rdparty/kexisql/src/parse.c
+++ b/kexi/3rdparty/kexisql/src/parse.c
@@ -711,7 +711,7 @@ static const YYCODETYPE yyFallback[] = {
     0,  /*      FLOAT => nothing */
     0,  /*       NULL => nothing */
     0,  /*    PRIMARY => nothing */
-    0,  /*     UNITQUE => nothing */
+    0,  /*     UNIQUE => nothing */
     0,  /*      CHECK => nothing */
     0,  /* REFERENCES => nothing */
     0,  /*    COLLATE => nothing */
@@ -840,7 +840,7 @@ static const char *yyTokenName[] = {
   "STAR",          "SLASH",         "REM",           "CONCAT",      
   "UMINUS",        "UPLUS",         "BITNOT",        "STRING",      
   "JOIN_KW",       "INTEGER",       "CONSTRAINT",    "DEFAULT",     
-  "FLOAT",         "NULL",          "PRIMARY",       "UNITQUE",      
+  "FLOAT",         "NULL",          "PRIMARY",       "UNIQUE",      
   "CHECK",         "REFERENCES",    "COLLATE",       "ON",          
   "DELETE",        "UPDATE",        "INSERT",        "SET",         
   "DEFERRABLE",    "FOREIGN",       "DROP",          "UNION",       
@@ -935,7 +935,7 @@ static const char *yyRuleName[] = {
  /*  53 */ "ccons ::= NULL onconf",
  /*  54 */ "ccons ::= NOT NULL onconf",
  /*  55 */ "ccons ::= PRIMARY KEY sortorder onconf",
- /*  56 */ "ccons ::= UNITQUE onconf",
+ /*  56 */ "ccons ::= UNIQUE onconf",
  /*  57 */ "ccons ::= CHECK LP expr RP onconf",
  /*  58 */ "ccons ::= REFERENCES nm idxlist_opt refargs",
  /*  59 */ "ccons ::= defer_subclause",
@@ -962,7 +962,7 @@ static const char *yyRuleName[] = {
  /*  80 */ "conslist ::= tcons",
  /*  81 */ "tcons ::= CONSTRAINT nm",
  /*  82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf",
- /*  83 */ "tcons ::= UNITQUE LP idxlist RP onconf",
+ /*  83 */ "tcons ::= UNIQUE LP idxlist RP onconf",
  /*  84 */ "tcons ::= CHECK expr onconf",
  /*  85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt",
  /*  86 */ "defer_subclause_opt ::=",
@@ -1115,7 +1115,7 @@ static const char *yyRuleName[] = {
  /* 233 */ "expritem ::= expr",
  /* 234 */ "expritem ::=",
  /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf",
- /* 236 */ "uniqueflag ::= UNITQUE",
+ /* 236 */ "uniqueflag ::= UNIQUE",
  /* 237 */ "uniqueflag ::=",
  /* 238 */ "idxlist_opt ::=",
  /* 239 */ "idxlist_opt ::= LP idxlist RP",
@@ -2183,7 +2183,7 @@ static void yy_reduce(
 #line 191 "parse.y"
 {sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);}
 #line 2185 "parse.c"
-        /* No destructor defined for UNITQUE */
+        /* No destructor defined for UNIQUE */
         break;
       case 57:
         /* No destructor defined for CHECK */
@@ -2342,7 +2342,7 @@ static void yy_reduce(
 #line 238 "parse.y"
 {sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);}
 #line 2344 "parse.c"
-        /* No destructor defined for UNITQUE */
+        /* No destructor defined for UNIQUE */
         /* No destructor defined for LP */
         /* No destructor defined for RP */
         break;
@@ -3428,7 +3428,7 @@ static void yy_reduce(
 #line 740 "parse.y"
 { yygotominor.yy372 = OE_Abort; }
 #line 3430 "parse.c"
-        /* No destructor defined for UNITQUE */
+        /* No destructor defined for UNIQUE */
         break;
       case 237:
 #line 741 "parse.y"
diff --git a/kexi/3rdparty/kexisql/src/parse.h b/kexi/3rdparty/kexisql/src/parse.h
index 35949283..188a336c 100644
--- a/kexi/3rdparty/kexisql/src/parse.h
+++ b/kexi/3rdparty/kexisql/src/parse.h
@@ -92,7 +92,7 @@
 #define TK_FLOAT                          92
 #define TK_NULL                           93
 #define TK_PRIMARY                        94
-#define TK_UNITQUE                         95
+#define TK_UNIQUE                         95
 #define TK_CHECK                          96
 #define TK_REFERENCES                     97
 #define TK_COLLATE                        98
diff --git a/kexi/3rdparty/kexisql/src/sqliteInt.h b/kexi/3rdparty/kexisql/src/sqliteInt.h
index 3f8858e0..dd0710f9 100644
--- a/kexi/3rdparty/kexisql/src/sqliteInt.h
+++ b/kexi/3rdparty/kexisql/src/sqliteInt.h
@@ -45,16 +45,16 @@
 /*
 ** If the following macro is set to 1, then NULL values are considered
 ** distinct when determining whether or not two entries are the same
-** in a UNITQUE index.  This is the way PostgreSQL, Oracle, DB2, MySQL,
+** in a UNIQUE index.  This is the way PostgreSQL, Oracle, DB2, MySQL,
 ** OCELOT, and Firebird all work.  The SQL92 spec explicitly says this
 ** is the way things are suppose to work.
 **
 ** If the following macro is set to 0, the NULLs are indistinct for
-** a UNITQUE index.  In this mode, you can only have a single NULL entry
-** for a column declared UNITQUE.  This is the way Informix and SQL Server
+** a UNIQUE index.  In this mode, you can only have a single NULL entry
+** for a column declared UNIQUE.  This is the way Informix and SQL Server
 ** work.
 */
-#define NULL_DISTINCT_FOR_UNITQUE 1
+#define NULL_DISTINCT_FOR_UNIQUE 1
 
 /*
 ** The maximum number of attached databases.  This must be at least 2
@@ -563,7 +563,7 @@ struct FKey {
 ** occurs.  IGNORE means that the particular row that caused the constraint
 ** error is not inserted or updated.  Processing continues and no error
 ** is returned.  REPLACE means that preexisting database rows that caused
-** a UNITQUE constraint violation are removed so that the new insert or
+** a UNIQUE constraint violation are removed so that the new insert or
 ** update can proceed.  Processing continues and no error is reported.
 **
 ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys.
@@ -623,7 +623,7 @@ struct Index {
   Table *pTable;   /* The SQL table being indexed */
   int tnum;        /* Page containing root of this index in database file */
   u8 onError;      /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
-  u8 autoIndex;    /* True if is automatically created (ex: by UNITQUE) */
+  u8 autoIndex;    /* True if is automatically created (ex: by UNIQUE) */
   u8 iDb;          /* Index in sqlite.aDb[] of where this index is stored */
   Index *pNext;    /* The next index associated with the same table */
 };
diff --git a/kexi/3rdparty/kexisql/src/tokenize.c b/kexi/3rdparty/kexisql/src/tokenize.c
index 40fe48ef..68cb9f99 100644
--- a/kexi/3rdparty/kexisql/src/tokenize.c
+++ b/kexi/3rdparty/kexisql/src/tokenize.c
@@ -130,7 +130,7 @@ static Keyword aKeywordTable[] = {
   { "TRANSACTION",       TK_TRANSACTION,  },
   { "TRIGGER",           TK_TRIGGER,      },
   { "UNION",             TK_UNION,        },
-  { "UNITQUE",            TK_UNITQUE,       },
+  { "UNIQUE",            TK_UNIQUE,       },
   { "UPDATE",            TK_UPDATE,       },
   { "USING",             TK_USING,        },
   { "VACUUM",            TK_VACUUM,       },
diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c
index 9f31e9cf..fb52ef38 100644
--- a/kexi/3rdparty/kexisql/src/vdbe.c
+++ b/kexi/3rdparty/kexisql/src/vdbe.c
@@ -2741,7 +2741,7 @@ case OP_IsUnique: {
     /* The last four bytes of the key are different from R.  Convert the
     ** last four bytes of the key into an integer and push it onto the
     ** stack.  (These bytes are the record number of an entry that
-    ** violates a UNITQUE constraint.)
+    ** violates a UNIQUE constraint.)
     */
     pTos++;
     pTos->i = v;