rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

33 files changed, 316 insertions, 316 deletions

diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index a257011e..edcba8c9 100644
--- a/kexi/3rdparty/kexisql/src/btree.c
+++ b/kexi/3rdparty/kexisql/src/btree.c
@@ -313,9 +313,9 @@ struct FreelistInfo {
 ** page to hold as many as two more cells than it might otherwise hold.
 ** The extra two entries in apCell[] are an allowance for this situation.
 **
-** The pParent field points back to the tqparent page.  This allows us to
+** The pParent field points back to the parent page.  This allows us to
 ** walk up the BTree from any leaf to the root.  Care must be taken to
-** unref() the tqparent page pointer when this page is no longer referenced.
+** unref() the parent page pointer when this page is no longer referenced.
 ** The pageDestructor() routine handles that chore.
 */
 struct MemPage {
@@ -326,7 +326,7 @@ struct MemPage {
   u8 isInit;                     /* True if auxiliary data is initialized */
   u8 idxShift;                   /* True if apCell[] indices have changed */
   u8 isOverfull;                 /* Some apCell[] points outside u.aDisk[] */
-  MemPage *pParent;              /* The tqparent of this page.  NULL for root */
+  MemPage *pParent;              /* The parent of this page.  NULL for root */
   int idxParent;                 /* Index in pParent->apCell[] of this node */
   int nFree;                     /* Number of free bytes in u.aDisk[] */
   int nCell;                     /* Number of entries on this page */
@@ -567,8 +567,8 @@ static void freeSpace(Btree *pBt, MemPage *pPage, int start, int size){
 ** Initialize the auxiliary information for a disk block.
 **
 ** The pParent parameter must be a pointer to the MemPage which
-** is the tqparent of the page being initialized.  The root of the
-** BTree (usually page 2) has no tqparent and so for that page, 
+** is the parent of the page being initialized.  The root of the
+** BTree (usually page 2) has no parent and so for that page, 
 ** pParent==NULL.
 **
 ** Return SQLITE_OK on success.  If we see that the page does
@@ -1414,7 +1414,7 @@ static int moveToChild(BtCursor *pCur, int newPgno){
 }
 
 /*
-** Move the cursor up to the tqparent page.
+** Move the cursor up to the parent page.
 **
 ** pCur->idx is set to the cell index that contains the pointer
 ** to the page we are coming from.  If we are coming from the
@@ -1451,7 +1451,7 @@ static void moveToParent(BtCursor *pCur){
   }else{
     /* The MemPage.idxShift flag indicates that cell indices might have 
     ** changed since idxParent was set and hence idxParent might be out
-    ** of date.  So recompute the tqparent cell index by scanning all cells
+    ** of date.  So recompute the parent cell index by scanning all cells
     ** and locating the one that points to the child we just came from.
     */
     int i;
@@ -1998,9 +1998,9 @@ static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){
 }
 
 /*
-** Retqparent all tqchildren of the given page to be the given page.
+** Reparent all tqchildren of the given page to be the given page.
 ** In other words, for every child of pPage, invoke reparentPage()
-** to make sure that each child knows that pPage is its tqparent.
+** to make sure that each child knows that pPage is its parent.
 **
 ** This routine gets called after you memcpy() one page into
 ** another.
@@ -2141,7 +2141,7 @@ static void copyPage(MemPage *pTo, MemPage *pFrom){
 ** of pPage so that all pages have about the same amount of free space.
 ** Usually one sibling on either side of pPage is used in the balancing,
 ** though both siblings might come from one side if pPage is the first
-** or last child of its tqparent.  If pPage has fewer than two siblings
+** or last child of its parent.  If pPage has fewer than two siblings
 ** (something which can only happen if pPage is the root page or a 
 ** child of root) then all available siblings participate in the balancing.
 **
@@ -2168,16 +2168,16 @@ static void copyPage(MemPage *pTo, MemPage *pFrom){
 ** if the page is overfull.  Part of the job of this routine is to
 ** make sure all Cells for pPage once again fit in pPage->u.aDisk[].
 **
-** In the course of balancing the siblings of pPage, the tqparent of pPage
+** In the course of balancing the siblings of pPage, the parent of pPage
 ** might become overfull or underfull.  If that happens, then this routine
-** is called recursively on the tqparent.
+** is called recursively on the parent.
 **
 ** If this routine fails for any reason, it might leave the database
 ** in a corrupted state.  So if this routine fails, the database should
 ** be rolled back.
 */
 static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
-  MemPage *pParent;            /* The tqparent of pPage */
+  MemPage *pParent;            /* The parent of pPage */
   int nCell;                   /* Number of cells in apCell[] */
   int nOld;                    /* Number of pages in apOld[] */
   int nNew;                    /* Number of pages in apNew[] */
@@ -2215,8 +2215,8 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   }
 
   /*
-  ** Find the tqparent of the page to be balanceed.
-  ** If there is no tqparent, it means this page is the root page and
+  ** Find the parent of the page to be balanceed.
+  ** If there is no parent, it means this page is the root page and
   ** special rules apply.
   */
   pParent = pPage->pParent;
@@ -2291,7 +2291,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   assert( pParent->isInit );
   
   /*
-  ** Find the Cell in the tqparent page whose h.leftChild points back
+  ** Find the Cell in the parent page whose h.leftChild points back
   ** to pPage.  The "idx" variable is the index of that cell.  If pPage
   ** is the rightmost child of pParent then set idx to pParent->nCell 
   */
@@ -2547,7 +2547,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   }
 
   /*
-  ** Retqparent tqchildren of all cells.
+  ** Reparent tqchildren of all cells.
   */
   for(i=0; i<nNew; i++){
     reparentChildPages(pBt, apNew[i]);
@@ -2555,7 +2555,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   reparentChildPages(pBt, pParent);
 
   /*
-  ** balance the tqparent page.
+  ** balance the parent page.
   */
   rc = balance(pBt, pParent, pCur);
 
diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c
index afb2c508..86feaa5b 100644
--- a/kexi/3rdparty/kexisql/src/btree_rb.c
+++ b/kexi/3rdparty/kexisql/src/btree_rb.c
@@ -123,7 +123,7 @@ struct BtRbNode {
   int nData;
   void *pData;
   u8 isBlack;        /* true for a black node, 0 for a red node */
-  BtRbNode *pParent; /* Nodes tqparent node, NULL for the tree head */
+  BtRbNode *pParent; /* Nodes parent node, NULL for the tree head */
   BtRbNode *pLeft;   /* Nodes left child, or NULL */
   BtRbNode *pRight;  /* Nodes right child, or NULL */
 
@@ -329,7 +329,7 @@ static void check_redblack_tree(BtRbTree * tree, char ** msg)
 {
   BtRbNode *pNode;
 
-  /* 0 -> came from tqparent 
+  /* 0 -> came from parent 
    * 1 -> came from left
    * 2 -> came from right */
   int prev_step = 0;
@@ -400,34 +400,34 @@ static void check_redblack_tree(BtRbTree * tree, char ** msg)
 
 /*
  * Node pX has just been inserted into pTree (by code in sqliteRbtreeInsert()).
- * It is possible that pX is a red node with a red tqparent, which is a violation
+ * It is possible that pX is a red node with a red parent, which is a violation
  * of the red-black tree properties. This function performs rotations and 
  * color changes to rebalance the tree
  */
 static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
 {
   /* In the first iteration of this loop, pX points to the red node just
-   * inserted in the tree. If the tqparent of pX exists (pX is not the root
+   * inserted in the tree. If the parent of pX exists (pX is not the root
    * node) and is red, then the properties of the red-black tree are
    * violated.
    *
    * At the start of any subsequent iterations, pX points to a red node
-   * with a red tqparent. In all other respects the tree is a legal red-black
+   * with a red parent. In all other respects the tree is a legal red-black
    * binary tree. */
   while( pX != pTree->pHead && !pX->pParent->isBlack ){
     BtRbNode *pUncle;
-    BtRbNode *pGrandtqparent;
+    BtRbNode *pGrandparent;
 
-    /* Grandtqparent of pX must exist and must be black. */
-    pGrandtqparent = pX->pParent->pParent;
-    assert( pGrandtqparent );
-    assert( pGrandtqparent->isBlack );
+    /* Grandparent of pX must exist and must be black. */
+    pGrandparent = pX->pParent->pParent;
+    assert( pGrandparent );
+    assert( pGrandparent->isBlack );
 
     /* Uncle of pX may or may not exist. */
-    if( pX->pParent == pGrandtqparent->pLeft ) 
-      pUncle = pGrandtqparent->pRight;
+    if( pX->pParent == pGrandparent->pLeft ) 
+      pUncle = pGrandparent->pRight;
     else 
-      pUncle = pGrandtqparent->pLeft;
+      pUncle = pGrandparent->pLeft;
 
     /* If the uncle of pX exists and is red, we do the following:
      *       |                 |
@@ -438,16 +438,16 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
      *           X(r)              X(r)
      *
      *     BEFORE             AFTER
-     * pX is then set to G. If the tqparent of G is red, then the while loop
+     * pX is then set to G. If the parent of G is red, then the while loop
      * will run again.  */
     if( pUncle && !pUncle->isBlack ){
-      pGrandtqparent->isBlack = 0;
+      pGrandparent->isBlack = 0;
       pUncle->isBlack = 1;
       pX->pParent->isBlack = 1;
-      pX = pGrandtqparent;
+      pX = pGrandparent;
     }else{
 
-      if( pX->pParent == pGrandtqparent->pLeft ){
+      if( pX->pParent == pGrandparent->pLeft ){
         if( pX == pX->pParent->pRight ){
           /* If pX is a right-child, do the following transform, essentially
            * to change pX into a left-child: 
@@ -474,10 +474,10 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
          *
          *     BEFORE             AFTER
          */
-        assert( pGrandtqparent == pX->pParent->pParent );
-        pGrandtqparent->isBlack = 0;
+        assert( pGrandparent == pX->pParent->pParent );
+        pGrandparent->isBlack = 0;
         pX->pParent->isBlack = 1;
-        rightRotate( pTree, pGrandtqparent );
+        rightRotate( pTree, pGrandparent );
 
       }else{
         /* This code is symetric to the illustrated case above. */
@@ -485,10 +485,10 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
           pX = pX->pParent;
           rightRotate(pTree, pX);
         }
-        assert( pGrandtqparent == pX->pParent->pParent );
-        pGrandtqparent->isBlack = 0;
+        assert( pGrandparent == pX->pParent->pParent );
+        pGrandparent->isBlack = 0;
         pX->pParent->isBlack = 1;
-        leftRotate( pTree, pGrandtqparent );
+        leftRotate( pTree, pGrandparent );
       }
     }
   }
diff --git a/kexi/3rdparty/kexisql/src/func.c b/kexi/3rdparty/kexisql/src/func.c
index cf0b8baf..0fcc291e 100644
--- a/kexi/3rdparty/kexisql/src/func.c
+++ b/kexi/3rdparty/kexisql/src/func.c
@@ -32,10 +32,10 @@ static void minmaxFunc(sqlite_func *context, int argc, const char **argv){
   const char *zBest; 
   int i;
   int (*xCompare)(const char*, const char*);
-  int tqmask;    /* 0 for min() or 0xffffffff for max() */
+  int mask;    /* 0 for min() or 0xffffffff for max() */
 
   if( argc==0 ) return;
-  tqmask = (int)sqlite_user_data(context);
+  mask = (int)sqlite_user_data(context);
   zBest = argv[0];
   if( zBest==0 ) return;
   if( argv[1][0]=='n' ){
@@ -45,7 +45,7 @@ static void minmaxFunc(sqlite_func *context, int argc, const char **argv){
   }
   for(i=2; i<argc; i+=2){
     if( argv[i]==0 ) return;
-    if( (xCompare(argv[i], zBest)^tqmask)<0 ){
+    if( (xCompare(argv[i], zBest)^mask)<0 ){
       zBest = argv[i];
     }
   }
@@ -514,7 +514,7 @@ struct MinMaxCtx {
 static void minmaxStep(sqlite_func *context, int argc, const char **argv){
   MinMaxCtx *p;
   int (*xCompare)(const char*, const char*);
-  int tqmask;    /* 0 for min() or 0xffffffff for max() */
+  int mask;    /* 0 for min() or 0xffffffff for max() */
 
   assert( argc==2 );
   if( argv[0]==0 ) return;  /* Ignore NULL values */
@@ -523,11 +523,11 @@ static void minmaxStep(sqlite_func *context, int argc, const char **argv){
   }else{
     xCompare = strcmp;
   }
-  tqmask = (int)sqlite_user_data(context);
-  assert( tqmask==0 || tqmask==-1 );
+  mask = (int)sqlite_user_data(context);
+  assert( mask==0 || mask==-1 );
   p = sqlite_aggregate_context(context, sizeof(*p));
   if( p==0 || argc<1 ) return;
-  if( p->z==0 || (xCompare(argv[0],p->z)^tqmask)<0 ){
+  if( p->z==0 || (xCompare(argv[0],p->z)^mask)<0 ){
     int len;
     if( p->zBuf[0] ){
       sqliteFree(p->z);
diff --git a/kexi/3rdparty/kexisql/src/parse.c b/kexi/3rdparty/kexisql/src/parse.c
index 77b09c5b..2fd6ae39 100644
--- a/kexi/3rdparty/kexisql/src/parse.c
+++ b/kexi/3rdparty/kexisql/src/parse.c
@@ -97,7 +97,7 @@ typedef union {
   IdList* yy320;
   ExprList* yy322;
   int yy372;
-  struct {int value; int tqmask;} yy407;
+  struct {int value; int mask;} yy407;
   int yy441;
 } YYMINORTYPE;
 #define YYSTACKDEPTH 100
@@ -2218,33 +2218,33 @@ static void yy_reduce(
         break;
       case 62:
 #line 207 "parse.y"
-{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.tqmask) | yymsp[0].minor.yy407.value; }
+{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.mask) | yymsp[0].minor.yy407.value; }
 #line 2222 "parse.c"
         break;
       case 63:
 #line 209 "parse.y"
-{ yygotominor.yy407.value = 0;     yygotominor.yy407.tqmask = 0x000000; }
+{ yygotominor.yy407.value = 0;     yygotominor.yy407.mask = 0x000000; }
 #line 2227 "parse.c"
         /* No destructor defined for MATCH */
         /* No destructor defined for nm */
         break;
       case 64:
 #line 210 "parse.y"
-{ yygotominor.yy407.value = yymsp[0].minor.yy372;     yygotominor.yy407.tqmask = 0x0000ff; }
+{ yygotominor.yy407.value = yymsp[0].minor.yy372;     yygotominor.yy407.mask = 0x0000ff; }
 #line 2234 "parse.c"
         /* No destructor defined for ON */
         /* No destructor defined for DELETE */
         break;
       case 65:
 #line 211 "parse.y"
-{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8;  yygotominor.yy407.tqmask = 0x00ff00; }
+{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8;  yygotominor.yy407.mask = 0x00ff00; }
 #line 2241 "parse.c"
         /* No destructor defined for ON */
         /* No destructor defined for UPDATE */
         break;
       case 66:
 #line 212 "parse.y"
-{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.tqmask = 0xff0000; }
+{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.mask = 0xff0000; }
 #line 2248 "parse.c"
         /* No destructor defined for ON */
         /* No destructor defined for INSERT */
diff --git a/kexi/3rdparty/kexisql/src/parse.y b/kexi/3rdparty/kexisql/src/parse.y
index ad0f3716..29bb493b 100644
--- a/kexi/3rdparty/kexisql/src/parse.y
+++ b/kexi/3rdparty/kexisql/src/parse.y
@@ -193,12 +193,12 @@ ccons ::= COLLATE id(C).  {
 //
 %type refargs {int}
 refargs(A) ::= .                     { A = OE_Restrict * 0x010101; }
-refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.tqmask) | Y.value; }
-%type refarg {struct {int value; int tqmask;}}
-refarg(A) ::= MATCH nm.              { A.value = 0;     A.tqmask = 0x000000; }
-refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.tqmask = 0x0000ff; }
-refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.tqmask = 0x00ff00; }
-refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.tqmask = 0xff0000; }
+refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; }
+%type refarg {struct {int value; int mask;}}
+refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
+refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
+refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
+refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.mask = 0xff0000; }
 %type refact {int}
 refact(A) ::= SET NULL.              { A = OE_SetNull; }
 refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
diff --git a/kexi/3rdparty/kexisql/src/pragma.c b/kexi/3rdparty/kexisql/src/pragma.c
index 7b100a70..4f102657 100644
--- a/kexi/3rdparty/kexisql/src/pragma.c
+++ b/kexi/3rdparty/kexisql/src/pragma.c
@@ -114,7 +114,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){
 static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
   static const struct {
     const char *zName;  /* Name of the pragma */
-    int tqmask;           /* Mask for the db->flags value */
+    int mask;           /* Mask for the db->flags value */
   } aPragma[] = {
     { "vdbe_trace",               SQLITE_VdbeTrace     },
     { "full_column_names",        SQLITE_FullColNames  },
@@ -131,13 +131,13 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
       if( strcmp(zLeft,zRight)==0 && (v = sqliteGetVdbe(pParse))!=0 ){
         sqliteVdbeOp3(v, OP_ColumnName, 0, 1, aPragma[i].zName, P3_STATIC);
         sqliteVdbeOp3(v, OP_ColumnName, 1, 0, "boolean", P3_STATIC);
-        sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].tqmask)!=0, 0,
+        sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].mask)!=0, 0,
                           OP_Callback, 1, 0,
                           0);
       }else if( getBoolean(zRight) ){
-        db->flags |= aPragma[i].tqmask;
+        db->flags |= aPragma[i].mask;
       }else{
-        db->flags &= ~aPragma[i].tqmask;
+        db->flags &= ~aPragma[i].mask;
       }
       return 1;
     }
diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c
index 0dde6d2e..7ae02d33 100644
--- a/kexi/3rdparty/kexisql/src/select.c
+++ b/kexi/3rdparty/kexisql/src/select.c
@@ -1634,7 +1634,7 @@ substExprList(ExprList *pList, int iTable, ExprList *pEList){
 */
 static int flattenSubquery(
   Parse *pParse,       /* The parsing context */
-  Select *p,           /* The tqparent or outer SELECT statement */
+  Select *p,           /* The parent or outer SELECT statement */
   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
   int isAgg,           /* True if outer SELECT uses aggregate functions */
   int subqueryIsAgg    /* True if the subquery uses aggregate functions */
@@ -1987,8 +1987,8 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 **
 ** The pParent, parentTab, and *pParentAgg fields are filled in if this
 ** SELECT is a subquery.  This routine may try to combine this SELECT
-** with its tqparent to form a single flat query.  In so doing, it might
-** change the tqparent query from a non-aggregate to an aggregate query.
+** with its parent to form a single flat query.  In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
 ** For that reason, the pParentAgg flag is passed as a pointer, so it
 ** can be changed.
 **
@@ -2228,7 +2228,7 @@ int sqliteSelect(
     goto select_end;
   }
 
-  /* Check to see if this is a subquery that can be "flattened" into its tqparent.
+  /* Check to see if this is a subquery that can be "flattened" into its parent.
   ** If flattening is a possiblity, do so and return immediately.  
   */
   if( pParent && pParentAgg &&
@@ -2409,7 +2409,7 @@ int sqliteSelect(
   }
 
   /* If this was a subquery, we have now converted the subquery into a
-  ** temporary table.  So delete the subquery structure from the tqparent
+  ** temporary table.  So delete the subquery structure from the parent
   ** to prevent this subquery from being evaluated again and to force the
   ** the use of the temporary table.
   */
diff --git a/kexi/3rdparty/kexisql/src/sqliteInt.h b/kexi/3rdparty/kexisql/src/sqliteInt.h
index ca5a85e9..3f8858e0 100644
--- a/kexi/3rdparty/kexisql/src/sqliteInt.h
+++ b/kexi/3rdparty/kexisql/src/sqliteInt.h
@@ -1053,9 +1053,9 @@ struct TriggerStep {
  *
  * struct TriggerStack has a "pNext" member, to allow linked lists to be
  * constructed. When coding nested triggers (triggers fired by other triggers)
- * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext" 
+ * each nested trigger stores its parent trigger's TriggerStack as the "pNext" 
  * pointer. Once the nested trigger has been coded, the pNext value is restored
- * to the pTriggerStack member of the Parse stucture and coding of the tqparent
+ * to the pTriggerStack member of the Parse stucture and coding of the parent
  * trigger continues.
  *
  * Before a nested trigger is coded, the linked list pointed to by the 
diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c
index bb6a7f4f..714972f8 100644
--- a/kexi/3rdparty/kexisql/src/where.c
+++ b/kexi/3rdparty/kexisql/src/where.c
@@ -29,9 +29,9 @@ struct ExprInfo {
                           ** p->pLeft is not the column of any table */
   short int idxRight;     /* p->pRight is a column in this table number. -1 if
                           ** p->pRight is not the column of any table */
-  unsigned prereqLeft;    /* Bittqmask of tables referenced by p->pLeft */
-  unsigned prereqRight;   /* Bittqmask of tables referenced by p->pRight */
-  unsigned prereqAll;     /* Bittqmask of tables referenced by p */
+  unsigned prereqLeft;    /* Bitmask of tables referenced by p->pLeft */
+  unsigned prereqRight;   /* Bitmask of tables referenced by p->pRight */
+  unsigned prereqAll;     /* Bitmask of tables referenced by p */
 };
 
 /*
@@ -81,12 +81,12 @@ static int exprSplit(int nSlot, ExprInfo *aSlot, Expr *pExpr){
 }
 
 /*
-** Initialize an expression tqmask set
+** Initialize an expression mask set
 */
 #define initMaskSet(P)  memset(P, 0, sizeof(*P))
 
 /*
-** Return the bittqmask for the given cursor.  Assign a new bittqmask
+** Return the bitmask for the given cursor.  Assign a new bitmask
 ** if this is the first time the cursor has been seen.
 */
 static int getMask(ExprMaskSet *pMaskSet, int iCursor){
@@ -103,13 +103,13 @@ static int getMask(ExprMaskSet *pMaskSet, int iCursor){
 }
 
 /*
-** Destroy an expression tqmask set
+** Destroy an expression mask set
 */
 #define freeMaskSet(P)   /* NO-OP */
 
 /*
 ** This routine walks (recursively) an expression tree and generates
-** a bittqmask indicating which tables are used in that expression
+** a bitmask indicating which tables are used in that expression
 ** tree.
 **
 ** In order for this routine to work, the calling function must have
@@ -120,26 +120,26 @@ static int getMask(ExprMaskSet *pMaskSet, int iCursor){
 ** the VDBE cursor number of the table.
 */
 static int exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
-  unsigned int tqmask = 0;
+  unsigned int mask = 0;
   if( p==0 ) return 0;
   if( p->op==TK_COLUMN ){
-    tqmask = getMask(pMaskSet, p->iTable);
-    if( tqmask==0 ) tqmask = -1;
-    return tqmask;
+    mask = getMask(pMaskSet, p->iTable);
+    if( mask==0 ) mask = -1;
+    return mask;
   }
   if( p->pRight ){
-    tqmask = exprTableUsage(pMaskSet, p->pRight);
+    mask = exprTableUsage(pMaskSet, p->pRight);
   }
   if( p->pLeft ){
-    tqmask |= exprTableUsage(pMaskSet, p->pLeft);
+    mask |= exprTableUsage(pMaskSet, p->pLeft);
   }
   if( p->pList ){
     int i;
     for(i=0; i<p->pList->nExpr; i++){
-      tqmask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr);
+      mask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr);
     }
   }
-  return tqmask;
+  return mask;
 }
 
 /*
@@ -391,7 +391,7 @@ WhereInfo *sqliteWhereBegin(
   int nExpr;           /* Number of subexpressions in the WHERE clause */
   int loopMask;        /* One bit set for each outer loop */
   int haveKey;         /* True if KEY is on the stack */
-  ExprMaskSet maskSet; /* The expression tqmask set */
+  ExprMaskSet maskSet; /* The expression mask set */
   int iDirectEq[32];   /* Term of the form ROWID==X for the N-th table */
   int iDirectLt[32];   /* Term of the form ROWID<X or ROWID<=X */
   int iDirectGt[32];   /* Term of the form ROWID>X or ROWID>=X */
@@ -448,16 +448,16 @@ WhereInfo *sqliteWhereBegin(
     if( pParse->trigStack ){
       int x;
       if( (x = pParse->trigStack->newIdx) >= 0 ){
-        int tqmask = ~getMask(&maskSet, x);
-        aExpr[i].prereqRight &= tqmask;
-        aExpr[i].prereqLeft &= tqmask;
-        aExpr[i].prereqAll &= tqmask;
+        int mask = ~getMask(&maskSet, x);
+        aExpr[i].prereqRight &= mask;
+        aExpr[i].prereqLeft &= mask;
+        aExpr[i].prereqAll &= mask;
       }
       if( (x = pParse->trigStack->oldIdx) >= 0 ){
-        int tqmask = ~getMask(&maskSet, x);
-        aExpr[i].prereqRight &= tqmask;
-        aExpr[i].prereqLeft &= tqmask;
-        aExpr[i].prereqAll &= tqmask;
+        int mask = ~getMask(&maskSet, x);
+        aExpr[i].prereqRight &= mask;
+        aExpr[i].prereqLeft &= mask;
+        aExpr[i].prereqAll &= mask;
       }
     }
   }
@@ -476,13 +476,13 @@ WhereInfo *sqliteWhereBegin(
   **
   ** Actually, if there are more than 32 tables in the join, only the
   ** first 32 tables are candidates for indices.  This is (again) due
-  ** to the limit of 32 bits in an integer bittqmask.
+  ** to the limit of 32 bits in an integer bitmask.
   */
   loopMask = 0;
   for(i=0; i<pTabList->nSrc && i<ARRAYSIZE(iDirectEq); i++){
     int j;
     int iCur = pTabList->a[i].iCursor;    /* The cursor for this table */
-    int tqmask = getMask(&maskSet, iCur);   /* Cursor tqmask for this table */
+    int mask = getMask(&maskSet, iCur);   /* Cursor mask for this table */
     Table *pTab = pTabList->a[i].pTab;
     Index *pIdx;
     Index *pBestIdx = 0;
@@ -524,7 +524,7 @@ WhereInfo *sqliteWhereBegin(
       }
     }
     if( iDirectEq[i]>=0 ){
-      loopMask |= tqmask;
+      loopMask |= mask;
       pWInfo->a[i].pIdx = 0;
       continue;
     }
@@ -651,7 +651,7 @@ WhereInfo *sqliteWhereBegin(
     pWInfo->a[i].pIdx = pBestIdx;
     pWInfo->a[i].score = bestScore;
     pWInfo->a[i].bRev = 0;
-    loopMask |= tqmask;
+    loopMask |= mask;
     if( pBestIdx ){
       pWInfo->a[i].iCur = pParse->nTab++;
       pWInfo->peakNTab = pParse->nTab;
diff --git a/kexi/3rdparty/kexisql/tool/lemon.c b/kexi/3rdparty/kexisql/tool/lemon.c
index a0eef810..b801e6b3 100644
--- a/kexi/3rdparty/kexisql/tool/lemon.c
+++ b/kexi/3rdparty/kexisql/tool/lemon.c
@@ -2542,10 +2542,10 @@ struct lemon *lemp;
 
 /* Search for the file "name" which is in the same directory as
 ** the exacutable */
-PRIVATE char *pathsearch(argv0,name,modetqmask)
+PRIVATE char *pathsearch(argv0,name,modemask)
 char *argv0;
 char *name;
-int modetqmask;
+int modemask;
 {
   char *pathlist;
   char *path,*cp;
@@ -2578,7 +2578,7 @@ int modetqmask;
         *cp = c;
         if( c==0 ) pathlist = "";
         else pathlist = &cp[1];
-        if( access(path,modetqmask)==0 ) break;
+        if( access(path,modemask)==0 ) break;
       }
     }
   }
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 0a2501d0..4ed6c51a 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -262,9 +262,9 @@ static const char zMagicHeader[] = SQLITE_FILE_HEADER;
 ** structure is appended and initialized to zero.  This structure stores
 ** information about the page that is decoded from the raw file page.
 **
-** The pParent field points back to the tqparent page.  This allows us to
+** The pParent field points back to the parent page.  This allows us to
 ** walk up the BTree from any leaf to the root.  Care must be taken to
-** unref() the tqparent page pointer when this page is no longer referenced.
+** unref() the parent page pointer when this page is no longer referenced.
 ** The pageDestructor() routine handles that chore.
 */
 struct MemPage {
@@ -281,7 +281,7 @@ struct MemPage {
   u16 maxLocal;        /* Copy of Btree.maxLocal or Btree.maxLeaf */
   u16 minLocal;        /* Copy of Btree.minLocal or Btree.minLeaf */
   u16 cellOffset;      /* Index in aData of first cell pointer */
-  u16 idxParent;       /* Index in tqparent of this node */
+  u16 idxParent;       /* Index in parent of this node */
   u16 nFree;           /* Number of free bytes on the page */
   u16 nCell;           /* Number of cells on this page, local and ovfl */
   struct _OvflCell {   /* Cells that will not fit on aData[] */
@@ -291,7 +291,7 @@ struct MemPage {
   struct Btree *pBt;   /* Pointer back to BTree structure */
   u8 *aData;           /* Pointer back to the start of the page */
   Pgno pgno;           /* Page number for this page */
-  MemPage *pParent;    /* The tqparent of this page.  NULL for root */
+  MemPage *pParent;    /* The parent of this page.  NULL for root */
 };
 
 /*
@@ -443,18 +443,18 @@ static void put4byte(unsigned char *p, u32 v){
 #define PTRMAP_ISPAGE(pgsz, pgno) (PTRMAP_PAGENO(pgsz,pgno)==pgno)
 
 /*
-** The pointer map is a lookup table that identifies the tqparent page for
-** each child page in the database file.  The tqparent page is the page that
+** The pointer map is a lookup table that identifies the parent page for
+** each child page in the database file.  The parent page is the page that
 ** contains a pointer to the child.  Every page in the database contains
-** 0 or 1 tqparent pages.  (In this context 'database page' refers
+** 0 or 1 parent pages.  (In this context 'database page' refers
 ** to any page that is not part of the pointer map itself.)  Each pointer map
-** entry consists of a single byte 'type' and a 4 byte tqparent page number.
+** entry consists of a single byte 'type' and a 4 byte parent page number.
 ** The PTRMAP_XXX identifiers below are the valid types.
 **
 ** The purpose of the pointer map is to facility moving pages from one
 ** position in the file to another as part of autovacuum.  When a page
-** is moved, the pointer in its tqparent must be updated to point to the
-** new location.  The pointer map is used to locate the tqparent page quickly.
+** is moved, the pointer in its parent must be updated to point to the
+** new location.  The pointer map is used to locate the parent page quickly.
 **
 ** PTRMAP_ROOTPAGE: The database page is a root-page. The page-number is not
 **                  used in this case.
@@ -471,7 +471,7 @@ static void put4byte(unsigned char *p, u32 v){
 **                   page in the overflow page list.
 **
 ** PTRMAP_BTREE: The database page is a non-root btree page. The page number
-**               identifies the tqparent page in the btree.
+**               identifies the parent page in the btree.
 */
 #define PTRMAP_ROOTPAGE 1
 #define PTRMAP_FREEPAGE 2
@@ -483,10 +483,10 @@ static void put4byte(unsigned char *p, u32 v){
 ** Write an entry into the pointer map.
 **
 ** This routine updates the pointer map entry for page number 'key'
-** so that it maps to type 'eType' and tqparent page number 'pgno'.
+** so that it maps to type 'eType' and parent page number 'pgno'.
 ** An error code is returned if something goes wrong, otherwise SQLITE_OK.
 */
-static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno tqparent){
+static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno parent){
   u8 *pPtrmap;    /* The pointer map page */
   Pgno iPtrmap;   /* The pointer map page number */
   int offset;     /* Offset in pointer map page */
@@ -503,12 +503,12 @@ static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno tqparent){
   }
   offset = PTRMAP_PTROFFSET(pBt->usableSize, key);
 
-  if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=tqparent ){
-    TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, tqparent));
+  if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){
+    TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent));
     rc = sqlite3pager_write(pPtrmap);
     if( rc==SQLITE_OK ){
       pPtrmap[offset] = eType;
-      put4byte(&pPtrmap[offset+1], tqparent);
+      put4byte(&pPtrmap[offset+1], parent);
     }
   }
 
@@ -520,7 +520,7 @@ static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno tqparent){
 ** Read an entry from the pointer map.
 **
 ** This routine retrieves the pointer map entry for page 'key', writing
-** the type and tqparent page number to *pEType and *pPgno respectively.
+** the type and parent page number to *pEType and *pPgno respectively.
 ** An error code is returned if something goes wrong, otherwise SQLITE_OK.
 */
 static int ptrmapGet(Btree *pBt, Pgno key, u8 *pEType, Pgno *pPgno){
@@ -1001,8 +1001,8 @@ static void decodeFlags(MemPage *pPage, int flagByte){
 ** Initialize the auxiliary information for a disk block.
 **
 ** The pParent parameter must be a pointer to the MemPage which
-** is the tqparent of the page being initialized.  The root of a
-** BTree has no tqparent and so for that page, pParent==NULL.
+** is the parent of the page being initialized.  The root of a
+** BTree has no parent and so for that page, pParent==NULL.
 **
 ** Return SQLITE_OK on success.  If we see that the page does
 ** not contain a well-formed database page, then return 
@@ -1012,7 +1012,7 @@ static void decodeFlags(MemPage *pPage, int flagByte){
 */
 static int initPage(
   MemPage *pPage,        /* The page to be initialized */
-  MemPage *pParent       /* The tqparent.  Might be NULL */
+  MemPage *pParent       /* The parent.  Might be NULL */
 ){
   int pc;            /* Address of a freeblock within pPage->aData[] */
   int hdr;           /* Offset to beginning of page header */
@@ -1029,7 +1029,7 @@ static int initPage(
   assert( pPage->pgno==sqlite3pager_pagenumber(pPage->aData) );
   assert( pPage->aData == &((unsigned char*)pPage)[-pBt->pageSize] );
   if( pPage->pParent!=pParent && (pPage->pParent!=0 || pPage->isInit) ){
-    /* The tqparent page should never change unless the file is corrupt */
+    /* The parent page should never change unless the file is corrupt */
     return SQLITE_CORRUPT_BKPT;
   }
   if( pPage->isInit ) return SQLITE_OK;
@@ -2578,7 +2578,7 @@ static int isRootPage(MemPage *pPage){
 }
 
 /*
-** Move the cursor up to the tqparent page.
+** Move the cursor up to the parent page.
 **
 ** pCur->idx is set to the cell index that contains the pointer
 ** to the page we are coming from.  If we are coming from the
@@ -3429,7 +3429,7 @@ static int reparentPage(Btree *pBt, Pgno pgno, MemPage *pNewParent, int idx){
 ** to pPage.
 **
 ** In other words, for every child of pPage, invoke reparentPage()
-** to make sure that each child knows that pPage is its tqparent.
+** to make sure that each child knows that pPage is its parent.
 **
 ** This routine gets called after you memcpy() one page into
 ** another.
@@ -3659,7 +3659,7 @@ static int balance(MemPage*, int);
 ** fill up.  On average.
 **
 ** pPage is the leaf page which is the right-most page in the tree.
-** pParent is its tqparent.  pPage must have a single overflow entry
+** pParent is its parent.  pPage must have a single overflow entry
 ** which is also the right-most entry on the page.
 */
 static int balance_quick(MemPage *pPage, MemPage *pParent){
@@ -3687,7 +3687,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   assemblePage(pNew, 1, &pCell, &szCell);
   pPage->nOverflow = 0;
 
-  /* Set the tqparent of the newly allocated page to pParent. */
+  /* Set the parent of the newly allocated page to pParent. */
   pNew->pParent = pParent;
   sqlite3pager_ref(pParent->aData);
 
@@ -3726,7 +3726,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   }
 #endif
 
-  /* Release the reference to the new page and balance the tqparent page,
+  /* Release the reference to the new page and balance the parent page,
   ** in case the divider cell inserted caused it to become overfull.
   */
   releasePage(pNew);
@@ -3752,7 +3752,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
 ** of pPage so that all pages have about the same amount of free space.
 ** Usually NN siblings on either side of pPage is used in the balancing,
 ** though more siblings might come from one side if pPage is the first
-** or last child of its tqparent.  If pPage has fewer than 2*NN siblings
+** or last child of its parent.  If pPage has fewer than 2*NN siblings
 ** (something which can only happen if pPage is the root page or a 
 ** child of root) then all available siblings participate in the balancing.
 **
@@ -3768,16 +3768,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
 ** if the page is overfull.  Part of the job of this routine is to
 ** make sure all Cells for pPage once again fit in pPage->aData[].
 **
-** In the course of balancing the siblings of pPage, the tqparent of pPage
+** In the course of balancing the siblings of pPage, the parent of pPage
 ** might become overfull or underfull.  If that happens, then this routine
-** is called recursively on the tqparent.
+** is called recursively on the parent.
 **
 ** If this routine fails for any reason, it might leave the database
 ** in a corrupted state.  So if this routine fails, the database should
 ** be rolled back.
 */
 static int balance_nonroot(MemPage *pPage){
-  MemPage *pParent;            /* The tqparent of pPage */
+  MemPage *pParent;            /* The parent of pPage */
   Btree *pBt;                  /* The whole database */
   int nCell = 0;               /* Number of cells in apCell[] */
   int nMaxCells = 0;           /* Allocated size of apCell, szCell, aFrom. */
@@ -3812,7 +3812,7 @@ static int balance_nonroot(MemPage *pPage){
 #endif
 
   /* 
-  ** Find the tqparent page.
+  ** Find the parent page.
   */
   assert( pPage->isInit );
   assert( sqlite3pager_iswriteable(pPage->aData) );
@@ -3848,7 +3848,7 @@ static int balance_nonroot(MemPage *pPage){
 #endif
 
   /*
-  ** Find the cell in the tqparent page whose left child points back
+  ** Find the cell in the parent page whose left child points back
   ** to pPage.  The "idx" variable is the index of that cell.  If pPage
   ** is the rightmost child of pParent then set idx to pParent->nCell 
   */
@@ -4218,7 +4218,7 @@ static int balance_nonroot(MemPage *pPage){
     j = cntNew[i];
 
     /* If the sibling page assembled above was not the right-most sibling,
-    ** insert a divider cell into the tqparent page.
+    ** insert a divider cell into the parent page.
     */
     if( i<nNew-1 && j<nCell ){
       u8 *pCell;
@@ -4284,7 +4284,7 @@ static int balance_nonroot(MemPage *pPage){
   }
 
   /*
-  ** Retqparent tqchildren of all cells.
+  ** Reparent tqchildren of all cells.
   */
   for(i=0; i<nNew; i++){
     rc = reparentChildPages(apNew[i]);
@@ -4294,9 +4294,9 @@ static int balance_nonroot(MemPage *pPage){
   if( rc!=SQLITE_OK ) goto balance_cleanup;
 
   /*
-  ** Balance the tqparent page.  Note that the current page (pPage) might
+  ** Balance the parent page.  Note that the current page (pPage) might
   ** have been added to the freelist so it might no longer be initialized.
-  ** But the tqparent page will always be initialized.
+  ** But the parent page will always be initialized.
   */
   assert( pParent->isInit );
   /* assert( pPage->isInit ); // No! pPage might have been added to freelist */
@@ -4376,7 +4376,7 @@ static int balance_shallower(MemPage *pPage){
           szCell[i] = cellSizePtr(pChild, apCell[i]);
         }
         assemblePage(pPage, pChild->nCell, apCell, szCell);
-        /* Copy the right-pointer of the child to the tqparent. */
+        /* Copy the right-pointer of the child to the parent. */
         put4byte(&pPage->aData[pPage->hdrOffset+8], 
             get4byte(&pChild->aData[pChild->hdrOffset+8]));
         freePage(pChild);
@@ -4433,10 +4433,10 @@ static int balance_deeper(MemPage *pPage){
   Pgno pgnoChild;     /* Page number of the new child page */
   Btree *pBt;         /* The BTree */
   int usableSize;     /* Total usable size of a page */
-  u8 *data;           /* Content of the tqparent page */
+  u8 *data;           /* Content of the parent page */
   u8 *cdata;          /* Content of the child page */
-  int hdr;            /* Offset to page header in tqparent */
-  int brk;            /* Offset to content of first cell in tqparent */
+  int hdr;            /* Offset to page header in parent */
+  int brk;            /* Offset to content of first cell in parent */
 
   assert( pPage->pParent==0 );
   assert( pPage->nOverflow>0 );
@@ -5136,7 +5136,7 @@ static int btreePageDump(Btree *pBt, int pgno, int recursive, MemPage *pParent){
   pPage->leaf = (c & PTF_LEAF)!=0;
   pPage->hasData = !(pPage->zeroData || (!pPage->leaf && pPage->leafData));
   nCell = get2byte(&data[hdr+3]);
-  sqlite3DebugPrintf("PAGE %d:  flags=0x%02x  frag=%d   tqparent=%d\n", pgno,
+  sqlite3DebugPrintf("PAGE %d:  flags=0x%02x  frag=%d   parent=%d\n", pgno,
     data[hdr], data[hdr+7], 
     (pPage->isInit && pPage->pParent) ? pPage->pParent->pgno : 0);
   assert( hdr == (pgno==1 ? 100 : 0) );
@@ -5353,7 +5353,7 @@ static void checkPtrmap(
   IntegrityCk *pCheck,   /* Integrity check context */
   Pgno iChild,           /* Child page number */
   u8 eType,              /* Expected pointer map type */
-  Pgno iParent,          /* Expected pointer map tqparent page number */
+  Pgno iParent,          /* Expected pointer map parent page number */
   char *zContext         /* Context description (used for error msg) */
 ){
   int rc;
diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c
index 4fcd2bc0..9818c954 100644
--- a/kexi/3rdparty/kexisql3/src/build.c
+++ b/kexi/3rdparty/kexisql3/src/build.c
@@ -67,19 +67,19 @@ void sqlite3FinishCoding(Parse *pParse){
   if( v ){
     sqlite3VdbeAddOp(v, OP_Halt, 0, 0);
 
-    /* The cookie tqmask contains one bit for each database file open.
+    /* The cookie mask contains one bit for each database file open.
     ** (Bit 0 is for main, bit 1 is for temp, and so forth.)  Bits are
     ** set for each database that is used.  Generate code to start a
     ** transaction on each used database and to verify the schema cookie
     ** on each used database.
     */
     if( pParse->cookieGoto>0 ){
-      u32 tqmask;
+      u32 mask;
       int iDb;
       sqlite3VdbeJumpHere(v, pParse->cookieGoto-1);
-      for(iDb=0, tqmask=1; iDb<db->nDb; tqmask<<=1, iDb++){
-        if( (tqmask & pParse->cookieMask)==0 ) continue;
-        sqlite3VdbeAddOp(v, OP_Transaction, iDb, (tqmask & pParse->writeMask)!=0);
+      for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
+        if( (mask & pParse->cookieMask)==0 ) continue;
+        sqlite3VdbeAddOp(v, OP_Transaction, iDb, (mask & pParse->writeMask)!=0);
         sqlite3VdbeAddOp(v, OP_VerifyCookie, iDb, pParse->cookieValue[iDb]);
       }
       sqlite3VdbeAddOp(v, OP_Goto, 0, pParse->cookieGoto);
@@ -2766,7 +2766,7 @@ static int sqlite3OpenTempDatabase(Parse *pParse){
 void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
   sqlite3 *db;
   Vdbe *v;
-  int tqmask;
+  int mask;
 
   v = sqlite3GetVdbe(pParse);
   if( v==0 ) return;  /* This only happens if there was a prior error */
@@ -2778,9 +2778,9 @@ void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
     assert( iDb<db->nDb );
     assert( db->aDb[iDb].pBt!=0 || iDb==1 );
     assert( iDb<32 );
-    tqmask = 1<<iDb;
-    if( (pParse->cookieMask & tqmask)==0 ){
-      pParse->cookieMask |= tqmask;
+    mask = 1<<iDb;
+    if( (pParse->cookieMask & mask)==0 ){
+      pParse->cookieMask |= mask;
       pParse->cookieValue[iDb] = db->aDb[iDb].schema_cookie;
       if( !OMIT_TEMPDB && iDb==1 ){
         sqlite3OpenTempDatabase(pParse);
diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c
index 9d079e1b..ac209552 100644
--- a/kexi/3rdparty/kexisql3/src/expr.c
+++ b/kexi/3rdparty/kexisql3/src/expr.c
@@ -1018,15 +1018,15 @@ static int lookupName(
   }
 
   /* If a column from a table in pSrcList is referenced, then record
-  ** this fact in the pSrcList.a[].colUsed bittqmask.  Column 0 causes
+  ** this fact in the pSrcList.a[].colUsed bitmask.  Column 0 causes
   ** bit 0 to be set.  Column 1 sets bit 1.  And so forth.  If the
-  ** column number is greater than the number of bits in the bittqmask
-  ** then set the high-order bit of the bittqmask.
+  ** column number is greater than the number of bits in the bitmask
+  ** then set the high-order bit of the bitmask.
   */
   if( pExpr->iColumn>=0 && pMatch!=0 ){
     int n = pExpr->iColumn;
-    if( n>=sizeof(Bittqmask)*8 ){
-      n = sizeof(Bittqmask)*8-1;
+    if( n>=sizeof(Bitmask)*8 ){
+      n = sizeof(Bitmask)*8-1;
     }
     assert( pMatch->iCursor==pExpr->iTable );
     pMatch->colUsed |= 1<<n;
diff --git a/kexi/3rdparty/kexisql3/src/func.c b/kexi/3rdparty/kexisql3/src/func.c
index 36435343..3e50d8fb 100644
--- a/kexi/3rdparty/kexisql3/src/func.c
+++ b/kexi/3rdparty/kexisql3/src/func.c
@@ -42,20 +42,20 @@ static void minmaxFunc(
   sqlite3_value **argv
 ){
   int i;
-  int tqmask;    /* 0 for min() or 0xffffffff for max() */
+  int mask;    /* 0 for min() or 0xffffffff for max() */
   int iBest;
   CollSeq *pColl;
 
   if( argc==0 ) return;
-  tqmask = sqlite3_user_data(context)==0 ? 0 : -1;
+  mask = sqlite3_user_data(context)==0 ? 0 : -1;
   pColl = sqlite3GetFuncCollSeq(context);
   assert( pColl );
-  assert( tqmask==-1 || tqmask==0 );
+  assert( mask==-1 || mask==0 );
   iBest = 0;
   if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
   for(i=1; i<argc; i++){
     if( sqlite3_value_type(argv[i])==SQLITE_NULL ) return;
-    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^tqmask)>=0 ){
+    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^mask)>=0 ){
       iBest = i;
     }
   }
diff --git a/kexi/3rdparty/kexisql3/src/parse.c b/kexi/3rdparty/kexisql3/src/parse.c
index d763cb29..5eda3e3f 100644
--- a/kexi/3rdparty/kexisql3/src/parse.c
+++ b/kexi/3rdparty/kexisql3/src/parse.c
@@ -106,7 +106,7 @@ typedef union {
   struct LikeOp yy222;
   IdList* yy240;
   int yy280;
-  struct {int value; int tqmask;} yy359;
+  struct {int value; int mask;} yy359;
   TriggerStep* yy360;
   struct AttachKey yy361;
   Select* yy375;
@@ -2164,27 +2164,27 @@ static void yy_reduce(
         break;
       case 65:
 #line 289 "parse.y"
-{ yygotominor.yy280 = (yymsp[-1].minor.yy280 & yymsp[0].minor.yy359.tqmask) | yymsp[0].minor.yy359.value; }
+{ yygotominor.yy280 = (yymsp[-1].minor.yy280 & yymsp[0].minor.yy359.mask) | yymsp[0].minor.yy359.value; }
 #line 2170 "parse.c"
         break;
       case 66:
 #line 291 "parse.y"
-{ yygotominor.yy359.value = 0;     yygotominor.yy359.tqmask = 0x000000; }
+{ yygotominor.yy359.value = 0;     yygotominor.yy359.mask = 0x000000; }
 #line 2175 "parse.c"
         break;
       case 67:
 #line 292 "parse.y"
-{ yygotominor.yy359.value = yymsp[0].minor.yy280;     yygotominor.yy359.tqmask = 0x0000ff; }
+{ yygotominor.yy359.value = yymsp[0].minor.yy280;     yygotominor.yy359.mask = 0x0000ff; }
 #line 2180 "parse.c"
         break;
       case 68:
 #line 293 "parse.y"
-{ yygotominor.yy359.value = yymsp[0].minor.yy280<<8;  yygotominor.yy359.tqmask = 0x00ff00; }
+{ yygotominor.yy359.value = yymsp[0].minor.yy280<<8;  yygotominor.yy359.mask = 0x00ff00; }
 #line 2185 "parse.c"
         break;
       case 69:
 #line 294 "parse.y"
-{ yygotominor.yy359.value = yymsp[0].minor.yy280<<16; yygotominor.yy359.tqmask = 0xff0000; }
+{ yygotominor.yy359.value = yymsp[0].minor.yy280<<16; yygotominor.yy359.mask = 0xff0000; }
 #line 2190 "parse.c"
         break;
       case 70:
diff --git a/kexi/3rdparty/kexisql3/src/parse.y b/kexi/3rdparty/kexisql3/src/parse.y
index 7487c731..b92d2276 100644
--- a/kexi/3rdparty/kexisql3/src/parse.y
+++ b/kexi/3rdparty/kexisql3/src/parse.y
@@ -207,12 +207,12 @@ ccons ::= COLLATE id(C).  {sqlite3AddCollateType(pParse, C.z, C.n);}
 //
 %type refargs {int}
 refargs(A) ::= .                     { A = OE_Restrict * 0x010101; }
-refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.tqmask) | Y.value; }
-%type refarg {struct {int value; int tqmask;}}
-refarg(A) ::= MATCH nm.              { A.value = 0;     A.tqmask = 0x000000; }
-refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.tqmask = 0x0000ff; }
-refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.tqmask = 0x00ff00; }
-refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.tqmask = 0xff0000; }
+refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; }
+%type refarg {struct {int value; int mask;}}
+refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
+refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
+refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
+refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.mask = 0xff0000; }
 %type refact {int}
 refact(A) ::= SET NULL.              { A = OE_SetNull; }
 refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
diff --git a/kexi/3rdparty/kexisql3/src/pragma.c b/kexi/3rdparty/kexisql3/src/pragma.c
index 181d9a94..c85c19d5 100644
--- a/kexi/3rdparty/kexisql3/src/pragma.c
+++ b/kexi/3rdparty/kexisql3/src/pragma.c
@@ -142,7 +142,7 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, int value){
 static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
   static const struct sPragmaType {
     const char *zName;  /* Name of the pragma */
-    int tqmask;           /* Mask for the db->flags value */
+    int mask;           /* Mask for the db->flags value */
   } aPragma[] = {
     { "vdbe_trace",               SQLITE_VdbeTrace     },
     { "sql_trace",                SQLITE_SqlTrace      },
@@ -164,12 +164,12 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
       v = sqlite3GetVdbe(pParse);
       if( v ){
         if( zRight==0 ){
-          returnSingleInt(pParse, p->zName, (db->flags & p->tqmask)!=0 );
+          returnSingleInt(pParse, p->zName, (db->flags & p->mask)!=0 );
         }else{
           if( getBoolean(zRight) ){
-            db->flags |= p->tqmask;
+            db->flags |= p->mask;
           }else{
-            db->flags &= ~p->tqmask;
+            db->flags &= ~p->mask;
           }
         }
         /* If one of these pragmas is executed, any prepared statements
diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c
index 13c38d50..7cb7b176 100644
--- a/kexi/3rdparty/kexisql3/src/select.c
+++ b/kexi/3rdparty/kexisql3/src/select.c
@@ -1961,7 +1961,7 @@ static void substSelect(Select *p, int iTable, ExprList *pEList){
 */
 static int flattenSubquery(
   Parse *pParse,       /* The parsing context */
-  Select *p,           /* The tqparent or outer SELECT statement */
+  Select *p,           /* The parent or outer SELECT statement */
   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
   int isAgg,           /* True if outer SELECT uses aggregate functions */
   int subqueryIsAgg    /* True if the subquery uses aggregate functions */
@@ -2322,7 +2322,7 @@ static int processOrderGroupBy(
 ** This routine resolves any names used in the result set of the
 ** supplied SELECT statement. If the SELECT statement being resolved
 ** is a sub-select, then pOuterNC is a pointer to the NameContext 
-** of the tqparent SELECT.
+** of the parent SELECT.
 */
 int sqlite3SelectResolve(
   Parse *pParse,         /* The parser context */
@@ -2571,8 +2571,8 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
 **
 ** The pParent, parentTab, and *pParentAgg fields are filled in if this
 ** SELECT is a subquery.  This routine may try to combine this SELECT
-** with its tqparent to form a single flat query.  In so doing, it might
-** change the tqparent query from a non-aggregate to an aggregate query.
+** with its parent to form a single flat query.  In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
 ** For that reason, the pParentAgg flag is passed as a pointer, so it
 ** can be changed.
 **
@@ -2730,7 +2730,7 @@ int sqlite3Select(
     goto select_end;
   }
 
-  /* Check to see if this is a subquery that can be "flattened" into its tqparent.
+  /* Check to see if this is a subquery that can be "flattened" into its parent.
   ** If flattening is a possiblity, do so and return immediately.  
   */
 #ifndef SQLITE_OMIT_VIEW
@@ -3100,7 +3100,7 @@ int sqlite3Select(
 
 #ifndef SQLITE_OMIT_SUBTQUERY
   /* If this was a subquery, we have now converted the subquery into a
-  ** temporary table.  So delete the subquery structure from the tqparent
+  ** temporary table.  So delete the subquery structure from the parent
   ** to prevent this subquery from being evaluated again and to force the
   ** the use of the temporary table.
   */
diff --git a/kexi/3rdparty/kexisql3/src/sqliteInt.h b/kexi/3rdparty/kexisql3/src/sqliteInt.h
index 74916805..153b537b 100644
--- a/kexi/3rdparty/kexisql3/src/sqliteInt.h
+++ b/kexi/3rdparty/kexisql3/src/sqliteInt.h
@@ -119,7 +119,7 @@
 ** The maximum number of attached databases.  This must be at least 2
 ** in order to support the main database file (0) and the file used to
 ** hold temporary tables (1).  And it must be less than 32 because
-** we use a bittqmask of databases with a u32 in places (for example
+** we use a bitmask of databases with a u32 in places (for example
 ** the Parse.cookieMask field).
 */
 #define MAX_ATTACHED 10
@@ -976,9 +976,9 @@ struct IdList {
 };
 
 /*
-** The bittqmask datatype defined below is used for various optimizations.
+** The bitmask datatype defined below is used for various optimizations.
 */
-typedef unsigned int Bittqmask;
+typedef unsigned int Bitmask;
 
 /*
 ** The following structure describes the FROM clause of a SELECT statement.
@@ -1004,7 +1004,7 @@ struct SrcList {
     i16 iCursor;      /* The VDBE cursor number used to access this table */
     Expr *pOn;        /* The ON clause of a join */
     IdList *pUsing;   /* The USING clause of a join */
-    Bittqmask colUsed;  /* Bit N (1<<N) set if column N or pTab is used */
+    Bitmask colUsed;  /* Bit N (1<<N) set if column N or pTab is used */
   } a[1];             /* One entry for each identifier on the list */
 };
 
@@ -1076,7 +1076,7 @@ struct WhereInfo {
 ** the context containing the match is incremented. 
 **
 ** Each subquery gets a new NameContext.  The pNext field points to the
-** NameContext in the tqparent query.  Thus the process of scanning the
+** NameContext in the parent query.  Thus the process of scanning the
 ** NameContext list corresponds to searching through successively outer
 ** subqueries looking for a match.
 */
@@ -1176,7 +1176,7 @@ struct Parse {
   int nMem;            /* Number of memory cells used so far */
   int nSet;            /* Number of sets used so far */
   u32 writeMask;       /* Start a write transaction on these databases */
-  u32 cookieMask;      /* Bittqmask of schema verified databases */
+  u32 cookieMask;      /* Bitmask of schema verified databases */
   int cookieGoto;      /* Address of OP_Goto to cookie verifier subroutine */
   int cookieValue[MAX_ATTACHED+2];  /* Values of cookies to verify */
 
@@ -1328,9 +1328,9 @@ struct TriggerStep {
  *
  * struct TriggerStack has a "pNext" member, to allow linked lists to be
  * constructed. When coding nested triggers (triggers fired by other triggers)
- * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext" 
+ * each nested trigger stores its parent trigger's TriggerStack as the "pNext" 
  * pointer. Once the nested trigger has been coded, the pNext value is restored
- * to the pTriggerStack member of the Parse stucture and coding of the tqparent
+ * to the pTriggerStack member of the Parse stucture and coding of the parent
  * trigger continues.
  *
  * Before a nested trigger is coded, the linked list pointed to by the 
diff --git a/kexi/3rdparty/kexisql3/src/trigger.c b/kexi/3rdparty/kexisql3/src/trigger.c
index 610f5090..f39d2bd8 100644
--- a/kexi/3rdparty/kexisql3/src/trigger.c
+++ b/kexi/3rdparty/kexisql3/src/trigger.c
@@ -581,7 +581,7 @@ int sqlite3TriggersExist(
   ExprList *pChanges      /* Columns that change in an UPDATE statement */
 ){
   Trigger *pTrigger = pTab->pTrigger;
-  int tqmask = 0;
+  int mask = 0;
 
   while( pTrigger ){
     if( pTrigger->op==op && checkColumnOverLap(pTrigger->pColumns, pChanges) ){
@@ -591,12 +591,12 @@ int sqlite3TriggersExist(
 	ss = ss->pNext;
       }
       if( ss==0 ){
-        tqmask |= pTrigger->tr_tm;
+        mask |= pTrigger->tr_tm;
       }
     }
     pTrigger = pTrigger->pNext;
   }
-  return tqmask;
+  return mask;
 }
 
 /*
diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c
index f4659371..8ff95946 100644
--- a/kexi/3rdparty/kexisql3/src/vdbe.c
+++ b/kexi/3rdparty/kexisql3/src/vdbe.c
@@ -1103,7 +1103,7 @@ case OP_CollSeq: {             /* no-push */
 ** defines the function) with P2 arguments taken from the stack.  Pop all
 ** arguments from the stack and push back the result.
 **
-** P1 is a 32-bit bittqmask indicating whether or not each argument to the 
+** P1 is a 32-bit bitmask indicating whether or not each argument to the 
 ** function was determined to be constant at compile time. If the first
 ** argument was constant then bit 0 of P1 is set. This is used to determine
 ** whether meta data associated with a user function argument using the
@@ -1421,7 +1421,7 @@ case OP_ToBlob: {                  /* no-push */
 ** whereas it would normally be NULL.  Similarly,  NULL==123 is false when
 ** 0x200 is set but is NULL when the 0x200 bit of P1 is clear.
 **
-** The least significant byte of P1 (tqmask 0xff) must be an affinity character -
+** The least significant byte of P1 (mask 0xff) must be an affinity character -
 ** 'n', 't', 'i' or 'o' - or 0x00. An attempt is made to coerce both values
 ** according to the affinity before the comparison is made. If the byte is
 ** 0x00, then numeric affinity is used.
@@ -2539,8 +2539,8 @@ case OP_OpenWrite: {       /* no-push */
     case SQLITE_OK: {
       int flags = sqlite3BtreeFlags(pCur->pCursor);
       /* Sanity checking.  Only the lower four bits of the flags byte should
-      ** be used.  Bit 3 (tqmask 0x08) is unpreditable.  The lower 3 bits
-      ** (tqmask 0x07) should be either 5 (intkey+leafdata for tables) or
+      ** be used.  Bit 3 (mask 0x08) is unpreditable.  The lower 3 bits
+      ** (mask 0x07) should be either 5 (intkey+leafdata for tables) or
       ** 2 (zerodata for indices).  If these conditions are not met it can
       ** only mean that we are dealing with a corrupt database file
       */
diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c
index 1ff314d1..cba9c096 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeaux.c
+++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c
@@ -176,7 +176,7 @@ void sqlite3VdbeResolveLabel(Vdbe *p, int x){
 */
 static int opcodeNoPush(u8 op){
   /* The 10 NOPUSH_MASK_n constants are defined in the automatically
-  ** generated header file opcodes.h. Each is a 16-bit bittqmask, one
+  ** generated header file opcodes.h. Each is a 16-bit bitmask, one
   ** bit corresponding to each opcode implemented by the virtual
   ** machine in vdbe.c. The bit is true if the word "no-push" appears
   ** in a comment on the same line as the "case OP_XXX:" in 
@@ -1326,15 +1326,15 @@ int sqlite3VdbeFinalize(Vdbe *p){
 
 /*
 ** Call the destructor for each auxdata entry in pVdbeFunc for which
-** the corresponding bit in tqmask is clear.  Auxdata entries beyond 31
+** the corresponding bit in mask is clear.  Auxdata entries beyond 31
 ** are always destroyed.  To destroy all auxdata entries, call this
-** routine with tqmask==0.
+** routine with mask==0.
 */
-void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int tqmask){
+void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){
   int i;
   for(i=0; i<pVdbeFunc->nAux; i++){
     struct AuxData *pAux = &pVdbeFunc->apAux[i];
-    if( (i>31 || !(tqmask&(1<<i))) && pAux->pAux ){
+    if( (i>31 || !(mask&(1<<i))) && pAux->pAux ){
       if( pAux->xDelete ){
         pAux->xDelete(pAux->pAux);
       }
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index 54c8402f..5ab2e4e6 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -21,9 +21,9 @@
 #include "sqliteInt.h"
 
 /*
-** The number of bits in a Bittqmask.  "BMS" means "BitMask Size".
+** The number of bits in a Bitmask.  "BMS" means "BitMask Size".
 */
-#define BMS  (sizeof(Bittqmask)*8)
+#define BMS  (sizeof(Bitmask)*8)
 
 /*
 ** Determine the number of elements in an array.
@@ -61,20 +61,20 @@ typedef struct WhereClause WhereClause;
 ** where X is a column name and <op> is one of certain operators,
 ** then WhereTerm.leftCursor and WhereTerm.leftColumn record the
 ** cursor number and column number for X.  WhereTerm.operator records
-** the <op> using a bittqmask encoding defined by WO_xxx below.  The
-** use of a bittqmask encoding for the operator allows us to search
+** the <op> using a bitmask encoding defined by WO_xxx below.  The
+** use of a bitmask encoding for the operator allows us to search
 ** quickly for terms that match any of several different operators.
 **
 ** prereqRight and prereqAll record sets of cursor numbers,
 ** but they do so indirectly.  A single ExprMaskSet structure translates
 ** cursor number into bits and the translated bit is stored in the prereq
 ** fields.  The translation is used in order to maximize the number of
-** bits that will fit in a Bittqmask.  The VDBE cursor numbers might be
+** bits that will fit in a Bitmask.  The VDBE cursor numbers might be
 ** spread out over the non-negative integers.  For example, the cursor
 ** numbers might be 3, 8, 9, 10, 20, 23, 41, and 45.  The ExprMaskSet
 ** translates these sparse cursor numbers into consecutive integers
 ** beginning with 0 in order to make the best possible use of the available
-** bits in the Bittqmask.  So, in the example above, the cursor numbers
+** bits in the Bitmask.  So, in the example above, the cursor numbers
 ** would be mapped into integers 0 through 7.
 */
 typedef struct WhereTerm WhereTerm;
@@ -87,8 +87,8 @@ struct WhereTerm {
   u8 flags;               /* Bit flags.  See below */
   u8 nChild;              /* Number of tqchildren that must disable us */
   WhereClause *pWC;       /* The clause this term is part of */
-  Bittqmask prereqRight;    /* Bittqmask of tables used by pRight */
-  Bittqmask prereqAll;      /* Bittqmask of tables referenced by p */
+  Bitmask prereqRight;    /* Bitmask of tables used by pRight */
+  Bitmask prereqAll;      /* Bitmask of tables referenced by p */
 };
 
 /*
@@ -124,8 +124,8 @@ struct WhereClause {
 ** from the sparse cursor numbers into consecutive integers beginning
 ** with 0.
 **
-** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bittqmask
-** corresponds VDBE cursor number B.  The A-th bit of a bittqmask is 1<<A.
+** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bitmask
+** corresponds VDBE cursor number B.  The A-th bit of a bitmask is 1<<A.
 **
 ** For example, if the WHERE clause expression used these VDBE
 ** cursors:  4, 5, 8, 29, 57, 73.  Then the  ExprMaskSet structure
@@ -141,7 +141,7 @@ struct WhereClause {
 typedef struct ExprMaskSet ExprMaskSet;
 struct ExprMaskSet {
   int n;                        /* Number of assigned cursor values */
-  int ix[sizeof(Bittqmask)*8];    /* Cursor assigned to each bit */
+  int ix[sizeof(Bitmask)*8];    /* Cursor assigned to each bit */
 };
 
 
@@ -258,26 +258,26 @@ static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){
 }
 
 /*
-** Initialize an expression tqmask set
+** Initialize an expression mask set
 */
 #define initMaskSet(P)  memset(P, 0, sizeof(*P))
 
 /*
-** Return the bittqmask for the given cursor number.  Return 0 if
+** Return the bitmask for the given cursor number.  Return 0 if
 ** iCursor is not in the set.
 */
-static Bittqmask getMask(ExprMaskSet *pMaskSet, int iCursor){
+static Bitmask getMask(ExprMaskSet *pMaskSet, int iCursor){
   int i;
   for(i=0; i<pMaskSet->n; i++){
     if( pMaskSet->ix[i]==iCursor ){
-      return ((Bittqmask)1)<<i;
+      return ((Bitmask)1)<<i;
     }
   }
   return 0;
 }
 
 /*
-** Create a new tqmask for cursor iCursor.
+** Create a new mask for cursor iCursor.
 **
 ** There is one cursor per table in the FROM clause.  The number of
 ** tables in the FROM clause is limited by a test early in the
@@ -291,7 +291,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 
 /*
 ** This routine walks (recursively) an expression tree and generates
-** a bittqmask indicating which tables are used in that expression
+** a bitmask indicating which tables are used in that expression
 ** tree.
 **
 ** In order for this routine to work, the calling function must have
@@ -300,46 +300,46 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 ** The sqlite3ExprResolveNames() routines looks for column names and
 ** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
 ** the VDBE cursor number of the table.  This routine just has to
-** translate the cursor numbers into bittqmask values and OR all
+** translate the cursor numbers into bitmask values and OR all
 ** the bitmasks together.
 */
-static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
-static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
-static Bittqmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
-  Bittqmask tqmask = 0;
+static Bitmask exprListTableUsage(ExprMaskSet*, ExprList*);
+static Bitmask exprSelectTableUsage(ExprMaskSet*, Select*);
+static Bitmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
+  Bitmask mask = 0;
   if( p==0 ) return 0;
   if( p->op==TK_COLUMN ){
-    tqmask = getMask(pMaskSet, p->iTable);
-    return tqmask;
+    mask = getMask(pMaskSet, p->iTable);
+    return mask;
   }
-  tqmask = exprTableUsage(pMaskSet, p->pRight);
-  tqmask |= exprTableUsage(pMaskSet, p->pLeft);
-  tqmask |= exprListTableUsage(pMaskSet, p->pList);
-  tqmask |= exprSelectTableUsage(pMaskSet, p->pSelect);
-  return tqmask;
+  mask = exprTableUsage(pMaskSet, p->pRight);
+  mask |= exprTableUsage(pMaskSet, p->pLeft);
+  mask |= exprListTableUsage(pMaskSet, p->pList);
+  mask |= exprSelectTableUsage(pMaskSet, p->pSelect);
+  return mask;
 }
-static Bittqmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
+static Bitmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
   int i;
-  Bittqmask tqmask = 0;
+  Bitmask mask = 0;
   if( pList ){
     for(i=0; i<pList->nExpr; i++){
-      tqmask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
+      mask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
     }
   }
-  return tqmask;
+  return mask;
 }
-static Bittqmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
-  Bittqmask tqmask;
+static Bitmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
+  Bitmask mask;
   if( pS==0 ){
-    tqmask = 0;
+    mask = 0;
   }else{
-    tqmask = exprListTableUsage(pMaskSet, pS->pEList);
-    tqmask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
-    tqmask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
-    tqmask |= exprTableUsage(pMaskSet, pS->pWhere);
-    tqmask |= exprTableUsage(pMaskSet, pS->pHaving);
+    mask = exprListTableUsage(pMaskSet, pS->pEList);
+    mask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
+    mask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
+    mask |= exprTableUsage(pMaskSet, pS->pWhere);
+    mask |= exprTableUsage(pMaskSet, pS->pHaving);
   }
-  return tqmask;
+  return mask;
 }
 
 /*
@@ -379,7 +379,7 @@ static void exprCommute(Expr *pExpr){
 }
 
 /*
-** Translate from TK_xx operator to WO_xx bittqmask.
+** Translate from TK_xx operator to WO_xx bitmask.
 */
 static int operatorMask(int op){
   int c;
@@ -408,7 +408,7 @@ static WhereTerm *findTerm(
   WhereClause *pWC,     /* The WHERE clause to be searched */
   int iCur,             /* Cursor number of LHS */
   int iColumn,          /* Column number of LHS */
-  Bittqmask notReady,     /* RHS must not overlap with this tqmask */
+  Bitmask notReady,     /* RHS must not overlap with this mask */
   u16 op,               /* Mask of WO_xx values describing operator */
   Index *pIdx           /* Must be compatible with this index, if not NULL */
 ){
@@ -542,8 +542,8 @@ static void exprAnalyze(
 ){
   WhereTerm *pTerm = &pWC->a[idxTerm];
   Expr *pExpr = pTerm->pExpr;
-  Bittqmask prereqLeft;
-  Bittqmask prereqAll;
+  Bitmask prereqLeft;
+  Bitmask prereqAll;
   int nPattern;
   int isComplete;
 
@@ -885,7 +885,7 @@ static double bestIndex(
   Parse *pParse,              /* The parsing context */
   WhereClause *pWC,           /* The WHERE clause */
   struct SrcList_item *pSrc,  /* The FROM clause term to search */
-  Bittqmask notReady,           /* Mask of cursors that are not available */
+  Bitmask notReady,           /* Mask of cursors that are not available */
   ExprList *pOrderBy,         /* The order by clause */
   Index **ppIndex,            /* Make *ppIndex point to the best index */
   int *pFlags,                /* Put flags describing this choice in *pFlags */
@@ -1052,13 +1052,13 @@ static double bestIndex(
     ** ever reading the table.  If that is the case, then halve the
     ** cost of this index.
     */
-    if( flags && pSrc->colUsed < (((Bittqmask)1)<<(BMS-1)) ){
-      Bittqmask m = pSrc->colUsed;
+    if( flags && pSrc->colUsed < (((Bitmask)1)<<(BMS-1)) ){
+      Bitmask m = pSrc->colUsed;
       int j;
       for(j=0; j<pProbe->nColumn; j++){
         int x = pProbe->aiColumn[j];
         if( x<BMS-1 ){
-          m &= ~(((Bittqmask)1)<<x);
+          m &= ~(((Bitmask)1)<<x);
         }
       }
       if( m==0 ){
@@ -1223,7 +1223,7 @@ static void codeAllEqualityTerms(
   Parse *pParse,        /* Parsing context */
   WhereLevel *pLevel,   /* Which nested loop of the FROM we are coding */
   WhereClause *pWC,     /* The WHERE clause */
-  Bittqmask notReady,     /* Which parts of FROM have not yet been coded */
+  Bitmask notReady,     /* Which parts of FROM have not yet been coded */
   int brk               /* Jump here to end the loop */
 ){
   int nEq = pLevel->nEq;        /* The number of == or IN constraints to code */
@@ -1380,9 +1380,9 @@ WhereInfo *sqlite3WhereBegin(
   WhereInfo *pWInfo;         /* Will become the return value of this function */
   Vdbe *v = pParse->pVdbe;   /* The virtual database engine */
   int brk, cont = 0;         /* Addresses used during code generation */
-  Bittqmask notReady;          /* Cursors that are not yet positioned */
+  Bitmask notReady;          /* Cursors that are not yet positioned */
   WhereTerm *pTerm;          /* A single term in the WHERE clause */
-  ExprMaskSet maskSet;       /* The expression tqmask set */
+  ExprMaskSet maskSet;       /* The expression mask set */
   WhereClause wc;            /* The WHERE clause is divided into these terms */
   struct SrcList_item *pTabItem;  /* A single entry from pTabList */
   WhereLevel *pLevel;             /* A single level in the pWInfo list */
@@ -1390,7 +1390,7 @@ WhereInfo *sqlite3WhereBegin(
   int andFlags;              /* AND-ed combination of all wc.a[].flags */
 
   /* The number of tables in the FROM clause is limited by the number of
-  ** bits in a Bittqmask 
+  ** bits in a Bitmask 
   */
   if( pTabList->nSrc>BMS ){
     sqlite3ErrorMsg(pParse, "at most %d tables in a join", BMS);
@@ -1450,7 +1450,7 @@ WhereInfo *sqlite3WhereBegin(
   ** This loop also figures out the nesting order of tables in the FROM
   ** clause.
   */
-  notReady = ~(Bittqmask)0;
+  notReady = ~(Bitmask)0;
   pTabItem = pTabList->a;
   pLevel = pWInfo->a;
   andFlags = ~0;
@@ -1466,7 +1466,7 @@ WhereInfo *sqlite3WhereBegin(
     int bestNEq = 0;            /* nEq associated with pBest */
     double lowestCost = 1.0e99; /* Cost of the pBest */
     int bestJ;                  /* The value of j */
-    Bittqmask m;                  /* Bittqmask value for j or bestJ */
+    Bitmask m;                  /* Bitmask value for j or bestJ */
 
     for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){
       m = getMask(&maskSet, pTabItem->iCursor);
@@ -1566,7 +1566,7 @@ WhereInfo *sqlite3WhereBegin(
   ** loop below generates code for a single nested loop of the VM
   ** program.
   */
-  notReady = ~(Bittqmask)0;
+  notReady = ~(Bitmask)0;
   for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
     int j;
     int iCur = pTabItem->iCursor;  /* The VDBE cursor for the table */
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index 60057c88..8ea3b0b9 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -25,8 +25,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
-    : KoPageLayoutColumnsBase(tqparent) {
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
+    : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
     m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 09bad9d5..8ebac1b2 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -40,12 +40,12 @@ class KoPageLayoutColumns : public KoPageLayoutColumnsBase {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param tqlayout the page tqlayout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
 
     /**
      * Update the page preview widget with the param tqlayout.
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
index b436447b..00296957 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
-    : KoPageLayoutHeaderBase(tqparent) {
+KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
+    : KoPageLayoutHeaderBase(parent) {
     m_headerFooters = kwhf;
     TQHBoxLayout *lay = new TQHBoxLayout(headerSpacingPane);
     m_headerSpacing = new KoUnitDoubleSpinBox( headerSpacingPane, 0.0, 999.0, 0.5, kwhf.ptHeaderBodySpacing, unit );
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
index de8db04b..1f1e8073 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
@@ -32,7 +32,7 @@ class KoPageLayoutHeader : public KoPageLayoutHeaderBase {
   TQ_OBJECT
 
 public:
-    KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf);
+    KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf);
     const KoKWHeaderFooter& headerFooter();
 
 private:
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index c83c381e..649f4c26 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -33,8 +33,8 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
-    : TQWidget(tqparent) {
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+    : TQWidget(parent) {
     m_layout = tqlayout;
     m_unit = unit;
 
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 5d7c0494..06c08517 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -41,14 +41,14 @@ class KoPageLayoutSize : public TQWidget {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param tqlayout the page tqlayout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index 991a2ced..d81d1870 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -49,8 +49,8 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* tqparent, const char *name, const KoPageLayout& tqlayout )
-    : TQGroupBox( i18n( "Page Preview" ), tqparent, name )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+    : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
     setPageLayout( tqlayout );
     columns = 1;
@@ -128,12 +128,12 @@ void KoPagePreview::drawContents( TQPainter *painter )
 /******************************************************************/
 
 /*==================== constructor ===============================*/
-KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
+KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
                                   const KoPageLayout& tqlayout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
-                   KDialogBase::Ok, tqparent, name, modal)
+                   KDialogBase::Ok, parent, name, modal)
 {
 
     flags = tabs;
@@ -153,14 +153,14 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
 }
 
 /*==================== constructor ===============================*/
-KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
+KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
                   const KoPageLayout& tqlayout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
                   int tabs, KoUnit::Unit unit )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
-                   KDialogBase::Ok, tqparent, name, true)
+                   KDialogBase::Ok, parent, name, true)
 {
     flags = tabs;
 
@@ -186,10 +186,10 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
@@ -205,10 +205,10 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 
 /*======================= show dialog ============================*/
 bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
-                                  KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent )
+                                  KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 05f8f3db..21fe7df3 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -90,7 +90,7 @@ public:
     /**
      *  Constructor.
      *
-     *  @param tqparent   The tqparent of the dialog.
+     *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
      *  @param tqlayout   The tqlayout.
      *  @param headfoot The header and the footer.
@@ -98,7 +98,7 @@ public:
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
-    KoPageLayoutDia( TQWidget* tqparent, const char* name,
+    KoPageLayoutDia( TQWidget* parent, const char* name,
              const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
@@ -106,7 +106,7 @@ public:
     /**
      *  Constructor.
      *
-     *  @param tqparent     The tqparent of the dialog.
+     *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
      *  @param tqlayout     The tqlayout.
      *  @param headfoot   The header and the footer.
@@ -115,7 +115,7 @@ public:
      *  @param tabs       The number of tabs.
      *  @param unit       The unit to use for displaying the values to the user
      */
-    KoPageLayoutDia( TQWidget* tqparent, const char* name,
+    KoPageLayoutDia( TQWidget* parent, const char* name,
              const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
@@ -131,13 +131,13 @@ public:
      *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
-    static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 );
+    static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
      *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
-    static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 );
+    static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
      *  Retrieves a standard page tqlayout.
      *  Deprecated: better use KoPageLayout::standardLayout()
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 21251b81..16ec9a55 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -30,8 +30,8 @@
 //                          Support classes
 
 
-KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name )
-: KDoubleValidator( tqparent, name ), m_base( base )
+KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name )
+: KDoubleValidator( parent, name ), m_base( base )
 {
 }
 
@@ -116,8 +116,8 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
 //                          Widget classes
 
 
-KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name )
-    : KDoubleSpinBox( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 )
+KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name )
+    : KDoubleSpinBox( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 )
     , m_lowerInPoints( -9999 )
     , m_upperInPoints( 9999 )
     , m_stepInPoints( 1 )
@@ -132,14 +132,14 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name )
 }
 
 
-KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, 
+KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, 
 						    double lower, double upper,
 						    double step, 
 						    double value, 
 						    KoUnit::Unit unit, 
 						    unsigned int precision, 
 						    const char *name )
-    : KDoubleSpinBox( lower, upper, step, value, precision, tqparent, name ),
+    : KDoubleSpinBox( lower, upper, step, value, precision, parent, name ),
       KoUnitDoubleBase( unit, precision ),
     m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step )
 {
@@ -218,8 +218,8 @@ void KoUnitDoubleSpinBox::setMinMaxStep( double min, double max, double step )
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name )
-    : KLineEdit( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
+KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
+    : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
     tqsetAlignment( TQt::AlignRight );
@@ -229,9 +229,9 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
 }
 
-KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit,
+KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
     unsigned int precision, const char *name )
-    : KLineEdit( tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
+    : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     tqsetAlignment( TQt::AlignRight );
@@ -283,8 +283,8 @@ double KoUnitDoubleLineEdit::value( void ) const
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name )
-     : KComboBox( true, tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
+KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
+     : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
     lineEdit()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
@@ -294,9 +294,9 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name
     connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
 }
 
-KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit,
+KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
      unsigned int precision, const char *name )
-     : KComboBox( true, tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
+     : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     lineEdit()->tqsetAlignment( TQt::AlignRight );
@@ -375,8 +375,8 @@ double KoUnitDoubleComboBox::value( void ) const
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent ), m_step( 1.0 )
+KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
+    : TQWidget( parent ), m_step( 1.0 )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
     //tqlayout->setMargin( 2 );
@@ -398,9 +398,9 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const ch
     tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
-KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value,
+KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
-    : TQWidget( tqparent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
+    : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
     //tqlayout->setMargin( 2 );
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.h b/kexi/3rdparty/kolibs/koUnitWidgets.h
index dbdcb9c0..80db554d 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.h
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.h
@@ -44,7 +44,7 @@ class KoUnitDoubleBase;
 class KOFFICEUI_EXPORT KoUnitDoubleValidator : public KDoubleValidator
 {
 public:
-    KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name = 0 );
+    KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name = 0 );
 
     virtual TQValidator::State validate( TQString &, int & ) const;
 
@@ -109,9 +109,9 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinBox : public KDoubleSpinBox, public KoUni
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleSpinBox( TQWidget *tqparent = 0L, const char *name = 0L );
+    KoUnitDoubleSpinBox( TQWidget *parent = 0L, const char *name = 0L );
     // lower, upper, step and value are in pt
-    KoUnitDoubleSpinBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0,
+    KoUnitDoubleSpinBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0,
                          KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
     // added so the class can be used in .ui files(by Tymoteusz Majewski, maju7@o2.pl)
     virtual void changeValue( double );
@@ -136,7 +136,7 @@ public:
     void setMinMaxStep( double min, double max, double step );
 
 signals:
-    /// emitted like valueChanged in the tqparent, but this one emits the point value
+    /// emitted like valueChanged in the parent, but this one emits the point value
     void valueChangedPt( double );
 
 
@@ -160,8 +160,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleLineEdit : public KLineEdit, public KoUnitDou
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleLineEdit( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleLineEdit( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     virtual void changeValue( double );
     virtual void setUnit( KoUnit::Unit = KoUnit::U_PT );
@@ -189,8 +189,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleComboBox : public KComboBox, public KoUnitDou
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleComboBox( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleComboBox( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     virtual void changeValue( double );
     void updateValue( double );
@@ -226,8 +226,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinComboBox : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleSpinComboBox( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleSpinComboBox( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     void insertItem( double, int index = -1 );
     void updateValue( double );