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

427 files changed, 1704 insertions, 1704 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 );
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index a98f9341..426854e6 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -42,7 +42,7 @@ namespace Kexi
 	enum ViewMode { 
 		AllViewModes = 0, //!< Usable primarily in KexiPart::initInstanceActions()
 		NoViewMode = 0, //!< In KexiViewBase::afterSwitchFrom() and KexiViewBase::beforeSwitchTo() 
-		                //!< means that tqparent dialog of the view has not yet view defined.
+		                //!< means that parent dialog of the view has not yet view defined.
 		DataViewMode = 1,
 		DesignViewMode = 2,
 		TextViewMode = 4 //!< Also known as SQL View Mode
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 4b77b9ef..49cbeb3b 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -97,7 +97,7 @@ KexiActionProxy::~KexiActionProxy()
 	for (;it.current();++it) {
 		it.current()->setActionProxyParent_internal( 0 );
 	}
-	//take me from tqparent
+	//take me from parent
 	if (m_actionProxyParent)
 		m_actionProxyParent->takeActionProxyChild( this );
 
@@ -158,7 +158,7 @@ KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQStri
 	TQCString altName = a->name();
 	altName += "_alt";
 	KAction *alt_act = new KAction(alternativeText, a->iconSet(), a->shortcut(), 
-		0, 0, a->tqparent(), altName);
+		0, 0, a->parent(), altName);
 	TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate()));
 	alt_act->plug(w);
 
@@ -201,7 +201,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe
 					return true;
 			}
 		}
-		return m_actionProxyParent ? m_actionProxyParent->activateSharedAction(action_name, false) : false; //last chance: tqparent
+		return m_actionProxyParent ? m_actionProxyParent->activateSharedAction(action_name, false) : false; //last chance: parent
 	}
 	//activate in this proxy...
 	p->first->activate();
@@ -244,7 +244,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild
 					return it.current()->isAvailable(action_name, alsoCheckInChildren);
 			}
 		}
-		return m_actionProxyParent ? m_actionProxyParent->isAvailable(action_name, false) : false; //last chance: tqparent
+		return m_actionProxyParent ? m_actionProxyParent->isAvailable(action_name, false) : false; //last chance: parent
 	}
 	//supported explicitly:
 	return p->second != 0;
@@ -273,9 +273,9 @@ void KexiActionProxy::takeActionProxyChild( KexiActionProxy* child )
 		m_sharedActionChildren.take();
 }
 
-void KexiActionProxy::setActionProxyParent_internal( KexiActionProxy* tqparent )
+void KexiActionProxy::setActionProxyParent_internal( KexiActionProxy* parent )
 {
-	m_actionProxyParent = tqparent;
+	m_actionProxyParent = parent;
 }
 
 #include "kexiactionproxy_p.moc"
diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h
index e88a89d9..facb09b3 100644
--- a/kexi/core/kexiactionproxy.h
+++ b/kexi/core/kexiactionproxy.h
@@ -153,8 +153,8 @@ class KEXICORE_EXPORT KexiActionProxy
 		 we start to iterate over proxy tqchildren (in unspecified order) to and call 
 		 activateSharedAction() on every child until one of them accept the "event".
 		 
-		 If proxy child is destroyed, it is automatically detached from its tqparent proxy. 
-		 Parent proxy is 0 by default. This pointer is properly cleared when tqparent proxy is destroyed. */
+		 If proxy child is destroyed, it is automatically detached from its parent proxy. 
+		 Parent proxy is 0 by default. This pointer is properly cleared when parent proxy is destroyed. */
 		void addActionProxyChild( KexiActionProxy* child );
 
 		void takeActionProxyChild( KexiActionProxy* child );
@@ -169,14 +169,14 @@ class KEXICORE_EXPORT KexiActionProxy
 
 		KexiActionProxy* m_actionProxyParent;
 
-		TQObject m_signal_parent; //!< it's just to have common tqparent for owned signals
+		TQObject m_signal_parent; //!< it's just to have common parent for owned signals
 
 		//! For internal use by plugSharedActionToExternalGUI()
 		KAction_setEnabled_Helper *m_KAction_setEnabled_helper;
 
 	public:
-		//! For internal use by addActionProxyChild(). \a tqparent can be 0.
-		void setActionProxyParent_internal( KexiActionProxy* tqparent );
+		//! For internal use by addActionProxyChild(). \a parent can be 0.
+		void setActionProxyParent_internal( KexiActionProxy* parent );
 
 		//! @internal
 		KexiActionProxy *m_focusedChild;
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index 48bf6b51..e806aaaf 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *tqparent)
-	:KoContextHelpWidget(tqparent,"kexi_contexthelp")
+KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *parent)
+	:KoContextHelpWidget(parent,"kexi_contexthelp")
 {
 	kdDebug()<<"KexiContextHelp::KexiContextHelp()"<<endl;
 	setCaption(i18n("Context Help"));
diff --git a/kexi/core/kexicontexthelp.h b/kexi/core/kexicontexthelp.h
index c1cd2a0b..d28c8e2a 100644
--- a/kexi/core/kexicontexthelp.h
+++ b/kexi/core/kexicontexthelp.h
@@ -30,7 +30,7 @@ class KEXICORE_EXPORT KexiContextHelp : public KoContextHelpWidget
   TQ_OBJECT
 
 	public:
-		KexiContextHelp(KexiMainWindow *view, TQWidget *tqparent=0);
+		KexiContextHelp(KexiMainWindow *view, TQWidget *parent=0);
 		~KexiContextHelp();
 	private slots:
 		void linkClickedInternal(const TQString &link);
diff --git a/kexi/core/kexidataiteminterface.h b/kexi/core/kexidataiteminterface.h
index ad3a3d25..1c87e0e0 100644
--- a/kexi/core/kexidataiteminterface.h
+++ b/kexi/core/kexidataiteminterface.h
@@ -188,7 +188,7 @@ class KEXICORE_EXPORT KexiDataItemInterface
 		bool cursorAtNewRow();
 
 		/*! Sets a pointer to a Parent Data Item Interface. This pointer is 0 by default, 
-		 but can be set by tqparent widget if this interface is a building block of a larger data widget. 
+		 but can be set by parent widget if this interface is a building block of a larger data widget. 
 		 It is the case for KexiDBFieldEdit widget (see KexiDBFieldEdit::createEditor()). Use with care.
 		 signalValueChanged() method will check this pointer, and if it's not 0, 
 		 m_parentDataItemInterface->signalValueChanged() is called, so a changes can be signalled at higher level. */
@@ -222,8 +222,8 @@ class KEXICORE_EXPORT KexiDataItemInterface
 //		virtual void setValueInternal(const TQVariant& value) = 0;
 
 		/*! Call this in your implementation when value changes, 
-		 so installed listener can react on this change. If there is a tqparent data item defined
-		 (see setParentDataItemInterface()), tqparent's signalValueChanged() method will be called instead. */
+		 so installed listener can react on this change. If there is a parent data item defined
+		 (see setParentDataItemInterface()), parent's signalValueChanged() method will be called instead. */
 		virtual void signalValueChanged();
 
 		/*! Used to perform some actions before signalValueChanged() call. 
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 01f20d8c..ff642741 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -41,9 +41,9 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 
-KexiDialogBase::KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption)
- : KMdiChildView(caption, tqparent, "KexiDialogBase")
- , KexiActionProxy(TQT_TQOBJECT(this), tqparent)
+KexiDialogBase::KexiDialogBase(KexiMainWindow *parent, const TQString &caption)
+ : KMdiChildView(caption, parent, "KexiDialogBase")
+ , KexiActionProxy(TQT_TQOBJECT(this), parent)
  , m_isRegistered(false)
  , m_origCaption(caption)
  , m_schemaData(0)
@@ -54,7 +54,7 @@ KexiDialogBase::KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption
 	m_supportedViewModes = 0; //will be set by KexiPart
 	m_openedViewModes = 0;
 	m_currentViewMode = Kexi::NoViewMode; //no view available yet
-	m_parentWindow = tqparent;
+	m_parentWindow = parent;
 	m_creatingViewsMode = -1;
 
 	TQVBoxLayout *lyr = new TQVBoxLayout(this);
@@ -64,7 +64,7 @@ KexiDialogBase::KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption
 #ifdef KEXI_NO_CTXT_HELP
 	m_contextHelpInfo=new KexiContextHelpInfo();
 #endif
-//	m_instance=tqparent->instance();
+//	m_instance=parent->instance();
 	m_id = -1;
 	m_item = 0;
 
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index 6479ae5b..6449004b 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -49,8 +49,8 @@ namespace KoProperty {
 class KEXICORE_EXPORT KexiDialogTempData : public TQObject
 {
 	public:
-	KexiDialogTempData(TQObject* tqparent)
-	 : TQObject(tqparent, "KexiDialogTempData")
+	KexiDialogTempData(TQObject* parent)
+	 : TQObject(parent, "KexiDialogTempData")
 	 , proposeOpeningInTextViewModeBecauseOfProblems(false)
 	{}
 	/*! Initially false, KexiPart::Part implementation can set this to true
@@ -81,7 +81,7 @@ class KEXICORE_EXPORT KexiDialogBase :
   TQ_OBJECT
 
 	public:
-		KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption = TQString());
+		KexiDialogBase(KexiMainWindow *parent, const TQString &caption = TQString());
 		virtual ~KexiDialogBase();
 
 		bool isRegistered();
diff --git a/kexi/core/kexidragobjects.cpp b/kexi/core/kexidragobjects.cpp
index f69b5a6a..e7373ed7 100644
--- a/kexi/core/kexidragobjects.cpp
+++ b/kexi/core/kexidragobjects.cpp
@@ -27,8 +27,8 @@
 /// implementation of KexiFieldDrag
 
 KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-	const TQString& field, TQWidget *tqparent, const char *name)
- : TQStoredDrag("kexi/field", tqparent, name)
+	const TQString& field, TQWidget *parent, const char *name)
+ : TQStoredDrag("kexi/field", parent, name)
 {
 	TQByteArray data;
 	TQDataStream stream1(data,IO_WriteOnly);
@@ -37,8 +37,8 @@ KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sou
 }
 
 KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-	const TQStringList& fields, TQWidget *tqparent, const char *name)
- : TQStoredDrag((fields.count() > 1) ? "kexi/fields" : "kexi/field", tqparent, name)
+	const TQStringList& fields, TQWidget *parent, const char *name)
+ : TQStoredDrag((fields.count() > 1) ? "kexi/fields" : "kexi/field", parent, name)
 {
 	TQByteArray data;
 	TQDataStream stream1(data,IO_WriteOnly);
@@ -112,8 +112,8 @@ KexiFieldDrag::decodeMultiple( TQDropEvent* e, TQString& sourceMimeType,
 /// implementation of KexiDataProviderDrag
 
 KexiDataProviderDrag::KexiDataProviderDrag(const TQString& sourceMimeType, const TQString& sourceName,
-	TQWidget *tqparent, const char *name)
- : TQStoredDrag("kexi/dataprovider", tqparent, name)
+	TQWidget *parent, const char *name)
+ : TQStoredDrag("kexi/dataprovider", parent, name)
 {
 	TQByteArray data;
 	TQDataStream stream1(data,IO_WriteOnly);
diff --git a/kexi/core/kexidragobjects.h b/kexi/core/kexidragobjects.h
index 26e2b24f..4db4534e 100644
--- a/kexi/core/kexidragobjects.h
+++ b/kexi/core/kexidragobjects.h
@@ -33,12 +33,12 @@ class KEXICORE_EXPORT KexiFieldDrag : public TQStoredDrag
 	public:
 		/*! Creates drag object for a single field \a field. */
 		KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-			const TQString& field, TQWidget *tqparent, const char *name);
+			const TQString& field, TQWidget *parent, const char *name);
 
 		/*! Creates drag object for multiple fields \a fields. 
 		 If there's less than two elements in the list, data is set up as for above ctor. */
 		KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-			const TQStringList& field, TQWidget *tqparent=0, const char *name=0);
+			const TQStringList& field, TQWidget *parent=0, const char *name=0);
 
 		~KexiFieldDrag();
 
@@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiDataProviderDrag : public TQStoredDrag
 {
 	public:
 		KexiDataProviderDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-		TQWidget *tqparent=0, const char *name=0);
+		TQWidget *parent=0, const char *name=0);
 		~KexiDataProviderDrag() { };
 
 		static bool canDecode( TQDragMoveEvent* e);
diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp
index 5b8bb8f5..4121543e 100644
--- a/kexi/core/kexiguimsghandler.cpp
+++ b/kexi/core/kexiguimsghandler.cpp
@@ -26,8 +26,8 @@
 #include <kmessagebox.h>
 #include <kdialogbase.h>
 
-KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *tqparent)
-: KexiDB::MessageHandler(tqparent)
+KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *parent)
+: KexiDB::MessageHandler(parent)
 {
 }
 
diff --git a/kexi/core/kexiguimsghandler.h b/kexi/core/kexiguimsghandler.h
index bfe1495e..af407ab1 100644
--- a/kexi/core/kexiguimsghandler.h
+++ b/kexi/core/kexiguimsghandler.h
@@ -26,7 +26,7 @@
 class KEXICORE_EXPORT KexiGUIMessageHandler : public KexiDB::MessageHandler
 {
 	public:
-		KexiGUIMessageHandler(TQWidget *tqparent = 0);
+		KexiGUIMessageHandler(TQWidget *parent = 0);
 		virtual ~KexiGUIMessageHandler();
 		virtual void showErrorMessage(const TQString &title, const TQString &details = TQString());
 		virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString());
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 7e0386cd..93d73cac 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -71,8 +71,8 @@ KexiInternalPartManager internalPartManager;
 
 //----------------------------------------------
 
-KexiInternalPart::KexiInternalPart(TQObject *tqparent, const char *name, const TQStringList &)
- : TQObject(tqparent, name)
+KexiInternalPart::KexiInternalPart(TQObject *parent, const char *name, const TQStringList &)
+ : TQObject(parent, name)
  , m_uniqueDialog(true)
  , m_cancelled(false)
 {
@@ -92,12 +92,12 @@ KexiInternalPart::part(KexiDB::MessageHandler *msgHdr, const char* partName)
 //static
 TQWidget* KexiInternalPart::createWidgetInstance(const char* partName, 
 	const char* widgetClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-	TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args)
+	TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args)
 {
 	KexiInternalPart *part = internalPartManager.findPart(msgHdr, partName);
 	if (!part)
 		return 0; //fatal!
-	return part->createWidget(widgetClass, mainWin, tqparent, objName ? objName : partName, args);
+	return part->createWidget(widgetClass, mainWin, parent, objName ? objName : partName, args);
 }
 
 KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog(
@@ -178,21 +178,21 @@ bool KexiInternalPart::executeCommand(const char* partName,
 }
 
 TQWidget* KexiInternalPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-	TQWidget * tqparent, const char * objName, TQMap<TQString,TQString>* args)
+	TQWidget * parent, const char * objName, TQMap<TQString,TQString>* args)
 {
 	Q_UNUSED(widgetClass);
 	Q_UNUSED(mainWin);
-	Q_UNUSED(tqparent);
+	Q_UNUSED(parent);
 	Q_UNUSED(objName);
 	Q_UNUSED(args);
 	return 0;
 }
 
-KexiViewBase* KexiInternalPart::createView(KexiMainWindow* mainWin, TQWidget * tqparent,
+KexiViewBase* KexiInternalPart::createView(KexiMainWindow* mainWin, TQWidget * parent,
  const char * objName)
 {
 	Q_UNUSED(mainWin);
-	Q_UNUSED(tqparent);
+	Q_UNUSED(parent);
 	Q_UNUSED(objName);
 	return 0;
 }
diff --git a/kexi/core/kexiinternalpart.h b/kexi/core/kexiinternalpart.h
index 4abf1d19..596f8dd4 100644
--- a/kexi/core/kexiinternalpart.h
+++ b/kexi/core/kexiinternalpart.h
@@ -52,10 +52,10 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
   TQ_OBJECT
 
 	public:
-		KexiInternalPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiInternalPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiInternalPart();
 	
-		KexiDialogBase *instance(KexiMainWindow *tqparent);
+		KexiDialogBase *instance(KexiMainWindow *parent);
 
 		/*! Creates a new widget instance using part \a partName.
 		 \a widgetClass is a pseudo class used in case when the part offers more 
@@ -64,23 +64,23 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 		 \a args is two-way optional argument: it can contain custom options used 
 		 on widget's creation. Depending on implementation, the created widget can write its 
 		 state (e.g. result or status information) back to this argument.
-		 Created widget will have assigned \a tqparent widget and \a objName name. */
+		 Created widget will have assigned \a parent widget and \a objName name. */
 		static TQWidget* createWidgetInstance(const char* partName, const char* widgetClass, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
+			TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 
 		/*! For convenience. */
 		static TQWidget* createWidgetInstance(const char* partName,
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0)
-		 { return createWidgetInstance(partName, 0, msgHdr, mainWin, tqparent, objName, args); }
+			TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0)
+		 { return createWidgetInstance(partName, 0, msgHdr, mainWin, parent, objName, args); }
 
 		/*! Creates a new dialog instance. If such instance already exists, 
 		 and is unique (see uniqueDialog()) it is just returned.
 		 The part knows about destroying its dialog instance, (if it is uinque), 
 		 so on another call the dialog will be created again. 
 		 \a msgHdr is a message handler for displaying error messages.
-		 The dialog is assigned to \a mainWin as its tqparent, 
+		 The dialog is assigned to \a mainWin as its parent, 
 		 and \a objName name is set. */
 		static KexiDialogBase* createKexiDialogInstance(const char* partName, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, const char *objName = 0);
@@ -96,7 +96,7 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 		 state (e.g. result or status information) back to this argument.
 		 The part knows about destroying its dialog instance, (if it is uinque), 
 		 so on another call the dialog will be created again. 
-		 The dialog is assigned to \a mainWin as its tqparent, 
+		 The dialog is assigned to \a mainWin as its parent, 
 		 and \a objName name is set. */
 		static TQDialog* createModalDialogInstance(const char* partName, 
 			const char* dialogClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
@@ -132,7 +132,7 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 		/*! Reimplement this if your internal part has to return widgets 
 		 or TQDialog objects. */
 		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-			TQWidget * tqparent, const char * objName = 0, TQMap<TQString,TQString>* args = 0);
+			TQWidget * parent, const char * objName = 0, TQMap<TQString,TQString>* args = 0);
 		
 //		//! Reimplement this if your internal part has to return dialogs
 //		virtual KexiDialogBase *createDialog(KexiMainWindow* /*mainWin*/, 
@@ -140,7 +140,7 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 //		 { return 0; }
 		
 		/*! Reimplement this if your internal part has to return a view object. */
-		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget * tqparent,
+		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget * parent,
 			const char *objName = 0);
 
 		/*! Reimplement this if your internal part has to execute a command \a commandName 
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index d95bd069..ba54fea7 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -87,8 +87,8 @@ public:
 
 using namespace KexiPart;
 
-Part::Part(TQObject *tqparent, const char *name, const TQStringList &)
-: TQObject(tqparent, name)
+Part::Part(TQObject *parent, const char *name, const TQStringList &)
+: TQObject(parent, name)
 , m_guiClient(0)
 , m_registeredPartID(-1) //no registered ID by default
 , d(new PartPrivate())
@@ -100,8 +100,8 @@ Part::Part(TQObject *tqparent, const char *name, const TQStringList &)
 	m_newObjectsAreDirty = false;
 }
 
-Part::Part(TQObject* tqparent, StaticInfo *info)
-: TQObject(tqparent, "StaticPart")
+Part::Part(TQObject* parent, StaticInfo *info)
+: TQObject(parent, "StaticPart")
 , m_guiClient(0)
 , m_registeredPartID(-1) //no registered ID by default
 , d(new PartPrivate())
diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h
index 34136d83..f1168fd4 100644
--- a/kexi/core/kexipart.h
+++ b/kexi/core/kexipart.h
@@ -69,7 +69,7 @@ class KEXICORE_EXPORT Part : public TQObject
 
 	public:
 		/*! Constructor. */
-		Part(TQObject *tqparent, const char *name, const TQStringList &);
+		Part(TQObject *parent, const char *name, const TQStringList &);
 		/*! Destructor. */
 		virtual ~Part();
 
@@ -148,9 +148,9 @@ class KEXICORE_EXPORT Part : public TQObject
 		 Default implemention just returns empty KexiDialogTempData object. */
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		/*! Creates a new view for mode \a viewMode, \a item and \a tqparent. The view will be 
+		/*! Creates a new view for mode \a viewMode, \a item and \a parent. The view will be 
 		 used inside \a dialog. */
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0) = 0;
 
 		/*! i18n'd instance name usable for displaying in gui as object's name.
@@ -213,7 +213,7 @@ class KEXICORE_EXPORT Part : public TQObject
 
 	protected:
 		//! Used by StaticPart
-		Part(TQObject* tqparent, StaticInfo *info);
+		Part(TQObject* parent, StaticInfo *info);
 
 //		virtual KexiDialogBase* createInstance(KexiMainWindow *win, const KexiPart::Item &item, int viewMode = Kexi::DataViewMode) = 0;
 
diff --git a/kexi/core/kexipartguiclient.h b/kexi/core/kexipartguiclient.h
index ed88a816..3b999fee 100644
--- a/kexi/core/kexipartguiclient.h
+++ b/kexi/core/kexipartguiclient.h
@@ -39,7 +39,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 	public:
 		virtual ~GUIClient() {};
 
-		inline Part *part() { return static_cast<Part*>(TQObject::tqparent()); }
+		inline Part *part() { return static_cast<Part*>(TQObject::parent()); }
 
 	protected:
 		/*! Creates a new GUI Client. If \a partInstanceClient is true, the part will be 
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index 00575461..f6fcd7d8 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -35,8 +35,8 @@
 
 using namespace KexiPart;
 
-Manager::Manager(TQObject *tqparent)
- : TQObject(tqparent)
+Manager::Manager(TQObject *parent)
+ : TQObject(parent)
 {
 	m_lookupDone = false;
 	m_partlist.setAutoDelete(true);
diff --git a/kexi/core/kexipartmanager.h b/kexi/core/kexipartmanager.h
index e771ae00..c7506e66 100644
--- a/kexi/core/kexipartmanager.h
+++ b/kexi/core/kexipartmanager.h
@@ -74,7 +74,7 @@ class KEXICORE_EXPORT Manager : public TQObject, public KexiDB::Object
 		/**
 		 * creates an empty instance
 		 */
-		Manager(TQObject *tqparent = 0);
+		Manager(TQObject *parent = 0);
 		~Manager();
 
 		/**
diff --git a/kexi/core/kexiproject.h b/kexi/core/kexiproject.h
index e6fb283e..3a246505 100644
--- a/kexi/core/kexiproject.h
+++ b/kexi/core/kexiproject.h
@@ -107,7 +107,7 @@ class KEXICORE_EXPORT KexiProject : public TQObject, public KexiDB::Object
 		 value in "kexi__db" table. 
 		 This is often the case for native server-based databases. 
 		 If so, Kexi application can propose importing the database
-		 or linking it to tqparent project (the latter isn't yet implemented).
+		 or linking it to parent project (the latter isn't yet implemented).
 		 For other types of errors the variable is set to true. */
 		tristate open(bool &incompatibleWithKexi);
 
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index aabba3e2..6a696461 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -230,8 +230,8 @@ KActionPtrList KexiSharedActionHost::sharedActions() const
 	public:
 		KexiAction(const TQString &text, const TQIconSet &pix,
 			const KShortcut &cut, const TQObject *receiver,
-			const char *slot, KActionCollection *tqparent, const char *name)
-		 : KAction(text,pix,cut,receiver,slot,tqparent,name)
+			const char *slot, KActionCollection *parent, const char *name)
+		 : KAction(text,pix,cut,receiver,slot,parent,name)
 		{
 		}
 
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 235ca9b8..91cc09f4 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiSharedActionHost
 
 		/*! \return window widget that is currently focused (using TQWidget::tqfocusWidget())
 		 and matches acceptsSharedActions(). If focused widget does not match,
-		 it's tqparent, grandtqparent, and so on is checked. If all this fails, 
+		 it's parent, grandparent, and so on is checked. If all this fails, 
 		 or no widget has focus, NULL is returned. 
 		 Also works if currently focused window is detached (as in KMDI).
 		 */
diff --git a/kexi/core/kexistaticpart.cpp b/kexi/core/kexistaticpart.cpp
index 86f3a746..69368a1e 100644
--- a/kexi/core/kexistaticpart.cpp
+++ b/kexi/core/kexistaticpart.cpp
@@ -51,10 +51,10 @@ StaticPart::~StaticPart()
 {
 }
 
-KexiViewBase* StaticPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+KexiViewBase* StaticPart::createView(TQWidget *parent, KexiDialogBase* dialog, 
 	KexiPart::Item &item, int viewMode)
 {
-	Q_UNUSED(tqparent);
+	Q_UNUSED(parent);
 	Q_UNUSED(dialog);
 	Q_UNUSED(item);
 	Q_UNUSED(viewMode);
diff --git a/kexi/core/kexistaticpart.h b/kexi/core/kexistaticpart.h
index 06ba7501..314ec59c 100644
--- a/kexi/core/kexistaticpart.h
+++ b/kexi/core/kexistaticpart.h
@@ -48,14 +48,14 @@ class KEXICORE_EXPORT StaticPart : public Part
 		StaticPart(const TQCString& mimeType, const TQString& itemIcon, const TQString& objectName);
 		virtual ~StaticPart();
 
-		/*! Creates a new view for mode \a viewMode, \a item and \a tqparent. The view will be 
+		/*! Creates a new view for mode \a viewMode, \a item and \a parent. The view will be 
 		 used inside \a dialog. \a args arguments can be passed. */
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* args) = 0;
 
 	protected:
 		//! unused by static parts
-		KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode);
 };
 
diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index a45c5ae9..b0966463 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -11,8 +11,8 @@
 #include "keximainwindow.h"
 #include "kexiuseraction.h"
 
-KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *tqparent, const TQString &name, const TQString &text, const TQString &pixmap)
- : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), tqparent, name.latin1())
+KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap)
+ : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1())
 {
 	m_win = win;
 	m_method = 0;
@@ -59,12 +59,12 @@ KexiUserAction::execute()
 }
 
 KexiUserAction *
-KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *tqparent, KexiDB::Cursor *c)
+KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c)
 {
 	if(!c || c->bof() || c->eof())
 		return 0;
 
-	KexiUserAction *a = new KexiUserAction(context, tqparent, c->value(1).toString(), c->value(2).toString(), c->value(3).toString());
+	KexiUserAction *a = new KexiUserAction(context, parent, c->value(1).toString(), c->value(2).toString(), c->value(3).toString());
 	TQString args = c->value(5).toString();
 	bool quote = false;
 
diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h
index 71ca1819..b7111bd1 100644
--- a/kexi/core/kexiuseraction.h
+++ b/kexi/core/kexiuseraction.h
@@ -48,7 +48,7 @@ class KEXICORE_EXPORT KexiUserAction : public KAction
 		/*! constructs an action
 		    \note methods are associated using setMethod() 
 		    */
-		KexiUserAction(KexiMainWindow *context, KActionCollection *tqparent, const TQString &name, const TQString &text, const TQString &pixmap);
+		KexiUserAction(KexiMainWindow *context, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap);
 		~KexiUserAction();
 
 		/*! sets execution information associated with this action this will mostly look like
@@ -64,7 +64,7 @@ class KEXICORE_EXPORT KexiUserAction : public KAction
 
 		/*! creates a KexiUserAction from current record in \a c
 		    mostly needed for creation from kexi__useractions table */
-		static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, KActionCollection *tqparent, KexiDB::Cursor *c);
+		static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c);
 
 	protected slots:
 		/*! actually executes the associated method
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index be201c9b..e89f4a4e 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -30,8 +30,8 @@
 
 #include <kdebug.h>
 
-KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
  , KexiActionProxy(TQT_TQOBJECT(this), mainWin)
  , m_mainWin(mainWin)
  , m_viewWidget(0)
@@ -218,7 +218,7 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 //		kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
 		if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) {
 			if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) {
-				//focus out: when currently focused widget is not a tqparent of this view
+				//focus out: when currently focused widget is not a parent of this view
 				emit focus(false);
 			} else if (e->type()==TQEvent::FocusIn) {
 				emit focus(true);
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 60beadf8..139f0b2d 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -40,7 +40,7 @@ namespace KexiDB {
  KexiViewBase has 'dirty' flag to indicate that view's data has changed.
  This flag's state is reused by KexiDialogBase object that contain the view.
  KexiViewBase objects can be also nested, using addChildView(): any actions and 'dirty' flag
- are transmited to tqparent view in this case.
+ are transmited to parent view in this case.
 
  KexiViewBase objects are usually allocated within KexiDialogBase objects by implementing
  KexiPart::createView() method. See query or table part code for examples.
@@ -55,13 +55,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
   TQ_OBJECT
 
 	public:
-		KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiViewBase(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiViewBase();
 
 		//! \return kexi main window that contain this view
 		inline KexiMainWindow *mainWin() const { return m_mainWin; }
 
-		//! \return tqparent KexiDialogBase that contains this view, or 0 if no dialog contain this view
+		//! \return parent KexiDialogBase that contains this view, or 0 if no dialog contain this view
 		KexiDialogBase* parentDialog() const { return m_dialog; }
 
 		/*! Added for convenience.
@@ -112,9 +112,9 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		virtual void propertySetSwitched();
 
 		/*! Sets dirty flag on or off. It the flag changes,
-		 dirty(bool) signal is emitted by tqparent dialog (KexiDialog),
-		 to inform the world about that. If this view has a tqparent view, setDirty()
-		 is called also on tqparent view.
+		 dirty(bool) signal is emitted by parent dialog (KexiDialog),
+		 to inform the world about that. If this view has a parent view, setDirty()
+		 is called also on parent view.
 		 Always use this function to update 'dirty' flag information. */
 		void setDirty(bool set);
 
@@ -233,13 +233,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 
 		virtual void setFocusInternal() { TQWidget::setFocus(); }
 
-		/*! Allows to react on tqparent dialog's detaching (only for KMDI's ChildFrame mode)
+		/*! Allows to react on parent dialog's detaching (only for KMDI's ChildFrame mode)
 		 - it is called by KexiDialogBase::youAreDetached().
 		 Default implementation does nothing.
 		 Implement it if you want to perform some appropriate actions. */
 		virtual void parentDialogDetached() {};
 
-		/*! Allows to react on tqparent dialog's attaching (only for KMDI's ChildFrame mode)
+		/*! Allows to react on parent dialog's attaching (only for KMDI's ChildFrame mode)
 		 - it is called by KexiDialogBase::youAreAttached().
 		 Default implementation does nothing.
 		 Implement it if you want to perform some appropriate actions. */
diff --git a/kexi/doc/dev/kexi_issues.txt b/kexi/doc/dev/kexi_issues.txt
index f6a27b7f..62292f2d 100644
--- a/kexi/doc/dev/kexi_issues.txt
+++ b/kexi/doc/dev/kexi_issues.txt
@@ -17,7 +17,7 @@
 	Easy example: form and report depends on table/query (or more tables and queries).
 
 	This dependency can be called inheriting when we wnat to reuse as many 
-	as possible properties of tqparent 'object' in child 'object'.
+	as possible properties of parent 'object' in child 'object'.
 
 	Examples of these properties: table colors, columns widths, etc. can be 
 	reused in forms/reports that use this its data.
diff --git a/kexi/doc/dev/kexidb_issues.txt b/kexi/doc/dev/kexidb_issues.txt
index 576a64de..0dd945c6 100644
--- a/kexi/doc/dev/kexidb_issues.txt
+++ b/kexi/doc/dev/kexidb_issues.txt
@@ -191,7 +191,7 @@ kexi__querydata
 	q_sql varchar, //raw sql text - stored in the unchanged form entered by a user (or generated)
 	q_valid boolean, //query schema may be invalid (syntactically or logically, 
 	                //but still can be stored)
-	q_parent_tab integer REFERENCES kexi__objects(o_id) //tqparent table of this query
+	q_parent_tab integer REFERENCES kexi__objects(o_id) //parent table of this query
 
 //This table contains information about fields defined in select queries
 kexi__queryfields
diff --git a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html
index 9d74be25..bfab0a72 100644
--- a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html
+++ b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html
@@ -82,7 +82,7 @@ Additional toolbars are also available:
 <a name="widgets_tab"></a>
 <H3>5.4.4. Using the &quot;Widgets&quot; tab</H3>
 <p>
-The "Widgets" tab in the Property pane provides a list of form widgets and their hierarchy. Each widget is presented within the hierarchy beside other widgets being on the same level (the same tqparent container). Child widgets (inside containers) are presented using indented names.
+The "Widgets" tab in the Property pane provides a list of form widgets and their hierarchy. Each widget is presented within the hierarchy beside other widgets being on the same level (the same parent container). Child widgets (inside containers) are presented using indented names.
 </p>
 
 <p>
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index c2319069..e7a5ad8e 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -869,8 +869,8 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	for(TQWidget *w = m_list->first(); w; w = m_list->next())
 		m_pos.insert(w->name(), w->tqgeometry());
 	ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name());
-	if(item && item->tqparent()->container())
-		m_containername = item->tqparent()->name();
+	if(item && item->parent()->container())
+		m_containername = item->parent()->name();
 	delete m_list;
 }
 
@@ -948,9 +948,9 @@ CreateLayoutCommand::execute()
 void
 CreateLayoutCommand::unexecute()
 {
-	ObjectTreeItem *tqparent = m_form->objectTree()->lookup(m_containername);
-	if(!tqparent)
-		tqparent = m_form->objectTree();
+	ObjectTreeItem *parent = m_form->objectTree()->lookup(m_containername);
+	if(!parent)
+		parent = m_form->objectTree();
 
 	// We reparent every widget to the Container and take them out of the tqlayout
 	TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
@@ -959,21 +959,21 @@ CreateLayoutCommand::unexecute()
 		ObjectTreeItem *item = m_form->objectTree()->lookup(it.key());
 		if(item && item->widget())
 		{
-			item->widget()->reparent(tqparent->widget(), TQPoint(0,0), true);
-			item->eventEater()->setContainer(tqparent->container());
+			item->widget()->reparent(parent->widget(), TQPoint(0,0), true);
+			item->eventEater()->setContainer(parent->container());
 			if(m_pos[it.key()].isValid())
 				item->widget()->setGeometry(m_pos[it.key()]);
 			m_form->objectTree()->reparent(item->name(), m_containername);
 		}
 	}
 
-	if(!tqparent->container())
+	if(!parent->container())
 		return;
 	ObjectTreeItem* titem = m_form->objectTree()->lookup(m_name);
 	if (!titem)
 		return; //better this than a crash
 	TQWidget *w = titem->widget();
-	tqparent->container()->deleteWidget(w); // delete the tqlayout widget
+	parent->container()->deleteWidget(w); // delete the tqlayout widget
 	FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
 }
 
@@ -1378,7 +1378,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 	m_domDoc = TQDomDocument("UI");
 	m_domDoc.appendChild(m_domDoc.createElement("UI"));
 
-	TQDomElement tqparent = m_domDoc.namedItem("UI").toElement();
+	TQDomElement parent = m_domDoc.namedItem("UI").toElement();
 
 	//for(TQWidget *w = list.first(); w; w = list.next())
 	/*for(WidgetListIterator it(list); it.current() != 0; ++it)
@@ -1401,12 +1401,12 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 
 		// We need to store both parentContainer and parentWidget as they may be different (eg for TabWidget page)
 		m_containers.insert(item->name().latin1(), m_form->parentContainer(item->widget())->widget()->name());
-		m_parents.insert(item->name().latin1(), item->tqparent()->name().latin1());
-		FormIO::saveWidget(item, tqparent, m_domDoc);
+		m_parents.insert(item->name().latin1(), item->parent()->name().latin1());
+		FormIO::saveWidget(item, parent, m_domDoc);
 		form->connectionBuffer()->saveAllConnectionsForWidget(item->widget()->name(), m_domDoc);
 	}
 
-	FormIO::cleanClipboard(tqparent);
+	FormIO::cleanClipboard(parent);
 }
 
 void
@@ -1426,7 +1426,7 @@ DeleteWidgetCommand::execute()
 			containerToSelect = cont;
 		cont->deleteWidget(item->widget());
 	}
-	//now we've nothing selecte: select tqparent container
+	//now we've nothing selecte: select parent container
 	if (containerToSelect)
 		m_form->setSelectedWidget( containerToSelect->widget() );
 }
@@ -1456,10 +1456,10 @@ DeleteWidgetCommand::unexecute()
 		if (!titem)
 			return; //better this than a crash
 		Container *cont = titem->container();
-		ObjectTreeItem *tqparent = m_form->objectTree()->lookup(m_parents[wname]);
+		ObjectTreeItem *parent = m_form->objectTree()->lookup(m_parents[wname]);
 		TQDomElement widg = n.toElement();
-		if(tqparent)
-			FormIO::loadWidget(cont, widg, tqparent->widget());
+		if(parent)
+			FormIO::loadWidget(cont, widg, parent->widget());
 		else
 			FormIO::loadWidget(cont, widg);
 	}
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index d998ad36..64e5a253 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -169,7 +169,7 @@ class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand
 };
 
 /*! This command is used when inserting a widger using toolbar or menu. You only need to give
-the tqparent Container and the widget pos.
+the parent Container and the widget pos.
  The other information is taken from FormManager. */
 class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 {
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index fff9a47c..f683ce74 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -45,8 +45,8 @@ namespace KFormDesigner {
 /////////////////////////////////////////////////////////////////////////////////
 ///////////// The dialog to edit or add/remove connections //////////////////////
 /////////////////////////////////////////////////////////////////////////////////
-ConnectionDialog::ConnectionDialog(TQWidget *tqparent)
-: KDialogBase(tqparent, "connections_dialog", true, i18n("Edit Form Connections"),
+ConnectionDialog::ConnectionDialog(TQWidget *parent)
+: KDialogBase(parent, "connections_dialog", true, i18n("Edit Form Connections"),
 							Ok|Cancel|Details, Ok, false)
 , m_buffer(0)
 {
diff --git a/kexi/formeditor/connectiondialog.h b/kexi/formeditor/connectiondialog.h
index 4f1a9a28..d2ecb097 100644
--- a/kexi/formeditor/connectiondialog.h
+++ b/kexi/formeditor/connectiondialog.h
@@ -49,7 +49,7 @@ class KFORMEDITOR_EXPORT ConnectionDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		ConnectionDialog(TQWidget *tqparent);
+		ConnectionDialog(TQWidget *parent);
 		~ConnectionDialog() {;}
 
 		/*! Displays as modal dialog, to edit connections in Form::connectionBuffer(). */
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 2b6d5eb7..d1275adc 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -88,8 +88,8 @@ EventEater::~EventEater()
 
 // Container itself
 
-Container::Container(Container *toplevel, TQWidget *container, TQObject *tqparent, const char *name)
-: TQObject(tqparent, name)
+Container::Container(Container *toplevel, TQWidget *container, TQObject *parent, const char *name)
+: TQObject(parent, name)
 , m_insertBegin(-1,-1)
 , m_mousePressEventReceived(false)
 , m_mouseReleaseEvent(TQEvent::None, TQPoint(), 0, 0)
@@ -118,11 +118,11 @@ Container::Container(Container *toplevel, TQWidget *container, TQObject *tqparen
 			widget()->name(), widget(), this, this);
 		setObjectTree(it);
 
-		if(tqparent->isWidgetType())
+		if(parent->isWidgetType())
 		{
-			TQString n = tqparent->name();
-			ObjectTreeItem *tqparent = m_form->objectTree()->lookup(n);
-			m_form->objectTree()->addItem(tqparent, it);
+			TQString n = parent->name();
+			ObjectTreeItem *parent = m_form->objectTree()->lookup(n);
+			m_form->objectTree()->addItem(parent, it);
 		}
 		else
 			m_form->objectTree()->addItem(toplevel->objectTree(), it);
@@ -406,9 +406,9 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			}
 			else if((kev->key() == Key_Tab) || (kev->key() == Key_BackTab)){
 				ObjectTreeItem *item = form()->objectTree()->lookup(form()->selectedWidgets()->first()->name());
-				if(!item || !item->tqparent())
+				if(!item || !item->parent())
 					return true;
-				ObjectTreeList *list = item->tqparent()->tqchildren();
+				ObjectTreeList *list = item->parent()->tqchildren();
 				if(list->count() == 1)
 					return true;
 				int index = list->findRef(item);
@@ -1107,7 +1107,7 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
 	{
-		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
 		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
@@ -1133,7 +1133,7 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
 	{
 		// Don't move tab widget pages (or widget stack pages)
-		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
 		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index f2ae1f14..36f35e82 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -51,7 +51,7 @@ class KFORMEDITOR_EXPORT EventEater : public TQObject
 
 	public:
 		/*! Constructs eater object. All events for \a widget and it's subwidgets
-		will be redirected to \a container. \a container will be also tqparent of eater object,
+		will be redirected to \a container. \a container will be also parent of eater object,
 		so you don't need to care about deleting it. */
 		EventEater(TQWidget *widget, TQObject *container);
 		~EventEater();
@@ -80,8 +80,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 
 		/**
 		 * Creates a Container from the widget \a container, which have
-		 \a toplevel as tqparent Container. */
-		Container(Container *toplevel, TQWidget *container, TQObject *tqparent=0, const char *name=0);
+		 \a toplevel as parent Container. */
+		Container(Container *toplevel, TQWidget *container, TQObject *parent=0, const char *name=0);
 		virtual ~Container();
 
 		//! \return a pointer to the toplevel Container, or 0 if this Container is toplevel
@@ -147,7 +147,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		  (and so of the Form). If \a add is true, the formerly selected widget
 		  is still selected, and the new one is just added. If false, \a selected
 		   replace the actually selected widget. If \a dontRaise is true, then
-		  the widget \a selected (and its tqparent) won't be raised (eg when you
+		  the widget \a selected (and its parent) won't be raised (eg when you
 		   select widget in ObjectTreeView).
 		  \sa Form::setSelectedWidget() */
 		void setSelectedWidget(TQWidget *selected, bool add, bool dontRaise=false,
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index 020a7876..27878e7f 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -38,9 +38,9 @@ namespace KFormDesigner {
 /// A Dialog to edit the contents of a listview /////////////////////
 /////////////////////////////////////////////////////////////////////////////////
 
-EditListViewDialog::EditListViewDialog(TQWidget *tqparent)
-//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, tqparent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
-: KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, tqparent, "editlistview_dialog", true /* modal */, false)
+EditListViewDialog::EditListViewDialog(TQWidget *parent)
+//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
+: KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, parent, "editlistview_dialog", true /* modal */, false)
 {
 	m_column = addPage(i18n("Columns"));
 	m_contents = addPage(i18n("Contents"));
@@ -356,33 +356,33 @@ EditListViewDialog::updateButtons(TQListViewItem *item)
 
 	m_buttons[BNewChild]->setEnabled(true);
 	m_buttons[BRemRow]->setEnabled(true);
-	m_buttons[BRowUp]->setEnabled( (item->itemAbove() && (item->itemAbove()->tqparent() == item->tqparent())) );
+	m_buttons[BRowUp]->setEnabled( (item->itemAbove() && (item->itemAbove()->parent() == item->parent())) );
 	m_buttons[BRowDown]->setEnabled(item->nextSibling());
 }
 
 void
-EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *tqparent)
+EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent)
 {
 	TQListViewItem *newItem;
 	if(listview->inherits("KListView"))
 	{
-		if(tqparent)
-			newItem = new KListViewItem(tqparent);
+		if(parent)
+			newItem = new KListViewItem(parent);
 		else
 			newItem = new KListViewItem(listview);
 	}
 	else
 	{
-		if(tqparent)
-			newItem = new TQListViewItem(tqparent);
+		if(parent)
+			newItem = new TQListViewItem(parent);
 		else
 			newItem = new TQListViewItem(listview);
 	}
 
 	// We need to move the item at the end, which is the expected behaviour (by default it is inserted at the beginning)
 	TQListViewItem *last;
-	if(tqparent)
-		last = tqparent->firstChild();
+	if(parent)
+		last = parent->firstChild();
 	else
 		last = listview->firstChild();
 
@@ -406,12 +406,12 @@ EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, T
 void
 EditListViewDialog::newRow()
 {
-	KListViewItem *tqparent = (KListViewItem*)m_listview->selectedItem();
-	if(tqparent)
-		tqparent = (KListViewItem*)tqparent->tqparent();
+	KListViewItem *parent = (KListViewItem*)m_listview->selectedItem();
+	if(parent)
+		parent = (KListViewItem*)parent->parent();
 	KListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent, m_listview->selectedItem());
+	if(parent)
+		item = new KListViewItem(parent, m_listview->selectedItem());
 	else
 		item = new KListViewItem(m_listview, m_listview->selectedItem());
 	item->setText(0, i18n("New Item"));
@@ -421,16 +421,16 @@ EditListViewDialog::newRow()
 void
 EditListViewDialog::newChildRow()
 {
-	KListViewItem *tqparent = (KListViewItem*)m_listview->currentItem();
+	KListViewItem *parent = (KListViewItem*)m_listview->currentItem();
 	KListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent);
+	if(parent)
+		item = new KListViewItem(parent);
 	else
 		item = new KListViewItem(m_listview, m_listview->currentItem());
 	item->setText(0, i18n("Sub Item"));
 
 	m_listview->setCurrentItem(item);
-	tqparent->setOpen(true);
+	parent->setOpen(true);
 }
 
 void
diff --git a/kexi/formeditor/editlistviewdialog.h b/kexi/formeditor/editlistviewdialog.h
index be2ae106..b6386a97 100644
--- a/kexi/formeditor/editlistviewdialog.h
+++ b/kexi/formeditor/editlistviewdialog.h
@@ -52,7 +52,7 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		EditListViewDialog(TQWidget *tqparent);
+		EditListViewDialog(TQWidget *parent);
 		~EditListViewDialog() {}
 
 		int exec(TQListView *listview);
@@ -75,9 +75,9 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase
 		void MoveRowDown();
 
 	protected:
-		/*! Loads all child items of \a item into \a listview (may be different from the \a items 's listview) as child of \a tqparent item.
+		/*! Loads all child items of \a item into \a listview (may be different from the \a items 's listview) as child of \a parent item.
 		This is used to copy the contents of a listview into another listview. */
-		void loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *tqparent);
+		void loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent);
 
 	protected:
 		enum { BNewRow = 10, BNewChild, BRemRow, BRowUp, BRowDown , BColAdd = 20, BColRem, BColUp, BColDown };
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ff7a2562..2a38803a 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -64,8 +64,8 @@
 # include <kinputdialog.h>
 #endif
 
-ContainerWidget::ContainerWidget(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+ContainerWidget::ContainerWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 }
 
@@ -92,8 +92,8 @@ void ContainerWidget::dropEvent( TQDropEvent *e )
 
 ////////////////////////
 
-GroupBox::GroupBox(const TQString & title, TQWidget *tqparent, const char *name)
- : TQGroupBox(title, tqparent, name)
+GroupBox::GroupBox(const TQString & title, TQWidget *parent, const char *name)
+ : TQGroupBox(title, parent, name)
 {
 }
 
@@ -115,8 +115,8 @@ void GroupBox::dropEvent( TQDropEvent *e )
 
 ////////////////////////
 
-KFDTabWidget::KFDTabWidget(TQWidget *tqparent, const char *name)
- : KFormDesigner::TabWidget(tqparent, name)
+KFDTabWidget::KFDTabWidget(TQWidget *parent, const char *name)
+ : KFormDesigner::TabWidget(parent, name)
 {
 }
 
@@ -152,8 +152,8 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
 
 /// Various tqlayout widgets /////////////////:
 
-HBox::HBox(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+HBox::HBox(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -165,8 +165,8 @@ HBox::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-VBox::VBox(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+VBox::VBox(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -178,8 +178,8 @@ VBox::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-Grid::Grid(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+Grid::Grid(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -191,8 +191,8 @@ Grid::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-HFlow::HFlow(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+HFlow::HFlow(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -204,8 +204,8 @@ HFlow::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-VFlow::VFlow(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+VFlow::VFlow(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -228,12 +228,12 @@ VFlow::tqsizeHint() const
 
 ///////  Tab related KCommand (to allow tab creation/deletion undoing)
 
-InsertPageCommand::InsertPageCommand(KFormDesigner::Container *container, TQWidget *tqparent)
+InsertPageCommand::InsertPageCommand(KFormDesigner::Container *container, TQWidget *parent)
   : KCommand()
 {
 	m_containername = container->widget()->name();
 	m_form = container->form();
-	m_parentname = tqparent->name();
+	m_parentname = parent->name();
 	m_pageid = -1;
 }
 
@@ -241,21 +241,21 @@ void
 InsertPageCommand::execute()
 {
 	KFormDesigner::Container *container = m_form->objectTree()->lookup(m_containername)->container();
-	TQWidget *tqparent = m_form->objectTree()->lookup(m_parentname)->widget();
+	TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
 	if(m_name.isEmpty()) {
 		m_name = container->form()->objectTree()->generateUniqueName(
 			container->form()->library()->displayName(TQWIDGET_OBJECT_NAME_STRING).latin1(),
 			/*!numberSuffixRequired*/false);
 	}
 
-	TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, tqparent, m_name.latin1(), container);
-//	TQWidget *page = new ContainerWidget(tqparent, m_name.latin1());
-//	new KFormDesigner::Container(container, page, tqparent);
+	TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, parent, m_name.latin1(), container);
+//	TQWidget *page = new ContainerWidget(parent, m_name.latin1());
+//	new KFormDesigner::Container(container, page, parent);
 
-	TQCString classname = tqparent->className();
+	TQCString classname = parent->className();
 	if(classname == "KFDTabWidget")
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(tqparent);
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
 		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
@@ -265,7 +265,7 @@ InsertPageCommand::execute()
 	}
 	else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)tqparent;
+		TQWidgetStack *stack = (TQWidgetStack*)parent;
 		stack->addWidget(page, m_pageid);
 		stack->raiseWidget(page);
 		m_pageid = stack->id(page);
@@ -279,21 +279,21 @@ void
 InsertPageCommand::unexecute()
 {
 	TQWidget *page = m_form->objectTree()->lookup(m_name)->widget();
-	TQWidget *tqparent = m_form->objectTree()->lookup(m_parentname)->widget();
+	TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
 
 	KFormDesigner::WidgetList list;
 	list.append(page);
 	KCommand *com = new KFormDesigner::DeleteWidgetCommand(list, m_form);
 
-	TQCString classname = tqparent->className();
+	TQCString classname = parent->className();
 	if(classname == "KFDTabWidget")
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(tqparent);
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
 		tab->removePage(page);
 	}
 	else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)tqparent;
+		TQWidgetStack *stack = (TQWidgetStack*)parent;
 		int id = stack->id(page) - 1;
 		while(!stack->widget(id))
 			id--;
@@ -314,8 +314,8 @@ InsertPageCommand::name() const
 
 /////// Sub forms ////////////////////////:
 
-SubForm::SubForm(TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_form(0), m_widget(0)
+SubForm::SubForm(TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -352,8 +352,8 @@ SubForm::setFormName(const TQString &name)
 
 /////   The factory /////////////////////////
 
-ContainerFactory::ContainerFactory(TQObject *tqparent, const char *, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, "containers")
+ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, "containers")
 {
 	KFormDesigner::WidgetInfo *wBtnGroup = new KFormDesigner::WidgetInfo(this);
 	wBtnGroup->setPixmap("frame");
@@ -674,10 +674,10 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
 		setWidget(
 			w->parentWidget(),
-			container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
+			container->form()->objectTree()->lookup(stack->name())->parent()->container()
 		);
-//		m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
-//		m_container = container->form()->objectTree()->lookup(stack->name())->tqparent()->container();
+//		m_container = container->form()->objectTree()->lookup(m_widget->name())->parent()->container();
+//		m_container = container->form()->objectTree()->lookup(stack->name())->parent()->container();
 
 		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
 
@@ -720,17 +720,17 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 }
 
 bool
-ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent)
 {
 	if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
-		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+		KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "title", tab->tabLabel(w));
 	}
 	else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
 		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
-		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
+		KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "id", stack->id(w));
 	}
 	else
 		return false;
@@ -741,7 +741,7 @@ bool
 ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item)
 {
 	TQString name = node.attribute("name");
-	if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((name == "title") && (item->parent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
 		tab->addTab(w, node.firstChild().toElement().text());
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index c8bdc1a6..b88b437f 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -58,7 +58,7 @@ class KFORMEDITOR_EXPORT HBox : public TQFrame
   TQ_OBJECT
 
 	public:
-		HBox(TQWidget *tqparent, const char *name);
+		HBox(TQWidget *parent, const char *name);
 		virtual ~HBox(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -74,7 +74,7 @@ class KFORMEDITOR_EXPORT VBox : public TQFrame
   TQ_OBJECT
 
 	public:
-		VBox(TQWidget *tqparent, const char *name);
+		VBox(TQWidget *parent, const char *name);
 		virtual ~VBox(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -90,7 +90,7 @@ class KFORMEDITOR_EXPORT Grid : public TQFrame
   TQ_OBJECT
 
 	public:
-		Grid(TQWidget *tqparent, const char *name);
+		Grid(TQWidget *parent, const char *name);
 		virtual ~Grid(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -106,7 +106,7 @@ class KFORMEDITOR_EXPORT HFlow : public TQFrame
   TQ_OBJECT
 
 	public:
-		HFlow(TQWidget *tqparent, const char *name);
+		HFlow(TQWidget *parent, const char *name);
 		virtual ~HFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -122,7 +122,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame
   TQ_OBJECT
 
 	public:
-		VFlow(TQWidget *tqparent, const char *name);
+		VFlow(TQWidget *parent, const char *name);
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -141,7 +141,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 	friend class KFDTabWidget;
 
 	public:
-		ContainerWidget(TQWidget *tqparent, const char *name);
+		ContainerWidget(TQWidget *parent, const char *name);
 		virtual ~ContainerWidget();
 
 		virtual TQSize tqsizeHint() const;
@@ -167,7 +167,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
   TQ_OBJECT
 
 	public:
-		KFDTabWidget(TQWidget *tqparent, const char *name);
+		KFDTabWidget(TQWidget *parent, const char *name);
 		virtual ~KFDTabWidget();
 
 		virtual TQSize tqsizeHint() const;
@@ -193,7 +193,7 @@ class KFORMEDITOR_EXPORT GroupBox : public TQGroupBox
   TQ_OBJECT
 
 	public:
-		GroupBox(const TQString & title, TQWidget *tqparent, const char *name);
+		GroupBox(const TQString & title, TQWidget *parent, const char *name);
 		virtual ~GroupBox();
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
@@ -218,7 +218,7 @@ class KFORMEDITOR_EXPORT SubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		SubForm(TQWidget *tqparent, const char *name);
+		SubForm(TQWidget *parent, const char *name);
 		~SubForm() {}
 
 		//! \return the name of the subform inside the db
@@ -239,10 +239,10 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		ContainerFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		ContainerFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~ContainerFactory();
 
-		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container,
+		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *parent, const char *name, KFormDesigner::Container *container,
 			int options = DefaultOptions);
 		virtual bool createMenuActions(const TQCString& classname, TQWidget *w, TQPopupMenu *menu,
 			KFormDesigner::Container *container);
@@ -251,7 +251,7 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &classname, TQWidget *widget,
 			KFormDesigner::Container *container);
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 32c557b3..bfc9db63 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -57,8 +57,8 @@
 #include "stdwidgetfactory.h"
 
 // Some widgets subclass to allow event filtering and some other things
-KexiPictureLabel::KexiPictureLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name)
+KexiPictureLabel::KexiPictureLabel(const TQPixmap &pix, TQWidget *parent, const char *name)
+ : TQLabel(parent, name)
 {
 	setPixmap(pix);
 	setScaledContents(false);
@@ -72,8 +72,8 @@ KexiPictureLabel::setProperty(const char *name, const TQVariant &value)
 	return TQLabel::setProperty(name, value);
 }
 
-Line::Line(Qt::Orientation orient, TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name)
+Line::Line(Qt::Orientation orient, TQWidget *parent, const char *name)
+ : TQFrame(parent, name)
 {
 	setFrameShadow(Sunken);
 	if(orient ==Qt::Horizontal)
@@ -102,8 +102,8 @@ Line::orientation() const
 
 // The factory itself
 
-StdWidgetFactory::StdWidgetFactory(TQObject *tqparent, const char *, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, "stdwidgets")
+StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, "stdwidgets")
 {
 	KFormDesigner::WidgetInfo *wFormWidget = new KFormDesigner::WidgetInfo(this);
 	wFormWidget->setPixmap("form");
@@ -798,18 +798,18 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 }
 
 void
-StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview)
+StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview)
 {
 	TQListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent);
+	if(parent)
+		item = new KListViewItem(parent);
 	else
 		item = new KListViewItem(listview);
 
 	// We need to move the item at the end of the list
 	TQListViewItem *last;
-	if(tqparent)
-		last = tqparent->firstChild();
+	if(parent)
+		last = parent->firstChild();
 	else
 		last = listview->firstChild();
 
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index 5d9032f0..e91f08b9 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -31,7 +31,7 @@ class KFORMEDITOR_EXPORT KexiPictureLabel : public TQLabel
   TQ_OBJECT
 
 	public:
-		KexiPictureLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name);
+		KexiPictureLabel(const TQPixmap &pix, TQWidget *parent, const char *name);
 		~KexiPictureLabel(){;}
 
 		virtual bool setProperty(const char *name, const TQVariant &value);
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT Line : public TQFrame
 	TQ_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
 
 	public:
-		Line(Qt::Orientation orient, TQWidget *tqparent, const char *name);
+		Line(Qt::Orientation orient, TQWidget *parent, const char *name);
 		~Line(){;}
 
 		void setOrientation(Qt::Orientation orient);
@@ -58,7 +58,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		StdWidgetFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		StdWidgetFactory(TQObject *parent, const char *name, const TQStringList &args);
 		~StdWidgetFactory();
 
 		virtual TQWidget *createWidget(const TQCString &c, TQWidget *p, const char *n, 
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 
 		virtual bool saveSpecialProperty(const TQCString &classname,
 			const TQString &name, const TQVariant &value, TQWidget *w,
-			TQDomElement &parentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &parent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
 			TQWidget *w, KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -92,7 +92,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
 		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
-		void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
+		void readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview);
 
 	private:
 //		KFormDesigner::Container *m_container;
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index e8b25c84..b5b20936 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -164,7 +164,7 @@ Form::activeContainer()
 	if(it->container())
 		return it->container();
 	else
-		return it->tqparent()->container();
+		return it->parent()->container();
 }
 
 ObjectTreeItem*
@@ -202,10 +202,10 @@ Form::parentContainer(TQWidget *w)
 	//else
 	it = d->topTree->lookup(w->name());
 
-	if(it->tqparent()->container())
-		return it->tqparent()->container();
+	if(it->parent()->container())
+		return it->parent()->container();
 	else
-		return it->tqparent()->tqparent()->container();
+		return it->parent()->parent()->container();
 }
 
 
@@ -267,7 +267,7 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 	emit selectionChanged(w, add, moreWillBeSelected);
 	emitActionSignals(false);
 
-	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their tqparent
+	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their parent
 	if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 	{
 		w = w->parentWidget();
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index d41d7a29..7df731c6 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -169,21 +169,21 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		//! \return the form's toplevel widget, or 0 if designMode() == false.
 		TQWidget* widget() const;
 
-//		//! \return the FormManager tqparent of this form.
+//		//! \return the FormManager parent of this form.
 //		FormManager* manager() const { return d->manager; }
 
-		/*! \return A pointer to the currently active Container, ie the tqparent Container for a simple widget,
+		/*! \return A pointer to the currently active Container, ie the parent Container for a simple widget,
 		    and the widget's Container if it is itself a container.
 		 */
 		Container* activeContainer();
 
-		/*! \return A pointer to the tqparent Container of the currently selected widget.
+		/*! \return A pointer to the parent Container of the currently selected widget.
 		 It is the same as activeContainer() for a simple widget, but unlike this function
-		  it will also return the tqparent Container if the widget itself is a Container.
+		  it will also return the parent Container if the widget itself is a Container.
 		 */
 		Container* parentContainer(TQWidget *w=0);
 
-		/*! \return The \ref Container which is a tqparent of all widgets in \a wlist.
+		/*! \return The \ref Container which is a parent of all widgets in \a wlist.
 		 Used by \ref activeContainer(), and to find where
 		 to paste widgets when multiple widgets are selected. */
 		ObjectTreeItem* commonParentContainer(WidgetList *wlist);
@@ -289,7 +289,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		 (called for example before saving or displaying the tab order dialog).
 		 Automatically sorts widget from the top-left to bottom-right corner.
 		 Widget can be grouped with containers. In paticular, for tab widgets,
-		 child widgets should ordered by tqparent tab's order. */
+		 child widgets should ordered by parent tab's order. */
 		void autoAssignTabStops();
 
 #ifdef KEXI_DEBUG_GUI
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 639b4a83..563d89fd 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -52,8 +52,8 @@
 #include "formIO.h"
 
 /// A blank widget used when the class name is not supported
-CustomWidget::CustomWidget(const TQCString &className, TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name), m_className(className)
+CustomWidget::CustomWidget(const TQCString &className, TQWidget *parent, const char *name)
+: TQWidget(parent, name), m_className(className)
 {
 	setBackgroundMode(TQt::PaletteDark);
 }
@@ -398,7 +398,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name, 
+FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const char *name, 
 	const TQVariant &value, TQWidget *w, WidgetLibrary *lib)
 {
 	// Widget specific properties and attributes ///////////////
@@ -416,14 +416,14 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 	{
 		kdDebug() << "FormIO::savePropertyValue()  The object doesn't have this property. Let's try the WidgetLibrary." << endl;
 		if(lib)
-			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, tqparent);
+			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, parent);
 		return;
 	}
 
 	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true);
 	if (!meta->stored( subwidget )) //not storable
 		return;
-	TQDomElement propertyE = tqparent.createElement("property");
+	TQDomElement propertyE = parent.createElement("property");
 	propertyE.setAttribute("name", name);
 	if (addSubwidgetFlag)
 		propertyE.setAttribute("subwidget", "true");
@@ -437,15 +437,15 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 		if(meta->isSetType())
 		{
 			TQStringList list = TQStringList::fromStrList(meta->valueToKeys(value.toInt()));
-			type = tqparent.createElement("set");
-			valueE = tqparent.createTextNode(list.join("|"));
+			type = parent.createElement("set");
+			valueE = parent.createTextNode(list.join("|"));
 			type.appendChild(valueE);
 		}
 		else
 		{
 			TQString s = meta->valueToKey(value.toInt());
-			type = tqparent.createElement("enum");
-			valueE = tqparent.createTextNode(s);
+			type = parent.createElement("enum");
+			valueE = parent.createTextNode(s);
 			type.appendChild(valueE);
 		}
 		propertyE.appendChild(type);
@@ -455,13 +455,13 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 
 	if(value.type() == TQVariant::Pixmap) {
 		TQDomText valueE;
-		TQDomElement type = tqparent.createElement("pixmap");
+		TQDomElement type = parent.createElement("pixmap");
 		TQCString property = propertyE.attribute("name").latin1();
 //todo		TQCString pixmapName = m_currentItem->widget()->property("pixmapName").toCString();
 		if(m_savePixmapsInline /* (js)too risky: || m_currentItem->pixmapName(property).isNull() */)
-			valueE = tqparent.createTextNode(saveImage(tqparent, value.toPixmap()));
+			valueE = parent.createTextNode(saveImage(parent, value.toPixmap()));
 		else
-			valueE = tqparent.createTextNode(m_currentItem->pixmapName(property));
+			valueE = parent.createTextNode(m_currentItem->pixmapName(property));
 		type.appendChild(valueE);
 		propertyE.appendChild(type);
 		parentNode.appendChild(propertyE);
@@ -469,12 +469,12 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 	}
 
 	// Saving a "normal" property
-	writeVariant(tqparent, propertyE, value);
+	writeVariant(parent, propertyE, value);
 	parentNode.appendChild(propertyE);
 }
 
 void
-FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value)
+FormIO::writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant value)
 {
 	TQDomElement type;
 	TQDomText valueE;
@@ -483,29 +483,29 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 	{
 		case TQVariant::String:
 		{
-			type = tqparent.createElement("string");
-			valueE = tqparent.createTextNode(value.toString());
+			type = parent.createElement("string");
+			valueE = parent.createTextNode(value.toString());
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::CString:
 		{
-			type = tqparent.createElement("cstring");
-			valueE = tqparent.createTextNode(value.toString());
+			type = parent.createElement("cstring");
+			valueE = parent.createTextNode(value.toString());
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::Rect:
 		{
-			type = tqparent.createElement("rect");
-			TQDomElement x = tqparent.createElement("x");
-			TQDomElement y = tqparent.createElement("y");
-			TQDomElement w = tqparent.createElement("width");
-			TQDomElement h = tqparent.createElement("height");
-			TQDomText valueX = tqparent.createTextNode(TQString::number(value.toRect().x()));
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toRect().y()));
-			TQDomText valueW = tqparent.createTextNode(TQString::number(value.toRect().width()));
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toRect().height()));
+			type = parent.createElement("rect");
+			TQDomElement x = parent.createElement("x");
+			TQDomElement y = parent.createElement("y");
+			TQDomElement w = parent.createElement("width");
+			TQDomElement h = parent.createElement("height");
+			TQDomText valueX = parent.createTextNode(TQString::number(value.toRect().x()));
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toRect().y()));
+			TQDomText valueW = parent.createTextNode(TQString::number(value.toRect().width()));
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toRect().height()));
 
 			x.appendChild(valueX);
 			y.appendChild(valueY);
@@ -520,13 +520,13 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Color:
 		{
-			type = tqparent.createElement("color");
-			TQDomElement r = tqparent.createElement("red");
-			TQDomElement g = tqparent.createElement("green");
-			TQDomElement b = tqparent.createElement("blue");
-			TQDomText valueR = tqparent.createTextNode(TQString::number(value.toColor().red()));
-			TQDomText valueG = tqparent.createTextNode(TQString::number(value.toColor().green()));
-			TQDomText valueB = tqparent.createTextNode(TQString::number(value.toColor().blue()));
+			type = parent.createElement("color");
+			TQDomElement r = parent.createElement("red");
+			TQDomElement g = parent.createElement("green");
+			TQDomElement b = parent.createElement("blue");
+			TQDomText valueR = parent.createTextNode(TQString::number(value.toColor().red()));
+			TQDomText valueG = parent.createTextNode(TQString::number(value.toColor().green()));
+			TQDomText valueB = parent.createTextNode(TQString::number(value.toColor().blue()));
 
 			r.appendChild(valueR);
 			g.appendChild(valueG);
@@ -539,27 +539,27 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Bool:
 		{
-			type = tqparent.createElement("bool");
-			//valueE = tqparent.createTextNode(TQString::number(value.toBool()));
-			valueE = tqparent.createTextNode(value.toBool() ? "true" : "false");
+			type = parent.createElement("bool");
+			//valueE = parent.createTextNode(TQString::number(value.toBool()));
+			valueE = parent.createTextNode(value.toBool() ? "true" : "false");
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::Int:
 		case TQVariant::UInt:
 		{
-			type = tqparent.createElement("number");
-			valueE = tqparent.createTextNode(TQString::number(value.toInt()));
+			type = parent.createElement("number");
+			valueE = parent.createTextNode(TQString::number(value.toInt()));
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::Size:
 		{
-			type = tqparent.createElement("size");
-			TQDomElement w = tqparent.createElement("width");
-			TQDomElement h = tqparent.createElement("height");
-			TQDomText valueW = tqparent.createTextNode(TQString::number(value.toSize().width()));
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toSize().height()));
+			type = parent.createElement("size");
+			TQDomElement w = parent.createElement("width");
+			TQDomElement h = parent.createElement("height");
+			TQDomText valueW = parent.createTextNode(TQString::number(value.toSize().width()));
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toSize().height()));
 
 			w.appendChild(valueW);
 			h.appendChild(valueH);
@@ -570,11 +570,11 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Point:
 		{
-			type = tqparent.createElement("point");
-			TQDomElement x = tqparent.createElement("x");
-			TQDomElement y = tqparent.createElement("y");
-			TQDomText valueX = tqparent.createTextNode(TQString::number(value.toPoint().x()));
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toPoint().y()));
+			type = parent.createElement("point");
+			TQDomElement x = parent.createElement("x");
+			TQDomElement y = parent.createElement("y");
+			TQDomText valueX = parent.createTextNode(TQString::number(value.toPoint().x()));
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toPoint().y()));
 
 			x.appendChild(valueX);
 			y.appendChild(valueY);
@@ -585,21 +585,21 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Font:
 		{
-			type = tqparent.createElement("font");
-			TQDomElement f = tqparent.createElement("family");
-			TQDomElement p = tqparent.createElement("pointsize");
-			TQDomElement w = tqparent.createElement("weight");
-			TQDomElement b = tqparent.createElement("bold");
-			TQDomElement i = tqparent.createElement("italic");
-			TQDomElement u = tqparent.createElement("underline");
-			TQDomElement s = tqparent.createElement("strikeout");
-			TQDomText valueF = tqparent.createTextNode(value.toFont().family());
-			TQDomText valueP = tqparent.createTextNode(TQString::number(value.toFont().pointSize()));
-			TQDomText valueW = tqparent.createTextNode(TQString::number(value.toFont().weight()));
-			TQDomText valueB = tqparent.createTextNode(TQString::number(value.toFont().bold()));
-			TQDomText valueI = tqparent.createTextNode(TQString::number(value.toFont().italic()));
-			TQDomText valueU = tqparent.createTextNode(TQString::number(value.toFont().underline()));
-			TQDomText valueS = tqparent.createTextNode(TQString::number(value.toFont().strikeOut()));
+			type = parent.createElement("font");
+			TQDomElement f = parent.createElement("family");
+			TQDomElement p = parent.createElement("pointsize");
+			TQDomElement w = parent.createElement("weight");
+			TQDomElement b = parent.createElement("bold");
+			TQDomElement i = parent.createElement("italic");
+			TQDomElement u = parent.createElement("underline");
+			TQDomElement s = parent.createElement("strikeout");
+			TQDomText valueF = parent.createTextNode(value.toFont().family());
+			TQDomText valueP = parent.createTextNode(TQString::number(value.toFont().pointSize()));
+			TQDomText valueW = parent.createTextNode(TQString::number(value.toFont().weight()));
+			TQDomText valueB = parent.createTextNode(TQString::number(value.toFont().bold()));
+			TQDomText valueI = parent.createTextNode(TQString::number(value.toFont().italic()));
+			TQDomText valueU = parent.createTextNode(TQString::number(value.toFont().underline()));
+			TQDomText valueS = parent.createTextNode(TQString::number(value.toFont().strikeOut()));
 
 			f.appendChild(valueF);
 			p.appendChild(valueP);
@@ -620,22 +620,22 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Cursor:
 		{
-			type = tqparent.createElement("cursor");
-			valueE = tqparent.createTextNode(TQString::number(value.toCursor().tqshape()));
+			type = parent.createElement("cursor");
+			valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape()));
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::SizePolicy:
 		{
-			type = tqparent.createElement("sizepolicy");
-			TQDomElement h = tqparent.createElement("hsizetype");
-			TQDomElement v = tqparent.createElement("vsizetype");
-			TQDomElement hs = tqparent.createElement("horstretch");
-			TQDomElement vs = tqparent.createElement("verstretch");
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toSizePolicy().horData()));
-			TQDomText valueV = tqparent.createTextNode(TQString::number(value.toSizePolicy().verData()));
-			TQDomText valueHS = tqparent.createTextNode(TQString::number(value.toSizePolicy().horStretch()));
-			TQDomText valueVS = tqparent.createTextNode(TQString::number(value.toSizePolicy().verStretch()));
+			type = parent.createElement("sizepolicy");
+			TQDomElement h = parent.createElement("hsizetype");
+			TQDomElement v = parent.createElement("vsizetype");
+			TQDomElement hs = parent.createElement("horstretch");
+			TQDomElement vs = parent.createElement("verstretch");
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toSizePolicy().horData()));
+			TQDomText valueV = parent.createTextNode(TQString::number(value.toSizePolicy().verData()));
+			TQDomText valueHS = parent.createTextNode(TQString::number(value.toSizePolicy().horStretch()));
+			TQDomText valueVS = parent.createTextNode(TQString::number(value.toSizePolicy().verStretch()));
 
 			h.appendChild(valueH);
 			v.appendChild(valueV);
@@ -650,13 +650,13 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Time:
 		{
-			type = tqparent.createElement("time");
-			TQDomElement h = tqparent.createElement("hour");
-			TQDomElement m = tqparent.createElement("minute");
-			TQDomElement s = tqparent.createElement("second");
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toTime().hour()));
-			TQDomText valueM = tqparent.createTextNode(TQString::number(value.toTime().minute()));
-			TQDomText valueS = tqparent.createTextNode(TQString::number(value.toTime().second()));
+			type = parent.createElement("time");
+			TQDomElement h = parent.createElement("hour");
+			TQDomElement m = parent.createElement("minute");
+			TQDomElement s = parent.createElement("second");
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toTime().hour()));
+			TQDomText valueM = parent.createTextNode(TQString::number(value.toTime().minute()));
+			TQDomText valueS = parent.createTextNode(TQString::number(value.toTime().second()));
 
 			h.appendChild(valueH);
 			m.appendChild(valueM);
@@ -669,13 +669,13 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Date:
 		{
-			type = tqparent.createElement("date");
-			TQDomElement y = tqparent.createElement("year");
-			TQDomElement m = tqparent.createElement("month");
-			TQDomElement d = tqparent.createElement("day");
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toDate().year()));
-			TQDomText valueM = tqparent.createTextNode(TQString::number(value.toDate().month()));
-			TQDomText valueD = tqparent.createTextNode(TQString::number(value.toDate().day()));
+			type = parent.createElement("date");
+			TQDomElement y = parent.createElement("year");
+			TQDomElement m = parent.createElement("month");
+			TQDomElement d = parent.createElement("day");
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toDate().year()));
+			TQDomText valueM = parent.createTextNode(TQString::number(value.toDate().month()));
+			TQDomText valueD = parent.createTextNode(TQString::number(value.toDate().day()));
 
 			y.appendChild(valueY);
 			m.appendChild(valueM);
@@ -688,19 +688,19 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::DateTime:
 		{
-			type = tqparent.createElement("datetime");
-			TQDomElement h = tqparent.createElement("hour");
-			TQDomElement m = tqparent.createElement("minute");
-			TQDomElement s = tqparent.createElement("second");
-			TQDomElement y = tqparent.createElement("year");
-			TQDomElement mo = tqparent.createElement("month");
-			TQDomElement d = tqparent.createElement("day");
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toDateTime().time().hour()));
-			TQDomText valueM = tqparent.createTextNode(TQString::number(value.toDateTime().time().minute()));
-			TQDomText valueS = tqparent.createTextNode(TQString::number(value.toDateTime().time().second()));
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toDateTime().date().year()));
-			TQDomText valueMo = tqparent.createTextNode(TQString::number(value.toDateTime().date().month()));
-			TQDomText valueD = tqparent.createTextNode(TQString::number(value.toDateTime().date().day()));
+			type = parent.createElement("datetime");
+			TQDomElement h = parent.createElement("hour");
+			TQDomElement m = parent.createElement("minute");
+			TQDomElement s = parent.createElement("second");
+			TQDomElement y = parent.createElement("year");
+			TQDomElement mo = parent.createElement("month");
+			TQDomElement d = parent.createElement("day");
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toDateTime().time().hour()));
+			TQDomText valueM = parent.createTextNode(TQString::number(value.toDateTime().time().minute()));
+			TQDomText valueS = parent.createTextNode(TQString::number(value.toDateTime().time().second()));
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toDateTime().date().year()));
+			TQDomText valueMo = parent.createTextNode(TQString::number(value.toDateTime().date().month()));
+			TQDomText valueD = parent.createTextNode(TQString::number(value.toDateTime().date().day()));
 
 			h.appendChild(valueH);
 			m.appendChild(valueM);
@@ -909,7 +909,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &domDoc, bool insideGridLayout)
+FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout)
 {
 	if (!item)
 		return;
@@ -917,7 +917,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	// we let Spring class handle saving itself
 	if(item->className() == "Spring")
 	{
-		Spring::saveSpring(item, tqparent, domDoc, insideGridLayout);
+		Spring::saveSpring(item, parent, domDoc, insideGridLayout);
 		return;
 	}
 
@@ -926,7 +926,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	if(!m_currentForm) // copying widget
 	{
 		resetCurrentForm = true;
-		m_currentForm = item->container() ? item->container()->form() : item->tqparent()->container()->form();
+		m_currentForm = item->container() ? item->container()->form() : item->parent()->container()->form();
 	}
 
 
@@ -934,11 +934,11 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 //	if(item->container())
 //		lib = item->container()->form()->manager()->lib();
 //	else
-//		lib = item->tqparent()->container()->form()->manager()->lib();
+//		lib = item->parent()->container()->form()->manager()->lib();
 
 	// We create the "widget" element
 	TQDomElement tclass = domDoc.createElement("widget");
-	tqparent.appendChild(tclass);
+	parent.appendChild(tclass);
 
 	if(insideGridLayout)
 	{
@@ -951,7 +951,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 		}
 	}
 
-	if(!item->tqparent()) // Toplevel widget
+	if(!item->parent()) // Toplevel widget
 		tclass.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING);
 	// For compatibility, HBox, VBox and Grid are saved as TQLAYOUTWIDGET_OBJECT_NAME_STRING
 	else if(item->widget()->isA("HBox") || item->widget()->isA("VBox") || item->widget()->isA("Grid")
@@ -971,15 +971,15 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 //	if (-1 != item->widget()->tqmetaObject()->findProperty("dataSource"))
 	//	savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
 
-	// We don't want to save the tqgeometry if the widget is inside a tqlayout (so tqparent.tagName() == "grid" for example)
-	if(item && !item->tqparent()) {
+	// We don't want to save the tqgeometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
+	if(item && !item->parent()) {
 		// save form widget size, but not its position
 		savePropertyValue(tclass, domDoc, "geometry",
 			TQRect( TQPoint(0,0), item->widget()->size()),
 			item->widget());
 	}
 	// normal widget (if == "UI', it means we're copying widget)
-	else if(tqparent.tagName() == "widget" || tqparent.tagName() == "UI")
+	else if(parent.tagName() == "widget" || parent.tagName() == "UI")
 		savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
 	// Save the buddy widget for a label
@@ -1116,7 +1116,7 @@ FormIO::cleanClipboard(TQDomElement &uiElement)
 }
 
 void
-FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqparent)
+FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *parent)
 {
 	bool resetCurrentForm = false;
 	if(!m_currentForm) // pasting widget
@@ -1187,11 +1187,11 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 			widgetOptions ^= WidgetFactory::DesignViewMode;
 		}
 
-		if(!tqparent)
+		if(!parent)
 			w = container->form()->library()->createWidget(classname, container->widget(), 
 				wname.latin1(), container, widgetOptions);
 		else
-			w = container->form()->library()->createWidget(classname, tqparent, wname.latin1(), 
+			w = container->form()->library()->createWidget(classname, parent, wname.latin1(), 
 				container, widgetOptions);
 	}
 
@@ -1213,12 +1213,12 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 		// not yet created
 		item =  new ObjectTreeItem(container->form()->library()->displayName(classname), 
 			wname, w, container);
-		if(tqparent)  {
-			ObjectTreeItem *titem = container->form()->objectTree()->lookup(tqparent->name());
+		if(parent)  {
+			ObjectTreeItem *titem = container->form()->objectTree()->lookup(parent->name());
 			if(titem)
 				container->form()->objectTree()->addItem(titem, item);
 			else
-				kdDebug() << "FORMIO :: ERROR no tqparent widget "  << endl;
+				kdDebug() << "FORMIO :: ERROR no parent widget "  << endl;
 		}
 		else
 			container->form()->objectTree()->addItem(container->objectTree(), item);
diff --git a/kexi/formeditor/formIO.h b/kexi/formeditor/formIO.h
index 5556b240..bb272a13 100644
--- a/kexi/formeditor/formIO.h
+++ b/kexi/formeditor/formIO.h
@@ -42,7 +42,7 @@ class KFORMEDITOR_EXPORT CustomWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-		CustomWidget(const TQCString &className, TQWidget *tqparent, const char *name);
+		CustomWidget(const TQCString &className, TQWidget *parent, const char *name);
 		virtual ~CustomWidget();
 
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -127,13 +127,13 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static bool loadFormFromFile(Form *form, TQWidget *container, const TQString &filename=TQString());
 
 		/*! Saves the widget associated to the ObjectTreeItem \a item into DOM document \a domDoc,
-		    with \a tqparent as tqparent node.
+		    with \a parent as parent node.
 		    It calls readPropertyValue() for each object property, readAttribute() for each attribute and
 		    itself to save child widgets.\n
 		    \return true if saving succeeded.
 		    This is used to copy/paste widgets.
 		*/
-		static void saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &domDoc,
+		static void saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc,
 			bool insideGridLayout=false);
 
 		/*! Cleans the "UI" TQDomElement after saving widget. It deletes the "includes" element
@@ -142,12 +142,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static void cleanClipboard(TQDomElement &uiElement);
 
 		/*! Loads the widget associated to the TQDomElement \a el into the Container \a container,
-		    with \a tqparent as tqparent widget.
-		    If tqparent = 0, the Container::widget() is used as tqparent widget.
+		    with \a parent as parent widget.
+		    If parent = 0, the Container::widget() is used as parent widget.
 		    This is used to copy/paste widgets.
 		*/
 		static void loadWidget(Container *container,
-			const TQDomElement &el, TQWidget *tqparent=0);
+			const TQDomElement &el, TQWidget *parent=0);
 
 		/*! Save an element in the \a domDoc as child of \a parentNode.
 		  The element will be saved like this :
@@ -174,15 +174,15 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 			 Properties of subwidget are saved with subwidget="true" arribute added 
 			 to 'property' XML element.
 		*/
-		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name,
+		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const char *name,
 			const TQVariant &value, TQWidget *w, WidgetLibrary *lib=0);
 
 	protected:
 		/*! Saves the TQVariant \a value as text to be included in an xml file, with \a parentNode.*/
-		static void writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value);
+		static void writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant value);
 
 		/*! Creates a toplevel widget from the TQDomElement \a element in the Form \a form,
-		 with \a tqparent as tqparent widget.
+		 with \a parent as parent widget.
 		 It calls readPropertyValue() and loadWidget() to load child widgets.
 		*/
 		static void createToplevelWidget(Form *form, TQWidget *container, TQDomElement &element);
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 66948abb..ce25d710 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -83,8 +83,8 @@ namespace KFormDesigner {
 class PropertyFactory : public KoProperty::CustomPropertyFactory
 {
 	public:
-		PropertyFactory(TQObject *tqparent) 
-		: KoProperty::CustomPropertyFactory(tqparent)
+		PropertyFactory(TQObject *parent) 
+		: KoProperty::CustomPropertyFactory(parent)
 //			m_manager(manager)
 		{
 		}
@@ -105,8 +105,8 @@ using namespace KFormDesigner;
 static KStaticDeleter<FormManager> m_managerDeleter;
 FormManager* FormManager::_self = 0L;
 
-FormManager::FormManager(TQObject *tqparent, int options, const char *name)
-   : TQObject(tqparent, name)
+FormManager::FormManager(TQObject *parent, int options, const char *name)
+   : TQObject(parent, name)
 #ifdef KEXI_DEBUG_GUI
    , m_uiCodeDialog(0)
    , m_options(options)
@@ -698,7 +698,7 @@ FormManager::isTopLevel(TQWidget *w)
 	if(!item)
 		return true;
 
-	return (!item->tqparent());
+	return (!item->parent());
 }
 
 void
@@ -734,8 +734,8 @@ FormManager::copyWidget()
 
 	// We clear the current clipboard
 	m_domDoc.setContent(TQString(), true);
-	TQDomElement tqparent = m_domDoc.createElement("UI");
-	m_domDoc.appendChild(tqparent);
+	TQDomElement parent = m_domDoc.createElement("UI");
+	m_domDoc.appendChild(parent);
 
 	TQWidget *w;
 	for(w = list->first(); w; w = list->next())
@@ -744,10 +744,10 @@ FormManager::copyWidget()
 		if (!it)
 			continue;
 
-		FormIO::saveWidget(it, tqparent, m_domDoc);
+		FormIO::saveWidget(it, parent, m_domDoc);
 	}
 
-	FormIO::cleanClipboard(tqparent);
+	FormIO::cleanClipboard(parent);
 
 	activeForm()->emitActionSignals(); // to update 'Paste' item state
 }
@@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	const uint widgetsCount = container->form()->selectedWidgets()->count();
 	const bool multiple = widgetsCount > 1;
 	//const bool enableRemove = w != m_active->widget();
-	// We only enabletqlayout creation if more than one widget with the same tqparent are selected
+	// We only enabletqlayout creation if more than one widget with the same parent are selected
 	const bool enableLayout = multiple || w == container->widget();
 
 	m_menuWidget = w;
@@ -1109,15 +1109,15 @@ FormManager::createLayout(int layoutType)
 		return;
 	}
 
-	TQWidget *tqparent = list->first()->parentWidget();
+	TQWidget *parent = list->first()->parentWidget();
 	for(TQWidget *w = list->first(); w; w = list->next())
 	{
-		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->parentWidget()->name() << " insteaed of " << tqparent->name() << endl;
-		if(w->parentWidget() != tqparent)
+		kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl;
+		if(w->parentWidget() != parent)
 		{
 			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
-		   "All selected widgets must have the same tqparent."));
-			kdDebug() << "FormManager::createLayout() widgets don't have the same tqparent widget" << endl;
+		   "All selected widgets must have the same parent."));
+			kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
 			return;
 		}
 	}
@@ -1250,7 +1250,7 @@ FormManager::alignWidgets(int type)
 	{
 		if(w->parentWidget() != parentWidget)
 		{
-			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same tqparent widget" << endl;
+			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same parent widget" << endl;
 			return;
 		}
 	}
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index e7934cc2..a43100ff 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -77,7 +77,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 	public:
 		/*! Constructs FormManager object.
 		 Using \a options you can control manager's behaviour, see Options. */
-		FormManager(TQObject *tqparent = 0, int options = 0, const char *name = 0);
+		FormManager(TQObject *parent = 0, int options = 0, const char *name = 0);
 
 		virtual ~FormManager();
 
@@ -419,7 +419,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0);
 #endif
 		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
-		  currently selected widgets (that must have the same tqparent).
+		  currently selected widgets (that must have the same parent).
 		  Calls \ref CreateLayoutCommand. */
 		void createLayout(int layoutType);
 
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index 8ab3ae0d..7166e7cc 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -123,8 +123,8 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
 
 KFormDesigner::WidgetLibrary* KFormDesignerKDevPart::static_formsLibrary = 0L;
 
-KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *tqparent, const char *name, bool readOnly, const TQStringList &args)
-: Designer(tqparent, name), m_count(0)
+KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name, bool readOnly, const TQStringList &args)
+: Designer(parent, name), m_count(0)
 {
 	setInstance(KFDFactory::instance());
 	instance()->iconLoader()->addAppDir("kexi");
@@ -138,7 +138,7 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *tqparent, const char *nam
 		setUniqueFormMode(false);
 	m_inShell = (!args.grep("shell").isEmpty());
 
-	TQHBox *container = new TQHBox(tqparent, "kfd_container_widget");
+	TQHBox *container = new TQHBox(parent, "kfd_container_widget");
 	container->setFocusPolicy(TQ_ClickFocus);
 
 	m_workspace = new TQWorkspace(container, "kfd_workspace");
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 72f2ef82..b6929e5c 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
@@ -45,7 +45,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
@@ -61,7 +61,7 @@ class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
   TQ_OBJECT
 
 	public:
-		KFormDesignerKDevPart(TQWidget *tqparent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
+		KFormDesignerKDevPart(TQWidget *parent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
 		virtual ~KFormDesignerKDevPart();
 
 		virtual DesignerType designerType() { return TQtDesigner; }
@@ -119,8 +119,8 @@ class KFORMEDITOR_EXPORT FormWidgetBase : public TQWidget, public KFormDesigner:
   TQ_OBJECT
 
 	public:
-		FormWidgetBase(KFormDesignerKDevPart *part, TQWidget *tqparent = 0, const char *name = 0, int WFlags = WDestructiveClose)
-		: TQWidget(tqparent, name, WFlags), m_part(part) {}
+		FormWidgetBase(KFormDesignerKDevPart *part, TQWidget *parent = 0, const char *name = 0, int WFlags = WDestructiveClose)
+		: TQWidget(parent, name, WFlags), m_part(part) {}
 		~FormWidgetBase() {;}
 
 		void drawRect(const TQRect& r, int type);
diff --git a/kexi/formeditor/kfdpixmapedit.cpp b/kexi/formeditor/kfdpixmapedit.cpp
index caadca85..db9a726e 100644
--- a/kexi/formeditor/kfdpixmapedit.cpp
+++ b/kexi/formeditor/kfdpixmapedit.cpp
@@ -29,8 +29,8 @@
 
 using namespace KFormDesigner;
 
-KFDPixmapEdit::KFDPixmapEdit(KoProperty::Property *property, TQWidget *tqparent, const char *name)
- : KoProperty::PixmapEdit(property, tqparent, name)
+KFDPixmapEdit::KFDPixmapEdit(KoProperty::Property *property, TQWidget *parent, const char *name)
+ : KoProperty::PixmapEdit(property, parent, name)
 {
 //	m_manager = manager;
 }
diff --git a/kexi/formeditor/kfdpixmapedit.h b/kexi/formeditor/kfdpixmapedit.h
index 181ed043..cac2b751 100644
--- a/kexi/formeditor/kfdpixmapedit.h
+++ b/kexi/formeditor/kfdpixmapedit.h
@@ -30,7 +30,7 @@ class KFORMEDITOR_EXPORT KFDPixmapEdit : public KoProperty::PixmapEdit
   TQ_OBJECT
 
 	public:
-		KFDPixmapEdit(KoProperty::Property *property, TQWidget *tqparent=0, const char *name=0);
+		KFDPixmapEdit(KoProperty::Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~KFDPixmapEdit();
 
 	public slots:
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index a00fbcbb..e2ada714 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -169,15 +169,15 @@ ObjectTree::rename(const TQString &oldname, const TQString &newname)
 }
 
 bool
-ObjectTree::reparent(const TQString &name, const TQString &newtqparent)
+ObjectTree::reparent(const TQString &name, const TQString &newparent)
 {
 	ObjectTreeItem *item = lookup(name);
 	if(!item)   return false;
-	ObjectTreeItem *tqparent = lookup(newtqparent);
-	if(!tqparent)   return false;
+	ObjectTreeItem *parent = lookup(newparent);
+	if(!parent)   return false;
 
-	item->tqparent()->removeChild(item);
-	tqparent->addChild(item);
+	item->parent()->removeChild(item);
+	parent->addChild(item);
 	return true;
 }
 
@@ -191,16 +191,16 @@ ObjectTree::lookup(const TQString &name)
 }
 
 void
-ObjectTree::addItem(ObjectTreeItem *tqparent, ObjectTreeItem *c)
+ObjectTree::addItem(ObjectTreeItem *parent, ObjectTreeItem *c)
 {
 	m_treeDict.insert(c->name(), c);
 
-	if(!tqparent)
-		tqparent = this;
-	tqparent->addChild(c);
+	if(!parent)
+		parent = this;
+	parent->addChild(c);
 	m_container->form()->emitChildAdded(c);
 
-	kdDebug() << "ObjectTree::addItem(): adding " << c->name() << " to " << tqparent->name() << endl;
+	kdDebug() << "ObjectTree::addItem(): adding " << c->name() << " to " << parent->name() << endl;
 }
 
 void
@@ -220,7 +220,7 @@ ObjectTree::removeItem(ObjectTreeItem *c)
 		removeItem(it->name());
 
 	m_treeDict.remove(c->name());
-	c->tqparent()->removeChild(c);
+	c->parent()->removeChild(c);
 	delete c;
 }
 
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index ae9b1e26..b37d7caa 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -58,7 +58,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 
 /*! 
  @short An item representing a widget
- Holds the properties of a widget (classname, name, tqparent, tqchildren ..).
+ Holds the properties of a widget (classname, name, parent, tqchildren ..).
  @author Lucijan Busch <lucijan@kde.org>
  */
 class KFORMEDITOR_EXPORT ObjectTreeItem
@@ -71,7 +71,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		TQString className() const { return m_className; }
 		TQWidget* widget() const { return m_widget; }
 		EventEater* eventEater() const { return m_eater; }
-		ObjectTreeItem* tqparent() const { return m_parent; }
+		ObjectTreeItem* parent() const { return m_parent; }
 		ObjectTreeList* tqchildren() { return &m_tqchildren; }
 
 		/*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget.
@@ -82,7 +82,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		Container* container() const { return m_container;}
 
 		void setWidget(TQWidget *w) { m_widget = w; }
-		void setParent(ObjectTreeItem *tqparent)  { m_parent = tqparent;}
+		void setParent(ObjectTreeItem *parent)  { m_parent = parent;}
 
 		void debug(int ident);
 		void rename(const TQString &name);
@@ -152,8 +152,8 @@ class KFORMEDITOR_EXPORT ObjectTree : public ObjectTreeItem
 		/*! Renames the item named \a oldname to \a newname. \return false if widget named \a newname
 		 already exists and renaming failed. */
 		bool rename(const TQString &oldname, const TQString &newname );
-		/*! Sets \a newtqparent as new tqparent for the item whose name is \a name. */
-		bool reparent(const TQString &name, const TQString &newtqparent);
+		/*! Sets \a newparent as new parent for the item whose name is \a name. */
+		bool reparent(const TQString &name, const TQString &newparent);
 
 		/*! \return the ObjectTreeItem named \a name, or 0 if doesn't exist. */
 		ObjectTreeItem* lookup(const TQString &name);
@@ -162,7 +162,7 @@ class KFORMEDITOR_EXPORT ObjectTree : public ObjectTreeItem
 		this dict, use ObjectTreeDictIterator. */
 		ObjectTreeDict* dict() { return &m_treeDict; }
 
-		void addItem(ObjectTreeItem *tqparent, ObjectTreeItem *c);
+		void addItem(ObjectTreeItem *parent, ObjectTreeItem *c);
 		void removeItem(const TQString &name);
 		void removeItem(ObjectTreeItem *c);
 
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index e6802d81..049df3a5 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -34,8 +34,8 @@
 
 using namespace KFormDesigner;
 
-ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *tqparent, ObjectTreeItem *item)
- : KListViewItem(tqparent, item->name(), item->className())
+ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item)
+ : KListViewItem(parent, item->name(), item->className())
 {
 	m_item = item;
 }
@@ -163,8 +163,8 @@ ObjectTreeViewItem::setOpen( bool o )
 
 // ObjectTreeView itself ----------------
 
-ObjectTreeView::ObjectTreeView(TQWidget *tqparent, const char *name, bool tabStop)
- : KListView(tqparent, name)
+ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop)
+ : KListView(parent, name)
  , m_form(0)
 {
 	addColumn(i18n("Name"), 130);
@@ -290,13 +290,13 @@ ObjectTreeView::slotSelectionChanged()
 void
 ObjectTreeView::addItem(ObjectTreeItem *item)
 {
-	ObjectTreeViewItem *tqparent=0;
+	ObjectTreeViewItem *parent=0;
 
-	tqparent = findItem(item->tqparent()->name());
-	if(!tqparent)
+	parent = findItem(item->parent()->name());
+	if(!parent)
 		return;
 
-	loadTree(item, tqparent);
+	loadTree(item, parent);
 }
 
 void
@@ -354,15 +354,15 @@ ObjectTreeView::slotBeforeFormDestroyed()
 }
 
 ObjectTreeViewItem*
-ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *tqparent)
+ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent)
 {
 	if(!item)
 		return 0;
-	ObjectTreeViewItem *treeItem = new ObjectTreeViewItem(tqparent, item);
+	ObjectTreeViewItem *treeItem = new ObjectTreeViewItem(parent, item);
 	treeItem->setOpen(true);
 
 	// The item is inserted by default at the beginning, but we want it to be at the end, so we move it
-	TQListViewItem *last = tqparent->firstChild();
+	TQListViewItem *last = parent->firstChild();
 	while(last->nextSibling())
 		last = last->nextSibling();
 	treeItem->moveItem(last);
diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h
index 46266144..b625c0ad 100644
--- a/kexi/formeditor/objecttreeview.h
+++ b/kexi/formeditor/objecttreeview.h
@@ -31,7 +31,7 @@ class Form;
 class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem
 {
 	public:
-		ObjectTreeViewItem(ObjectTreeViewItem *tqparent, ObjectTreeItem *item);
+		ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item);
 		ObjectTreeViewItem(KListView *list, ObjectTreeItem *item=0);
 		virtual ~ObjectTreeViewItem();
 
@@ -70,7 +70,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
   TQ_OBJECT
 
 	public:
-		ObjectTreeView(TQWidget *tqparent=0, const char *name=0, bool tabStop = false);
+		ObjectTreeView(TQWidget *parent=0, const char *name=0, bool tabStop = false);
 		virtual ~ObjectTreeView();
 
 		virtual TQSize tqsizeHint() const;
@@ -89,7 +89,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 		 It is added to current selection if \a add is true. */
 		void setSelectedWidget(TQWidget *w, bool add=false);
 
-		/*! Adds the ObjectTreeItem \a item in the list, with the appropriate tqparent. */
+		/*! Adds the ObjectTreeItem \a item in the list, with the appropriate parent. */
 		void addItem(ObjectTreeItem *item);
 
 		/*! Removess the ObjectTreeItem \a item from the list. */
@@ -113,7 +113,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 
 	protected:
 		//! Internal function to fill the list.
-		ObjectTreeViewItem* loadTree(ObjectTreeItem *item, ObjectTreeViewItem *tqparent);
+		ObjectTreeViewItem* loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent);
 
 		//! \return The item whose name is \a name.
 		ObjectTreeViewItem* findItem(const TQString &name);
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index c2448c6e..bdd0e3b0 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -220,7 +220,7 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev)
 		tmph = MINIMUM_HEIGHT;
 	}
 
-	// Do not resize a widget outside of tqparent boundaries
+	// Do not resize a widget outside of parent boundaries
 	if(tmpx < 0)
 	{
 		tmpw += tmpx;
@@ -281,7 +281,7 @@ ResizeHandleSet::ResizeHandleSet(TQWidget *modify, Form *form, bool editing)
 : TQObject(modify->parentWidget()), /*m_widget(modify),*/ m_form(form)
 {
 	m_widget = 0;
-	/*TQWidget *tqparent = modify->parentWidget();
+	/*TQWidget *parent = modify->parentWidget();
 
 	handles[0] = new ResizeHandle( modify, ResizeHandle::TopLeft, editing);
 	handles[1] = new ResizeHandle( modify, ResizeHandle::TopCenter, editing);
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index 74a31ab0..168102b0 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -33,8 +33,8 @@ namespace KFormDesigner {
 //////////////// A simple dialog to edit rich text   ////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
-RichTextDialog::RichTextDialog(TQWidget *tqparent, const TQString &text)
-: KDialogBase(tqparent, "richtext_dialog", true, i18n("Edit Rich Text"), Ok|Cancel, Ok, false)
+RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
+: KDialogBase(parent, "richtext_dialog", true, i18n("Edit Rich Text"), Ok|Cancel, Ok, false)
 {
 	TQFrame *frame = makeMainWidget();
 	TQVBoxLayout *l = new TQVBoxLayout(frame);
diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h
index 66a04e16..25150873 100644
--- a/kexi/formeditor/richtextdialog.h
+++ b/kexi/formeditor/richtextdialog.h
@@ -37,7 +37,7 @@ class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		RichTextDialog(TQWidget *tqparent, const TQString &text);
+		RichTextDialog(TQWidget *parent, const TQString &text);
 		~RichTextDialog(){;}
 
 		TQString  text();
diff --git a/kexi/formeditor/scripting/scriptmanager.cpp b/kexi/formeditor/scripting/scriptmanager.cpp
index cfc5df04..73bf70e3 100644
--- a/kexi/formeditor/scripting/scriptmanager.cpp
+++ b/kexi/formeditor/scripting/scriptmanager.cpp
@@ -27,8 +27,8 @@
 
 using KFormDesigner::Form;
 
-ScriptManager::ScriptManager(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+ScriptManager::ScriptManager(TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
 	m_manager = Kross::Api::Manager::scriptManager();
 	m_dict.setAutoDelete(true);
diff --git a/kexi/formeditor/scripting/scriptmanager.h b/kexi/formeditor/scripting/scriptmanager.h
index bc97ec3c..07cacbd0 100644
--- a/kexi/formeditor/scripting/scriptmanager.h
+++ b/kexi/formeditor/scripting/scriptmanager.h
@@ -44,7 +44,7 @@ class ScriptManager : public TQObject
   TQ_OBJECT
 
 	public:
-		ScriptManager(TQObject *tqparent=0, const char *name=0);
+		ScriptManager(TQObject *parent=0, const char *name=0);
 		~ScriptManager();
 
 		/*! \return The FormScript object associated to this Form. */
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index be8cfb4a..1ec9a2b4 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -33,8 +33,8 @@
 
 #include "spring.h"
 
-Spring::Spring(TQWidget *tqparent, const char *name)
-  : TQWidget(tqparent, name)
+Spring::Spring(TQWidget *parent, const char *name)
+  : TQWidget(parent, name)
 {
 	m_edit = true;
 	m_orient =Qt::Horizontal;
diff --git a/kexi/formeditor/spring.h b/kexi/formeditor/spring.h
index b75249d9..2e139a3c 100644
--- a/kexi/formeditor/spring.h
+++ b/kexi/formeditor/spring.h
@@ -48,11 +48,11 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget
 		    Expanding = MinimumExpanding|MayShrink };
 
 	public:
-		Spring(TQWidget *tqparent, const char *name);
+		Spring(TQWidget *parent, const char *name);
 		~Spring() {;}
 
 		static bool isPropertyVisible(const TQCString &name);
-		static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &domDoc, bool insideGridLayout);
+		static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout);
 
 		void setOrientation(Qt::Orientation orient);
 		Qt::Orientation orientation() const { return m_orient;}
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index 6de89b71..f28c8e2a 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -37,8 +37,8 @@ using namespace KFormDesigner;
 //////////  The Tab Stop Dialog to edit tab order  ///////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
-TabStopDialog::TabStopDialog(TQWidget *tqparent)
-: KDialogBase(tqparent, "tabstop_dialog", true, i18n("Edit Tab Order"), Ok|Cancel, Ok, false)
+TabStopDialog::TabStopDialog(TQWidget *parent)
+: KDialogBase(parent, "tabstop_dialog", true, i18n("Edit Tab Order"), Ok|Cancel, Ok, false)
 {
 	TQFrame *frame = makeMainWidget();
 	TQGridLayout *l = new TQGridLayout(frame, 2, 2, 0, 6);
@@ -147,7 +147,7 @@ void
 TabStopDialog::updateButtons(TQListViewItem *item)
 {
 	m_btnUp->setEnabled( item && (item->itemAbove() && m_treeview->isEnabled()
-	/*&& (item->itemAbove()->tqparent() == item->tqparent()))*/ ));
+	/*&& (item->itemAbove()->parent() == item->parent()))*/ ));
 	m_btnDown->setEnabled( item && item->nextSibling() && m_treeview->isEnabled() );
 }
 
diff --git a/kexi/formeditor/tabstopdialog.h b/kexi/formeditor/tabstopdialog.h
index 52b919be..d0829777 100644
--- a/kexi/formeditor/tabstopdialog.h
+++ b/kexi/formeditor/tabstopdialog.h
@@ -41,7 +41,7 @@ class KFORMEDITOR_EXPORT TabStopDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		TabStopDialog(TQWidget *tqparent);
+		TabStopDialog(TQWidget *parent);
 		virtual ~TabStopDialog();
 
 	public slots:
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index d95e96ae..f309283f 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -123,8 +123,8 @@ KFDFactory::aboutData()
 
 KFormDesigner::WidgetLibrary* KFormDesignerPart::static_formsLibrary = 0L;
 
-KFormDesignerPart::KFormDesignerPart(TQWidget *tqparent, const char *name, bool readOnly, const TQStringList &args)
-: KParts::ReadWritePart(tqparent, name), m_count(0)
+KFormDesignerPart::KFormDesignerPart(TQWidget *parent, const char *name, bool readOnly, const TQStringList &args)
+: KParts::ReadWritePart(parent, name), m_count(0)
 {
 	setInstance(KFDFactory::instance());
 	instance()->iconLoader()->addAppDir("kexi");
@@ -138,7 +138,7 @@ KFormDesignerPart::KFormDesignerPart(TQWidget *tqparent, const char *name, bool
 		setUniqueFormMode(false);
 	m_inShell = (!args.grep("shell").isEmpty());
 
-	TQHBox *container = new TQHBox(tqparent, "kfd_container_widget");
+	TQHBox *container = new TQHBox(parent, "kfd_container_widget");
 
 	m_workspace = new TQWorkspace(container, "kfd_workspace");
 	m_workspace->show();
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 5b264b03..cb2874ae 100644
--- a/kexi/formeditor/test/kfd_part.h
+++ b/kexi/formeditor/test/kfd_part.h
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
@@ -60,7 +60,7 @@ class KFORMEDITOR_EXPORT KFormDesignerPart: public KParts::ReadWritePart
   TQ_OBJECT
 
 	public:
-		KFormDesignerPart(TQWidget *tqparent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
+		KFormDesignerPart(TQWidget *parent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
 		virtual ~KFormDesignerPart();
 
 		static KFormDesigner::WidgetLibrary* formsLibrary();
@@ -122,8 +122,8 @@ class KFORMEDITOR_EXPORT FormWidgetBase : public TQWidget, public KFormDesigner:
   TQ_OBJECT
 
 	public:
-		FormWidgetBase(KFormDesignerPart *part, TQWidget *tqparent = 0, const char *name = 0, int WFlags = WDestructiveClose)
-		: TQWidget(tqparent, name, WFlags), m_part(part) {}
+		FormWidgetBase(KFormDesignerPart *part, TQWidget *parent = 0, const char *name = 0, int WFlags = WDestructiveClose)
+		: TQWidget(parent, name, WFlags), m_part(part) {}
 		~FormWidgetBase() {;}
 
 		void drawRect(const TQRect& r, int type);
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index 30bbfdf3..3d078401 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -33,8 +33,8 @@ namespace KFormDesigner {
 
 class Form;
 
-/*! \return tqparent object of \a o that inherits \a className or NULL if no such tqparent
- If the tqparent is found, \a prevPrev is set to a child of child of the tqparent, 
+/*! \return parent object of \a o that inherits \a className or NULL if no such parent
+ If the parent is found, \a prevPrev is set to a child of child of the parent, 
  what for TabWidget means the page widget. */
 template<class type>
 type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className, TQObject* &prevPrev)
@@ -42,7 +42,7 @@ type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className, TQObject* &prev
 	if (!o || !className || className[0]=='\0')
 		return 0;
 	TQObject *prev = TQT_TQOBJECT(o);
-	while ( ((o=TQT_TQOBJECT(o)->tqparent())) && !TQT_TQOBJECT(o)->inherits(className) ) {
+	while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) ) {
 		prevPrev = prev;
 		prev = TQT_TQOBJECT(o);
 	}
@@ -55,8 +55,8 @@ class KFORMEDITOR_EXPORT TabWidget : public TabWidgetBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		TabWidget(TQWidget *tqparent, const char *name) 
-		 : TabWidgetBase(tqparent, name) {}
+		TabWidget(TQWidget *parent, const char *name) 
+		 : TabWidgetBase(parent, name) {}
 		virtual ~TabWidget() {}
 		int tabBarHeight() const { return tabBar()->height(); }
 };
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 3e0458b9..178e2b74 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -147,8 +147,8 @@ int WidgetInfo::customTypeForProperty(const char *propertyName) const
 
 ///// Widget Factory //////////////////////////
 
-WidgetFactory::WidgetFactory(TQObject *tqparent, const char *name)
- : TQObject(tqparent, (const char*)(TQCString("kformdesigner_")+name))
+WidgetFactory::WidgetFactory(TQObject *parent, const char *name)
+ : TQObject(parent, (const char*)(TQCString("kformdesigner_")+name))
 {
 	m_showAdvancedProperties = true;
 	m_classesByName.setAutoDelete(true);
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index eab422ce..9e585625 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -268,7 +268,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 			DefaultOptions = AnyOrientation | DesignViewMode
 		};
 
-		WidgetFactory(TQObject *tqparent=0, const char *name=0);
+		WidgetFactory(TQObject *parent=0, const char *name=0);
 		virtual ~WidgetFactory();
 
 		/*! Adds a new class described by \a w. */
@@ -289,12 +289,12 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 * Creates a widget (and if needed a KFormDesigner::Container)
 		 * \return the created widget
 		 * \param classname the classname of the widget, which should get created
-		 * \param tqparent the tqparent for the created widget
+		 * \param parent the parent for the created widget
 		 * \param name the name of the created widget
 		 * \param container the toplevel Container (if a container should get created)
 		 * \param options options for the created widget: orientation and view mode (see CreateWidgetOptions)
 		 */
-		virtual TQWidget* createWidget(const TQCString &classname, TQWidget *tqparent, const char *name,
+		virtual TQWidget* createWidget(const TQCString &classname, TQWidget *parent, const char *name,
 			KFormDesigner::Container *container, 
 			int options = DefaultOptions) = 0;
 
@@ -310,7 +310,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		/*! Creates (if necessary) an editor to edit the contents of the widget directly in the Form
 		   (eg creates a line edit to change the text of a label). \a classname is
 		   the class the widget belongs to, \a w is the widget to edit
-		   and \a container is the tqparent container of this widget (to access Form etc.).
+		   and \a container is the parent container of this widget (to access Form etc.).
 		 */
 		virtual bool startEditing(const TQCString &classname, TQWidget *w, Container *container)=0;
 
@@ -327,7 +327,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 */
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
 			const TQVariant &value, TQWidget *w,
-			TQDomElement &parentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &parent);
 
 		/*! This function is called when FormIO finds a property or an unknown
 		element in a .ui file. You can this way load a special property, for
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 3d8607ba..c9f9bd9b 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -43,8 +43,8 @@ namespace KFormDesigner {
 class XMLGUIClient : public TQObject, public KXMLGUIClient
 {
 	public:
-		XMLGUIClient(KXMLGUIClient* tqparent, const TQString& xmlFileName)
-		 : TQObject(tqparent->actionCollection()), KXMLGUIClient(tqparent)
+		XMLGUIClient(KXMLGUIClient* parent, const TQString& xmlFileName)
+		 : TQObject(parent->actionCollection()), KXMLGUIClient(parent)
 		{
 			setXMLFile( xmlFileName, true /*merge*/ );
 		}
@@ -107,8 +107,8 @@ using namespace KFormDesigner;
 
 //-------------------------------------------
 
-WidgetLibrary::WidgetLibrary(TQObject *tqparent, const TQStringList& supportedFactoryGroups)
- : TQObject(tqparent)
+WidgetLibrary::WidgetLibrary(TQObject *parent, const TQStringList& supportedFactoryGroups)
+ : TQObject(parent)
  , d(new WidgetLibraryPrivate())
 {
 	for (TQStringList::ConstIterator it = supportedFactoryGroups.constBegin();
@@ -138,7 +138,7 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f)
 			WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName];
 			if (!parentFactory) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className()
-					<< "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl;
+					<< "' - no such parent factory '" << w->m_parentFactoryName << "'" << endl;
 				continue;
 			}
 			WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ];
@@ -319,7 +319,7 @@ WidgetLibrary::createXML()
 }*/
 
 ActionList
-WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *tqparent, 
+WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
 	TQObject *receiver, const char *slot)
 {
 	loadFactories();
@@ -340,7 +340,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *tqp
 	{
 		LibActionWidget *a = new LibActionWidget(it.current(), 
 			it.current()->factory()->m_guiClient 
-			? it.current()->factory()->m_guiClient->actionCollection() : tqparent);
+			? it.current()->factory()->m_guiClient->actionCollection() : parent);
 		connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
 		actions.append(a);
 	}
@@ -359,7 +359,7 @@ WidgetLibrary::addCustomWidgetActions(KActionCollection *col)
 }
 
 TQWidget*
-WidgetLibrary::createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, Container *c,
+WidgetLibrary::createWidget(const TQCString &classname, TQWidget *parent, const char *name, Container *c,
 	int options)
 {
 	loadFactories();
@@ -367,12 +367,12 @@ WidgetLibrary::createWidget(const TQCString &classname, TQWidget *tqparent, cons
 	if(!wclass)
 		return 0;
 
-	TQWidget *widget = wclass->factory()->createWidget(wclass->className(), tqparent, name, c, options);
+	TQWidget *widget = wclass->factory()->createWidget(wclass->className(), parent, name, c, options);
 	if (!widget) {
 		//try to instantiate from inherited class
 		if (wclass->inheritedClass())
 			widget = wclass->inheritedClass()->factory()->createWidget(
-				wclass->className(), tqparent, name, c, options);
+				wclass->className(), parent, name, c, options);
 		if (!widget)
 			return 0;
 	}
@@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname)
 }
 
 bool
-WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
+WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent)
 {
 	loadFactories();
 	WidgetInfo *wi = d->widgets.find(classname);
 	if (!wi)
 		return false;
 
-	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent))
+	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, parent))
 		return true;
 	//try from inherited class
 	if (wi->inheritedClass())
-		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent);
+		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, parent);
 	return false;
 }
 
@@ -648,7 +648,7 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString&
 	if (winfo->m_parentFactoryName.isEmpty())
 		return TQString();
 
-	//try in tqparent factory, if exists
+	//try in parent factory, if exists
 	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
 	if (!parentFactory)
 		return TQString();
@@ -666,7 +666,7 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString&
 	if (winfo->m_parentFactoryName.isEmpty())
 		return TQString();
 
-	//try in tqparent factory, if exists
+	//try in parent factory, if exists
 	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
 	if (!parentFactory)
 		return TQString();
@@ -705,7 +705,7 @@ TQString WidgetLibrary::internalProperty(const TQCString& classname, const TQCSt
 }
 
 WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
-	const TQCString &classname, TQWidget* tqparent, const TQPoint& pos)
+	const TQCString &classname, TQWidget* parent, const TQPoint& pos)
 {
 	loadFactories();
 	WidgetInfo *wclass = d->widgets[classname];
@@ -738,7 +738,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 	if (textVertical.isEmpty()) //default
 		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
 
-	KPopupMenu* popup = new KPopupMenu(tqparent, "orientationSelectionPopup");
+	KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup");
 	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(wclass->name()));
 	popup->insertItem(iconHorizontal, textHorizontal, 1);
 	popup->insertItem(iconVertical, textVertical, 2);
diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index 22d4c05f..1c4a77a0 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -66,14 +66,14 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 By default (when supportedFactoryGroups is empty) only factories having empty
 		 "X-KFormDesigner-FactoryGroup" field will be loaded.
 		 Factory group names are case-insensitive. */
-		WidgetLibrary(TQObject *tqparent=0, const TQStringList& supportedFactoryGroups = TQStringList());
+		WidgetLibrary(TQObject *parent=0, const TQStringList& supportedFactoryGroups = TQStringList());
 
 		virtual ~WidgetLibrary();
 
 		/**
 		 * creates actions for widget creating
 		 */
-		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *tqparent, 
+		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
 			TQObject *receiver, const char *slot);
 
 		void addCustomWidgetActions(KActionCollection *col);
@@ -87,7 +87,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 * searches the right factory and creates a widget.
 		 * \return the widget or 0 if something falid
 		 */
-		TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, Container *c,
+		TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, Container *c,
 			int options = WidgetFactory::DefaultOptions);
 
 		bool createMenuActions(const TQCString &c, TQWidget *w, TQPopupMenu *menu,
@@ -101,7 +101,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 * - WidgetFactory::VerticalQt::Orientation
 		 */
 		WidgetFactory::CreateWidgetOptions showOrientationSelectionPopup(
-			const TQCString &classname, TQWidget* tqparent, const TQPoint& pos);
+			const TQCString &classname, TQWidget* parent, const TQPoint& pos);
 
 		TQString internalProperty(const TQCString& classname, const TQCString& property);
 
@@ -122,7 +122,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		bool clearWidgetContent(const TQCString &classname, TQWidget *w);
 
 		bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent);
 		bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			ObjectTreeItem *item);
 		bool isPropertyVisible(const TQCString &classname, TQWidget *w,
@@ -149,7 +149,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 for a class described by \a winfo. The name can be displayed in
 		 PropertyEditor. The name is retrieved from class' widget library.
 		 If this library doesn't define description for such property,
-		 and there is a tqparent library for \a winfo defined, tqparent library
+		 and there is a parent library for \a winfo defined, parent library
 		 is asked for returning description string.
 		 Eventually, if even this failed, empty string is returned.
 		 @see WidgetFactory::propertyDescForName() */
@@ -157,7 +157,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 
 		/*! \return The i18n'ed name of the property's value whose name is \a name.
 		 Works in the same way as propertyDescForName(): if actual library
-		 does not define a description we are looking for, tqparent factory is asked
+		 does not define a description we are looking for, parent factory is asked
 		 to return such description.
 		 Eventually, if even this failed, empty string is returned.
 		 @see WidgetFactory::propertyDescForValue() */
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index bd150e45..d06a5c2e 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -88,8 +88,8 @@ class WidgetPropertySetPrivate
 };
 }
 
-WidgetPropertySet::WidgetPropertySet(TQObject *tqparent)
- : TQObject(tqparent, "kfd_widgetPropertySet")
+WidgetPropertySet::WidgetPropertySet(TQObject *parent)
+ : TQObject(parent, "kfd_widgetPropertySet")
 {
 	d = new WidgetPropertySetPrivate();
 //	d->manager = manager;
@@ -1086,7 +1086,7 @@ WidgetPropertySet::createValueList(WidgetInfo *winfo, const TQStringList &list)
 	TQStringList::ConstIterator endIt = list.end();
 	for(TQStringList::ConstIterator it = list.begin(); it != endIt; ++it) {
 		TQString n( d->propValCaption[ (*it).latin1() ] );
-		if (n.isEmpty()) { //try within factory and (maybe) tqparent factory
+		if (n.isEmpty()) { //try within factory and (maybe) parent factory
 			if (winfo)
 				n = KFormDesigner::FormManager::self()->activeForm()->library()->propertyDescForValue( winfo, (*it).latin1() );
 			if (n.isEmpty())
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index cc403ef0..afb303d1 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject
   TQ_OBJECT
 
 	public:
-		WidgetPropertySet(TQObject *tqparent);
+		WidgetPropertySet(TQObject *parent);
 		~WidgetPropertySet();
 
 //		FormManager* manager();
diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
index 0bbb958c..aa84f831 100644
--- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
+++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
@@ -40,7 +40,7 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget)
 	m_subproperies.clear();
 	TQAsciiDict<char> addedSubproperies(1024);
 	if (m_subwidget) {
-		//remember properties in the subwidget that are not present in the tqparent
+		//remember properties in the subwidget that are not present in the parent
 		for( TQMetaObject *tqmetaObject = m_subwidget->tqmetaObject(); tqmetaObject; tqmetaObject = tqmetaObject->tqsuperClass()) {
 			const int numProperties = tqmetaObject->numProperties();
 			for (int i = 0; i < numProperties; i++) {
diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.h b/kexi/formeditor/widgetwithsubpropertiesinterface.h
index b0d86710..dd6b0ddc 100644
--- a/kexi/formeditor/widgetwithsubpropertiesinterface.h
+++ b/kexi/formeditor/widgetwithsubpropertiesinterface.h
@@ -32,7 +32,7 @@ namespace KFormDesigner {
 /*! Currently used in KexiDBAutoField to allow editing specific properties 
  of its internal editor. For example, if the autofield is of type Image Box,
  the Image Box widget has some specific properties like "lineWidth". 
- Such properties are provided by the tqparent KexiDBAutoField object as subproperties. */
+ Such properties are provided by the parent KexiDBAutoField object as subproperties. */
 class KFORMEDITOR_EXPORT WidgetWithSubpropertiesInterface
 {
 	public:
diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp
index b7a2f633..1edf5a25 100644
--- a/kexi/kexidb/dbobjectnamevalidator.cpp
+++ b/kexi/kexidb/dbobjectnamevalidator.cpp
@@ -25,8 +25,8 @@ using namespace KexiDB;
 using namespace KexiUtils;
 
 ObjectNameValidator::ObjectNameValidator(
-	KexiDB::Driver *drv, TQObject * tqparent, const char * name)
-: Validator(tqparent,name)
+	KexiDB::Driver *drv, TQObject * parent, const char * name)
+: Validator(parent,name)
 {
 	m_drv = drv;
 }
diff --git a/kexi/kexidb/dbobjectnamevalidator.h b/kexi/kexidb/dbobjectnamevalidator.h
index 2b9a0645..ad2db4bd 100644
--- a/kexi/kexidb/dbobjectnamevalidator.h
+++ b/kexi/kexidb/dbobjectnamevalidator.h
@@ -36,7 +36,7 @@ namespace KexiDB {
 			/*! \a drv is a KexiDB driver on which isSystemObjectName() will be 
 			 called inside check(). If \a drv is 0, KexiDB::Driver::isKexiDBSystemObjectName()
 			 static function is called instead. */
-			ObjectNameValidator(KexiDB::Driver *drv, TQObject * tqparent = 0, const char * name = 0);
+			ObjectNameValidator(KexiDB::Driver *drv, TQObject * parent = 0, const char * name = 0);
 			virtual ~ObjectNameValidator();
 
 		protected:
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index da77ab72..4db1b400 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -69,8 +69,8 @@ Driver::Info::Info()
 
 //---------------------------------------------
 
-Driver::Driver( TQObject *tqparent, const char *name, const TQStringList & )
-	: TQObject( tqparent, name )
+Driver::Driver( TQObject *parent, const char *name, const TQStringList & )
+	: TQObject( parent, name )
 	, Object()
 	, beh( new DriverBehaviour() )
 	, d( new DriverPrivate() )
diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h
index 7a8d5165..3c69a687 100644
--- a/kexi/kexidb/driver.h
+++ b/kexi/kexidb/driver.h
@@ -43,7 +43,7 @@ class DriverPrivate;
 //! Generic database abstraction.
 /*! This class is a prototype of the database driver for implementations.
  Driver allows new connections to be created, and groups
- these as a tqparent. 
+ these as a parent. 
  Before destruction, all connections are destructed.
 
  Notes:
@@ -305,7 +305,7 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object
 		 You may also want to change options in DriverBehaviour *beh member.
 		 See drivers/mySQL/mysqldriver.cpp for usage example.
 		 */
-		Driver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		Driver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 
 		/*! For reimplemenation: creates and returns connection object 
 		 with additional structures specific for a given driver.
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 4d7db160..01d326af 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -54,7 +54,7 @@ KEXIDB_DRIVER_INFO( MySqlDriver, mysql )
  *
  * See: http://dev.mysql.com/doc/mysql/en/Column_types.html
  */
-MySqlDriver::MySqlDriver(TQObject *tqparent, const char *name, const TQStringList &args) : Driver(tqparent, name,args)
+MySqlDriver::MySqlDriver(TQObject *parent, const char *name, const TQStringList &args) : Driver(parent, name,args)
 {
 //	KexiDBDrvDbg << "MySqlDriver::MySqlDriver()" << endl;
 
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.h b/kexi/kexidb/drivers/mySQL/mysqldriver.h
index 7e6d5a35..df02441c 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.h
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.h
@@ -34,7 +34,7 @@ class MySqlDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		MySqlDriver(TQObject *tqparent, const char *name, const TQStringList &args=TQStringList());
+		MySqlDriver(TQObject *parent, const char *name, const TQStringList &args=TQStringList());
 		virtual ~MySqlDriver();
 		
 		virtual bool isSystemDatabaseName( const TQString &n ) const;
diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.cpp b/kexi/kexidb/drivers/odbc/odbcdriver.cpp
index 38e0796e..83d46361 100644
--- a/kexi/kexidb/drivers/odbc/odbcdriver.cpp
+++ b/kexi/kexidb/drivers/odbc/odbcdriver.cpp
@@ -39,8 +39,8 @@ using namespace KexiDB;
 
 KEXIDB_DRIVER_INFO( ODBCDriver, odbc )
 
-ODBCDriver::ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args )
-	: Driver( tqparent, name, args )
+ODBCDriver::ODBCDriver( TQObject *parent, const char *name, const TQStringList &args )
+	: Driver( parent, name, args )
 {
 	d->isFileDriver = false;
 	d->isDBOpenedAfterCreate = true;
diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.h b/kexi/kexidb/drivers/odbc/odbcdriver.h
index c26af43f..a5e7ee68 100644
--- a/kexi/kexidb/drivers/odbc/odbcdriver.h
+++ b/kexi/kexidb/drivers/odbc/odbcdriver.h
@@ -45,7 +45,7 @@ class ODBCDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		ODBCDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 		~ODBCDriver();
 
 		virtual bool isSystemDatabaseName( const TQString& name ) const;
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index ce66a6e8..333df590 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -33,8 +33,8 @@ KEXIDB_DRIVER_INFO( pqxxSqlDriver, pqxxsql )
 
 //==================================================================================
 //
-pqxxSqlDriver::pqxxSqlDriver( TQObject *tqparent, const char *name, const TQStringList &args )
-	: Driver( tqparent, name, args )
+pqxxSqlDriver::pqxxSqlDriver( TQObject *parent, const char *name, const TQStringList &args )
+	: Driver( parent, name, args )
 {
 	d->isFileDriver = false;
 	d->features = SingleTransactions | CursorForward | CursorBackward;
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.h b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
index 779c1368..8ea7b1fa 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
@@ -38,7 +38,7 @@ class pqxxSqlDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		pqxxSqlDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		pqxxSqlDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 		~pqxxSqlDriver();
 
 		virtual bool isSystemObjectName( const TQString& n )const;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
index 80276682..fc356558 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
@@ -48,9 +48,9 @@ class KexiDB::SQLiteDriverPrivate
 		}
 };
 
-//PgSqlDB::PgSqlDB(TQObject *tqparent, const char *name, const TQStringList &) 
-SQLiteDriver::SQLiteDriver( TQObject *tqparent, const char *name, const TQStringList &args )
-	: Driver( tqparent, name, args )
+//PgSqlDB::PgSqlDB(TQObject *parent, const char *name, const TQStringList &) 
+SQLiteDriver::SQLiteDriver( TQObject *parent, const char *name, const TQStringList &args )
+	: Driver( parent, name, args )
 	,dp( new SQLiteDriverPrivate() )
 {
 	d->isFileDriver = true;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.h b/kexi/kexidb/drivers/sqlite/sqlitedriver.h
index a388d823..59fe89af 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.h
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.h
@@ -39,7 +39,7 @@ class SQLiteDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		SQLiteDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		SQLiteDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 		virtual ~SQLiteDriver();
 
 		/*! \return true if \a n is a system object name; 
diff --git a/kexi/kexidb/expression.h b/kexi/kexidb/expression.h
index ee2c9810..67c1c07e 100644
--- a/kexi/kexidb/expression.h
+++ b/kexi/kexidb/expression.h
@@ -80,7 +80,7 @@ public:
 	
 	virtual Field::Type type();
 	
-	BaseExpr* tqparent() const { return m_par; }
+	BaseExpr* parent() const { return m_par; }
 	
 	virtual void setParent(BaseExpr *p) { m_par = p; }
 	
@@ -121,7 +121,7 @@ public:
 
 protected:
 	int m_cl; //!< class
-	BaseExpr *m_par; //!< tqparent expression
+	BaseExpr *m_par; //!< parent expression
 	int m_token;
 };
 
@@ -224,7 +224,7 @@ public:
 	virtual QueryParameterExpr* copy() const;
 	virtual Field::Type type();
 	/*! Sets expected type of the parameter. The default is String.
-	 This method is called from tqparent's expression validate().
+	 This method is called from parent's expression validate().
 	 This depends on the type of the related expression.
 	 For instance: query "SELECT * FROM cars WHERE name=[enter name]",
 	 "[enter name]" has parameter of the same type as "name" field.
diff --git a/kexi/kexidb/field.h b/kexi/kexidb/field.h
index 9e0c9480..a99e845e 100644
--- a/kexi/kexidb/field.h
+++ b/kexi/kexidb/field.h
@@ -57,8 +57,8 @@ class BaseExpr;
  Note that aliases for fields are defined within query, not in Field object, 
  because the same field can be used in different queries with different alias.
 
- Notes for advanced use: Field obeject is designed to be owned by a tqparent object. 
- Such a tqparent object can be KexiDB::TableSchema, if the field defines single table column,
+ Notes for advanced use: Field obeject is designed to be owned by a parent object. 
+ Such a parent object can be KexiDB::TableSchema, if the field defines single table column,
  or KexiDB::QuerySchema, if the field defines an expression (KexiDB::BaseExpr class).
 
  Using expression class for fields allos to define expressions within queries like
diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h
index 439a5cc1..fbf303a9 100644
--- a/kexi/kexidb/fieldlist.h
+++ b/kexi/kexidb/fieldlist.h
@@ -109,7 +109,7 @@ class KEXI_DB_EXPORT FieldList
 
 		/*! Creates and returns a list that contain fields selected by name.
 		 At least one field (exising on this list) should be selected, otherwise 0 is
-		 returned. Returned FieldList object is not owned by any tqparent (so you need 
+		 returned. Returned FieldList object is not owned by any parent (so you need 
 		 to destroy yourself) and Field objects included in it are not owned by it 
 		 (but still as before, by 'this' object).
 		 Returned list can be usable e.g. as argument for Connection::insertRecord().
diff --git a/kexi/kexidb/fieldvalidator.cpp b/kexi/kexidb/fieldvalidator.cpp
index d9252c20..57f8bd8d 100644
--- a/kexi/kexidb/fieldvalidator.cpp
+++ b/kexi/kexidb/fieldvalidator.cpp
@@ -26,12 +26,12 @@
 
 using namespace KexiDB;
 
-FieldValidator::FieldValidator( const Field &field, TQWidget * tqparent, const char * name )
- : KexiUtils::MultiValidator(TQT_TQOBJECT(tqparent), name)
+FieldValidator::FieldValidator( const Field &field, TQWidget * parent, const char * name )
+ : KexiUtils::MultiValidator(TQT_TQOBJECT(parent), name)
 {
 //! @todo merge this code with KexiTableEdit code!
 //! @todo set maximum length validator
-//! @todo handle input tqmask (via TQLineEdit::setInputMask()
+//! @todo handle input mask (via TQLineEdit::setInputMask()
 	const Field::Type t = field.type();
 	if (field.isIntegerType()) {
 		TQValidator *validator = 0;
diff --git a/kexi/kexidb/fieldvalidator.h b/kexi/kexidb/fieldvalidator.h
index 7b0e2bf8..038a9100 100644
--- a/kexi/kexidb/fieldvalidator.h
+++ b/kexi/kexidb/fieldvalidator.h
@@ -40,7 +40,7 @@ class KEXI_DB_EXPORT FieldValidator : public KexiUtils::MultiValidator
 {
 	public:
 		//! Setups the validator for \a field. Does not keep a pointer to \a field.
-		FieldValidator( const Field &field, TQWidget * tqparent, const char * name = 0 );
+		FieldValidator( const Field &field, TQWidget * parent, const char * name = 0 );
 		~FieldValidator();
 };
 
diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h
index 12feae04..54306af2 100644
--- a/kexi/kexidb/indexschema.h
+++ b/kexi/kexidb/indexschema.h
@@ -110,7 +110,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 		 is this IndexSchem object assigned.
 
 		 Note: If \a rel was detached from masterRelationships() list, 
-		 this object now has no tqparent, so you need to attach it to somewhere or destruct it. 
+		 this object now has no parent, so you need to attach it to somewhere or destruct it. 
 		*/
 		void detachRelationship(Relationship *rel);
 
diff --git a/kexi/kexidb/msghandler.cpp b/kexi/kexidb/msghandler.cpp
index f2946a2b..e72b33e3 100644
--- a/kexi/kexidb/msghandler.cpp
+++ b/kexi/kexidb/msghandler.cpp
@@ -35,8 +35,8 @@ MessageTitle::~MessageTitle()
 
 //------------------------------------------------
 
-MessageHandler::MessageHandler(TQWidget *tqparent)
- : m_messageHandlerParentWidget(tqparent)
+MessageHandler::MessageHandler(TQWidget *parent)
+ : m_messageHandlerParentWidget(parent)
  , m_enableMessages(true)
 {
 }
diff --git a/kexi/kexidb/msghandler.h b/kexi/kexidb/msghandler.h
index c0c8c494..e4fc6644 100644
--- a/kexi/kexidb/msghandler.h
+++ b/kexi/kexidb/msghandler.h
@@ -54,9 +54,9 @@ class KEXI_DB_EXPORT MessageHandler
 	public:
 		enum MessageType { Error, Sorry, Warning };
 
-		/*! Constructs mesage handler, \a tqparent is a widget that will be a tqparent 
+		/*! Constructs mesage handler, \a parent is a widget that will be a parent 
 		 for displaying gui elements (e.g. message boxes). Can be 0 for non-gui usage. */
-		MessageHandler(TQWidget *tqparent = 0);
+		MessageHandler(TQWidget *parent = 0);
 		virtual ~MessageHandler();
 
 		/*! This method can be used to block/unblock messages.
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 7ed1a47b..c2cece0b 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -485,7 +485,7 @@ QuerySchema* buildSelectQuery(
 		}
 	}
 
-	/* set tqparent table if there's only one */
+	/* set parent table if there's only one */
 //	if (parser->select()->tables()->count()==1)
 	if (querySchema->tables()->count()==1)
 		querySchema->setMasterTable(querySchema->tables()->first());
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index d3d1361c..9fa9ca01 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -382,10 +382,10 @@ void ConnectionTestThread::run()
 	m_dlg->error(0);
 }
 
-ConnectionTestDialog::ConnectionTestDialog(TQWidget* tqparent, 
+ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent, 
 	const KexiDB::ConnectionData& data,
 	KexiDB::MessageHandler& msgHandler)
- : KProgressDialog(tqparent, "testconn_dlg",
+ : KProgressDialog(parent, "testconn_dlg",
 	i18n("Test Connection"), i18n("<qt>Testing connection to <b>%1</b> database server...</qt>")
 	.tqarg(data.serverInfoString(true)), true /*modal*/)
  , m_thread(new ConnectionTestThread(this, data))
@@ -483,10 +483,10 @@ void ConnectionTestDialog::slotCancel()
 	KProgressDialog::slotCancel();
 }
 
-void KexiDB::connectionTestDialog(TQWidget* tqparent, const KexiDB::ConnectionData& data, 
+void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData& data, 
 	KexiDB::MessageHandler& msgHandler)
 {
-	ConnectionTestDialog dlg(tqparent, data, msgHandler);
+	ConnectionTestDialog dlg(parent, data, msgHandler);
 	dlg.exec();
 }
 
diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h
index b8ee03b5..ec807d34 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -259,7 +259,7 @@ namespace KexiDB
 	 (within a second thread).
 	 \a data is used to perform a (temporary) test connection. \a msgHandler is used to display errors.
 	 On successful connecting, a message is displayed. After testing, temporary connection is closed. */
-	KEXI_DB_EXPORT void connectionTestDialog(TQWidget* tqparent, const ConnectionData& data, 
+	KEXI_DB_EXPORT void connectionTestDialog(TQWidget* parent, const ConnectionData& data, 
 		MessageHandler& msgHandler);
 
 	/*! Saves connection data \a data into \a map. */
@@ -349,7 +349,7 @@ namespace KexiDB
 	/*! Convenience version of loadPropertyValueFromDom(). \return TQString value. */
 	KEXI_DB_EXPORT TQString loadStringPropertyValueFromDom( const TQDomNode& node, bool* ok );
 
-	/*! Saves integer element for value \a value to \a doc document within tqparent element
+	/*! Saves integer element for value \a value to \a doc document within parent element
 	 \a parentEl. The value will be enclosed in "number" element and "elementName" element.
 	 Example: saveNumberElementToDom(doc, parentEl, "height", 15) will create 
 	 \code
@@ -359,7 +359,7 @@ namespace KexiDB
 	KEXI_DB_EXPORT TQDomElement saveNumberElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 		const TQString& elementName, int value);
 
-	/*! Saves boolean element for value \a value to \a doc document within tqparent element
+	/*! Saves boolean element for value \a value to \a doc document within parent element
 	 \a parentEl. Like saveNumberElementToDom() but creates "bool" tags. True/false values will be
 	 saved as "true"/"false" strings. 
 	 \return the reference to element created with tag elementName. */
diff --git a/kexi/kexidb/utils_p.h b/kexi/kexidb/utils_p.h
index 56c20267..8f10fb5b 100644
--- a/kexi/kexidb/utils_p.h
+++ b/kexi/kexidb/utils_p.h
@@ -34,7 +34,7 @@ class ConnectionTestDialog : protected KProgressDialog
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		ConnectionTestDialog(TQWidget* tqparent, 
+		ConnectionTestDialog(TQWidget* parent, 
 			const KexiDB::ConnectionData& data, KexiDB::MessageHandler& msgHandler);
 		virtual ~ConnectionTestDialog();
 
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index f0a5146c..cbee692d 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -37,10 +37,10 @@ static KTabWidget* debugWindowTab = 0;
 static KListView* kexiDBDebugPage = 0;
 static KListView* kexiAlterTableActionDebugPage = 0;
 
-TQWidget *KexiUtils::createDebugWindow(TQWidget *tqparent)
+TQWidget *KexiUtils::createDebugWindow(TQWidget *parent)
 {
 	// (this is internal code - do not use i18n() here)
-	debugWindow = new DebugWindowDialog(tqparent);
+	debugWindow = new DebugWindowDialog(parent);
 	debugWindow->setSizeGripEnabled( true );
 	TQBoxLayout *lyr = new TQVBoxLayout(debugWindow, KDialogBase::marginHint());
 	debugWindowTab = new KTabWidget(debugWindow, "debugWindowTab");
@@ -127,7 +127,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	TQListViewItem * lastItem = kexiAlterTableActionDebugPage->lastItem();
 	//kdDebug() << "lastItem: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
 	while (lastItem) {
-		lastItem = lastItem->tqparent();
+		lastItem = lastItem->parent();
 		availableNestingLevels++;
 	}
 	//kdDebug() << "availableNestingLevels: " << availableNestingLevels << endl;
@@ -135,7 +135,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	lastItem = kexiAlterTableActionDebugPage->lastItem();
 	int levelsToGoUp = availableNestingLevels - nestingLevel;
 	while (levelsToGoUp > 0 && lastItem) {
-		lastItem = lastItem->tqparent();
+		lastItem = lastItem->parent();
 		levelsToGoUp--;
 	}
 	//kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
@@ -150,8 +150,8 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	}
 	else {
 		lastItem = kexiAlterTableActionDebugPage->lastItem();
-		while (lastItem && lastItem->tqparent())
-			lastItem = lastItem->tqparent();
+		while (lastItem && lastItem->parent())
+			lastItem = lastItem->parent();
 		//kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
 		li = new KListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after
 	}
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index 46e62b7b..da5f7f96 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -93,8 +93,8 @@ TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const T
 
 //--------------------------------------------------------------------------------
 
-IdentifierValidator::IdentifierValidator(TQObject * tqparent, const char * name)
-: Validator(tqparent,name)
+IdentifierValidator::IdentifierValidator(TQObject * parent, const char * name)
+: Validator(parent,name)
 {
 }
 
diff --git a/kexi/kexiutils/identifier.h b/kexi/kexiutils/identifier.h
index 2987019b..e8f6a294 100644
--- a/kexi/kexiutils/identifier.h
+++ b/kexi/kexiutils/identifier.h
@@ -48,7 +48,7 @@ namespace KexiUtils {
 	class KEXIUTILS_EXPORT IdentifierValidator : public Validator
 	{
 		public:
-			IdentifierValidator(TQObject * tqparent = 0, const char * name = 0);
+			IdentifierValidator(TQObject * parent = 0, const char * name = 0);
 			virtual ~IdentifierValidator();
 			virtual State validate( TQString & input, int & pos) const;
 
diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp
index 7d985c32..ca3a42dd 100644
--- a/kexi/kexiutils/longlongvalidator.cpp
+++ b/kexi/kexiutils/longlongvalidator.cpp
@@ -25,15 +25,15 @@
 
 using namespace KexiUtils;
 
-LongLongValidator::LongLongValidator( TQWidget * tqparent, int base, const char * name )
- : TQValidator(TQT_TQOBJECT(tqparent), name)
+LongLongValidator::LongLongValidator( TQWidget * parent, int base, const char * name )
+ : TQValidator(TQT_TQOBJECT(parent), name)
  , m_min(0), m_max(0)
 {
 	setBase(base);
 }
 
-LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * tqparent, int base, const char * name )
-  : TQValidator(TQT_TQOBJECT(tqparent), name)
+LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base, const char * name )
+  : TQValidator(TQT_TQOBJECT(parent), name)
 {
 	setBase(base);
 	setRange( bottom, top );
diff --git a/kexi/kexiutils/longlongvalidator.h b/kexi/kexiutils/longlongvalidator.h
index bd211feb..e1853eec 100644
--- a/kexi/kexiutils/longlongvalidator.h
+++ b/kexi/kexiutils/longlongvalidator.h
@@ -38,8 +38,8 @@ namespace KexiUtils {
 class KEXIUTILS_EXPORT LongLongValidator : public TQValidator
 {
 	public:
-		LongLongValidator( TQWidget * tqparent, int base = 10, const char * name = 0 );
-		LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * tqparent, int base = 10, const char * name = 0 );
+		LongLongValidator( TQWidget * parent, int base = 10, const char * name = 0 );
+		LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base = 10, const char * name = 0 );
 		virtual ~LongLongValidator();
 
 		//! Validates the text, and returns the result.  Does not modify the parameters.
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 118f2d64..d7bdbae8 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -30,23 +30,23 @@ class TQColor;
 //! @short General Utils
 namespace KexiUtils
 {
-	//! \return true if \a o has tqparent \a par.
+	//! \return true if \a o has parent \a par.
 	inline bool hasParent(TQObject* par, TQObject* o)
 	{
 		if (!o || !par)
 			return false;
 		while (o && o!=par)
-			o = o->tqparent();
+			o = o->parent();
 		return o==par;
 	}
 
-	//! \return tqparent object of \a o that inherits \a className or NULL if no such tqparent
+	//! \return parent object of \a o that inherits \a className or NULL if no such parent
 	template<class type>
 	inline type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className)
 	{
 		if (!o || !className || className[0]=='\0')
 			return 0;
-		while ( ((o=TQT_TQOBJECT(o)->tqparent())) && !TQT_TQOBJECT(o)->inherits(className) )
+		while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) )
 			;
 		return static_cast<type*>(o);
 	}
@@ -58,7 +58,7 @@ namespace KexiUtils
 		const TQObject * obj = o;
 		if (!obj || !className || className[0]=='\0')
 			return 0;
-		while ( ((obj=obj->tqparent())) && !obj->inherits(className) )
+		while ( ((obj=obj->parent())) && !obj->inherits(className) )
 			;
 		return static_cast<const type*>(obj);
 	}
@@ -195,7 +195,7 @@ namespace KexiUtils
 
 #ifdef KEXI_DEBUG_GUI
 	//! Creates debug window for convenient debugging output
-	KEXIUTILS_EXPORT TQWidget *createDebugWindow(TQWidget *tqparent);
+	KEXIUTILS_EXPORT TQWidget *createDebugWindow(TQWidget *parent);
 
 	//! Adds debug line for for KexiDB database
 	KEXIUTILS_EXPORT void addKexiDBDebug(const TQString& text);
diff --git a/kexi/kexiutils/utils_p.h b/kexi/kexiutils/utils_p.h
index b91f2237..41d86425 100644
--- a/kexi/kexiutils/utils_p.h
+++ b/kexi/kexiutils/utils_p.h
@@ -44,8 +44,8 @@ class DelayedCursorHandler : public TQObject
 class DebugWindowDialog : public TQDialog
 {
 	public:
-		explicit DebugWindowDialog( TQWidget * tqparent )
-		 : TQDialog(tqparent, 0, false, TQt::WType_Dialog|TQt::WStyle_MinMax|TQt::WStyle_StaysOnTop)
+		explicit DebugWindowDialog( TQWidget * parent )
+		 : TQDialog(parent, 0, false, TQt::WType_Dialog|TQt::WStyle_MinMax|TQt::WStyle_StaysOnTop)
 		{
 			setWindowState( TQt::WindowMinimized );
 		}
diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp
index 54af4ccd..bec7a1ec 100644
--- a/kexi/kexiutils/validator.cpp
+++ b/kexi/kexiutils/validator.cpp
@@ -21,8 +21,8 @@
 
 using namespace KexiUtils;
 
-Validator::Validator(TQObject * tqparent, const char * name)
-: TQValidator(tqparent,name)
+Validator::Validator(TQObject * parent, const char * name)
+: TQValidator(parent,name)
 , m_acceptsEmptyValue(false)
 {
 }
@@ -57,15 +57,15 @@ TQValidator::State Validator::validate ( TQString & , int & ) const
 
 //-----------------------------------------------------------
 
-MultiValidator::MultiValidator(TQObject* tqparent, const char * name)
- : Validator(tqparent, name)
+MultiValidator::MultiValidator(TQObject* parent, const char * name)
+ : Validator(parent, name)
 {
 	m_ownedSubValidators.setAutoDelete(true);
 }
 
 MultiValidator::MultiValidator(TQValidator *validator, 
-	TQObject * tqparent, const char * name)
- : Validator(tqparent, name)
+	TQObject * parent, const char * name)
+ : Validator(parent, name)
 {
 	addSubvalidator(validator);
 }
@@ -76,7 +76,7 @@ void MultiValidator::addSubvalidator( TQValidator* validator, bool owned )
 	if (!validator)
 		return;
 	m_subValidators.append(validator);
-	if (owned && !validator->tqparent())
+	if (owned && !validator->parent())
 		m_ownedSubValidators.append(validator);
 }
 
diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h
index b5c6e6cc..684a30fc 100644
--- a/kexi/kexiutils/validator.h
+++ b/kexi/kexiutils/validator.h
@@ -47,7 +47,7 @@ class KEXIUTILS_EXPORT Validator : public TQValidator
 	public:
 		typedef enum Result { Error = 0, Ok = 1, Warning = 2 };
 
-		Validator(TQObject * tqparent = 0, const char * name = 0);
+		Validator(TQObject * parent = 0, const char * name = 0);
 		virtual ~Validator();
 
 		/*! Sets accepting empty values on (true) or off (false). 
@@ -122,16 +122,16 @@ class KEXIUTILS_EXPORT MultiValidator : public Validator
 	public:
 		/*! Constructs multivalidator with no subvalidators defined.
 		 You can add more validators with addSubvalidator(). */
-		MultiValidator(TQObject * tqparent = 0, const char * name = 0);
+		MultiValidator(TQObject * parent = 0, const char * name = 0);
 
 		/*! Constructs multivalidator with one validator \a validator.
-		 It will be owned if has no tqparent defined.
+		 It will be owned if has no parent defined.
 		 You can add more validators with addSubvalidator(). */
-		MultiValidator(TQValidator *validator, TQObject * tqparent = 0, const char * name = 0);
+		MultiValidator(TQValidator *validator, TQObject * parent = 0, const char * name = 0);
 
 		/*! Adds validator \a validator as another subvalidator.
 		 Subvalidator will be owned by this multivalidator if \a owned is true
-		 and its tqparent is NULL. */
+		 and its parent is NULL. */
 		void addSubvalidator( TQValidator* validator, bool owned = true );
 
 		/*! Reimplemented to call validate() on subvalidators. */
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 6f451aef..0aa0cd35 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -48,18 +48,18 @@ class KexiFindDialog::Private
 		}
 		//! Connects action \a action with appropriate signal \a member
 		//! and optionally adds accel that will receive shortcut for \a action 
-		//! at global scope of the dialog \a tqparent.
-		void setActionAndAccel(KAction *action, TQWidget* tqparent, const char* member)
+		//! at global scope of the dialog \a parent.
+		void setActionAndAccel(KAction *action, TQWidget* parent, const char* member)
 		{
 			if (!action)
 				return;
-			TQObject::connect(tqparent, member, action, TQT_SLOT(activate()));
+			TQObject::connect(parent, member, action, TQT_SLOT(activate()));
 			if (action->shortcut().isNull())
 				return;
-			TQAccel *accel = new TQAccel(tqparent); // we want to handle dialog-wide shortcut as well
+			TQAccel *accel = new TQAccel(parent); // we want to handle dialog-wide shortcut as well
 			accels.append( accel );
 			accel->connectItem(
-				accel->insertItem( action->shortcut() ), tqparent, member );
+				accel->insertItem( action->shortcut() ), parent, member );
 		}
 
 		TQStringList lookInColumnNames;
@@ -75,8 +75,8 @@ class KexiFindDialog::Private
 
 //------------------------------------------
 
-KexiFindDialog::KexiFindDialog( TQWidget* tqparent )
- : KexiFindDialogBase(tqparent, "KexiFindDialog", false/*!modal*/, 
+KexiFindDialog::KexiFindDialog( TQWidget* parent )
+ : KexiFindDialogBase(parent, "KexiFindDialog", false/*!modal*/, 
 	TQt::WType_Dialog|TQt::WStyle_NormalBorder|TQt::WStyle_Title
 	|TQt::WStyle_SysMenu|TQt::WStyle_Customize|TQt::WStyle_Tool)
  , d( new Private() )
diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h
index 4cf55e53..70d13917 100644
--- a/kexi/main/kexifinddialog.h
+++ b/kexi/main/kexifinddialog.h
@@ -37,7 +37,7 @@ class KexiFindDialog : public KexiFindDialogBase
   TQ_OBJECT
 	public:
 		//! Creates a new find dialog. Replace mode is off by default.
-		KexiFindDialog(TQWidget* tqparent);
+		KexiFindDialog(TQWidget* parent);
 		virtual ~KexiFindDialog();
 
 		//! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once.
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index a14ebfbb..37ff1c83 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3514,7 +3514,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			else {
 /*			TQObject* o = tqfocusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
-				o = o->tqparent();*/
+				o = o->parent();*/
 //js				invalidateSharedActions(focus_w);
 			}
 		}
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index c9b78f36..45cbc449 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -20,13 +20,13 @@
 #include "kexinamedialog.h"
 
 KexiNameDialog::KexiNameDialog(const TQString& message, 
-	TQWidget * tqparent, const char * name)
+	TQWidget * parent, const char * name)
  : KDialogBase(KDialogBase::Plain, TQString(),
 	KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help,
 	KDialogBase::Ok,
-	tqparent, name)
+	parent, name)
 {
-//	TQHBox ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 )
+//	TQHBox ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
 	m_widget= new KexiNameWidget(message, plainPage(), "KexiNameWidget");
 	init();
 }
@@ -34,11 +34,11 @@ KexiNameDialog::KexiNameDialog(const TQString& message,
 KexiNameDialog::KexiNameDialog(const TQString& message, 
 	const TQString& nameLabel, const TQString& nameText, 
 	const TQString& captionLabel, const TQString& captionText, 
-	TQWidget * tqparent, const char * name)
+	TQWidget * parent, const char * name)
  : KDialogBase(KDialogBase::Plain, TQString(),
 	KDialogBase::Ok|KDialogBase::Cancel,
 	KDialogBase::Ok,
-	tqparent, name)
+	parent, name)
 {
 	m_widget= new KexiNameWidget(message, nameLabel, nameText,
 		captionLabel, captionText, plainPage(), "KexiNameWidget");
diff --git a/kexi/main/kexinamedialog.h b/kexi/main/kexinamedialog.h
index c4453c0d..365214e2 100644
--- a/kexi/main/kexinamedialog.h
+++ b/kexi/main/kexinamedialog.h
@@ -31,12 +31,12 @@ class KEXIMAIN_EXPORT KexiNameDialog : public KDialogBase
 
 	public:
 		KexiNameDialog(const TQString& message, 
-			TQWidget * tqparent = 0, const char * name = 0);
+			TQWidget * parent = 0, const char * name = 0);
 
 		KexiNameDialog(const TQString& message, 
 			const TQString& nameLabel, const TQString& nameText, 
 			const TQString& captionLabel, const TQString& captionText, 
-			TQWidget * tqparent = 0, const char * name = 0);
+			TQWidget * parent = 0, const char * name = 0);
 		
 		virtual ~KexiNameDialog();
 
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index db061d93..c6ca8f41 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -33,8 +33,8 @@
 using namespace KexiUtils;
 
 KexiNameWidget::KexiNameWidget( const TQString& message, 
-	TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget(tqparent, name, fl)
+	TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget(parent, name, fl)
 {
 	init(message, TQString(), TQString(), TQString(), TQString());
 }
@@ -42,9 +42,9 @@ KexiNameWidget::KexiNameWidget( const TQString& message,
 KexiNameWidget::KexiNameWidget(const TQString& message, 
 	const TQString& nameLabel, const TQString& nameText, 
 	const TQString& captionLabel, const TQString& captionText, 
-	TQWidget * tqparent, const char * name, WFlags fl)
+	TQWidget * parent, const char * name, WFlags fl)
 {
-	Q_UNUSED( tqparent );
+	Q_UNUSED( parent );
 	Q_UNUSED( name );
 	Q_UNUSED( fl );
 
diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h
index 1ab1d106..acbeed5c 100644
--- a/kexi/main/kexinamewidget.h
+++ b/kexi/main/kexinamewidget.h
@@ -36,12 +36,12 @@ class KEXIMAIN_EXPORT KexiNameWidget : public TQWidget
 
 	public:
 		KexiNameWidget(const TQString& message, 
-			TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0);
+			TQWidget * parent = 0, const char * name = 0, WFlags fl = 0);
 
 		KexiNameWidget(const TQString& message, 
 			const TQString& nameLabel, const TQString& nameText, 
 			const TQString& captionLabel, const TQString& captionText, 
-			TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0);
+			TQWidget * parent = 0, const char * name = 0, WFlags fl = 0);
 
 		virtual ~KexiNameWidget(); 
 
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 2e26b356..c6bd3a96 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -30,12 +30,12 @@
 
 #include "kexinewstuff.h"
 
-KexiNewStuff::KexiNewStuff(TQWidget *tqparent)
+KexiNewStuff::KexiNewStuff(TQWidget *parent)
  : KNewStuff( "kexi/template"
 #if KDE_IS_VERSION(3,3,0)
 	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
 #endif
-	, tqparent)
+	, parent)
 {
 	// Prevent GHNS to deny downloading a second time. If GHNS
 	// fails to download something, it still marks the thing as
diff --git a/kexi/main/kexinewstuff.h b/kexi/main/kexinewstuff.h
index 0247e706..e2966841 100644
--- a/kexi/main/kexinewstuff.h
+++ b/kexi/main/kexinewstuff.h
@@ -27,7 +27,7 @@
 class KexiNewStuff : public KNewStuff
 {
 	public:
-		KexiNewStuff(TQWidget *tqparent);
+		KexiNewStuff(TQWidget *parent);
 		virtual ~KexiNewStuff();
 
 		virtual bool install( const TQString &fileName );
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 2d51cad5..bfee9859 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -38,8 +38,8 @@
 #include <ktexteditor/viewstatusmsginterface.h>
 #endif
 
-KexiStatusBar::KexiStatusBar(TQWidget *tqparent, const char *name)
-    : KStatusBar(tqparent, name)
+KexiStatusBar::KexiStatusBar(TQWidget *parent, const char *name)
+    : KStatusBar(parent, name)
 #if KexiStatusBar_KTEXTEDITOR_USED
 	, m_cursorIface(0)
 #endif
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index 0cd5f6c6..c498e2f5 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -43,7 +43,7 @@ class KexiStatusBar : public KStatusBar
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiStatusBar( TQWidget *tqparent=0, const char *name=0 );
+		KexiStatusBar( TQWidget *parent=0, const char *name=0 );
 		virtual ~KexiStatusBar();
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index 9bf359b1..3fe7b28d 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -51,12 +51,12 @@ class KDockSplitter : public TQWidget
 public:
   /**
    * Constructor.
-   * @param tqparent tqparent widget
+   * @param parent parent widget
    * @param name name
    * @param orient orientation. Either @pQt::Vertical or @pQt::Horizontal
    * @param pos procentual position of the splitter. Must be int [0...100].
    */
-  KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
+  KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
   virtual ~KDockSplitter(){};
 
   /**
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 59a86efd..45ab5892 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -116,8 +116,8 @@ void KexiSimplePrintingSettings::save()
 //------------------------
 
 KexiSimplePrintingEngine::KexiSimplePrintingEngine(
-	const KexiSimplePrintingSettings& settings, TQObject* tqparent)
- : TQObject(tqparent, "KexiSimplePrintingEngine")
+	const KexiSimplePrintingSettings& settings, TQObject* parent)
+ : TQObject(parent, "KexiSimplePrintingEngine")
  , m_settings(&settings)
  , m_pdm(0)
 {
diff --git a/kexi/main/printing/kexisimpleprintingengine.h b/kexi/main/printing/kexisimpleprintingengine.h
index f3a5371d..8c6d995d 100644
--- a/kexi/main/printing/kexisimpleprintingengine.h
+++ b/kexi/main/printing/kexisimpleprintingengine.h
@@ -60,7 +60,7 @@ class KexiSimplePrintingEngine : public TQObject
   TQ_OBJECT
 
 	public:
-		KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* tqparent );
+		KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* parent );
 		~KexiSimplePrintingEngine();
 
 		bool init(KexiDB::Connection& conn, KexiDB::TableOrQuerySchema& tableOrQuery,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index f528cb23..f8634e82 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -47,8 +47,8 @@
 #include <kexiutils/tristate.h>
 
 KexiSimplePrintingCommand::KexiSimplePrintingCommand(
-	KexiMainWindow* mainWin, int objectId, TQObject* tqparent)
- : TQObject(tqparent, "KexiSimplePrintCommand")
+	KexiMainWindow* mainWin, int objectId, TQObject* parent)
+ : TQObject(parent, "KexiSimplePrintCommand")
  , m_previewEngine(0)
  , m_mainWin(mainWin)
  , m_objectId(objectId)
@@ -297,9 +297,9 @@ void KexiSimplePrintingCommand::slotShowPageSetupRequested()
 
 //----------------------------------------------------------
 
-KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, 
+KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *parent, 
 	TQMap<TQString,TQString>* args )
-	: KexiViewBase( mainWin, tqparent, "KexiSimplePrintingPageSetup" )
+	: KexiViewBase( mainWin, parent, "KexiSimplePrintingPageSetup" )
 	, m_settings( KexiSimplePrintingSettings::load() )
 //	, m_command(0)
 {
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.h b/kexi/main/printing/kexisimpleprintingpagesetup.h
index b2fbc668..6efd1314 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.h
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.h
@@ -42,7 +42,7 @@ class KexiSimplePrintingCommand : public TQObject
 
 	public:
 		KexiSimplePrintingCommand(KexiMainWindow* mainWin, int objectId, 
-			TQObject* tqparent = 0);
+			TQObject* parent = 0);
 		~KexiSimplePrintingCommand();
 
 	public slots:
@@ -76,7 +76,7 @@ class KexiSimplePrintingPageSetup : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, TQMap<TQString,TQString>* args );
+		KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *parent, TQMap<TQString,TQString>* args );
 		~KexiSimplePrintingPageSetup();
 
 	public slots:
diff --git a/kexi/main/printing/kexisimpleprintingpart.cpp b/kexi/main/printing/kexisimpleprintingpart.cpp
index ca751003..048f92ae 100644
--- a/kexi/main/printing/kexisimpleprintingpart.cpp
+++ b/kexi/main/printing/kexisimpleprintingpart.cpp
@@ -48,12 +48,12 @@ KexiSimplePrintingPart::~KexiSimplePrintingPart()
 {
 }
 
-KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* args)
 {
 	Q_UNUSED( item );
 	if (viewMode == Kexi::DesignViewMode) {
-		KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), tqparent, args );
+		KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), parent, args );
 		return w;
 	}
 
diff --git a/kexi/main/printing/kexisimpleprintingpart.h b/kexi/main/printing/kexisimpleprintingpart.h
index 6e44ff4c..00c44b50 100644
--- a/kexi/main/printing/kexisimpleprintingpart.h
+++ b/kexi/main/printing/kexisimpleprintingpart.h
@@ -44,7 +44,7 @@ class KexiSimplePrintingPart : public KexiPart::StaticPart
 		virtual ~KexiSimplePrintingPart();
 
 	protected:
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* staticObjectArgs);
 };
 
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 960a23b2..68c1c673 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -36,8 +36,8 @@
 #include <kapplication.h>
 
 KexiSimplePrintPreviewView::KexiSimplePrintPreviewView(
-	TQWidget *tqparent, KexiSimplePrintPreviewWindow *window)
- : TQWidget(tqparent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase)
+	TQWidget *parent, KexiSimplePrintPreviewWindow *window)
+ : TQWidget(parent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase)
  , m_window(window)
 {
 	enablePainting = false;
@@ -150,8 +150,8 @@ void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
 
 KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	KexiSimplePrintingEngine &engine, const TQString& previewName, 
-	TQWidget *tqparent, WFlags f)
- : TQWidget(tqparent, "KexiSimplePrintPreviewWindow", f)
+	TQWidget *parent, WFlags f)
+ : TQWidget(parent, "KexiSimplePrintPreviewWindow", f)
  , m_engine(engine)
  , m_settings(*m_engine.settings())
  , m_pageNumber(-1)
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h
index d3119339..35870285 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h
@@ -38,7 +38,7 @@ class KexiSimplePrintPreviewWindow : public TQWidget
 
 	public:
 		KexiSimplePrintPreviewWindow(KexiSimplePrintingEngine &engine,
-			const TQString& previewName, TQWidget *tqparent, WFlags f = 0);
+			const TQString& previewName, TQWidget *parent, WFlags f = 0);
 		~KexiSimplePrintPreviewWindow();
 
 		int currentPage() const { return m_pageNumber; }
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
index 2c72e8a1..5246d329 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
@@ -25,7 +25,7 @@
 class KexiSimplePrintPreviewView : public TQWidget
 {
 	public:
-		KexiSimplePrintPreviewView(TQWidget *tqparent, KexiSimplePrintPreviewWindow *window);
+		KexiSimplePrintPreviewView(TQWidget *parent, KexiSimplePrintPreviewWindow *window);
 
 		virtual void paintEvent( TQPaintEvent *pe );
 
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 797dcc2a..a9a2a316 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -101,8 +101,8 @@ public:
 /*================================================================*/
 
 KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
-	const TQString& startDirOrVariable, TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+	const TQString& startDirOrVariable, TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 	,d(new KexiConnSelectorWidgetPrivate())
 {
 	d->conn_set = &conn_set;
diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index 2f4a9fe9..c42fc536 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -67,7 +67,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget
 		 in KRecentDirs documentation). */
 		KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
 			const TQString& startDirOrVariable, 
-			TQWidget* tqparent = 0, const char* name = 0 );
+			TQWidget* parent = 0, const char* name = 0 );
 
 		virtual ~KexiConnSelectorWidget();
 		
diff --git a/kexi/main/startup/KexiDBTitlePage.cpp b/kexi/main/startup/KexiDBTitlePage.cpp
index 4d686039..7c97440c 100644
--- a/kexi/main/startup/KexiDBTitlePage.cpp
+++ b/kexi/main/startup/KexiDBTitlePage.cpp
@@ -21,8 +21,8 @@
 
 #include <tqlabel.h>
 
-KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent, const char* name )
- : KexiDBTitlePageBase( tqparent, name )
+KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* parent, const char* name )
+ : KexiDBTitlePageBase( parent, name )
 {
 	if (!labelText.isEmpty())
 		label->setText(labelText);
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 15030c7b..4ac59bc0 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -31,7 +31,7 @@ class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
 public:
 	//! Constructs title page. \a labelText can be provided to change default 
 	//! "Project caption:" label.
-	KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent = 0, const char* name = 0 );
+	KexiDBTitlePage( const TQString& labelText, TQWidget* parent = 0, const char* name = 0 );
 	~KexiDBTitlePage();
 	
 protected slots:
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 9e897e8f..b24a66ab 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -84,8 +84,8 @@ class KexiNewProjectWizardPrivate
 };
 
 KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
-	TQWidget *tqparent, const char *name, bool modal, WFlags f)
-: KWizard(tqparent, name, modal, f)
+	TQWidget *parent, const char *name, bool modal, WFlags f)
+: KWizard(parent, name, modal, f)
 , d(new KexiNewProjectWizardPrivate() )
 {
 	d->msgHandler = new KexiGUIMessageHandler(this);
diff --git a/kexi/main/startup/KexiNewProjectWizard.h b/kexi/main/startup/KexiNewProjectWizard.h
index 18dab257..ff16b996 100644
--- a/kexi/main/startup/KexiNewProjectWizard.h
+++ b/kexi/main/startup/KexiNewProjectWizard.h
@@ -39,7 +39,7 @@ class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *tqparent=0, 
+		KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *parent=0, 
 			const char *name=0, bool modal=false, WFlags f=0);
 		~KexiNewProjectWizard();
 	
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 55aa930f..9353e3a6 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -91,14 +91,14 @@ public:
 /*================================================================*/
 
 /*!
- *  Constructs a KexiProjectSelector which is a child of 'tqparent', with the 
+ *  Constructs a KexiProjectSelector which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 KexiProjectSelectorWidget::KexiProjectSelectorWidget( 
-	TQWidget* tqparent, const char* name, 
+	TQWidget* parent, const char* name, 
 	KexiProjectSet* prj_set, bool showProjectNameColumn,
 	bool showConnectionColumns )
-    : KexiProjectSelectorBase( tqparent, name )
+    : KexiProjectSelectorBase( parent, name )
 	,m_prj_set(prj_set)
 	,d(new KexiProjectSelectorWidgetPrivate())
 {
@@ -217,19 +217,19 @@ bool KexiProjectSelectorWidget::isSelectable() const
 
 /*================================================================*/
 
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 	KexiProjectSet* prj_set, bool showProjectNameColumn, bool showConnectionColumns)
 	: KDialogBase( Plain, i18n("Open Recent Project"), 
 #ifndef KEXI_NO_UNFINISHED 
 	//! @todo re-add Help when doc is available
 	Help | 
 #endif
-	Ok | Cancel, Ok, tqparent, name )
+	Ok | Cancel, Ok, parent, name )
 {
 	init(prj_set, showProjectNameColumn, showConnectionColumns);
 }
 
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 	KexiDB::ConnectionData* cdata, 
 	bool showProjectNameColumn, bool showConnectionColumns)
 	: KDialogBase( 
@@ -238,7 +238,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const
 	//! @todo re-add Help when doc is available
 	Help | 
 #endif
-	Ok | Cancel, Ok, tqparent, name, true/*modal*/, false/*sep*/ )
+	Ok | Cancel, Ok, parent, name, true/*modal*/, false/*sep*/ )
 {
 	setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection")));
 	assert(cdata);
diff --git a/kexi/main/startup/KexiProjectSelector.h b/kexi/main/startup/KexiProjectSelector.h
index 91c13712..43c6a6b5 100644
--- a/kexi/main/startup/KexiProjectSelector.h
+++ b/kexi/main/startup/KexiProjectSelector.h
@@ -45,7 +45,7 @@ public:
 	 information about database driver and connection columns are added.
 	 \a prj_set may be NULL - you can assign a set later with setProjectSet().
 	*/
-	KexiProjectSelectorWidget( TQWidget* tqparent = 0, const char* name = 0, 
+	KexiProjectSelectorWidget( TQWidget* parent = 0, const char* name = 0, 
 		KexiProjectSet* prj_set = 0, bool showProjectNameColumn = true,
 		bool showConnectionColumns = true );
     
@@ -99,7 +99,7 @@ public:
 	/*! Constructor 1, used for displaying recent projects list
 	 Label "there are recently opened projects" is displayed automatically
 	*/
-	KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+	KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 		KexiProjectSet* prj_set, 
 		bool showProjectNameColumn = true, bool showConnectionColumns = true);
 
@@ -107,7 +107,7 @@ public:
 	 Label "Select one of these existing projects on server" is displayed automatically
 	 You should test if project set was properly loaded using projectSet()->error().
 	*/
-	KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+	KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 		KexiDB::ConnectionData* cdata, 
 		bool showProjectNameColumn = true, bool showConnectionColumns = true);
 	
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 13becfc8..61746d5c 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -134,9 +134,9 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 
 //---------------------------------
 
-KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
+KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
  : KPasswordDialog( KPasswordDialog::Password, false/*keep*/, 
-	showDetailsButton ? (int)KDialogBase::User1 : 0, tqparent )
+	showDetailsButton ? (int)KDialogBase::User1 : 0, parent )
  , m_cdata(&cdata)
  , m_showConnectionDetailsRequested(false)
 {
@@ -739,7 +739,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 
 tristate KexiStartupHandler::detectActionForFile( 
 	KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
-	const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *tqparent, int options )
+	const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *parent, int options )
 {
 	detectedImportAction = KexiStartupData::Import(); //clear
 	TQString suggestedDriverName(_suggestedDriverName); //safe
@@ -747,7 +747,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	TQFileInfo finfo(dbFileName);
 	if (dbFileName.isEmpty() || !finfo.isReadable()) {
 		if (!(options & SkipMessages))
-			KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+			KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 				+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
 				.tqarg(TQDir::convertSeparators(dbFileName))
 				+i18n("Check the file's permissions and whether it is already opened "
@@ -779,7 +779,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!f.open(IO_ReadOnly)) {
 			// BTW: similar error msg is provided in SQLiteConnection::drv_useDatabase()
 			if (!(options & SkipMessages))
-				KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+				KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 					+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
 					.tqarg(TQDir::convertSeparators(dbFileName))
 					+i18n("Check the file's permissions and whether it is already opened "
@@ -802,7 +802,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (ptr.data()) {
 		if (mimename=="application/x-msaccess") {
 			if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
-				tqparent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
+				parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
 				"Do you want to import the file as a Kexi project?")
 				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
 				i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
@@ -826,7 +826,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (!useDetectedDriver) {
 		int res = KMessageBox::Yes;
 		if (!(options & SkipMessages))
-			res = KMessageBox::warningYesNoCancel(tqparent, i18n(
+			res = KMessageBox::warningYesNoCancel(parent, i18n(
 			 "The project file \"%1\" is recognized as compatible with \"%2\" database driver, "
 			 "while you have asked for \"%3\" database driver to be used.\n"
 			 "Do you want to use \"%4\" database driver?")
@@ -848,7 +848,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	const TQString newFileFormat = "SQLite3";
 	if (!(options & DontConvert || options & SkipMessages) 
 		&& detectedDriverName.lower()=="sqlite2" && detectedDriverName.lower()!=suggestedDriverName.lower()
-		&& KMessageBox::Yes == KMessageBox::questionYesNo(tqparent, i18n(
+		&& KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
 			"Previous version of database file format (\"%1\") is detected in the \"%2\" "
 			"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
 			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
@@ -859,7 +859,7 @@ tristate KexiStartupHandler::detectActionForFile(
 //		kdDebug() << "--- migr.run() END ---" <<endl;
 		if (!res) {
 			//TODO msg
-			KMessageBox::sorry(tqparent, i18n(
+			KMessageBox::sorry(parent, i18n(
 				"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
 				"The file format remains unchanged.")
 				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
@@ -876,7 +876,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
-			KMessageBox::detailedSorry(tqparent, 
+			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
 					.tqarg(TQDir::convertSeparators(dbFileName)),
 				TQString::tqfromLatin1("<p>")
@@ -892,7 +892,7 @@ tristate KexiStartupHandler::detectActionForFile(
 }
 
 KexiProjectData*
-KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent)
+KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
 	cleartqStatus();
 	cancelled = false;
@@ -911,7 +911,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 	}
 	KexiProjectData* projectData = 0;
 	//dialog for selecting a project
-	KexiProjectSelectorDialog prjdlg( tqparent, "prjdlg", cdata, true, false );
+	KexiProjectSelectorDialog prjdlg( parent, "prjdlg", cdata, true, false );
 	if (!prjdlg.projectSet() || prjdlg.projectSet()->error()) {
 		KexiGUIMessageHandler msgh;
 		if (prjdlg.projectSet())
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index 22c55440..fe1b3cf0 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -42,7 +42,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
+		KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
 		virtual ~KexiDBPasswordDialog();
 
 		bool showConnectionDetailsRequested() const { return m_showConnectionDetailsRequested; }
@@ -73,12 +73,12 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 	#if 0
 		/*! Used for opening existing projects. 
 		 Detects project file type by mime type and returns project data, if it can be detected,
-		 otherwise - NULL. \a tqparent is passed as tqparent for potential error message boxes.
+		 otherwise - NULL. \a parent is passed as parent for potential error message boxes.
 		 Also uses \a cdata connection data for server-based projects.
 		 cdata.driverName is adjusted, if a file-based project has been detected.
 		*/
 		static KexiProjectData* detectProjectData( 
-			KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *tqparent);
+			KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *parent);
 	#endif
 
 		/*! Options for detectDriverForFile() */
@@ -103,20 +103,20 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 		 - "shortcut" if the file looks like a shortcut to a project/connection file
 		 - "connection" if the file looks like a connection data file.
 
-		 \a tqparent is passed as a tqparent for potential error message boxes.
+		 \a parent is passed as a parent for potential error message boxes.
 		 \a driverName is a preferred driver name. 
 		 \a options should be a combination of DetectDriverForFileOptions enum values. */
 		static tristate detectActionForFile( 
 			KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
 			const TQString& _suggestedDriverName, 
-			const TQString &dbFileName, TQWidget *tqparent = 0, int options = 0 );
+			const TQString &dbFileName, TQWidget *parent = 0, int options = 0 );
 
 		/*! Allows user to select a project with KexiProjectSelectorDialog.
 			\return selected project's data
 			Returns NULL and sets cancelled to true if the dialog was cancelled.
 			Returns NULL and sets cancelled to false if there was an error.
 		*/
-		KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent = 0);
+		KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent = 0);
 
 	protected slots:
 		void slotSaveShortcutFileChanges();
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 40ced9b1..43666706 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -142,21 +142,21 @@ TQString captionForDialogType(int type)
 }
 
 /*================================================================*/
-/*KexiStartupDialog::KexiStartupDialog(TQWidget *tqparent, const char *name, KInstance* global,
+/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
 	const TQCString &format, const TQString &nativePattern,
 	const TQString &nativeName, const DialogType &dialogType,
 	const TQCString& templateType) :
-	KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
+	KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
 	KDialogBase::Ok) {
 */
 KexiStartupDialog::KexiStartupDialog(
 	int dialogType, int dialogOptions,
 	KexiDBConnectionSet& connSet, KexiProjectSet& recentProjects,
-	TQWidget *tqparent, const char *name )
+	TQWidget *parent, const char *name )
  : KDialogBase(
  	dlgSinglePage(dialogType) ? Plain : Tabbed
 	,captionForDialogType(dialogType)
- 	,Help | Ok | Cancel, Ok, tqparent, name )
+ 	,Help | Ok | Cancel, Ok, parent, name )
  , d(new KexiStartupDialogPrivate())
 {
 	d->recentProjects = &recentProjects;
diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h
index 0f994ff3..aad9ec9e 100644
--- a/kexi/main/startup/KexiStartupDialog.h
+++ b/kexi/main/startup/KexiStartupDialog.h
@@ -89,7 +89,7 @@ public:
 	 @param recentProjects a set of recent projects' info, used for "Open recent" tab
 	 @param connSet conenction set used to present available conenctions
 	  in "Open Existing" tab. Pass an empty object is this tab is not used.
-	 @param tqparent tqparent widget, if any.
+	 @param parent parent widget, if any.
 	 @param name name of this object.
 	 */
 	KexiStartupDialog(
@@ -97,7 +97,7 @@ public:
 		int dialogOptions,
 		KexiDBConnectionSet& connSet,
 		KexiProjectSet& recentProjects,
-		TQWidget *tqparent = 0, const char *name = 0 );
+		TQWidget *parent = 0, const char *name = 0 );
 	~KexiStartupDialog();
 
 	/*! \return true if startup dialog should be shown (info is taken from kexi config)
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 52fe0870..429499f4 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -52,10 +52,10 @@
 class TemplateItem : public KListViewItem
 {
 	public:
-		TemplateItem(TQListView* tqparent, const TQString& aFilename, 
+		TemplateItem(TQListView* parent, const TQString& aFilename, 
 			const TQString& name, const TQString& description, const TQPixmap& icon, 
 			const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects)
-		: KListViewItem(tqparent, name + "\n" + description)
+		: KListViewItem(parent, name + "\n" + description)
 		, autoopenObjects(aAutoopenObjects)
 		, filename(aFilename)
 		{
@@ -69,8 +69,8 @@ class TemplateItem : public KListViewItem
 
 //-----------------------
 
-KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * tqparent )
-	: KListView(tqparent, "KexiStartupDialogTemplatesPage")
+KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent )
+	: KListView(parent, "KexiStartupDialogTemplatesPage")
 	, m_popuplated(false)
 {
 	addColumn(TQString());
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 2cf50b7b..2c7058d4 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -30,7 +30,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView
   TQ_OBJECT
 	
 	public:
-		KexiStartupDialogTemplatesPage( TQWidget * tqparent = 0 );
+		KexiStartupDialogTemplatesPage( TQWidget * parent = 0 );
 		~KexiStartupDialogTemplatesPage(); 
 //		void addItem(const TQString& key, const TQString& name, 
 //			const TQString& description, const TQPixmap& icon);
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index ed4dcd40..cd54602b 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -37,8 +37,8 @@
 
 KexiStartupFileDialog::KexiStartupFileDialog(
 		const TQString& startDirOrVariable, int mode,
-		TQWidget *tqparent, const char *name)
-	:  KexiStartupFileDialogBase(startDirOrVariable, "", tqparent, name, 0)
+		TQWidget *parent, const char *name)
+	:  KexiStartupFileDialogBase(startDirOrVariable, "", parent, name, 0)
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
@@ -323,12 +323,12 @@ bool KexiStartupFileDialog::checkFileName()
 }
 
 //static 
-bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *tqparent)
+bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *parent)
 {
 	TQFileInfo fi(filePath);
 	if (!fi.exists())
 		return true;
-	const int res = KMessageBox::warningYesNo( tqparent, i18n( "The file \"%1\" already exists.\n"
+	const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
 		"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), 
 			i18n("Overwrite"), KStdGuiItem::no() );
 	if (res == KMessageBox::Yes)
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 12fc3ef4..c85797db 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -50,15 +50,15 @@ public:
 	};
 	
 	KexiStartupFileDialog(
-		const TQString& startDirOrVariable, int mode, TQWidget *tqparent=0, const char *name=0);
+		const TQString& startDirOrVariable, int mode, TQWidget *parent=0, const char *name=0);
 
 	virtual ~KexiStartupFileDialog();
 
 	/*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box.
-	 \a tqparent is used as a tqparent of the KMessageBox.
+	 \a parent is used as a parent of the KMessageBox.
 	 \return true if \a filePath file does not exists or user has agreed on overwriting,
 	 false in user do not want to overwrite. */
-	static bool askForOverwriting(const TQString& filePath, TQWidget *tqparent = 0);
+	static bool askForOverwriting(const TQString& filePath, TQWidget *parent = 0);
 
 	void setMode(int mode);
 
diff --git a/kexi/main/startup/KexiStartupFileDialogBase_win.h b/kexi/main/startup/KexiStartupFileDialogBase_win.h
index 00742c69..9231b744 100644
--- a/kexi/main/startup/KexiStartupFileDialogBase_win.h
+++ b/kexi/main/startup/KexiStartupFileDialogBase_win.h
@@ -33,7 +33,7 @@ class KexiStartupFileDialogBase : public TQFileDialog
 {
 public:
 	KexiStartupFileDialogBase(const TQString & dirName, const TQString & filter = TQString(), 
-		TQWidget * tqparent = 0, const char * name = 0, bool modal = false );
+		TQWidget * parent = 0, const char * name = 0, bool modal = false );
 	~KexiStartupFileDialogBase();
 
 	TQPushButton * okButton() const { return m_okBtn; }
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index e716a607..c81de131 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -47,8 +47,8 @@ class KexiStartupFileDialogBasePrivate
 
 KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	const TQString & dirName, const TQString & filter, 
-	TQWidget * tqparent, const char * name, bool modal )
- : TQFileDialog( realStartDir(dirName), filter, tqparent, name, modal )
+	TQWidget * parent, const char * name, bool modal )
+ : TQFileDialog( realStartDir(dirName), filter, parent, name, modal )
  , d(new KexiStartupFileDialogBasePrivate())
 {
 //	TQString _dirName = dirName;
@@ -58,7 +58,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	if (_dirName.isEmpty())
 		_dirName = KGlobalSettings::documentPath();
 
-	init(_dirName, filter, tqparent);
+	init(_dirName, filter, parent);
 
 	//find "OK" button
 	TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false );
@@ -183,7 +183,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
     // plug nav items into the toolbar
     coll->action( "up" )->plug( toolbar );
-    coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the tqparent directory.<p>"
+    coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
                                             "For instance, if the current location is file:/home/%1 clicking this "
                                             "button will take you to file:/home.</qt>").tqarg(getlogin()));
     coll->action( "back" )->plug( toolbar );
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 4741bf5c..50d6726d 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -36,13 +36,13 @@
 
 using namespace KexiMigration;
 
-OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* tqparent )
+OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* parent )
  : KDialogBase( 
 	KDialogBase::Plain, 
 	i18n( "Advanced Import Options" ),
 	Ok|Cancel, 
 	Ok,
-	tqparent, 
+	parent, 
 	"KexiMigration::OptionsDialog", 
 	true, 
 	false
diff --git a/kexi/migration/importoptionsdlg.h b/kexi/migration/importoptionsdlg.h
index f40e8230..e24e37c7 100644
--- a/kexi/migration/importoptionsdlg.h
+++ b/kexi/migration/importoptionsdlg.h
@@ -35,7 +35,7 @@ class OptionsDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* tqparent = 0 );
+		OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* parent = 0 );
 		virtual ~OptionsDialog();
 
 		KexiCharacterEncodingComboBox* encodingComboBox() const;
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index b97b6fcf..9c1b4559 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -58,8 +58,8 @@ using namespace KexiMigration;
 
 //===========================================================
 //
-ImportWizard::ImportWizard(TQWidget *tqparent, TQMap<TQString,TQString>* args)
- : KWizard(tqparent)
+ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
+ : KWizard(parent)
  , m_args(args)
 {
 	setCaption(i18n("Import Database"));
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index 95da22cd..8d3a82b0 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -69,7 +69,7 @@ public:
 	 \a args contains arguments that can be parsed by parseArguments().
 	 \a *arg will be also set to imported project's filename on success
 	 and to null value on failure or cancellation. */
-	ImportWizard(TQWidget *tqparent = 0, TQMap<TQString,TQString>* args = 0);
+	ImportWizard(TQWidget *parent = 0, TQMap<TQString,TQString>* args = 0);
 	virtual ~ImportWizard();
 
 public slots:
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index fc11d0cd..b225f6ba 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -33,9 +33,9 @@
 using namespace KexiDB;
 using namespace KexiMigration;
 
-KexiMigrate::KexiMigrate(TQObject *tqparent, const char *name,
+KexiMigrate::KexiMigrate(TQObject *parent, const char *name,
   const TQStringList&) 
-  : TQObject( tqparent, name )
+  : TQObject( parent, name )
   , m_migrateData(0)
   , m_destPrj(0)
 {
diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h
index b897bd95..ee22ded8 100644
--- a/kexi/migration/keximigrate.h
+++ b/kexi/migration/keximigrate.h
@@ -145,7 +145,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
 
 	protected:
 		//! Used by MigrateManager.
-		KexiMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList());
+		KexiMigrate(TQObject *parent, const char *name, const TQStringList &args = TQStringList());
 
 		//! Connect to source database (driver specific)
 		virtual bool drv_connect() = 0;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 1ea152c6..1b125d8d 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -52,9 +52,9 @@ KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql )
 }*/
 
 //! Constructor (needed for trading interface)
-MySQLMigrate::MySQLMigrate(TQObject *tqparent, const char *name,
+MySQLMigrate::MySQLMigrate(TQObject *parent, const char *name,
                            const TQStringList &args) :
-	KexiMigrate(tqparent, name, args)
+	KexiMigrate(parent, name, args)
 	,d(new MySqlConnectionInternal(0))
 	,m_mysqlres(0)
 {
diff --git a/kexi/migration/mysql/mysqlmigrate.h b/kexi/migration/mysql/mysqlmigrate.h
index e7627e76..8f223ac5 100644
--- a/kexi/migration/mysql/mysqlmigrate.h
+++ b/kexi/migration/mysql/mysqlmigrate.h
@@ -68,7 +68,7 @@ namespace KexiMigration
 
 		public:
 //			MySQLMigrate();
-			MySQLMigrate(TQObject *tqparent, const char *name, const TQStringList& args = TQStringList());
+			MySQLMigrate(TQObject *parent, const char *name, const TQStringList& args = TQStringList());
 			~MySQLMigrate();
 			
 			KexiDB::Field::Type type(const TQString& table, const MYSQL_FIELD* t);
diff --git a/kexi/migration/pqxx/pg_type.h b/kexi/migration/pqxx/pg_type.h
index a8b94f0a..e0ead91a 100644
--- a/kexi/migration/pqxx/pg_type.h
+++ b/kexi/migration/pqxx/pg_type.h
@@ -152,10 +152,10 @@
 //XX:XX:XX:XX:XX:XX, MAC address
 #define MACADDROID 		829
 
-//IP address/nettqmask, host address, nettqmask optional
+//IP address/netmask, host address, netmask optional
 #define INETOID 		869
 
-//network IP address/nettqmask, network address
+//network IP address/netmask, network address
 #define CIDROID 		650
 
 //access control list
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index c01d68fd..d6c655f9 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -50,15 +50,15 @@ KEXIMIGRATE_DRIVER_INFO( PqxxMigrate, pqxx )
 //==================================================================================
 //Constructor
 /*PqxxMigrate::PqxxMigrate()
- : KexiMigrate(tqparent, name, args)
+ : KexiMigrate(parent, name, args)
 {
     m_res=0;
     m_trans=0;
     m_conn=0;
 }*/
 
-PqxxMigrate::PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiMigrate(tqparent, name, args)
+PqxxMigrate::PqxxMigrate(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiMigrate(parent, name, args)
 {
     m_res=0;
     m_trans=0;
diff --git a/kexi/migration/pqxx/pqxxmigrate.h b/kexi/migration/pqxx/pqxxmigrate.h
index ee33c138..6202c0db 100644
--- a/kexi/migration/pqxx/pqxxmigrate.h
+++ b/kexi/migration/pqxx/pqxxmigrate.h
@@ -38,7 +38,7 @@ namespace KexiMigration
 		KEXIMIGRATION_DRIVER
 
 		public:
-			PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList());
+			PqxxMigrate(TQObject *parent, const char *name, const TQStringList &args = TQStringList());
 			virtual ~PqxxMigrate();
 			
 		protected:
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 9318bb5e..61585840 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -51,18 +51,18 @@ typedef KListViewItemTemplate<TQString> ActionSelectorDialogListItemBase;
 class ActionSelectorDialogListItem : public ActionSelectorDialogListItemBase
 {
 public:
-	ActionSelectorDialogListItem(const TQString& data, TQListView *tqparent, TQString label1)
-	 : ActionSelectorDialogListItemBase(data, tqparent, label1)
+	ActionSelectorDialogListItem(const TQString& data, TQListView *parent, TQString label1)
+	 : ActionSelectorDialogListItemBase(data, parent, label1)
 	 , fifoSorting(true)
 	{
-		m_sortKey.sprintf("%2.2d", tqparent->childCount());
+		m_sortKey.sprintf("%2.2d", parent->childCount());
 	}
 
-	ActionSelectorDialogListItem(const TQString& data, TQListViewItem *tqparent, TQString label1)
-	 : ActionSelectorDialogListItemBase(data, tqparent, label1)
+	ActionSelectorDialogListItem(const TQString& data, TQListViewItem *parent, TQString label1)
+	 : ActionSelectorDialogListItemBase(data, parent, label1)
 	 , fifoSorting(true)
 	{
-		m_sortKey.sprintf("%2.2d", tqparent->childCount());
+		m_sortKey.sprintf("%2.2d", parent->childCount());
 	}
 
 	virtual TQString key( int column, bool ascending ) const
@@ -78,8 +78,8 @@ protected:
 
 //---------------------------------------
 
-ActionsListViewBase::ActionsListViewBase(TQWidget* tqparent)
- : KListView(tqparent)
+ActionsListViewBase::ActionsListViewBase(TQWidget* parent)
+ : KListView(parent)
 {
 	setResizeMode(TQListView::AllColumns);
 	addColumn("");
@@ -115,8 +115,8 @@ void ActionsListViewBase::selectAction(const TQString& actionName)
 
 //---------------------------------------
 
-KActionsListViewBase::KActionsListViewBase(TQWidget* tqparent, KexiMainWindow* mainWin)
-	: ActionsListViewBase(tqparent)
+KActionsListViewBase::KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin)
+	: ActionsListViewBase(parent)
 	, m_mainWin(mainWin)
 {
 }
@@ -156,8 +156,8 @@ void KActionsListViewBase::init()
 class KActionsListView : public KActionsListViewBase
 {
 public:
-	KActionsListView(TQWidget* tqparent, KexiMainWindow* mainWin)
-		: KActionsListViewBase(tqparent, mainWin)
+	KActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
+		: KActionsListViewBase(parent, mainWin)
 	{
 	}
 	virtual ~KActionsListView() {}
@@ -172,8 +172,8 @@ public:
 class CurrentFormActionsListView : public KActionsListViewBase
 {
 public:
-	CurrentFormActionsListView(TQWidget* tqparent, KexiMainWindow* mainWin)
-		: KActionsListViewBase(tqparent, mainWin)
+	CurrentFormActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
+		: KActionsListViewBase(parent, mainWin)
 	{
 	}
 	virtual ~CurrentFormActionsListView() {}
@@ -188,8 +188,8 @@ public:
 class ActionCategoriesListView : public ActionsListViewBase
 {
 public:
-	ActionCategoriesListView(TQWidget* tqparent) //, KexiProject& project)
-	 : ActionsListViewBase(tqparent)
+	ActionCategoriesListView(TQWidget* parent) //, KexiProject& project)
+	 : ActionsListViewBase(parent)
 	{
 		TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") );
 		const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
@@ -243,8 +243,8 @@ public:
 class ActionToExecuteListView : public ActionsListViewBase
 {
 	public:
-		ActionToExecuteListView(TQWidget* tqparent)
-		 : ActionsListViewBase(tqparent)
+		ActionToExecuteListView(TQWidget* parent)
+		 : ActionsListViewBase(parent)
 		{
 		}
 
@@ -394,9 +394,9 @@ public:
 
 //-------------------------------------
 
-KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *tqparent, 
+KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *parent, 
 	const KexiFormEventAction::ActionData& action, const TQCString& actionWidgetName)
-	: KDialogBase(tqparent, "actionSelectorDialog", true, i18n("Assigning Action to Command Button"), 
+	: KDialogBase(parent, "actionSelectorDialog", true, i18n("Assigning Action to Command Button"), 
 		KDialogBase::Ok | KDialogBase::Cancel )
 	, d( new KexiActionSelectionDialogPrivate() )
 {
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h
index a9c4d549..a2c4066d 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog.h
@@ -39,7 +39,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *tqparent, 
+		KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *parent, 
 			const KexiFormEventAction::ActionData& action, const TQCString& actionWidgetName);
 		~KexiActionSelectionDialog();
 
diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h
index a2579074..488805ee 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog_p.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h
@@ -26,7 +26,7 @@
 class ActionsListViewBase : public KListView
 {
 	public:
-		ActionsListViewBase(TQWidget* tqparent);
+		ActionsListViewBase(TQWidget* parent);
 		virtual ~ActionsListViewBase();
 
 		//! \return item for action \a actionName
@@ -40,7 +40,7 @@ class KActionsListViewBase : public ActionsListViewBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KActionsListViewBase(TQWidget* tqparent, KexiMainWindow* mainWin);
+		KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin);
 		virtual ~KActionsListViewBase();
 		void init();
 		virtual bool isActionVisible(const char* actionName, int actionCategories) const = 0;
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 7e5b9b85..e89ba9cb 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -64,7 +64,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget)
 		KexiFormDataItemInterface* const formDataItem = dynamic_cast<KexiFormDataItemInterface*>(obj);
 		if (!formDataItem)
 			continue;
-		if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead...
+		if (formDataItem->parentInterface()) //item with parent interface: collect parent instead...
 			continue;
 #if 0 //! @todo reenable when subform is moved to KexiDBForm
 		KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface...
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index 74f9af05..e9ff4177 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -43,8 +43,8 @@
 #include <koproperty/property.h>
 #include <koproperty/utils.h>
 
-KexiDataSourcePage::KexiDataSourcePage(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
  , m_insideClearDataSourceSelection(false)
 {
 	TQVBoxLayout *vlyr = new TQVBoxLayout(this);
diff --git a/kexi/plugins/forms/kexidatasourcepage.h b/kexi/plugins/forms/kexidatasourcepage.h
index 914a869b..748d5d3d 100644
--- a/kexi/plugins/forms/kexidatasourcepage.h
+++ b/kexi/plugins/forms/kexidatasourcepage.h
@@ -41,7 +41,7 @@ class KEXIFORMUTILS_EXPORT KexiDataSourcePage : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiDataSourcePage(TQWidget *tqparent, const char *name = 0);
+		KexiDataSourcePage(TQWidget *parent, const char *name = 0);
 		virtual ~KexiDataSourcePage();
 
 		KexiDataSourceComboBox* dataSourceCombo() const { return m_dataSourceCombo; }
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 8683c2bb..89f8ae11 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -69,8 +69,8 @@
 
 //////////////////////////////////////////
 
-KexiDBFactory::KexiDBFactory(TQObject *tqparent, const char *name, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, name)
+KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, name)
 {
 	KFormDesigner::WidgetInfo *wi;
 	wi = new KexiDataAwareWidgetInfo(this);
diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h
index 79873b72..67ee3527 100644
--- a/kexi/plugins/forms/kexidbfactory.h
+++ b/kexi/plugins/forms/kexidbfactory.h
@@ -37,10 +37,10 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		KexiDBFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiDBFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiDBFactory();
 
-		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, 
+		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, 
 			KFormDesigner::Container *container, int options = DefaultOptions );
 
 		virtual void createCustomActions(KActionCollection* col);
@@ -51,7 +51,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
 		virtual bool clearWidgetContent(const TQCString &classname, TQWidget *w);
 
 		//virtual void		saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w,
-		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &parent) {}
 		//virtual void            readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {}
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
diff --git a/kexi/plugins/forms/kexiformdataiteminterface.h b/kexi/plugins/forms/kexiformdataiteminterface.h
index 1cb7a11f..a1d41482 100644
--- a/kexi/plugins/forms/kexiformdataiteminterface.h
+++ b/kexi/plugins/forms/kexiformdataiteminterface.h
@@ -118,7 +118,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataItemInterface : public KexiDataItemInterf
 		virtual void undoChanges();
 
 		/* Cancels editing of the widget's data. This method just looks for 
-		 the (grand)tqparent KexiFormScrollView object and calls
+		 the (grand)parent KexiFormScrollView object and calls
 		 KexiFormScrollView::cancelEditor(). */
 		void cancelEditor();
 
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index cd6f5ac3..4e066bd6 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -68,9 +68,9 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 
 //-------------------------------------
 
-KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* tqparent, 
+KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, 
 	const TQString& actionName, const TQString& objectName, const TQString& actionOption)
- : KAction(tqparent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName)
+ : KAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName)
  , m_actionOption(actionOption)
 {
 }
@@ -94,7 +94,7 @@ void KexiFormEventAction::activate()
 	bool actionCancelled = false;
 	if (m_actionOption.isEmpty()) { // backward compatibility (good defaults)
 		if (part->info()->isExecuteSupported())
-			part->execute(item, tqparent());
+			part->execute(item, parent());
 		else
 			m_mainWin->openObject(item, Kexi::DataViewMode, actionCancelled);
 	}
@@ -103,7 +103,7 @@ void KexiFormEventAction::activate()
 		if (m_actionOption == "open")
 			m_mainWin->openObject(item, Kexi::DataViewMode, actionCancelled);
 		else if (m_actionOption == "execute")
-			part->execute(item, tqparent());
+			part->execute(item, parent());
 		else if (m_actionOption == "print") {
 			if (part->info()->isPrintingSupported())
 				m_mainWin->printItem(item);
diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h
index 6e020e25..e882eeb8 100644
--- a/kexi/plugins/forms/kexiformeventhandler.h
+++ b/kexi/plugins/forms/kexiformeventhandler.h
@@ -84,7 +84,7 @@ class KEXIFORMUTILS_EXPORT KexiFormEventAction : public KAction
 				                //!< @see ActionToExecuteListView::showActionsForMimeType()
 		};
 
-		KexiFormEventAction(KexiMainWindow *mainWin, TQObject* tqparent, const TQString& actionName, 
+		KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, const TQString& actionName, 
 			const TQString& objectName, const TQString& actionOption);
 		virtual ~KexiFormEventAction();
 
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 3c76e7d9..9674f4fe 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -35,13 +35,13 @@
 #include <koproperty/property.h>
 #include <widget/kexicustompropertyfactory.h>
 
-KexiFormManager::KexiFormManager(KexiPart::Part *tqparent, const char* name)
- : KFormDesigner::FormManager(tqparent, 
+KexiFormManager::KexiFormManager(KexiPart::Part *parent, const char* name)
+ : KFormDesigner::FormManager(parent, 
 		KFormDesigner::FormManager::HideEventsInPopupMenu |
 		KFormDesigner::FormManager::SkipFileActions |
 		KFormDesigner::FormManager::HideSignalSlotConnections
 	, name)
- , m_part(tqparent)
+ , m_part(parent)
 {
 	m_emitSelectionSignalsUpdatesPropertySet = true;
 	KexiCustomPropertyFactory::init();
@@ -67,7 +67,7 @@ KAction* KexiFormManager::action( const char* name )
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return 0;
-	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
+	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 	if (!formViewWidget)
 		return 0;
 	return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data());
@@ -82,7 +82,7 @@ KexiFormView* KexiFormManager::activeFormViewWidget() const
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return 0;
-	return dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
+	return dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 }
 
 void KexiFormManager::enableAction( const char* name, bool enable )
diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h
index 34decc1d..6cde85dc 100644
--- a/kexi/plugins/forms/kexiformmanager.h
+++ b/kexi/plugins/forms/kexiformmanager.h
@@ -34,7 +34,7 @@ class KEXIFORMUTILS_EXPORT KexiFormManager : public KFormDesigner::FormManager
   TQ_OBJECT
 
 	public:
-		KexiFormManager(KexiPart::Part *tqparent, const char* name = 0);
+		KexiFormManager(KexiPart::Part *parent, const char* name = 0);
 		virtual ~KexiFormManager();
 
 		virtual KAction* action( const char* name );
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index e03a0779..9c4e3173 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -77,8 +77,8 @@ class KexiFormPart::Private
 		KexiDataSourceComboBox *dataSourceCombo;
 };
 
-KexiFormPart::KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
  , d(new Private())
 {
 	// REGISTERED ID:
@@ -233,7 +233,7 @@ KexiFormPart::createTempData(KexiDialogBase* dialog)
 	return new KexiFormPart::TempData(TQT_TQOBJECT(dialog));
 }
 
-KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
+KexiViewBase* KexiFormPart::createView(TQWidget *parent, KexiDialogBase* dialog,
 	KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	Q_UNUSED( viewMode );
@@ -243,7 +243,7 @@ KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialo
 	if (!win || !win->project() || !win->project()->dbConnection())
 		return 0;
 
-	KexiFormView *view = new KexiFormView(win, tqparent, item.name().latin1(),
+	KexiFormView *view = new KexiFormView(win, parent, item.name().latin1(),
 		win->project()->dbConnection() );
 
 	return view;
@@ -424,7 +424,7 @@ void KexiFormPart::slotAssignAction()
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return;
-	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
+	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 	if (!formViewWidget)
 		return;
 
@@ -538,8 +538,8 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 
 //----------------
 
-KexiFormPart::TempData::TempData(TQObject* tqparent)
- : KexiDialogTempData(tqparent)
+KexiFormPart::TempData::TempData(TQObject* parent)
+ : KexiDialogTempData(parent)
 {
 }
 
diff --git a/kexi/plugins/forms/kexiformpart.h b/kexi/plugins/forms/kexiformpart.h
index df5c6b53..fe667061 100644
--- a/kexi/plugins/forms/kexiformpart.h
+++ b/kexi/plugins/forms/kexiformpart.h
@@ -52,7 +52,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiFormPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiFormPart();
 
 		//! \return a pointer to Forms Widget Library.
@@ -65,7 +65,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(TQObject* tqparent);
+				TempData(TQObject* parent);
 				~TempData();
 				TQGuardedPtr<KFormDesigner::Form> form;
 				TQGuardedPtr<KFormDesigner::Form> previewForm;
@@ -85,7 +85,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog,
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog,
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 5996061f..df5191ed 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -30,8 +30,8 @@
 #include <kpopupmenu.h>
 #include <kdebug.h>
 
-KexiFormScrollView::KexiFormScrollView(TQWidget *tqparent, bool preview)
- : KexiScrollView(tqparent, preview)
+KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview)
+ : KexiScrollView(parent, preview)
  , KexiRecordNavigatorHandler()
  , KexiSharedActionClient()
  , KexiDataAwareObjectInterface()
@@ -71,7 +71,7 @@ KexiFormScrollView::show()
 #if 0 //moved to KexiFormView, OK?
 	//now get resize mode settings for entire form
 	if (m_preview) {
-		KexiFormView* fv = dynamic_cast<KexiFormView*>(tqparent());
+		KexiFormView* fv = dynamic_cast<KexiFormView*>(parent());
 		int resizeMode = fv ? fv->resizeMode() : KexiFormView::ResizeAuto;
 		if (resizeMode == KexiFormView::ResizeAuto)
 			setResizePolicy(AutoOneFit);
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index 61c13a8f..d8326a57 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -51,7 +51,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 	KEXI_DATAAWAREOBJECTINTERFACE
 
 	public:
-		KexiFormScrollView(TQWidget *tqparent, bool preview);
+		KexiFormScrollView(TQWidget *parent, bool preview);
 		virtual ~KexiFormScrollView();
 
 		void setForm(KFormDesigner::Form *form) { m_form = form; }
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 3b12588c..01ec080f 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -60,9 +60,9 @@
 
 //! @todo #define KEXI_SHOW_SPLITTER_WIDGET
 
-KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
+KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 	const char *name, bool /*dbAware*/)
- : KexiDataAwareView( mainWin, tqparent, name )
+ : KexiDataAwareView( mainWin, parent, name )
  , m_propertySet(0)
  , m_resizeMode(KexiFormView::ResizeDefault)
  , m_query(0)
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index b05a544c..8bc1cb79 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -65,8 +65,8 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 			NoResize = 2 /*! @todo */
 		};
 
-//		KexiFormView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn);
-		KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0,
+//		KexiFormView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn);
+		KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0,
 			bool dbAware = true);
 		virtual ~KexiFormView();
 
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 521dce2a..7ebc522f 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -72,8 +72,8 @@ class KexiDBAutoField::Private
 //-------------------------------------
 
 KexiDBAutoField::KexiDBAutoField(const TQString &text, WidgetType type, LabelPosition pos, 
-	TQWidget *tqparent, const char *name, bool designMode)
- : TQWidget(tqparent, name)
+	TQWidget *parent, const char *name, bool designMode)
+ : TQWidget(parent, name)
  , KexiFormDataItemInterface()
  , KFormDesigner::DesignTimeDynamicChildWidgetHandler()
  , d( new Private() )
@@ -82,8 +82,8 @@ KexiDBAutoField::KexiDBAutoField(const TQString &text, WidgetType type, LabelPos
 	init(text, type, pos);
 }
 
-KexiDBAutoField::KexiDBAutoField(TQWidget *tqparent, const char *name, bool designMode, LabelPosition pos)
- : TQWidget(tqparent, name)
+KexiDBAutoField::KexiDBAutoField(TQWidget *parent, const char *name, bool designMode, LabelPosition pos)
+ : TQWidget(parent, name)
  , KexiFormDataItemInterface()
  , KFormDesigner::DesignTimeDynamicChildWidgetHandler()
  , d( new Private() )
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h
index f13e701e..653e4067 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.h
+++ b/kexi/plugins/forms/widgets/kexidbautofield.h
@@ -64,8 +64,8 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField :
 		enum LabelPosition { Left = 300, Top, NoLabel };
 
 		KexiDBAutoField(const TQString &text, WidgetType type, LabelPosition pos, 
-			TQWidget *tqparent = 0, const char *name = 0, bool designMode = true);
-		KexiDBAutoField(TQWidget *tqparent = 0, const char *name = 0, bool designMode = true,
+			TQWidget *parent = 0, const char *name = 0, bool designMode = true);
+		KexiDBAutoField(TQWidget *parent = 0, const char *name = 0, bool designMode = true,
 			LabelPosition pos = Left);
 
 		virtual ~KexiDBAutoField();
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
index c704a985..c1a8f5d4 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
@@ -23,8 +23,8 @@
 #include <kexiutils/utils.h>
 #include <kexidb/queryschema.h>
 
-KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *tqparent, const char *name)
- : TQCheckBox(text, tqparent, name), KexiFormDataItemInterface()
+KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const char *name)
+ : TQCheckBox(text, parent, name), KexiFormDataItemInterface()
  , m_invalidState(false)
  , m_tristateChanged(false)
  , m_tristate(TristateDefault)
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.h b/kexi/plugins/forms/widgets/kexidbcheckbox.h
index 8a65f33a..aba3314c 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.h
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.h
@@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBCheckBox : public TQCheckBox, public KexiFormDa
 	Q_ENUMS( Tristate )
 
 	public:
-		KexiDBCheckBox(const TQString &text, TQWidget *tqparent, const char *name=0);
+		KexiDBCheckBox(const TQString &text, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBCheckBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index f194908f..81c66ba6 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -72,8 +72,8 @@ class KexiDBComboBox::Private
 
 //-------------------------------------
 
-KexiDBComboBox::KexiDBComboBox(TQWidget *tqparent, const char *name, bool designMode)
- : KexiDBAutoField(tqparent, name, designMode, NoLabel)
+KexiDBComboBox::KexiDBComboBox(TQWidget *parent, const char *name, bool designMode)
+ : KexiDBAutoField(parent, name, designMode, NoLabel)
  , KexiComboBoxBase()
  , d(new Private())
 {
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index 2639b1f9..4e780aa3 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -44,7 +44,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 	TQ_OVERRIDE(bool autoCaption DESIGNABLE false)
 
 	public:
-		KexiDBComboBox(TQWidget *tqparent, const char *name=0, bool designMode = true);
+		KexiDBComboBox(TQWidget *parent, const char *name=0, bool designMode = true);
 		virtual ~KexiDBComboBox();
 
 		//! Implemented for KexiComboBoxBase: form has no 'related data' model (only the full database model)
@@ -147,7 +147,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		//! Implemented for KexiComboBoxBase
 		virtual void acceptRequested();
 
-		//! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) 
+		//! Implement this to return a position \a pos mapped from parent (e.g. viewport) 
 		//! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed.
 		virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const;
 
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 9638f93a..8394ef58 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -28,8 +28,8 @@
 #include <kexiutils/utils.h>
 #include <kexidb/queryschema.h>
 
-KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name), KexiFormDataItemInterface()
+KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char *name)
+ : TQWidget(parent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	m_cleared = false;
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.h b/kexi/plugins/forms/widgets/kexidbdateedit.h
index b611590e..4b02a3bc 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.h
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.h
@@ -47,7 +47,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateEdit : public TQWidget, public KexiFormData
 	public:
 		enum Order { DMY = TQDateEdit::DMY, MDY = TQDateEdit::MDY, YMD = TQDateEdit::YMD,  YDM = TQDateEdit::YDM };
 
-		KexiDBDateEdit(const TQDate &date, TQWidget *tqparent, const char *name=0);
+		KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBDateEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index e99e4651..ea9dede7 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -27,8 +27,8 @@
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
 
-KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name), KexiFormDataItemInterface()
+KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *parent, const char *name)
+ : TQWidget(parent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	m_cleared = false;
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
index b5bbaec0..b28ff069 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
@@ -42,7 +42,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiForm
 	public:
 		enum Order { DMY, MDY, YMD, YDM };
 
-		KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *tqparent, const char *name=0);
+		KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBDateTimeEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
index c0eb17d3..99afcbd6 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
@@ -22,8 +22,8 @@
 
 #include <tqlineedit.h>
 
-KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *tqparent, const char *name)
- : KDoubleSpinBox(tqparent, name) , KexiFormDataItemInterface()
+KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name)
+ : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface()
 {
 	connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged()));
 }
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
index 1445980c..e693245b 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
@@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDoubleSpinBox : public KDoubleSpinBox, public K
 	TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true )
 
 	public:
-		KexiDBDoubleSpinBox(TQWidget *tqparent, const char *name=0);
+		KexiDBDoubleSpinBox(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBDoubleSpinBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index c2a705c0..88ddf93f 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -100,9 +100,9 @@ class KexiDBForm::Private
 
 //========================
 
-KexiDBForm::KexiDBForm(TQWidget *tqparent, KexiDataAwareObjectInterface* dataAwareObject, 
+KexiDBForm::KexiDBForm(TQWidget *parent, KexiDataAwareObjectInterface* dataAwareObject, 
 	const char *name/*, KexiDB::Connection *conn*/)
- : KexiDBFormBase(tqparent, name)
+ : KexiDBFormBase(parent, name)
  , KexiFormDataItemInterface()
  , d(new Private())
 {
@@ -425,11 +425,11 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						while (dataItemIface) {
 							if (dataItemIface->keyPressed(ke))
 								return false;
-							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox
+							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in parent, e.g. in combobox
 						}
 						break;
 					}
-					o = o->tqparent();
+					o = o->parent();
 				}
 				// try to handle global shortcuts at the KexiDataAwareObjectInterface 
 				// level (e.g. for "next record" action)
diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h
index cbfdc8ee..fc0d25c2 100644
--- a/kexi/plugins/forms/widgets/kexidbform.h
+++ b/kexi/plugins/forms/widgets/kexidbform.h
@@ -50,7 +50,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm :
 	//original "size" property is not designable, so here's a custom (not storable) replacement
 	TQ_PROPERTY( TQSize sizeInternal READ sizeInternal WRITE resizeInternal DESIGNABLE true STORED false )
 	public:
-		KexiDBForm(TQWidget *tqparent, KexiDataAwareObjectInterface* dataAwareObject, const char *name="kexi_dbform");
+		KexiDBForm(TQWidget *parent, KexiDataAwareObjectInterface* dataAwareObject, const char *name="kexi_dbform");
 		virtual ~KexiDBForm();
 
 		KexiDataAwareObjectInterface* dataAwareObject() const;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 0e79fada..4165c000 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -64,8 +64,8 @@ static TQPixmap* KexiDBImageBox_pm = 0;
 static KStaticDeleter<TQPixmap> KexiDBImageBox_pmSmallDeleter;
 static TQPixmap* KexiDBImageBox_pmSmall = 0;
 
-KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *tqparent, const char *name )
-	: KexiFrame( tqparent, name, TQt::WNoAutoErase )
+KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name )
+	: KexiFrame( parent, name, TQt::WNoAutoErase )
 	, KexiFormDataItemInterface()
 	, m_tqalignment(TQt::AlignAuto|TQt::AlignTop)
 	, m_designMode(designMode)
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index 85b54cd5..32b4e9b1 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -56,7 +56,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 	TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicyInternal WRITE setFocusPolicy )
 
 	public:
-		KexiDBImageBox( bool designMode, TQWidget *tqparent, const char *name = 0 );
+		KexiDBImageBox( bool designMode, TQWidget *parent, const char *name = 0 );
 		virtual ~KexiDBImageBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
index 7d5ae6ee..a48d06c8 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
@@ -23,8 +23,8 @@
 #include <tqlineedit.h>
 #include <knumvalidator.h>
 
-KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *tqparent, const char *name)
- : KIntSpinBox(tqparent, name) , KexiFormDataItemInterface()
+KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name)
+ : KIntSpinBox(parent, name) , KexiFormDataItemInterface()
 {
 	connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged()));
 }
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.h b/kexi/plugins/forms/widgets/kexidbintspinbox.h
index 9827cd5f..a76ab0dd 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.h
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.h
@@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBIntSpinBox : public KIntSpinBox, public KexiFor
 	TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true )
 
 	public:
-		KexiDBIntSpinBox(TQWidget *tqparent, const char *name=0);
+		KexiDBIntSpinBox(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBIntSpinBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 8226d3c4..0fc3525c 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -59,9 +59,9 @@ class KexiDBInternalLabel : public TQLabel {
 		KexiDBLabel *m_parentLabel;
 };
 
-KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* tqparent )
-	: TQLabel( tqparent )
-	, m_parentLabel(tqparent)
+KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent )
+	: TQLabel( parent )
+	, m_parentLabel(parent)
 {
 	int a = tqalignment() | TQt::WordBreak;
 	a &= (0xffffff ^ TQt::AlignVertical_Mask);
@@ -395,8 +395,8 @@ class KexiDBLabel::Private
 
 //=========================================================
 
-KexiDBLabel::KexiDBLabel( TQWidget *tqparent, const char *name, WFlags f )
-	: TQLabel( tqparent, name, f )
+KexiDBLabel::KexiDBLabel( TQWidget *parent, const char *name, WFlags f )
+	: TQLabel( parent, name, f )
 	, KexiDBTextWidgetInterface()
 	, KexiFormDataItemInterface()
 	, d( new Private() )
@@ -404,8 +404,8 @@ KexiDBLabel::KexiDBLabel( TQWidget *tqparent, const char *name, WFlags f )
 	init();
 }
 
-KexiDBLabel::KexiDBLabel( const TQString& text, TQWidget *tqparent, const char *name, WFlags f )
-	: TQLabel( tqparent, name, f )
+KexiDBLabel::KexiDBLabel( const TQString& text, TQWidget *parent, const char *name, WFlags f )
+	: TQLabel( parent, name, f )
 	, KexiDBTextWidgetInterface()
 	, KexiFormDataItemInterface()
 	, d( new Private() )
diff --git a/kexi/plugins/forms/widgets/kexidblabel.h b/kexi/plugins/forms/widgets/kexidblabel.h
index af396a12..f99ddc76 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.h
+++ b/kexi/plugins/forms/widgets/kexidblabel.h
@@ -51,8 +51,8 @@ class KEXIFORMUTILS_EXPORT KexiDBLabel : public TQLabel, protected KexiDBTextWid
 		TQ_PROPERTY( TQColor frameColor READ frameColor WRITE setFrameColor DESIGNABLE true )
 
 	public:
-		KexiDBLabel( TQWidget *tqparent, const char *name = 0, WFlags f = 0 );
-		KexiDBLabel( const TQString& text, TQWidget *tqparent, const char *name = 0, WFlags f = 0 );
+		KexiDBLabel( TQWidget *parent, const char *name = 0, WFlags f = 0 );
+		KexiDBLabel( const TQString& text, TQWidget *parent, const char *name = 0, WFlags f = 0 );
 		virtual ~KexiDBLabel();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 0b1709e1..5bb74e22 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -40,8 +40,8 @@
 class KexiDBLineEdit_ReadOnlyValidator : public TQValidator
 {
 	public:
-		KexiDBLineEdit_ReadOnlyValidator( TQObject * tqparent ) 
-		 : TQValidator(tqparent)
+		KexiDBLineEdit_ReadOnlyValidator( TQObject * parent ) 
+		 : TQValidator(parent)
 		{
 		}
 		~KexiDBLineEdit_ReadOnlyValidator() {}
@@ -50,8 +50,8 @@ class KexiDBLineEdit_ReadOnlyValidator : public TQValidator
 
 //-----
 
-KexiDBLineEdit::KexiDBLineEdit(TQWidget *tqparent, const char *name)
- : KLineEdit(tqparent, name)
+KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name)
+ : KLineEdit(parent, name)
  , KexiDBTextWidgetInterface()
  , KexiFormDataItemInterface()
 //moved , m_dateFormatter(0)
@@ -303,7 +303,7 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo)
 	if (!cinfo)
 		return;
 
-//! @todo handle input tqmask (via TQLineEdit::setInputMask()) using a special KexiDB::FieldInputMask class
+//! @todo handle input mask (via TQLineEdit::setInputMask()) using a special KexiDB::FieldInputMask class
 	setValidator( new KexiDB::FieldValidator(*cinfo->field, this) );
 
 #if 0 // moved to KexiTextFormatter
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h
index 92a87280..9d85dac5 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.h
+++ b/kexi/plugins/forms/widgets/kexidblineedit.h
@@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiDBLineEdit :
 	TQ_OVERRIDE(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true)
 
 	public:
-		KexiDBLineEdit(TQWidget *tqparent, const char *name=0);
+		KexiDBLineEdit(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBLineEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 283631c3..9c24df4a 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -29,8 +29,8 @@
 #include <formeditor/container.h>
 #include <formeditor/formmanager.h>
 
-KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
+KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h
index cbbc6250..c09e5e83 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.h
+++ b/kexi/plugins/forms/widgets/kexidbsubform.h
@@ -32,7 +32,7 @@ class KEXIFORMUTILS_EXPORT KexiDBSubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name);
+		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, const char *name);
 		~KexiDBSubForm() {}
 
 		//! \return the name of the subform to display inside this widget
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 6f6aa89d..c4cbe4d0 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -28,8 +28,8 @@
 
 #include <tqpainter.h>
 
-KexiDBTextEdit::KexiDBTextEdit(TQWidget *tqparent, const char *name)
- : KTextEdit(tqparent, name)
+KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name)
+ : KTextEdit(parent, name)
  , KexiDBTextWidgetInterface()
  , KexiFormDataItemInterface()
  , m_menuExtender(TQT_TQOBJECT(this), this)
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.h b/kexi/plugins/forms/widgets/kexidbtextedit.h
index c6f64136..8e92ee6f 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.h
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.h
@@ -38,7 +38,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit :
 	TQ_PROPERTY(TQCString dataSourceMimeType READ dataSourceMimeType WRITE setDataSourceMimeType DESIGNABLE true)
 
 	public:
-		KexiDBTextEdit(TQWidget *tqparent, const char *name=0);
+		KexiDBTextEdit(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBTextEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index f2546a44..b136fa0d 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -29,8 +29,8 @@
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
 
-KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name)
- : TQTimeEdit(time, tqparent, name), KexiFormDataItemInterface()
+KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char *name)
+ : TQTimeEdit(time, parent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	setAutoAdvance(true);
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.h b/kexi/plugins/forms/widgets/kexidbtimeedit.h
index 6b29a7ac..808316e6 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.h
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.h
@@ -37,7 +37,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTimeEdit : public TQTimeEdit, public KexiFormDa
 	TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true )
 
 	public:
-		KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name=0);
+		KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBTimeEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp
index ba9f2aec..3f12b3dd 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.cpp
+++ b/kexi/plugins/forms/widgets/kexidbutils.cpp
@@ -37,8 +37,8 @@ TQColor lighterGrayBackgroundColor(const TQPalette& palette)
 
 //-------
 
-KexiDBWidgetContextMenuExtender::KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface )
- : TQObject(tqparent)
+KexiDBWidgetContextMenuExtender::KexiDBWidgetContextMenuExtender( TQObject* parent, KexiDataItemInterface* iface )
+ : TQObject(parent)
  , m_iface(iface)
  , m_contextMenuHasTitle(false)
 {
diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h
index 06f49406..f4100c73 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.h
+++ b/kexi/plugins/forms/widgets/kexidbutils.h
@@ -31,7 +31,7 @@ TQColor lighterGrayBackgroundColor(const TQPalette& palette);
 class KexiDBWidgetContextMenuExtender : public TQObject
 {
 	public:
-		KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface );
+		KexiDBWidgetContextMenuExtender( TQObject* parent, KexiDataItemInterface* iface );
 		~KexiDBWidgetContextMenuExtender();
 
 		//! Creates title for context menu \a menu
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index b33581d7..09266ae4 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -43,8 +43,8 @@ class KexiFrame::Private
 
 //=========================================================
 
-KexiFrame::KexiFrame( TQWidget * tqparent, const char * name, WFlags f )
-	: TQFrame(tqparent, name, f)
+KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
+	: TQFrame(parent, name, f)
 	, d( new Private() )
 {
 	//defaults
diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index d960cefd..2f6ca562 100644
--- a/kexi/plugins/forms/widgets/kexiframe.h
+++ b/kexi/plugins/forms/widgets/kexiframe.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame
 //todo	TQ_OVERRIDE( Shadow frameShadow READ frameShadow WRITE setFrameShadow )
 
 	public:
-		KexiFrame( TQWidget * tqparent, const char * name = 0, WFlags f = 0 );
+		KexiFrame( TQWidget * parent, const char * name = 0, WFlags f = 0 );
 		virtual ~KexiFrame();
 
 		virtual const TQColor& frameColor() const;
diff --git a/kexi/plugins/forms/widgets/kexipushbutton.cpp b/kexi/plugins/forms/widgets/kexipushbutton.cpp
index 95d0b92e..dbff6c4b 100644
--- a/kexi/plugins/forms/widgets/kexipushbutton.cpp
+++ b/kexi/plugins/forms/widgets/kexipushbutton.cpp
@@ -20,8 +20,8 @@
 
 #include "kexipushbutton.h"
 
-KexiPushButton::KexiPushButton( const TQString & text, TQWidget * tqparent, const char * name )
-: KPushButton(text, tqparent, name)
+KexiPushButton::KexiPushButton( const TQString & text, TQWidget * parent, const char * name )
+: KPushButton(text, parent, name)
 {
 }
 
diff --git a/kexi/plugins/forms/widgets/kexipushbutton.h b/kexi/plugins/forms/widgets/kexipushbutton.h
index 3dd8f0a9..4f9ec5f7 100644
--- a/kexi/plugins/forms/widgets/kexipushbutton.h
+++ b/kexi/plugins/forms/widgets/kexipushbutton.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiPushButton : public KPushButton
 	TQ_PROPERTY(TQString onClickActionOption READ onClickActionOption WRITE setOnClickActionOption DESIGNABLE true)
 
 	public:
-		KexiPushButton( const TQString & text, TQWidget * tqparent, const char * name = 0 );
+		KexiPushButton( const TQString & text, TQWidget * parent, const char * name = 0 );
 		~KexiPushButton();
 
 	public slots:
diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp
index 7037b29a..0ca5b7d2 100644
--- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp
+++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp
@@ -26,8 +26,8 @@
 
 #include <kgenericfactory.h>
 
-KexiCSVImportExportPart::KexiCSVImportExportPart(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiInternalPart(tqparent, name, args)
+KexiCSVImportExportPart::KexiCSVImportExportPart(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiInternalPart(parent, name, args)
 {
 }
 
@@ -36,12 +36,12 @@ KexiCSVImportExportPart::~KexiCSVImportExportPart()
 }
 
 TQWidget *KexiCSVImportExportPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
- TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args )
+ TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args )
 {
 	if (0==qstrcmp(widgetClass, "KexiCSVImportDialog")) {
 		KexiCSVImportDialog::Mode mode = (args && (*args)["sourceType"]=="file")
 			? KexiCSVImportDialog::File : KexiCSVImportDialog::Clipboard;
-		KexiCSVImportDialog *dlg = new KexiCSVImportDialog( mode, mainWin, tqparent, objName );
+		KexiCSVImportDialog *dlg = new KexiCSVImportDialog( mode, mainWin, parent, objName );
 		m_cancelled = dlg->cancelled();
 		if (m_cancelled) {
 			delete dlg;
@@ -55,7 +55,7 @@ TQWidget *KexiCSVImportExportPart::createWidget(const char* widgetClass, KexiMai
 		KexiCSVExport::Options options;
 		if (!options.assign( *args ))
 			return 0;
-		KexiCSVExportWizard *dlg = new KexiCSVExportWizard( options, mainWin, tqparent, objName);
+		KexiCSVExportWizard *dlg = new KexiCSVExportWizard( options, mainWin, parent, objName);
 		m_cancelled = dlg->cancelled();
 		if (m_cancelled) {
 			delete dlg;
diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.h b/kexi/plugins/importexport/csv/kexicsv_importexportpart.h
index c4a666e3..bd40c2f5 100644
--- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.h
+++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.h
@@ -27,12 +27,12 @@
 class KexiCSVImportExportPart : public KexiInternalPart
 {
 	public:
-		KexiCSVImportExportPart(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiCSVImportExportPart(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiCSVImportExportPart();
 
 		/*! Reimplemented to return wizard object. */
 		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-		 TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
+		 TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 
 		/*! Reimplemented to execute a command \a commandName (nonvisual). The result are put into the \a args. */
 		virtual bool executeCommand(KexiMainWindow* mainWin, const char* commandName, 
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 956681b1..6e985901 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -44,8 +44,8 @@
 
 
 KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
-	KexiMainWindow* mainWin, TQWidget * tqparent, const char * name )
- : KWizard(tqparent, name)
+	KexiMainWindow* mainWin, TQWidget * parent, const char * name )
+ : KWizard(parent, name)
  , m_options(options)
 // , m_mode(mode)
 // , m_itemId(itemId)
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index ef2bd17b..27213159 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -46,7 +46,7 @@ class KexiCSVExportWizard : public KWizard
 
 	public:
 		KexiCSVExportWizard( const KexiCSVExport::Options& options, KexiMainWindow* mainWin, 
-			TQWidget * tqparent = 0, const char * name = 0 );
+			TQWidget * parent = 0, const char * name = 0 );
 
 		virtual ~KexiCSVExportWizard();
 
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 01601230..18398d39 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -102,8 +102,8 @@
 class KexiCSVImportDialogTable : public TQTable
 {
 public:
-	KexiCSVImportDialogTable( TQWidget * tqparent = 0, const char * name = 0 )
-	: TQTable(tqparent, name) {
+	KexiCSVImportDialogTable( TQWidget * parent = 0, const char * name = 0 )
+	: TQTable(parent, name) {
 		f = font();
 		f.setBold(true);
 	}
@@ -137,7 +137,7 @@ void installRecursiveEventFilter(TQObject *filter, TQObject *object)
 }
 
 KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, 
-	TQWidget * tqparent, const char * name
+	TQWidget * parent, const char * name
 )
  : KDialogBase( 
 	KDialogBase::Plain, 
@@ -146,7 +146,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	,
 	(mode==File ? User1 : (ButtonCode)0) |Ok|Cancel, 
 	Ok,
-	tqparent, 
+	parent, 
 	name ? name : "KexiCSVImportDialog", 
 	true, 
 	false,
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.h b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
index dd8a51df..cbb4ac6b 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
@@ -85,7 +85,7 @@ class KexiCSVImportDialog : public KDialogBase
 		enum Header { TEXT, NUMBER, DATE, CURRENCY };
 
 		//! @todo what about making it kexidb-independent?
-		KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, TQWidget * tqparent, 
+		KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, TQWidget * parent, 
 		  const char * name = 0/*, TQRect const & rect*/);
 
 		virtual ~KexiCSVImportDialog();
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 23fee674..ed1a5b30 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -66,13 +66,13 @@ bool KexiCSVImportOptions::operator!= ( const KexiCSVImportOptions & opt ) const
 //----------------------------------
 
 KexiCSVImportOptionsDialog::KexiCSVImportOptionsDialog( 
-	const KexiCSVImportOptions& options, TQWidget* tqparent )
+	const KexiCSVImportOptions& options, TQWidget* parent )
  : KDialogBase( 
 	KDialogBase::Plain, 
 	i18n( "CSV Import Options" ),
 	Ok|Cancel, 
 	Ok,
-	tqparent, 
+	parent, 
 	"KexiCSVImportOptionsDialog", 
 	true, 
 	false
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h
index 51319bbf..35d8b5cd 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h
@@ -46,7 +46,7 @@ class KexiCSVImportOptionsDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiCSVImportOptionsDialog( const KexiCSVImportOptions& options, TQWidget* tqparent = 0 );
+		KexiCSVImportOptionsDialog( const KexiCSVImportOptions& options, TQWidget* parent = 0 );
 		virtual ~KexiCSVImportOptionsDialog();
 
 		KexiCSVImportOptions options() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index f490795b..48d907b9 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -32,8 +32,8 @@
 
 #define KEXICSV_OTHER_DELIMITER_INDEX 4
 
-KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent )
- : TQWidget(tqparent, "KexiCSVDelimiterWidget")
+KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * parent )
+ : TQWidget(parent, "KexiCSVDelimiterWidget")
  , m_availableDelimiters(KEXICSV_OTHER_DELIMITER_INDEX)
 
 {
@@ -129,8 +129,8 @@ void KexiCSVDelimiterWidget::setDelimiter(const TQString& delimiter)
 
 //----------------------------------------------------
 
-KexiCSVTextQuoteComboBox::KexiCSVTextQuoteComboBox( TQWidget * tqparent )
- : KComboBox(tqparent, "KexiCSVTextQuoteComboBox")
+KexiCSVTextQuoteComboBox::KexiCSVTextQuoteComboBox( TQWidget * parent )
+ : KComboBox(parent, "KexiCSVTextQuoteComboBox")
 {
 	insertItem( "\"" );
 	insertItem( "'" );
@@ -154,8 +154,8 @@ void KexiCSVTextQuoteComboBox::setTextQuote(const TQString& textQuote)
 
 //----------------------------------------------------
 
-KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent )
- : TQWidget(tqparent, "KexiCSVInfoLabel")
+KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent )
+ : TQWidget(parent, "KexiCSVInfoLabel")
 {
 	TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialogBase::spacingHint() );
 	TQHBoxLayout *hbox = new TQHBoxLayout( this );
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 7a163ee0..3c420c7a 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -50,7 +50,7 @@ class KexiCSVInfoLabel : public TQWidget
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/
-		KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent );
+		KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent );
 
 		void setFileName( const TQString& fileName );
 		void setLabelText( const TQString& text );
@@ -79,7 +79,7 @@ class KexiCSVDelimiterWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent = 0 );
+		KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * parent = 0 );
 
 		TQString delimiter() const { return m_delimiter; }
 		void setDelimiter(const TQString& delimiter);
@@ -106,7 +106,7 @@ class KexiCSVDelimiterWidget : public TQWidget
 class KexiCSVTextQuoteComboBox : public KComboBox
 {
 	public:
-		KexiCSVTextQuoteComboBox( TQWidget * tqparent = 0 );
+		KexiCSVTextQuoteComboBox( TQWidget * parent = 0 );
 
 		TQString textQuote() const;
 
diff --git a/kexi/plugins/macros/kexiactions/kexivariable.h b/kexi/plugins/macros/kexiactions/kexivariable.h
index da3f47e2..c6b093cf 100644
--- a/kexi/plugins/macros/kexiactions/kexivariable.h
+++ b/kexi/plugins/macros/kexiactions/kexivariable.h
@@ -68,7 +68,7 @@ namespace KexiMacro {
 			}
 
 		private:
-			/// The tqparent @a KexiAction implementation.
+			/// The parent @a KexiAction implementation.
 			ACTIONIMPL* m_actionimpl;
 	};
 }
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index efce73c0..b7e89e9a 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -107,8 +107,8 @@ class KexiMacroDesignView::Private
 
 };
 
-KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro)
-	: KexiMacroView(mainwin, tqparent, macro, "KexiMacroDesignView")
+KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro)
+	: KexiMacroView(mainwin, parent, macro, "KexiMacroDesignView")
 	, d( new Private() )
 {
 	// The table's data-model.
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h
index e982f1bd..3529ea0c 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.h
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h
@@ -49,10 +49,10 @@ class KexiMacroDesignView : public KexiMacroView
 		*
 		* \param mainwin The \a KexiMainWindow instance this \a KexiViewBase
 		*        belongs to.
-		* \param tqparent The tqparent widget this widget should be displayed in.
+		* \param parent The parent widget this widget should be displayed in.
 		* \param macro The \a KoMacro::Macro instance this view is for.
 		*/
-		KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro);
+		KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro);
 
 		/**
 		* Destructor.
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h
index d902d6a4..e03afbcd 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.h
+++ b/kexi/plugins/macros/kexipart/keximacroerror.h
@@ -57,7 +57,7 @@ class KexiMacroError : public KexiMacroErrorBase
 		/**
 		* Constructor.
 		*
-		* @param mainwin The tqparent @a KexiMainWindow instance.
+		* @param mainwin The parent @a KexiMainWindow instance.
 		* @param context The @a KoMacro::Context where the error happened.
 		*/
 		KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context);
diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp
index 1fddbd78..ad9babd3 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.cpp
+++ b/kexi/plugins/macros/kexipart/keximacropart.cpp
@@ -54,8 +54,8 @@ class KexiMacroPart::Private
 	public:
 };
 
-KexiMacroPart::KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList &l)
-	: KexiPart::Part(tqparent, name, l)
+KexiMacroPart::KexiMacroPart(TQObject *parent, const char *name, const TQStringList &l)
+	: KexiPart::Part(parent, name, l)
 	, d( new Private() )
 {
 	//kdDebug() << "KexiMacroPart::KexiMacroPart() Ctor" << endl;
@@ -123,7 +123,7 @@ void KexiMacroPart::initInstanceActions()
 	//createSharedAction(Kexi::DesignViewMode, i18n("Execute Macro"), "exec", 0, "data_execute");
 }
 
-KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
+KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
 {
 	const TQString itemname = item.name();
 	//kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl;
@@ -140,14 +140,14 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dial
 		KexiMainWindow *win = dialog->mainWin();
 		if(win && win->project() && win->project()->dbConnection()) {
 			if(viewMode == Kexi::DesignViewMode) {
-				return new KexiMacroDesignView(win, tqparent, macro);
+				return new KexiMacroDesignView(win, parent, macro);
 			}
 			if(viewMode == Kexi::TextViewMode) {
-				return new KexiMacroTextView(win, tqparent, macro);
+				return new KexiMacroTextView(win, parent, macro);
 			}
 			if(viewMode == Kexi::DataViewMode) {
 				// Called if the macro should be executed.
-				return new KexiMacroView(win, tqparent, macro);
+				return new KexiMacroView(win, parent, macro);
 			}
 		}
 	}
diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h
index 0ea70c06..374679c0 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.h
+++ b/kexi/plugins/macros/kexipart/keximacropart.h
@@ -37,11 +37,11 @@ class KexiMacroPart : public KexiPart::Part
 		/**
 		* Constructor.
 		*
-		* \param tqparent The tqparent TQObject this part is child of.
+		* \param parent The parent TQObject this part is child of.
 		* \param name The name this part has.
 		* \param args Optional list of arguments passed to this part.
 		*/
-		KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList& args);
+		KexiMacroPart(TQObject *parent, const char *name, const TQStringList& args);
 
 		/**
 		* Destructor.
@@ -64,12 +64,12 @@ class KexiMacroPart : public KexiPart::Part
 		/**
 		* Create a new view.
 		*
-		* \param tqparent The tqparent TQWidget the new view is displayed in.
+		* \param parent The parent TQWidget the new view is displayed in.
 		* \param dialog The \a KexiDialogBase the view is child of.
 		* \param item The \a KexiPart::Item this view is for.
 		* \param viewMode The viewmode we like to have a view for.
 		*/
-		virtual KexiViewBase* createView(TQWidget *tqparent,
+		virtual KexiViewBase* createView(TQWidget *parent,
 		                                 KexiDialogBase* dialog,
 		                                 KexiPart::Item& item,
 		                                 int viewMode = Kexi::DesignViewMode,
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index aed4a9bd..e67794be 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -53,8 +53,8 @@ class KexiMacroProperty::Private
 		TQString name;
 };
 
-KexiMacroProperty::KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
-	: KoProperty::CustomProperty(tqparent)
+KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
+	: KoProperty::CustomProperty(parent)
 	, d( new Private() )
 {
 	d->macroitem = macroitem;
@@ -164,8 +164,8 @@ KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::Macr
  * KexiMacroPropertyFactory
  */
 
-KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* tqparent)
-	: KoProperty::CustomPropertyFactory(tqparent)
+KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* parent)
+	: KoProperty::CustomPropertyFactory(parent)
 {
 }
 
@@ -173,14 +173,14 @@ KexiMacroPropertyFactory::~KexiMacroPropertyFactory()
 {
 }
 
-KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* tqparent)
+KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* parent)
 {
-	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl;
+	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty parent="<<parent->name()<<endl;
 
-	KoProperty::CustomProperty* customproperty = tqparent->customProperty();
+	KoProperty::CustomProperty* customproperty = parent->customProperty();
 	KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
 	if(! parentcustomproperty) {
-		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl;
+		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() parent=" << parent->name() << " has an invalid customproperty." << endl;
 		return 0;
 	}
 
@@ -189,7 +189,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
 	const TQString name = parentcustomproperty->name();
 	Q_ASSERT(! name.isEmpty());
 
-	KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name);
+	KexiMacroProperty* macroproperty = new KexiMacroProperty(parent, macroitem, name);
 	if(! macroproperty->variable().data()) {
 		delete macroproperty; macroproperty = 0;
 		return 0;
@@ -232,12 +232,12 @@ class ListBoxItem : public TQListBoxText
 		virtual ~ListBoxItem() {}
 		void setEnabled(bool enabled) { m_enabled = enabled; }
 		virtual int width(const TQListBox* lb) const {
-			Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) );
-			return static_cast<KComboBox*>( lb->tqparent() )->lineEdit()->width() + 2;
+			Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) );
+			return static_cast<KComboBox*>( lb->parent() )->lineEdit()->width() + 2;
 		}
 		virtual int height(const TQListBox* lb) const {
-			Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) );
-			return m_enabled ? static_cast<KComboBox*>( lb->tqparent() )->height() + 2 : 0;
+			Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) );
+			return m_enabled ? static_cast<KComboBox*>( lb->parent() )->height() + 2 : 0;
 		}
 	private:
 		bool m_enabled;
@@ -281,7 +281,7 @@ class EditListBoxItem : public ListBoxItem
 	protected:
 		virtual void paint(TQPainter* p) {
 			if(! m_widget) return;
-			Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->tqparent() ) );
+			Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->parent() ) );
 			const int w = width(listBox());
 			const int h = height(listBox());
 			m_widget->setFixedSize(w - 2, h - 2);
@@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem
 				variable->text(), // caption
 				TQString(), // description
 				type, // type
-				0 //parentproperty // tqparent
+				0 //parentproperty // parent
 			);
 
 			m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop);
@@ -367,8 +367,8 @@ class EditListBoxItem : public ListBoxItem
 class ListBox : public TQListBox
 {
 	public:
-		ListBox(KComboBox* tqparent, KexiMacroProperty* macroproperty)
-			: TQListBox(tqparent)
+		ListBox(KComboBox* parent, KexiMacroProperty* macroproperty)
+			: TQListBox(parent)
 			, m_macroproperty(macroproperty)
 			, m_edititem(0)
 		{
@@ -501,8 +501,8 @@ class KexiMacroPropertyWidget::Private
 		ListBox* listbox;
 };
 
-KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent)
-	: KoProperty::Widget(property, tqparent)
+KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* parent)
+	: KoProperty::Widget(property, parent)
 	, d( new Private() )
 {
 	kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl;
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h
index b80857d1..9419304e 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.h
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.h
@@ -47,24 +47,24 @@ class KexiMacroProperty
 	public:
 
 		/** Constructor. */
-		explicit KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
+		explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
 		/** Destructor. */
 		virtual ~KexiMacroProperty();
 
-		/** @return the tqparent @a KoProperty::Property instance. */
+		/** @return the parent @a KoProperty::Property instance. */
 		KoProperty::Property* parentProperty() const;
 
 		/** This function is called by @ref KoProperty::Property::setValue() 
 		when a custom property is set.
 		You don't have to modify the property value, it is done by Property class.
-		You just have to update child or tqparent properties value (m_property->tqparent()->setValue()).
+		You just have to update child or parent properties value (m_property->parent()->setValue()).
 		Note that, when calling Property::setValue, you <b>need</b> to set
 		useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */
 		virtual void setValue(const TQVariant &value, bool rememberOldValue);
 
 		/** This function is called by @ref KoProperty::Property::value()
 		when a custom property is set and @ref handleValue() is true.
-		You should return property's value, taken from tqparent's value.*/
+		You should return property's value, taken from parent's value.*/
 		virtual TQVariant value() const;
 
 		/** Tells whether CustomProperty should be used to get the property's value.
@@ -111,18 +111,18 @@ class KexiMacroPropertyFactory : public KoProperty::CustomPropertyFactory
 {
 	public:
 		/** Constructor. */
-		explicit KexiMacroPropertyFactory(TQObject* tqparent);
+		explicit KexiMacroPropertyFactory(TQObject* parent);
 		/** Destructor. */
 		virtual ~KexiMacroPropertyFactory();
 
-		/** @return a new instance of custom property for @p tqparent.
+		/** @return a new instance of custom property for @p parent.
 		 Implement this for property types you want to support.
-		 Use tqparent->type() to get type of the property. */
-		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* tqparent);
+		 Use parent->type() to get type of the property. */
+		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* parent);
 
 		/** @return a new instance of custom property for @p property.
 		 Implement this for property editor types you want to support.
-		 Use tqparent->type() to get type of the property. */
+		 Use parent->type() to get type of the property. */
 		virtual KoProperty::Widget* createCustomWidget(KoProperty::Property* property);
 
 		/** Initializes this factory. The factory may register itself at
@@ -144,7 +144,7 @@ class KexiMacroPropertyWidget : public KoProperty::Widget
 
 	public:
 		/** Constructor. */
-		explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent = 0);
+		explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* parent = 0);
 		/** Destructor. */
 		virtual ~KexiMacroPropertyWidget();
 
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index 11d9cee5..e35ee5b2 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -41,8 +41,8 @@ class KexiMacroTextView::Private
 
 };
 
-KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro)
-	: KexiMacroView(mainwin, tqparent, macro, "KexiMacroTextView")
+KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro)
+	: KexiMacroView(mainwin, parent, macro, "KexiMacroTextView")
 	, d( new Private() )
 {
 	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.h b/kexi/plugins/macros/kexipart/keximacrotextview.h
index 5101c30b..0acfa9ef 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.h
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.h
@@ -40,10 +40,10 @@ class KexiMacroTextView : public KexiMacroView
 		*
 		* \param mainwin The \a KexiMainWindow instance this \a KexiViewBase
 		*        belongs to.
-		* \param tqparent The tqparent widget this widget should be displayed in.
+		* \param parent The parent widget this widget should be displayed in.
 		* \param macro The \a KoMacro::Macro instance this view is for.
 		*/
-		KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro);
+		KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro);
 
 		/**
 		* Destructor.
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index e13483c1..e9f9cd33 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -62,8 +62,8 @@ class KexiMacroView::Private
 
 };
 
-KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, KoMacro::Macro* const macro, const char* name)
-	: KexiViewBase(mainwin, tqparent, (name ? name : "KexiMacroView"))
+KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, KoMacro::Macro* const macro, const char* name)
+	: KexiViewBase(mainwin, parent, (name ? name : "KexiMacroView"))
 	, d( new Private(macro) )
 {
 	//kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl;
@@ -164,7 +164,7 @@ void KexiMacroView::execute(TQObject* sender)
 	KSharedPtr<KoMacro::Context> context = d->macro->execute(sender);
 	if(context->hadException()) {
 		KexiMacroError* error = new KexiMacroError(
-			mainWin(), // The tqparent KexiMainWindow
+			mainWin(), // The parent KexiMainWindow
 			context // The KoMacro::Context where the error occured.
 		);
 		error->exec();
diff --git a/kexi/plugins/macros/kexipart/keximacroview.h b/kexi/plugins/macros/kexipart/keximacroview.h
index 0c44419b..f98d394d 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.h
+++ b/kexi/plugins/macros/kexipart/keximacroview.h
@@ -50,10 +50,10 @@ class KexiMacroView : public KexiViewBase
 		*
 		* \param mainwin The \a KexiMainWindow instance this \a KexiViewBase
 		*        belongs to.
-		* \param tqparent The tqparent widget this widget should be displayed in.
+		* \param parent The parent widget this widget should be displayed in.
 		* \param macro The \a KoMacro::Macro instance this view is for.
 		*/
-		KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro, const char* name = 0);
+		KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro, const char* name = 0);
 
 		/**
 		* Destructor.
diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index 558ff0aa..2bb1bef3 100644
--- a/kexi/plugins/macros/lib/context.h
+++ b/kexi/plugins/macros/lib/context.h
@@ -121,7 +121,7 @@ namespace KoMacro {
 			/**
 			* This slot extends the slot above with the passed
 			* @a Context @p context which will be used as
-			* tqparent context for this context.
+			* parent context for this context.
 			*/
 			virtual void activate(KSharedPtr<Context> context);
 
diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h
index ae32aad9..733ffb75 100644
--- a/kexi/plugins/macros/lib/manager.h
+++ b/kexi/plugins/macros/lib/manager.h
@@ -64,7 +64,7 @@ namespace KoMacro {
 	*
 	* // Finally free the publishedobject instance we created. We
 	* // need to free it manualy cause PublishedObject doesn't
-	* // got a TQObject tqparent as argument.
+	* // got a TQObject parent as argument.
 	* delete publishedobject;
 	*
 	* // Finally free the manager-instance. It's always needed
diff --git a/kexi/plugins/migration/keximigrationpart.cpp b/kexi/plugins/migration/keximigrationpart.cpp
index 5d4830ef..a3a099e0 100644
--- a/kexi/plugins/migration/keximigrationpart.cpp
+++ b/kexi/plugins/migration/keximigrationpart.cpp
@@ -23,8 +23,8 @@
 
 #include <kgenericfactory.h>
 
-KexiMigrationPart::KexiMigrationPart(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiInternalPart(tqparent, name, args)
+KexiMigrationPart::KexiMigrationPart(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiInternalPart(parent, name, args)
 {
 }
 
@@ -33,11 +33,11 @@ KexiMigrationPart::~KexiMigrationPart()
 }
 
 TQWidget *KexiMigrationPart::createWidget(const char* /*widgetClass*/, KexiMainWindow* mainWin, 
- TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args )
+ TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args )
 {
 	Q_UNUSED( mainWin );
 
-	KexiMigration::ImportWizard *w = new KexiMigration::ImportWizard(tqparent, args);
+	KexiMigration::ImportWizard *w = new KexiMigration::ImportWizard(parent, args);
 	w->setName(objName);
 	return w;
 }
diff --git a/kexi/plugins/migration/keximigrationpart.h b/kexi/plugins/migration/keximigrationpart.h
index b41656a6..12d38fa5 100644
--- a/kexi/plugins/migration/keximigrationpart.h
+++ b/kexi/plugins/migration/keximigrationpart.h
@@ -26,13 +26,13 @@
 class KexiMigrationPart : public KexiInternalPart
 {
 	public:
-		KexiMigrationPart(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiMigrationPart(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiMigrationPart();
 
 		/*! Reimplement this if your internal part has to return widgets 
 		 or TQDialog objects. */
 		virtual TQWidget *createWidget(const char* /*widgetClass*/, KexiMainWindow* mainWin, 
-		 TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
+		 TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 };
 
 #endif
diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp
index 4b1141be..9b7f5db9 100644
--- a/kexi/plugins/queries/kexiaddparamdialog.cpp
+++ b/kexi/plugins/queries/kexiaddparamdialog.cpp
@@ -26,8 +26,8 @@
 #include "kexiaddparamdialog.moc"
 #include "kexiaddparamwidget.h"
 
-KexiAddParamDialog::KexiAddParamDialog(TQWidget *tqparent)
- : KDialogBase(tqparent, "kexiaddparamdialog", true, i18n("Add Parameter"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true)
+KexiAddParamDialog::KexiAddParamDialog(TQWidget *parent)
+ : KDialogBase(parent, "kexiaddparamdialog", true, i18n("Add Parameter"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true)
 {
 	m_wid=new KexiAddParamWidget(makeVBoxMainWidget());
 	for (int i=1;i<=KexiDataProvider::Parameter::maxType;i++)
diff --git a/kexi/plugins/queries/kexiaddparamdialog.h b/kexi/plugins/queries/kexiaddparamdialog.h
index 2aa27bf7..3c543941 100644
--- a/kexi/plugins/queries/kexiaddparamdialog.h
+++ b/kexi/plugins/queries/kexiaddparamdialog.h
@@ -30,7 +30,7 @@ class KexiAddParamDialog : public KDialogBase
   TQ_OBJECT
 	
 	public:
-		KexiAddParamDialog(TQWidget *tqparent);
+		KexiAddParamDialog(TQWidget *parent);
 		virtual ~KexiAddParamDialog();
 		TQString parameterName();
 		int parameterType();
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
index 938d407f..555a84cf 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
@@ -27,9 +27,9 @@
 #include <tqlineedit.h>
 #include <tqobjectlist.h>
 
-KexiDynamicQueryParameterDialog::KexiDynamicQueryParameterDialog(TQWidget *tqparent,
+KexiDynamicQueryParameterDialog::KexiDynamicQueryParameterDialog(TQWidget *parent,
 	KexiDataProvider::Parameters *values, const KexiDataProvider::ParameterList &list):
-		KDialogBase(tqparent, "paramddialog", true, i18n("Query Parameters"),
+		KDialogBase(parent, "paramddialog", true, i18n("Query Parameters"),
 		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true )
 {
 	m_values=values;
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
index 60137c1f..afa9163d 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
@@ -31,7 +31,7 @@ class KexiDynamicQueryParameterDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KexiDynamicQueryParameterDialog(TQWidget *tqparent,KexiDataProvider::Parameters *, const KexiDataProvider::ParameterList &);
+	KexiDynamicQueryParameterDialog(TQWidget *parent,KexiDataProvider::Parameters *, const KexiDataProvider::ParameterList &);
 	virtual ~KexiDynamicQueryParameterDialog();
 
 protected:
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index be16b70d..e215ab90 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -139,8 +139,8 @@ static bool sortingAllowed(const TQString& fieldName, const TQString& tableName)
 //=========================================================
 
 KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
-	KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+	KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
  , d( new Private() )
 {
 	d->conn = mainWin->project()->dbConnection();
@@ -916,8 +916,8 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 				if (!criteriaArgument) {//try table.field
 					criteriaArgument = criterias[tableName+"."+fieldName];
 				}
-				if (criteriaArgument) {//criteria expression is just a tqparent of argument
-					criteriaExpr = criteriaArgument->tqparent()->toBinary();
+				if (criteriaArgument) {//criteria expression is just a parent of argument
+					criteriaExpr = criteriaArgument->parent()->toBinary();
 					usedCriterias.insert(criteriaArgument, (char*)1); //save info. about used criteria
 				}
 			}
@@ -1002,7 +1002,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 		if (usedCriterias[it.current()])
 			continue;
 		//unused: append a new row
-		KexiDB::BinaryExpr *criteriaExpr = criteriaArgument->tqparent()->toBinary();
+		KexiDB::BinaryExpr *criteriaExpr = criteriaArgument->parent()->toBinary();
 		if (!criteriaExpr) {
 			kexipluginswarn << "KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(): "
 				"criteriaExpr is not a binary expr" << endl;
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index 587e60a6..c97c140d 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -62,7 +62,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiQueryDesignerGuiEditor();
 
 //		KexiDB::QuerySchema	*schema();
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index e6eb9835..37fab0e6 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -99,8 +99,8 @@ class KexiQueryDesignerSQLView::Private
 
 //===================
 
-KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
  , d( new Private() )
 {
 	d->splitter = new TQSplitter(this);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.h b/kexi/plugins/queries/kexiquerydesignersql.h
index ae07d457..fe535b0d 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.h
+++ b/kexi/plugins/queries/kexiquerydesignersql.h
@@ -38,7 +38,7 @@ class KexiQueryDesignerSQLView : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiQueryDesignerSQLView();
 
 		TQString sqlText() const;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 0321ff2b..7cc62620 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -31,8 +31,8 @@
 
 #include "kexiquerydesignersqlhistory.h"
 
-KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name)
- : TQScrollView(tqparent, name)
+KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name)
+ : TQScrollView(parent, name)
 {
 	viewport()->setPaletteBackgroundColor(white);
 
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 6709a22f..a6d55285 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -65,7 +65,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name=0);
+		KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0);
 		virtual ~KexiQueryDesignerSQLHistory();
 
 		KPopupMenu* popupMenu() const;
diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp
index c9ce5755..d0c71eae 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -37,8 +37,8 @@
 
 //------------------------------------------------
 
-KexiQueryPart::KexiQueryPart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiQueryPart::KexiQueryPart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
 {
 	// REGISTERED ID:
 	m_registeredPartID = (int)KexiPart::QueryObjectType;
@@ -65,18 +65,18 @@ KexiQueryPart::createTempData(KexiDialogBase* dialog)
 }
 
 KexiViewBase*
-KexiQueryPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
+KexiQueryPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	Q_UNUSED( item );
 
 	kdDebug() << "KexiQueryPart::createView()" << endl;
 
 	if (viewMode == Kexi::DataViewMode) {
-		return new KexiQueryView(dialog->mainWin(), tqparent, "dataview");
+		return new KexiQueryView(dialog->mainWin(), parent, "dataview");
 	}
 	else if (viewMode == Kexi::DesignViewMode) {
 		KexiQueryDesignerGuiEditor* view = new KexiQueryDesignerGuiEditor(
-			dialog->mainWin(), tqparent, "guieditor");
+			dialog->mainWin(), parent, "guieditor");
 		//needed for updating tables combo box:
 		KexiProject *prj = dialog->mainWin()->project();
 		connect(prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)),
@@ -91,7 +91,7 @@ KexiQueryPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::
 		return view;
 	}
 	else if (viewMode == Kexi::TextViewMode) {
-		return new KexiQueryDesignerSQLView(dialog->mainWin(), tqparent, "sqldesigner");
+		return new KexiQueryDesignerSQLView(dialog->mainWin(), parent, "sqldesigner");
 	}
 
 	return 0;
@@ -213,8 +213,8 @@ tristate KexiQueryPart::rename(KexiMainWindow *win, KexiPart::Item &item, const
 
 //----------------
 
-KexiQueryPart::TempData::TempData(KexiDialogBase* tqparent, KexiDB::Connection *conn)
- : KexiDialogTempData(TQT_TQOBJECT(tqparent))
+KexiQueryPart::TempData::TempData(KexiDialogBase* parent, KexiDB::Connection *conn)
+ : KexiDialogTempData(TQT_TQOBJECT(parent))
  , KexiDB::Connection::TableSchemaChangeListenerInterface()
  , queryChangedInPreviousView(false)
  , m_query(0)
@@ -253,7 +253,7 @@ void KexiQueryPart::TempData::registerTableSchemaChanges(KexiDB::QuerySchema *q)
 
 tristate KexiQueryPart::TempData::closeListener()
 {
-	KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(tqparent()));
+	KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()));
 	return dlg->mainWin()->closeDialog(dlg);
 }
 
@@ -270,7 +270,7 @@ void KexiQueryPart::TempData::setQuery(KexiDB::QuerySchema *query)
 		return;
 	if (m_query
 		/* query not owned by dialog */
-		&& (static_cast<KexiDialogBase*>(TQT_TQWIDGET(tqparent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query )))
+		&& (static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query )))
 	{
 		delete m_query;
 	}
diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h
index aee905e6..1fb2063c 100644
--- a/kexi/plugins/queries/kexiquerypart.h
+++ b/kexi/plugins/queries/kexiquerypart.h
@@ -47,7 +47,7 @@ class KexiQueryPart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiQueryPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiQueryPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiQueryPart();
 
 		virtual bool remove(KexiMainWindow *win, KexiPart::Item &item);
@@ -57,7 +57,7 @@ class KexiQueryPart : public KexiPart::Part
 		                 public KexiDB::Connection::TableSchemaChangeListenerInterface
 		{
 			public:
-				TempData(KexiDialogBase* tqparent, KexiDB::Connection *conn);
+				TempData(KexiDialogBase* parent, KexiDB::Connection *conn);
 				virtual ~TempData();
 				virtual tristate closeListener();
 				void clearQuery();
@@ -66,7 +66,7 @@ class KexiQueryPart : public KexiPart::Part
 
 				/*! Assigns query \a query for this data.
 				 Existing query (available using query()) is deleted but only 
-				 if it is not owned by tqparent dialog (i.e. != KexiDialogBase::schemaData()).
+				 if it is not owned by parent dialog (i.e. != KexiDialogBase::schemaData()).
 				 \a query can be 0. 
 				 If \a query is equal to existing query, nothing is performed.
 				*/
@@ -102,7 +102,7 @@ class KexiQueryPart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 //		virtual void initPartActions( KActionCollection *col );
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index 9d7cc542..c57224ea 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -50,8 +50,8 @@ class KexiQueryView::Private
 
 //---------------------------------------------------------------------------------
 
-KexiQueryView::KexiQueryView(KexiMainWindow *win, TQWidget *tqparent, const char *name)
- : KexiDataTable(win, tqparent, name)
+KexiQueryView::KexiQueryView(KexiMainWindow *win, TQWidget *parent, const char *name)
+ : KexiDataTable(win, parent, name)
  , d( new Private() )
 {
 	tableView()->setInsertingEnabled(false); //default
diff --git a/kexi/plugins/queries/kexiqueryview.h b/kexi/plugins/queries/kexiqueryview.h
index b1f183ad..e089bfc4 100644
--- a/kexi/plugins/queries/kexiqueryview.h
+++ b/kexi/plugins/queries/kexiqueryview.h
@@ -35,7 +35,7 @@ class KexiQueryView : public KexiDataTable
   TQ_OBJECT
 
 	public:
-		KexiQueryView(KexiMainWindow *win, TQWidget *tqparent, const char *name=0);
+		KexiQueryView(KexiMainWindow *win, TQWidget *parent, const char *name=0);
 		~KexiQueryView();
 
 	protected:
diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp
index ded97e1c..6c5fae1d 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.cpp
+++ b/kexi/plugins/relations/kexirelationmaindlg.cpp
@@ -32,8 +32,8 @@
 #include "kexirelationwidget.h"
 #include "kexirelationview.h"
 
-KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
 {
 	kdDebug() << "KexiRelationMainDlg()" << endl;
 //	setIcon(SmallIcon("relation"));
diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h
index 4dbc7698..a2f8ca57 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.h
+++ b/kexi/plugins/relations/kexirelationmaindlg.h
@@ -31,7 +31,7 @@ class KexiRelationMainDlg : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		~KexiRelationMainDlg();
 
 		virtual TQSize tqsizeHint() const;
diff --git a/kexi/plugins/relations/kexirelationpartimpl.cpp b/kexi/plugins/relations/kexirelationpartimpl.cpp
index 9d08527b..7656f46d 100644
--- a/kexi/plugins/relations/kexirelationpartimpl.cpp
+++ b/kexi/plugins/relations/kexirelationpartimpl.cpp
@@ -28,8 +28,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 
-KexiRelationPartImpl::KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiInternalPart(tqparent, name, args)
+KexiRelationPartImpl::KexiRelationPartImpl(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiInternalPart(parent, name, args)
 {
 	kdDebug() << "KexiRelationPartImpl()" << endl;
 }
@@ -40,9 +40,9 @@ KexiRelationPartImpl::~KexiRelationPartImpl()
 
 /*TQWidget *
 KexiRelationPartImpl::createWidget(const char* , KexiMainWindow* mainWin, 
- TQWidget *tqparent, const char *objName)
+ TQWidget *parent, const char *objName)
 {
-	return new KexiRelationWidget(mainWin, tqparent, objName);
+	return new KexiRelationWidget(mainWin, parent, objName);
 }*/
 
 /*KexiDialogBase *
@@ -62,14 +62,14 @@ KexiRelationPartImpl::createDialog(KexiMainWindow* mainWin, const char *)
 }*/
 
 KexiViewBase *
-KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *tqparent, const char *)
+KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *parent, const char *)
 {
 //	kdDebug() << "KexiRelationPartImpl::createDialog()" << endl;
 //	KexiDialogBase * dlg = new KexiDialogBase(mainWin, i18n("Relations"));
 //	dlg->setIcon(SmallIcon("relation"));
 //	dlg->setDocID( mainWin->generatePrivateDocID() );
 
-	KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, tqparent, "relations");
+	KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, parent, "relations");
 //	dlg->addView(view);
 //	dlg->show();
 //	dlg->registerDialog();
diff --git a/kexi/plugins/relations/kexirelationpartimpl.h b/kexi/plugins/relations/kexirelationpartimpl.h
index 58ee5674..fc16fbe0 100644
--- a/kexi/plugins/relations/kexirelationpartimpl.h
+++ b/kexi/plugins/relations/kexirelationpartimpl.h
@@ -28,18 +28,18 @@ class KexiRelationPartImpl : public KexiInternalPart
   TQ_OBJECT
 
 	public:
-		KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiRelationPartImpl(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiRelationPartImpl();
 	
 	protected:
 //		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-//		 TQWidget *tqparent, const char *objName=0);
+//		 TQWidget *parent, const char *objName=0);
 		
-		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *tqparent,
+		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *parent,
 		 const char *objName=0);
 
-		//virtual KexiDialogBase *createWindow(KexiMainWindow *tqparent);
-		//virtual TQWidget *createWidget(TQWidget *tqparent, KexiMainWindow *win);
+		//virtual KexiDialogBase *createWindow(KexiMainWindow *parent);
+		//virtual TQWidget *createWidget(TQWidget *parent, KexiMainWindow *win);
 };
 
 #endif
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index d863bc9f..f45b30bf 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -33,8 +33,8 @@
 #include "reportwidgets.h"
 #include "kexireportfactory.h"
 
-KexiReportFactory::KexiReportFactory(TQObject *tqparent, const char *name, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, name)
+KexiReportFactory::KexiReportFactory(TQObject *parent, const char *name, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, name)
 {
 	KFormDesigner::WidgetInfo *wView = new KFormDesigner::WidgetInfo(this);
 	wView->setPixmap("report");
diff --git a/kexi/plugins/reports/kexireportfactory.h b/kexi/plugins/reports/kexireportfactory.h
index 1813fce7..e7c5f13a 100644
--- a/kexi/plugins/reports/kexireportfactory.h
+++ b/kexi/plugins/reports/kexireportfactory.h
@@ -29,11 +29,11 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		KexiReportFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiReportFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiReportFactory();
 
 		virtual TQString  name();
-		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container,
+		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, KFormDesigner::Container *container,
 			int options = DefaultOptions);
 
 		virtual bool createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu,
@@ -42,7 +42,7 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &, TQWidget *, KFormDesigner::Container *);
 
 		//virtual void		saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w,
-		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &parent) {}
 		//virtual void            readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {}
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index 4e04beae..89423b03 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -26,8 +26,8 @@
 
 #include "kexireportform.h"
 
-KexiReportForm::KexiReportForm(TQWidget *tqparent, const char *name/*, KexiDB::Connection *conn*/)
- : TQWidget(tqparent, name)
+KexiReportForm::KexiReportForm(TQWidget *parent, const char *name/*, KexiDB::Connection *conn*/)
+ : TQWidget(parent, name)
 {
 	//m_conn = conn;
 	kexipluginsdbg << "KexiReportForm::KexiReportForm(): " << endl;
diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h
index 9f13fbc9..8813a2c3 100644
--- a/kexi/plugins/reports/kexireportform.h
+++ b/kexi/plugins/reports/kexireportform.h
@@ -33,7 +33,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig
   TQ_OBJECT
 
 	public:
-		KexiReportForm(TQWidget *tqparent, const char *name="kexi_dbform");
+		KexiReportForm(TQWidget *parent, const char *name="kexi_dbform");
 		virtual ~KexiReportForm();
 
 		/*TQString datasource() const { return m_ds; }
diff --git a/kexi/plugins/reports/kexireportpart.cpp b/kexi/plugins/reports/kexireportpart.cpp
index 6b9c6bc3..08c4cf7c 100644
--- a/kexi/plugins/reports/kexireportpart.cpp
+++ b/kexi/plugins/reports/kexireportpart.cpp
@@ -43,8 +43,8 @@
 
 KFormDesigner::WidgetLibrary* KexiReportPart::static_reportsLibrary = 0L;
 
-KexiReportPart::KexiReportPart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiReportPart::KexiReportPart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
 {
 	// REGISTERED ID:
 	m_registeredPartID = (int)KexiPart::ReportObjectType;
@@ -101,7 +101,7 @@ KexiReportPart::createTempData(KexiDialogBase* dialog)
 }
 
 KexiViewBase*
-KexiReportPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
+KexiReportPart::createView(TQWidget *parent, KexiDialogBase* dialog,
 	KexiPart::Item &item, int, TQMap<TQString,TQString>*)
 {
 	kexipluginsdbg << "KexiReportPart::createView()" << endl;
@@ -109,7 +109,7 @@ KexiReportPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
 	if (!win || !win->project() || !win->project()->dbConnection())
 		return 0;
 
-	KexiReportView *view = new KexiReportView(win, tqparent, item.name().latin1(),
+	KexiReportView *view = new KexiReportView(win, parent, item.name().latin1(),
 		win->project()->dbConnection() );
 
 	return view;
@@ -128,8 +128,8 @@ KexiReportPart::i18nMessage(const TQCString& englishMessage, KexiDialogBase* dlg
 
 //---------------
 
-KexiReportPart::TempData::TempData(TQObject* tqparent)
- : KexiDialogTempData(tqparent)
+KexiReportPart::TempData::TempData(TQObject* parent)
+ : KexiDialogTempData(parent)
 {
 }
 
diff --git a/kexi/plugins/reports/kexireportpart.h b/kexi/plugins/reports/kexireportpart.h
index ee93580f..47f9d4ef 100644
--- a/kexi/plugins/reports/kexireportpart.h
+++ b/kexi/plugins/reports/kexireportpart.h
@@ -45,7 +45,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiReportPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiReportPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiReportPart();
 
 		//! \return a pointer to Reports Widget Library.
@@ -58,7 +58,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(TQObject* tqparent);
+				TempData(TQObject* parent);
 				~TempData();
 				TQGuardedPtr<KFormDesigner::Form> form;
 				TQGuardedPtr<KFormDesigner::Form> previewForm;
@@ -73,7 +73,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog,
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog,
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp
index 403c0277..2de5f4a7 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -39,8 +39,8 @@
 
 #define NO_DSWIZARD
 
-KexiReportScrollView::KexiReportScrollView(TQWidget *tqparent, bool preview)
- : KexiScrollView(tqparent, preview)
+KexiReportScrollView::KexiReportScrollView(TQWidget *parent, bool preview)
+ : KexiScrollView(parent, preview)
 {
 	if(preview) {
 		setRecordNavigatorVisible(true);
@@ -61,7 +61,7 @@ KexiReportScrollView::show()
 
 	//now get resize mode settings for entire form
 	if (m_preview) {
-		KexiReportView* fv = dynamic_cast<KexiReportView*>(tqparent());
+		KexiReportView* fv = dynamic_cast<KexiReportView*>(parent());
 		int resizeMode = fv ? fv->resizeMode() : KexiReportView::ResizeAuto;
 		if (resizeMode == KexiReportView::ResizeAuto)
 			setResizePolicy(AutoOneFit);
@@ -80,9 +80,9 @@ KexiReportScrollView::slotResizingStarted()
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
-KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *tqparent, const char *name,
+KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *parent, const char *name,
 	KexiDB::Connection *conn)
- : KexiViewBase(win, tqparent, name), m_propertySet(0), m_conn(conn)
+ : KexiViewBase(win, parent, name), m_propertySet(0), m_conn(conn)
  , m_resizeMode(KexiReportView::ResizeDefault)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this);
diff --git a/kexi/plugins/reports/kexireportview.h b/kexi/plugins/reports/kexireportview.h
index 2b88c181..df4b3190 100644
--- a/kexi/plugins/reports/kexireportview.h
+++ b/kexi/plugins/reports/kexireportview.h
@@ -37,7 +37,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportScrollView : public KexiScrollView
   TQ_OBJECT
 
 	public:
-		KexiReportScrollView(TQWidget *tqparent, bool preview);
+		KexiReportScrollView(TQWidget *parent, bool preview);
 		virtual ~KexiReportScrollView();
 
 		void setForm(KFormDesigner::Form *form) { m_form = form; }
@@ -73,7 +73,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportView : public KexiViewBase
 			NoResize = 2 /*! @todo */
 		};
 
-		KexiReportView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn);
+		KexiReportView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn);
 		virtual ~KexiReportView();
 
 		KexiDB::Connection* connection() { return m_conn; }
diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp
index c3ca65e4..7cea50a3 100644
--- a/kexi/plugins/reports/reportwidgets.cpp
+++ b/kexi/plugins/reports/reportwidgets.cpp
@@ -28,16 +28,16 @@
 #include "kexireportview.h"
 #include "reportwidgets.h"
 
-Label::Label(const TQString &text, TQWidget *tqparent, const char *name)
-: TQLabel(text, tqparent, name)
+Label::Label(const TQString &text, TQWidget *parent, const char *name)
+: TQLabel(text, parent, name)
 {
 	setPaletteBackgroundColor(white);
 }
 
 ////////////////////////////////////////////////////////////////////
 
-ReportLine::ReportLine(TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name)
+ReportLine::ReportLine(TQWidget *parent, const char *name)
+: TQWidget(parent, name)
 {
 	m_lineStyle = (ReportLineStyle)TQt::SolidLine;
 	m_lineWidth = 1;
@@ -113,8 +113,8 @@ ReportLine::paintEvent (TQPaintEvent *ev)
 ////////////////////////////////////////////////////////////////////
 
 
-PicLabel::PicLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name)
+PicLabel::PicLabel(const TQPixmap &pix, TQWidget *parent, const char *name)
+ : TQLabel(parent, name)
 {
 	setPixmap(pix);
 	setScaledContents(false);
@@ -131,8 +131,8 @@ PicLabel::setProperty(const char *name, const TQVariant &value)
 
 ////////////////////////////////////////////////////////////////////
 
-KexiSubReport::KexiSubReport(TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_form(0), m_widget(0)
+KexiSubReport::KexiSubReport(TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::Plain | TQFrame::Box);
 	viewport()->setPaletteBackgroundColor(white);
diff --git a/kexi/plugins/reports/reportwidgets.h b/kexi/plugins/reports/reportwidgets.h
index 9e587556..1452f41e 100644
--- a/kexi/plugins/reports/reportwidgets.h
+++ b/kexi/plugins/reports/reportwidgets.h
@@ -38,7 +38,7 @@ class KexiSubReport : public TQScrollView
 	TQ_PROPERTY(TQString reportName READ reportName WRITE setReportName DESIGNABLE true);
 
 	public:
-		KexiSubReport(TQWidget *tqparent, const char *name);
+		KexiSubReport(TQWidget *parent, const char *name);
 		~KexiSubReport() {}
 
 		//! \return the name of the subreport inside the db
@@ -59,7 +59,7 @@ class Label : public TQLabel
   TQ_OBJECT
 
 	public:
-		Label(const TQString &text, TQWidget *tqparent, const char *name);
+		Label(const TQString &text, TQWidget *parent, const char *name);
 		~Label() {}
 };
 
@@ -70,7 +70,7 @@ class PicLabel : public TQLabel
   TQ_OBJECT
 
 	public:
-		PicLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name);
+		PicLabel(const TQPixmap &pix, TQWidget *parent, const char *name);
 		~PicLabel() {}
 
 		virtual bool setProperty(const char *name, const TQVariant &value);
@@ -91,7 +91,7 @@ class ReportLine : public TQWidget
 			DashDot = TQt::DashDotLine, DashDotDot =  TQt::DashDotDotLine };
 		enum CapStyle { Flat = TQt::FlatCap, Square = TQt::SquareCap, Round = TQt::RoundCap };
 
-		ReportLine(TQWidget *tqparent, const char *name);
+		ReportLine(TQWidget *parent, const char *name);
 		~ReportLine(){;}
 
 		ReportLineStyle lineStyle() const;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 50a875b3..421bc31f 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -64,8 +64,8 @@ class KexiScriptDesignViewPrivate
         KTextBrowser* statusbrowser;
 };
 
-KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *tqparent, Kross::Api::ScriptAction* scriptaction)
-    : KexiViewBase(mainWin, tqparent, "KexiScriptDesignView")
+KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *parent, Kross::Api::ScriptAction* scriptaction)
+    : KexiViewBase(mainWin, parent, "KexiScriptDesignView")
     , d( new KexiScriptDesignViewPrivate() )
 {
     d->scriptaction = scriptaction;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
index ac5240ed..b3dec360 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
@@ -53,7 +53,7 @@ class KexiScriptDesignView : public KexiViewBase
         /**
          * Constructor.
          */
-        KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *tqparent, Kross::Api::ScriptAction* scriptaction);
+        KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *parent, Kross::Api::ScriptAction* scriptaction);
 
         /**
          * Destructor.
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index a6f2dfc1..8aec288b 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -41,8 +41,8 @@ class KexiScriptEditor::Private
         Private() : scriptaction(0) {}
 };
 
-KexiScriptEditor::KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
-    : KexiEditor(mainWin, tqparent, name)
+KexiScriptEditor::KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+    : KexiEditor(mainWin, parent, name)
     , d( new Private() )
 {
 }
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h
index 22415a7b..a00e3aa2 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h
@@ -43,7 +43,7 @@ class KexiScriptEditor : public KexiEditor
         /**
          * Constructor.
          */
-        KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+        KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 
         /**
          * Destructor.
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index b778bc75..cb66734d 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -44,8 +44,8 @@ class KexiScriptPart::Private
 		Kross::Api::ScriptGUIClient* scriptguiclient;
 };
 
-KexiScriptPart::KexiScriptPart(TQObject *tqparent, const char *name, const TQStringList &l)
-	: KexiPart::Part(tqparent, name, l)
+KexiScriptPart::KexiScriptPart(TQObject *parent, const char *name, const TQStringList &l)
+	: KexiPart::Part(parent, name, l)
 	, d( new Private() )
 {
 	d->scriptguiclient = 0;
@@ -159,7 +159,7 @@ void KexiScriptPart::initInstanceActions()
 	createSharedAction(Kexi::DesignViewMode, i18n("Configure Editor..."), "configure", 0, "script_config_editor");
 }
 
-KexiViewBase* KexiScriptPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
+KexiViewBase* KexiScriptPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
 {
 	TQString partname = item.name();
 	if( ! partname.isNull() ) {
@@ -181,7 +181,7 @@ KexiViewBase* KexiScriptPart::createView(TQWidget *tqparent, KexiDialogBase* dia
 		}
 
 		if(viewMode == Kexi::DesignViewMode) {
-			return new KexiScriptDesignView(win, tqparent, scriptaction);
+			return new KexiScriptDesignView(win, parent, scriptaction);
 		}
 	}
 	return 0;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h
index eca7a001..b2928a8f 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h
@@ -42,11 +42,11 @@ class KexiScriptPart : public KexiPart::Part
         /**
          * Constructor.
          *
-         * \param tqparent The tqparent TQObject this part is child of.
+         * \param parent The parent TQObject this part is child of.
          * \param name The name this part has.
          * \param args Optional list of arguments passed to this part.
          */
-        KexiScriptPart(TQObject *tqparent, const char *name, const TQStringList& args);
+        KexiScriptPart(TQObject *parent, const char *name, const TQStringList& args);
 
         /**
          * Destructor.
@@ -69,12 +69,12 @@ class KexiScriptPart : public KexiPart::Part
         /**
          * Create a new view.
          *
-         * \param tqparent The tqparent TQWidget the new view is displayed in.
+         * \param parent The parent TQWidget the new view is displayed in.
          * \param dialog The \a KexiDialogBase the view is child of.
          * \param item The \a KexiPart::Item this view is for.
          * \param viewMode The viewmode we like to have a view for.
          */
-        virtual KexiViewBase* createView(TQWidget *tqparent,
+        virtual KexiViewBase* createView(TQWidget *parent,
                                          KexiDialogBase* dialog,
                                          KexiPart::Item& item,
                                          int viewMode = Kexi::DesignViewMode,
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index bdec927b..6f75bdea 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -89,9 +89,9 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class ListViewDialog(qt.QDialog):
-		def __init__(self, tqparent, caption):
-			qt.QDialog.__init__(self, tqparent, "ProgressDialog", 1)
-			self.tqparent = tqparent
+		def __init__(self, parent, caption):
+			qt.QDialog.__init__(self, parent, "ProgressDialog", 1)
+			self.parent = parent
 			self.setCaption(caption)
 			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
@@ -124,9 +124,9 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class CopyJobWidget(qt.QVBox):
-		def __init__(self,dialog,tqparent):
+		def __init__(self,dialog,parent):
 			self.dialog = dialog
-			qt.QVBox.__init__(self,tqparent)
+			qt.QVBox.__init__(self,parent)
 			self.setSpacing(6)
 			typebox = qt.QHBox(self)
 			typebox.setSpacing(6)
@@ -165,7 +165,7 @@ def runGuiApp(copycenter, name):
 		def doubleClicked(self, **args):
 			print "CopyJobWidget.doubleClicked"
 			item = self.listview.selectedItem()
-			if item and item.tqparent(): item.startRename(1)
+			if item and item.parent(): item.startRename(1)
 
 		def readOptions(self,domnode,plugininst):
 			print "CopyJobWidget.readOptions plugintype=\"%s\"" % plugininst.plugintype
@@ -442,13 +442,13 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class DataSelector(qt.QVGroupBox):
-		def __init__(self, plugintype, title, caption, tqparent, dialog, items):
+		def __init__(self, plugintype, title, caption, parent, dialog, items):
 			self.plugintype = plugintype
 			self.pluginimpl = None
 			self.dialog = dialog
 			self.mainbox = None
 
-			qt.QVGroupBox.__init__(self,title,tqparent)
+			qt.QVGroupBox.__init__(self,title,parent)
 			self.setInsideMargin(6)
 			self.setInsideSpacing(0)
 
@@ -520,7 +520,7 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class Dialog(qt.QDialog):
-		def __init__(self, copycenter, tqparent):
+		def __init__(self, copycenter, parent):
 			self.copycenter = copycenter
 
 			import qt
@@ -528,7 +528,7 @@ def runGuiApp(copycenter, name):
 			import sys
 
 			self.ListViewDialog = ListViewDialog
-			qt.QDialog.__init__(self, tqparent, "Dialog", 1, qt.Qt.WDestructiveClose)
+			qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 			self.setCaption("Copy Center")
 			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
index 85023ee4..e8241405 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
@@ -53,9 +53,9 @@ class CopyCenterPlugin:
 		def finish(self):
 			""" Called if reading is finished."""
 			self.connection.finish()
-		def createWidget(self, dialog, tqparent):
+		def createWidget(self, dialog, parent):
 			""" Create and return a widget to modify the plugin settings. """
-			return self.copycenterplugin.createWidget(dialog, self, tqparent)
+			return self.copycenterplugin.createWidget(dialog, self, parent)
 
 	class Source(Plugin):
 		""" Specialization of the Plugin class to implement the
@@ -196,7 +196,7 @@ class CopyCenterPlugin:
 		self.drivermanager = krosskexidb.DriverManager()
 		self.copycenter = copycenter
 
-	def createWidget(self, dialog, plugin, tqparent):
+	def createWidget(self, dialog, plugin, parent):
 		""" Each plugin may provide a qt.QWidget back to the
 		CopyCenter.py. The widget will be used to configure our
 		plugin settings. """
@@ -208,12 +208,12 @@ class CopyCenterPlugin:
 		self.dialog = dialog
 		self.mainbox = None
 		class ProjectBox(qt.QHBox):
-			def __init__(self,main,copycenterplugin,plugin,tqparent):
+			def __init__(self,main,copycenterplugin,plugin,parent):
 				self.main = main
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 
-				qt.QHBox.__init__(self,tqparent)
+				qt.QHBox.__init__(self,parent)
 				prjlabel = qt.QLabel("Project File:",self)
 				self.prjcombo = qt.QComboBox(self)
 				self.prjcombo.setEditable(True)
@@ -244,8 +244,8 @@ class CopyCenterPlugin:
 				if str(filename) != "": self.prjcombo.setCurrentText(str(filename))
 
 		class DriverBox(qt.QVBox):
-			def __init__(self,main,tqparent):
-				qt.QVBox.__init__(self,tqparent)
+			def __init__(self,main,parent):
+				qt.QVBox.__init__(self,parent)
 				self.main = main
 				self.copycenterplugin = main.copycenterplugin
 				self.plugin = main.plugin
@@ -364,8 +364,8 @@ class CopyCenterPlugin:
 				if str(filename) != "": self.sockfileedit.setText(str(filename))
 
 		class TableBox(qt.QHBox):
-			def __init__(self,copycenterplugin,plugin,tqparent):
-				qt.QHBox.__init__(self,tqparent)
+			def __init__(self,copycenterplugin,plugin,parent):
+				qt.QHBox.__init__(self,parent)
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 				tablelabel = qt.QLabel("Table:",self)
@@ -405,8 +405,8 @@ class CopyCenterPlugin:
 				dialog.show()
 
 		class FieldBox(qt.QHBox):
-			def __init__(self,copycenterplugin,plugin,tqparent):
-				qt.QHBox.__init__(self,tqparent)
+			def __init__(self,copycenterplugin,plugin,parent):
+				qt.QHBox.__init__(self,parent)
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 				self.tablename = ""
@@ -462,15 +462,15 @@ class CopyCenterPlugin:
 				self.fieldsbtn.setEnabled(False)
 
 		class MainBox(qt.QHBox):
-			def __init__(self,copycenterplugin,plugin,tqparent):
-				qt.QHBox.__init__(self,tqparent)
+			def __init__(self,copycenterplugin,plugin,parent):
+				qt.QHBox.__init__(self,parent)
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 
-				self.prjbox = ProjectBox(self,copycenterplugin,plugin,tqparent)
-				self.driverbox = DriverBox(self,tqparent)
+				self.prjbox = ProjectBox(self,copycenterplugin,plugin,parent)
+				self.driverbox = DriverBox(self,parent)
 
-				statusbar = qt.QHBox(tqparent)
+				statusbar = qt.QHBox(parent)
 				statusbar.setSpacing(2)
 				#self.statuslabel = qt.QLabel("Disconnected",statusbar)
 				#statusbar.setStretchFactor(self.statuslabel,1)
@@ -482,9 +482,9 @@ class CopyCenterPlugin:
 				self.disconnectbtn.setEnabled(False)
 				qt.QObject.connect(self.disconnectbtn, qt.SIGNAL("clicked()"),self.disconnectClicked)
 
-				#self.connectionbox = ConnectionBox(copycenterplugin,plugin,tqparent)
-				self.tablebox = TableBox(copycenterplugin,plugin,tqparent)
-				self.fieldbox = FieldBox(copycenterplugin,plugin,tqparent)
+				#self.connectionbox = ConnectionBox(copycenterplugin,plugin,parent)
+				self.tablebox = TableBox(copycenterplugin,plugin,parent)
+				self.fieldbox = FieldBox(copycenterplugin,plugin,parent)
 				qt.QObject.connect(self.tablebox.tableedit, qt.SIGNAL("textChanged(const QString&)"), self.fieldbox.tableChanged)
 
 				if self.plugin.options['project'] != '':
@@ -499,7 +499,7 @@ class CopyCenterPlugin:
 						pass
 
 				if self.plugin.plugintype == "Destination":
-					#typebox = qt.QHBox(tqparent)
+					#typebox = qt.QHBox(parent)
 					#label = qt.QLabel("Operation:",typebox)
 					#combobox = qt.QComboBox(typebox)
 					#combobox.insertItem("Append")
@@ -511,15 +511,15 @@ class CopyCenterPlugin:
 					#typebox.setStretchFactor(combobox,1)
 					pass
 				elif self.plugin.plugintype == "Source":
-					wherebox = qt.QHBox(tqparent)
+					wherebox = qt.QHBox(parent)
 					wherelabel = qt.QLabel("Where:",wherebox)
 					self.whereedit = qt.QLineEdit(self.plugin.options['where'],wherebox)
 
-					#orderbox = qt.QHBox(tqparent)
+					#orderbox = qt.QHBox(parent)
 					#orderlabel = qt.QLabel("Order By:",orderbox)
 					#orderedit = qt.QLineEdit("",orderbox)
 
-				#errbox = qt.QHBox(tqparent)
+				#errbox = qt.QHBox(parent)
 				#errlabel = qt.QLabel("On Error:",errbox)
 				#errcombo = qt.QComboBox(errbox)
 				#errcombo.insertItem("Ask")
@@ -640,7 +640,7 @@ class CopyCenterPlugin:
 					pass
 				return ""
 				
-		mainbox = MainBox(self,plugin,tqparent)
+		mainbox = MainBox(self,plugin,parent)
 		plugin.widget = mainbox
 		return mainbox
 
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index de553b92..678cf40b 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -39,8 +39,8 @@ class CopyCenterPlugin:
 		def finish(self):
 			self.isfinished = True
 			self.widget.disconnectClicked()
-		def createWidget(self,dialog,tqparent):
-			return self.copycenterplugin.widget(dialog, self, tqparent)
+		def createWidget(self,dialog,parent):
+			return self.copycenterplugin.widget(dialog, self, parent)
 
 	class Source(Plugin):
 		plugintype = "Source"
@@ -209,7 +209,7 @@ class CopyCenterPlugin:
 		""" Constructor. """
 		pass
 
-	def widget(self,dialog,plugin,tqparent):
+	def widget(self,dialog,plugin,parent):
 		""" Each plugin may provide a qt.QWidget back to the
 		CopyCenter.py. The widget will be used to configure our
 		plugin settings. """
@@ -246,7 +246,7 @@ class CopyCenterPlugin:
 
 		class FieldsDialog(ListViewDialog):
 			def __init__(self, mainwidget):
-				ListViewDialog.__init__(self,tqparent,"Fields")
+				ListViewDialog.__init__(self,parent,"Fields")
 				self.mainwidget = mainwidget
 				self.listview.setSelectionMode(qt.QListView.Multi)
 				self.listview.setSorting(-1)
@@ -280,14 +280,14 @@ class CopyCenterPlugin:
 
 
 		class MainWidget(qt.QHBox):
-			def __init__(self,plugin,dialog,tqparent):
+			def __init__(self,plugin,dialog,parent):
 				import qt
 				import qtsql
-				qt.QHBox.__init__(self,tqparent)
+				qt.QHBox.__init__(self,parent)
 				self.dialog = dialog
 				self.plugin = plugin
 
-				self.connectionbox = qt.QVBox(tqparent)
+				self.connectionbox = qt.QVBox(parent)
 				self.connectionbox.setSpacing(2)
 
 				driverbox = qt.QHBox(self.connectionbox)
@@ -331,7 +331,7 @@ class CopyCenterPlugin:
 				dblabel.setBuddy(self.dbedit)
 				dbbox.setStretchFactor(self.dbedit,1)
 				
-				statusbar = qt.QHBox(tqparent)
+				statusbar = qt.QHBox(parent)
 				statusbar.setSpacing(2)
 				statusbar.setStretchFactor(qt.QWidget(statusbar),1)
 				self.connectbtn = qt.QPushButton("Connect",statusbar)
@@ -340,7 +340,7 @@ class CopyCenterPlugin:
 				self.disconnectbtn.setEnabled(False)
 				qt.QObject.connect(self.disconnectbtn, qt.SIGNAL("clicked()"),self.disconnectClicked)
 
-				tablebox = qt.QHBox(tqparent)
+				tablebox = qt.QHBox(parent)
 				tablelabel = qt.QLabel("Table:",tablebox)
 				self.tableedit = qt.QLineEdit(self.plugin.options['table'],tablebox)
 				qt.QObject.connect(self.tableedit, qt.SIGNAL("textChanged(const QString&)"), self.tableEditChanged)
@@ -350,7 +350,7 @@ class CopyCenterPlugin:
 				tablelabel.setBuddy(self.tableedit)
 				tablebox.setStretchFactor(self.tableedit,1)
 
-				fieldbox = qt.QHBox(tqparent)
+				fieldbox = qt.QHBox(parent)
 				fieldlabel = qt.QLabel("Fields:",fieldbox)
 				self.fieldedit = qt.QLineEdit(self.plugin.options['fields'],fieldbox)
 				self.fieldbtn = qt.QPushButton("...",fieldbox)
@@ -360,7 +360,7 @@ class CopyCenterPlugin:
 				fieldbox.setStretchFactor(self.fieldedit,1)
 
 				if self.plugin.plugintype == "Source":
-					box = qt.QHBox(tqparent)
+					box = qt.QHBox(parent)
 					wherelabel = qt.QLabel("Where:",box)
 					self.whereedit = qt.QLineEdit(self.plugin.options['where'],box)
 					wherelabel.setBuddy(self.whereedit)
@@ -368,9 +368,9 @@ class CopyCenterPlugin:
 				elif self.plugin.plugintype == "Destination":
 					
 					class OperationBox(qt.QVBox):
-						def __init__(self, mainwidget, tqparent):
+						def __init__(self, mainwidget, parent):
 							self.mainwidget = mainwidget
-							qt.QVBox.__init__(self, tqparent)
+							qt.QVBox.__init__(self, parent)
 							opbox = qt.QHBox(self)
 							operationlabel = qt.QLabel("Operation:",opbox)
 							self.mainwidget.operationedit = qt.QComboBox(opbox)
@@ -401,7 +401,7 @@ class CopyCenterPlugin:
 								1: showUpdate,
 							}[ self.mainwidget.operationedit.currentItem() ](self)
 							if self.box != None: self.box.show()
-					OperationBox(self,tqparent)
+					OperationBox(self,parent)
 
 			def tableEditChanged(self,text):
 				if self.plugin.database != None and self.plugin.database.isOpen():
@@ -491,5 +491,5 @@ class CopyCenterPlugin:
 				print "database is closed now!"
 				self.updateConnectState()
 
-		plugin.widget = MainWidget(plugin,self.dialog,tqparent)
+		plugin.widget = MainWidget(plugin,self.dialog,parent)
 		return plugin.widget
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 33e12d64..443f26d4 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -122,8 +122,8 @@ class KexiLookupColumnPage::Private
 
 //----------------------------------------------
 
-KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *tqparent)
- : TQWidget(tqparent)
+KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
+ : TQWidget(parent)
  , d(new Private())
 {
 	setName("KexiLookupColumnPage");
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.h b/kexi/plugins/tables/kexilookupcolumnpage.h
index f7b79bb2..d5c6d174 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.h
+++ b/kexi/plugins/tables/kexilookupcolumnpage.h
@@ -48,7 +48,7 @@ class KexiLookupColumnPage : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiLookupColumnPage(TQWidget *tqparent);
+		KexiLookupColumnPage(TQWidget *parent);
 		virtual ~KexiLookupColumnPage();
 
 	public slots:
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.cpp b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
index e1b8ddb9..36283c1f 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.cpp
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
@@ -26,8 +26,8 @@
 #include "kexidatatableview.h"
 #include "keximainwindow.h"
 
-KexiTableDesigner_DataView::KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *tqparent)
- : KexiDataTable(win, tqparent, "KexiTableDesigner_DataView", true/*db-aware*/)
+KexiTableDesigner_DataView::KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *parent)
+ : KexiDataTable(win, parent, "KexiTableDesigner_DataView", true/*db-aware*/)
 {
 }
 
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.h b/kexi/plugins/tables/kexitabledesigner_dataview.h
index 1a974fd8..75552f27 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.h
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.h
@@ -29,7 +29,7 @@ class KexiTableDesigner_DataView : public KexiDataTable
   TQ_OBJECT
 
 	public:
-		KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *tqparent);
+		KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *parent);
 
 		virtual ~KexiTableDesigner_DataView();
 
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 0e743bd1..84ea686c 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -104,8 +104,8 @@ static TQVariant tryCastTQVariant( const TQVariant& fromVal, TQVariant::Type toT
 }
 
 
-KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *tqparent)
- : KexiDataTable(win, tqparent, "KexiTableDesignerView", false/*not db-aware*/)
+KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *parent)
+ : KexiDataTable(win, parent, "KexiTableDesignerView", false/*not db-aware*/)
  , KexiTableDesignerInterface()
  , d( new KexiTableDesignerViewPrivate(this) )
 {
diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h
index b7ff7a23..13ce495d 100644
--- a/kexi/plugins/tables/kexitabledesignerview.h
+++ b/kexi/plugins/tables/kexitabledesignerview.h
@@ -60,7 +60,7 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 
 	public:
 		/*! Creates a new alter table dialog. */
-		KexiTableDesignerView(KexiMainWindow *win, TQWidget *tqparent);
+		KexiTableDesignerView(KexiMainWindow *win, TQWidget *parent);
 
 		virtual ~KexiTableDesignerView();
 
@@ -219,7 +219,7 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 		 Assigns primary key icon and value for property set \a propertySet, 
 		 and deselects it from previous pkey's row. 
 		 \a aWasPKey is internal. 
-		 If \a commandGroup is not 0, it is used as tqparent group for storing actions' history. */
+		 If \a commandGroup is not 0, it is used as parent group for storing actions' history. */
 		void switchPrimaryKey(KoProperty::Set &propertySet, bool set, bool aWasPKey = false,
 			CommandGroup* commandGroup = 0);
 
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 1ee3d049..4efd237a 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -54,8 +54,8 @@ class KexiTablePart::Private
 		TQGuardedPtr<KexiLookupColumnPage> lookupColumnPage;
 };
 
-KexiTablePart::KexiTablePart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiTablePart::KexiTablePart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
  , d(new Private())
 {
 	// REGISTERED ID:
@@ -96,7 +96,7 @@ KexiDialogTempData* KexiTablePart::createTempData(KexiDialogBase* dialog)
 	return new KexiTablePart::TempData(TQT_TQOBJECT(dialog));
 }
 
-KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+KexiViewBase* KexiTablePart::createView(TQWidget *parent, KexiDialogBase* dialog, 
 	KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	KexiMainWindow *win = dialog->mainWin();
@@ -111,7 +111,7 @@ KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dial
 	}
 
 	if (viewMode == Kexi::DesignViewMode) {
-		KexiTableDesignerView *t = new KexiTableDesignerView(win, tqparent);
+		KexiTableDesignerView *t = new KexiTableDesignerView(win, parent);
 		return t;
 	}
 	else if (viewMode == Kexi::DataViewMode) {
@@ -119,7 +119,7 @@ KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dial
 			return 0; //todo: message
 		//we're not setting table schema here -it will be forced to set 
 		// in KexiTableDesigner_DataView::afterSwitchFrom()
-		KexiTableDesigner_DataView *t = new KexiTableDesigner_DataView(win, tqparent);
+		KexiTableDesigner_DataView *t = new KexiTableDesigner_DataView(win, parent);
 		return t;
 	}
 	return 0;
@@ -171,7 +171,7 @@ KexiTablePart::dataSource()
 }
 #endif
 
-tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *tqparent, KexiDB::Connection& conn, 
+tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, KexiDB::Connection& conn, 
 	KexiDB::TableSchema& table, const TQString& msg)
 {
 	TQPtrList<KexiDB::Connection::TableSchemaChangeListenerInterface>* listeners
@@ -185,7 +185,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *tqparent,
 			openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString);
 	}
 	openedObjectsStr += "</ul>";
-	int r = KMessageBox::questionYesNo(tqparent, 
+	int r = KMessageBox::questionYesNo(parent, 
 		"<p>"+msg+"</p><p>"+openedObjectsStr+"</p><p>"
 		+i18n("Do you want to close all windows for these objects?"), 
 		TQString(), KGuiItem(i18n("Close windows"),"fileclose"), KStdGuiItem::cancel());
@@ -278,8 +278,8 @@ KexiTableDataSource::cursor(KexiProject * /*project*/,
 
 //----------------
 
-KexiTablePart::TempData::TempData(TQObject* tqparent)
- : KexiDialogTempData(tqparent)
+KexiTablePart::TempData::TempData(TQObject* parent)
+ : KexiDialogTempData(parent)
  , table(0)
  , tableSchemaChangedInPreviousView(true /*to force reloading on startup*/ )
 {
diff --git a/kexi/plugins/tables/kexitablepart.h b/kexi/plugins/tables/kexitablepart.h
index 68825138..6042f365 100644
--- a/kexi/plugins/tables/kexitablepart.h
+++ b/kexi/plugins/tables/kexitablepart.h
@@ -38,7 +38,7 @@ class KexiTablePart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiTablePart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiTablePart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiTablePart();
 
 		virtual bool remove(KexiMainWindow *win, KexiPart::Item &item);
@@ -51,7 +51,7 @@ class KexiTablePart : public KexiPart::Part
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(TQObject* tqparent);
+				TempData(TQObject* parent);
 				KexiDB::TableSchema *table;
 				/*! true, if \a table member has changed in previous view. Used on view switching.
 				 We're checking this flag to see if we should refresh data for DataViewMode. */
@@ -59,7 +59,7 @@ class KexiTablePart : public KexiPart::Part
 		};
 
 		static tristate askForClosingObjectsUsingTableSchema(
-			TQWidget *tqparent, KexiDB::Connection& conn, 
+			TQWidget *parent, KexiDB::Connection& conn, 
 			KexiDB::TableSchema& table, const TQString& msg);
 
 		virtual TQString i18nMessage(const TQCString& englishMessage, 
@@ -70,7 +70,7 @@ class KexiTablePart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp
index 5482c072..72266fb2 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.cpp
+++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp
@@ -27,8 +27,8 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* tqparent, const char* name, bool modal )
- : KexiFindDialogBase(tqparent, name, modal)
+KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* parent, const char* name, bool modal )
+ : KexiFindDialogBase(parent, name, modal)
  , m_replaceMode(true)
 {
 	m_btnFind->setIconSet(KStdGuiItem::find().iconSet());
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.h b/kexi/tests/gui/finddialog/kexifinddialog.h
index b1cd4a5c..63a70b5d 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.h
+++ b/kexi/tests/gui/finddialog/kexifinddialog.h
@@ -31,7 +31,7 @@ class KexiFindDialog : public KexiFindDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiFindDialog( bool replaceMode, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE );
+		KexiFindDialog( bool replaceMode, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE );
 		virtual ~KexiFindDialog();
 
 #if 0
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 0f8b5e02..4c279382 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -68,8 +68,8 @@ KexiBrowserView::KexiBrowserView(KexiMainWindow *mainWin)
 	setFocusProxy(m_browser);
 }*/
 
-KexiBrowser::KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int features)
- : TQWidget(tqparent, "KexiBrowser")
+KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features)
+ : TQWidget(parent, "KexiBrowser")
  , m_mainWin(mainWin)
  , m_features(features)
  , m_actions( new KActionCollection(this) )
@@ -370,18 +370,18 @@ KexiBrowserItem *KexiBrowser::addGroup(KexiPart::Info& info)
 KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item)
 {
 	//part object for this item
-	KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower());
-	return addItem(item, tqparent, tqparent->info());
+	KexiBrowserItem *parent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower());
+	return addItem(item, parent, parent->info());
 }
 
-KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item, KexiBrowserItem *tqparent, KexiPart::Info* info)
+KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item, KexiBrowserItem *parent, KexiPart::Info* info)
 {
-//	if (!tqparent) //TODO: add "Other" part group for that
+//	if (!parent) //TODO: add "Other" part group for that
 	//	return 0;
-//	kdDebug() << "KexiBrowser::addItem() found tqparent:" << tqparent << endl;
+//	kdDebug() << "KexiBrowser::addItem() found parent:" << parent << endl;
 	KexiBrowserItem *bitem;
-	if (tqparent)
-		bitem = new KexiBrowserItem(tqparent, info, &item);
+	if (parent)
+		bitem = new KexiBrowserItem(parent, info, &item);
 	else
 		bitem = new KexiBrowserItem(m_list, info, &item);
 	m_normalItems.insert(item.identifier(), bitem);
@@ -400,7 +400,7 @@ KexiBrowser::slotRemoveItem(const KexiPart::Item &item)
 	TQListViewItem *new_item_to_select = 0;
 	if (it==to_remove) {//compute item to select if current one will be removed
 		new_item_to_select = it->itemBelow();//nearest item to select
-		if (!new_item_to_select || new_item_to_select->tqparent()!=it->tqparent()) {
+		if (!new_item_to_select || new_item_to_select->parent()!=it->parent()) {
 			new_item_to_select = it->itemAbove();
 		}
 	}
@@ -421,7 +421,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ
 		pm = m_itemPopup;
 		//update popup title
 		TQString title_text = bit->text(0).stripWhiteSpace();
-		KexiBrowserItem *par_it = static_cast<KexiBrowserItem*>(bit->tqparent());
+		KexiBrowserItem *par_it = static_cast<KexiBrowserItem*>(bit->parent());
 		KexiPart::Part* par_part = 0;
 		if (par_it && par_it->info() && ((par_part = Kexi::partManager().part(par_it->info()))) && !par_part->instanceCaption().isEmpty()) {
 			//add part type name
@@ -471,7 +471,7 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i)
 		return;
 	KexiPart::Part* part = Kexi::partManager().part(it->info());
 	if (!part) {
-		it = static_cast<KexiBrowserItem*>(it->tqparent());
+		it = static_cast<KexiBrowserItem*>(it->parent());
 		if (it) {
 			part = Kexi::partManager().part(it->info());
 		}
@@ -710,7 +710,7 @@ void KexiBrowser::itemRenameDone()
 		m_list->nameEndsWithAsterisk = false;
 	}
 	it->setText(0, txt);
-	it->tqparent()->sort();
+	it->parent()->sort();
 	setFocus();
 }
 
@@ -852,8 +852,8 @@ void KexiBrowser::clear()
 }
 
 //--------------------------------------------
-KexiBrowserListView::KexiBrowserListView(TQWidget *tqparent)
- : KListView(tqparent, "KexiBrowserListView")
+KexiBrowserListView::KexiBrowserListView(TQWidget *parent)
+ : KListView(parent, "KexiBrowserListView")
  , nameEndsWithAsterisk(false)
  , enableExecuteArea(true)
 {
diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h
index df51197a..3f9347cb 100644
--- a/kexi/widget/kexibrowser.h
+++ b/kexi/widget/kexibrowser.h
@@ -63,13 +63,13 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
 				| SingleClickOpensItemOptionEnabled //!< the default
 		};
 
-		KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int features = DefaultFeatures);
+		KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features = DefaultFeatures);
 		virtual ~KexiBrowser(); 
 
 		/*! Sets project \a prj for this browser. If \a partManagerErrorMessages is not NULL
 		 it will be set to error message if there's a problem with loading any KexiPart.
 		 If \a itemsMimeType is empty (the default), items of all mime types are displayed,
-		 items for only one mime type are displayed. In the latter case, no group (tqparent) 
+		 items for only one mime type are displayed. In the latter case, no group (parent) 
 		 items are displayed.
 		 Previous items are removed. */
 		void setProject(KexiProject* prj, const TQString& itemsMimeType = TQString(), 
@@ -151,7 +151,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
 
 	protected:
 		void itemRenameDone();
-		KexiBrowserItem* addItem(KexiPart::Item& item, KexiBrowserItem *tqparent, KexiPart::Info* info);
+		KexiBrowserItem* addItem(KexiPart::Item& item, KexiBrowserItem *parent, KexiPart::Info* info);
 
 		KexiMainWindow *m_mainWin;
 		int m_features;
diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h
index 4459daab..d0cc5589 100644
--- a/kexi/widget/kexibrowser_p.h
+++ b/kexi/widget/kexibrowser_p.h
@@ -29,7 +29,7 @@ class KexiBrowserListView : public KListView
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiBrowserListView(TQWidget *tqparent);
+		KexiBrowserListView(TQWidget *parent);
 		~KexiBrowserListView();
 		
 		virtual bool isExecuteArea( const TQPoint& point );
diff --git a/kexi/widget/kexibrowseritem.cpp b/kexi/widget/kexibrowseritem.cpp
index 24f1d46c..99b80095 100644
--- a/kexi/widget/kexibrowseritem.cpp
+++ b/kexi/widget/kexibrowseritem.cpp
@@ -24,8 +24,8 @@
 #include <kiconloader.h>
 #include <core/kexipartinfo.h>
 
-KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i)
- : KListViewItem(tqparent, i->groupName())
+KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i)
+ : KListViewItem(parent, i->groupName())
  , m_info(i)
  , m_item(0)
 {
@@ -36,8 +36,8 @@ KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i)
 	m_fifoSorting = 1; //because this is top level item
 }
 
-KexiBrowserItem::KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, KexiPart::Item *item)
- : KListViewItem(tqparent, item->name())
+KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item)
+ : KListViewItem(parent, item->name())
  , m_info(i)
  , m_item(item)
 {
@@ -45,8 +45,8 @@ KexiBrowserItem::KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, Kex
 	initItem();
 }
 
-KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i, KexiPart::Item *item)
- : KListViewItem(tqparent, item->name())
+KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item)
+ : KListViewItem(parent, item->name())
  , m_info(i)
  , m_item(item)
 {
@@ -63,8 +63,8 @@ void KexiBrowserItem::initItem()
 	m_fifoSorting = 0;
 	int sortKey = 0;
 	// set sorting key with FIFO order
-	if (tqparent()) {
-		sortKey = tqparent()->childCount();
+	if (parent()) {
+		sortKey = parent()->childCount();
 	} else if (listView()) {
 		sortKey = listView()->childCount();
 	}
diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h
index a46f5a8d..9138dafd 100644
--- a/kexi/widget/kexibrowseritem.h
+++ b/kexi/widget/kexibrowseritem.h
@@ -37,14 +37,14 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem
 {
 	public:
 		//! Creates group item for part \a i
-		KexiBrowserItem(KListView *tqparent, KexiPart::Info *i);
+		KexiBrowserItem(KListView *parent, KexiPart::Info *i);
 
-		//! Creates item for object \a item defined by part \a i for \a tqparent
-		KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, KexiPart::Item *item);
+		//! Creates item for object \a item defined by part \a i for \a parent
+		KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item);
 
-		//! Creates item for object \a item defined by part \a i, without tqparent 
+		//! Creates item for object \a item defined by part \a i, without parent 
 		//! (used in a case when KexiBrowser::itemsMimeType() is not empty)
-		KexiBrowserItem(KListView *tqparent, KexiPart::Info *i, KexiPart::Item *item);
+		KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item);
 
 		virtual ~KexiBrowserItem();
 
@@ -53,7 +53,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem
 		//! \return part info; should not be null.
 		KexiPart::Info *info() const { return m_info; }
 
-		//! \return part item. Can be null if the browser item is a "folder", i.e. a tqparent node.
+		//! \return part item. Can be null if the browser item is a "folder", i.e. a parent node.
 		KexiPart::Item* item() const { return m_item; }
 
 	protected:
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index 1b66f6a8..ff277e7d 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -27,8 +27,8 @@
 #include <kcharsets.h>
 
 KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( 
-	TQWidget* tqparent, const TQString& selectedEncoding )
- : KComboBox( tqparent, "KexiCharacterEncodingComboBox" )
+	TQWidget* parent, const TQString& selectedEncoding )
+ : KComboBox( parent, "KexiCharacterEncodingComboBox" )
  , m_defaultEncodingAdded(false)
 {
 	TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding()));
diff --git a/kexi/widget/kexicharencodingcombobox.h b/kexi/widget/kexicharencodingcombobox.h
index fd147cec..eba25d6d 100644
--- a/kexi/widget/kexicharencodingcombobox.h
+++ b/kexi/widget/kexicharencodingcombobox.h
@@ -30,7 +30,7 @@ class KEXIEXTWIDGETS_EXPORT KexiCharacterEncodingComboBox : public KComboBox
 	public:
 		//! Constructs a new combobox. \a selectedEncoding can be provided to preselect encoding.
 		//! If it is not provided, default encoding is selected for current system settings.
-		KexiCharacterEncodingComboBox( TQWidget* tqparent = 0, 
+		KexiCharacterEncodingComboBox( TQWidget* parent = 0, 
 			const TQString& selectedEncoding = TQString() );
 		~KexiCharacterEncodingComboBox();
 
diff --git a/kexi/widget/kexicustompropertyfactory.cpp b/kexi/widget/kexicustompropertyfactory.cpp
index e89727d0..7936ddb1 100644
--- a/kexi/widget/kexicustompropertyfactory.cpp
+++ b/kexi/widget/kexicustompropertyfactory.cpp
@@ -29,8 +29,8 @@ using namespace KoProperty;
 class PixmapIdCustomProperty : public CustomProperty
 {
 	public:
-		PixmapIdCustomProperty(Property *tqparent)
-			: CustomProperty(tqparent) {
+		PixmapIdCustomProperty(Property *parent)
+			: CustomProperty(parent) {
 		}
 		virtual ~PixmapIdCustomProperty() {};
 		virtual void setValue(const TQVariant &value, bool rememberOldValue) { 
@@ -47,8 +47,8 @@ class PixmapIdCustomProperty : public CustomProperty
 class IdentifierCustomProperty : public CustomProperty
 {
 	public:
-		IdentifierCustomProperty(Property *tqparent)
-			: CustomProperty(tqparent) {
+		IdentifierCustomProperty(Property *parent)
+			: CustomProperty(parent) {
 		}
 		virtual ~IdentifierCustomProperty() {};
 		virtual void setValue(const TQVariant &value, bool rememberOldValue)
@@ -66,8 +66,8 @@ class IdentifierCustomProperty : public CustomProperty
 
 //---------------
 
-KexiCustomPropertyFactory::KexiCustomPropertyFactory(TQObject* tqparent) 
-: CustomPropertyFactory(tqparent)
+KexiCustomPropertyFactory::KexiCustomPropertyFactory(TQObject* parent) 
+: CustomPropertyFactory(parent)
 {
 }
 
@@ -75,13 +75,13 @@ KexiCustomPropertyFactory::~KexiCustomPropertyFactory()
 {
 }
 
-CustomProperty* KexiCustomPropertyFactory::createCustomProperty(Property *tqparent)
+CustomProperty* KexiCustomPropertyFactory::createCustomProperty(Property *parent)
 {
-	const int type = tqparent->type();
+	const int type = parent->type();
 	if (type==(int)KexiCustomPropertyFactory::PixmapId)
-		return new PixmapIdCustomProperty(tqparent);
+		return new PixmapIdCustomProperty(parent);
 	else if (type==(int)KexiCustomPropertyFactory::Identifier)
-		return new IdentifierCustomProperty(tqparent);
+		return new IdentifierCustomProperty(parent);
 	return 0;
 }
 
diff --git a/kexi/widget/kexicustompropertyfactory.h b/kexi/widget/kexicustompropertyfactory.h
index d1550947..58efe5df 100644
--- a/kexi/widget/kexicustompropertyfactory.h
+++ b/kexi/widget/kexicustompropertyfactory.h
@@ -35,10 +35,10 @@ class KEXIEXTWIDGETS_EXPORT KexiCustomPropertyFactory : public KoProperty::Custo
 		//! Called once to register all propert and editor types provided by this factory.
 		static void init();
 
-		KexiCustomPropertyFactory(TQObject* tqparent);
+		KexiCustomPropertyFactory(TQObject* parent);
 		virtual ~KexiCustomPropertyFactory();
 
-		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property *tqparent);
+		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property *parent);
 		virtual KoProperty::Widget* createCustomWidget(KoProperty::Property *prop);
 };
 
diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index f5fbb90a..20e85b04 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -27,8 +27,8 @@
 using namespace KoProperty;
 
 KexiImagePropertyEdit::KexiImagePropertyEdit(
-	Property *property, TQWidget *tqparent, const char *name)
- : PixmapEdit(property, tqparent, name)
+	Property *property, TQWidget *parent, const char *name)
+ : PixmapEdit(property, parent, name)
  , m_id(0)
 {
 }
@@ -79,8 +79,8 @@ void KexiImagePropertyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, con
 //----------------------------------------------------------------
 
 KexiIdentifierPropertyEdit::KexiIdentifierPropertyEdit(
-	Property *property, TQWidget *tqparent, const char *name)
- : StringEdit(property, tqparent, name)
+	Property *property, TQWidget *parent, const char *name)
+ : StringEdit(property, parent, name)
 {
 	m_edit->setValidator( 
 		new KexiUtils::IdentifierValidator(TQT_TQOBJECT(m_edit), "KexiIdentifierPropertyEdit Validator") );
diff --git a/kexi/widget/kexicustompropertyfactory_p.h b/kexi/widget/kexicustompropertyfactory_p.h
index 49a4066b..792f424c 100644
--- a/kexi/widget/kexicustompropertyfactory_p.h
+++ b/kexi/widget/kexicustompropertyfactory_p.h
@@ -32,7 +32,7 @@ class KexiImagePropertyEdit : public KoProperty::PixmapEdit
 
 	public:
 		KexiImagePropertyEdit(KoProperty::Property *property, 
-			TQWidget *tqparent=0, const char *name=0);
+			TQWidget *parent=0, const char *name=0);
 		virtual ~KexiImagePropertyEdit();
 
 		virtual TQVariant value() const;
@@ -61,7 +61,7 @@ class KexiIdentifierPropertyEdit : public KoProperty::StringEdit
 
 	public:
 		KexiIdentifierPropertyEdit(KoProperty::Property *property, 
-			TQWidget *tqparent=0, const char *name=0);
+			TQWidget *parent=0, const char *name=0);
 		virtual ~KexiIdentifierPropertyEdit();
 
 		/*! Reimplemented: sets \a value but it is converted to identifier
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 13e308c8..113f8be4 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -27,8 +27,8 @@
 
 #include <kpopupmenu.h>
 
-KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
  , KexiSearchAndReplaceViewInterface()
  , m_internalView(0)
  , m_actionClient(0)
diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h
index 98124f5a..5cc76e97 100644
--- a/kexi/widget/kexidataawareview.h
+++ b/kexi/widget/kexidataawareview.h
@@ -45,7 +45,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
   TQ_OBJECT
 
 	public:
-		KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 
 		TQWidget* mainWidget();
 
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 0db52c9d..f830926f 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -69,8 +69,8 @@ class KexiDataSourceComboBox::Private
 
 //------------------------
 
-KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *tqparent, const char *name)
- : KComboBox(true/*rw*/, tqparent, name)
+KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *name)
+ : KComboBox(true/*rw*/, parent, name)
  , d(new Private())
 {
 	setInsertionPolicy(NoInsertion);
diff --git a/kexi/widget/kexidatasourcecombobox.h b/kexi/widget/kexidatasourcecombobox.h
index 6f9f58ed..0ccb663a 100644
--- a/kexi/widget/kexidatasourcecombobox.h
+++ b/kexi/widget/kexidatasourcecombobox.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox
   TQ_OBJECT
 
 	public:
-		KexiDataSourceComboBox(TQWidget *tqparent, const char *name=0);
+		KexiDataSourceComboBox(TQWidget *parent, const char *name=0);
 		~KexiDataSourceComboBox();
 
 		//! \return global project that is used to retrieve schema informationm for this combo box.
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index e0f2dd1b..09680b14 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -34,10 +34,10 @@
 #include "kexidatatable.h"
 #include "kexidialogbase.h"
 
-KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, 
+KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, 
 	const char *name, bool dbAware)
-// : KexiViewBase(mainWin, tqparent, name)
- : KexiDataAwareView( mainWin, tqparent, name )
+// : KexiViewBase(mainWin, parent, name)
+ : KexiDataAwareView( mainWin, parent, name )
 {
 	KexiTableView *view;
 	if (dbAware)
@@ -50,9 +50,9 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent,
 	KexiDataAwareView::init( view, view, view );
 }
 
-KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, 
+KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, 
 	KexiDB::Cursor *cursor, const char *name)
- : KexiDataAwareView( mainWin, tqparent, name )
+ : KexiDataAwareView( mainWin, parent, name )
 {
 	KexiTableView *view = new KexiDataTableView(this, "view", cursor);
 	KexiDataAwareView::init( view, view, view );
diff --git a/kexi/widget/kexidatatable.h b/kexi/widget/kexidatatable.h
index ccc5c6c3..1cf392e1 100644
--- a/kexi/widget/kexidatatable.h
+++ b/kexi/widget/kexidatatable.h
@@ -54,12 +54,12 @@ class KEXIEXTWIDGETS_EXPORT KexiDataTable : public KexiDataAwareView
 		 Otherwise, table will be not-db-aware, 
 		  and KexiTableView is used internally. In the latter case,
 		  data can be set by calling tableView()->setData(KexiTableViewData* data). */
-		KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0, 
+		KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0, 
 			bool dbAware = true);
 
 		/*! CTOR2: Creates db-aware, table view initialized with \a cursor. 
 		 KexiDataTableView is used internally. */
-		KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, 
+		KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, 
 			KexiDB::Cursor *cursor, const char *name = 0);
 
 		virtual ~KexiDataTable();
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index a048e929..78b67c8d 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -65,8 +65,8 @@ class KexiDBConnectionWidget::Private
 
 //---------
 
-KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* tqparent,  const char* name )
- : KexiDBConnectionWidgetBase( tqparent, name )
+KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* name )
+ : KexiDBConnectionWidgetBase( parent, name )
  , d(new Private())
 {
 	iconLabel->setPixmap(DesktopIcon("network"));
@@ -221,8 +221,8 @@ void KexiDBConnectionWidget::slotCBToggled(bool on)
 
 //-----------
 
-KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* tqparent, const char* name )
- : KTabWidget( tqparent, name )
+KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const char* name )
+ : KTabWidget( parent, name )
 {
 	mainWidget = new KexiDBConnectionWidget( this, "mainWidget" );
 	mainWidget->tqlayout()->setMargin(KDialog::marginHint());
diff --git a/kexi/widget/kexidbconnectionwidget.h b/kexi/widget/kexidbconnectionwidget.h
index 72c49c89..db9bef11 100644
--- a/kexi/widget/kexidbconnectionwidget.h
+++ b/kexi/widget/kexidbconnectionwidget.h
@@ -39,7 +39,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionWidget : public KexiDBConnectionWidg
   TQ_OBJECT
 
 	public:
-		KexiDBConnectionWidget( TQWidget* tqparent = 0, const char* name = 0 );
+		KexiDBConnectionWidget( TQWidget* parent = 0, const char* name = 0 );
 		virtual ~KexiDBConnectionWidget();
 
 		/*! Sets project data \a data.
@@ -95,7 +95,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionTabWidget : public KTabWidget
   TQ_OBJECT
 
 	public:
-		KexiDBConnectionTabWidget( TQWidget* tqparent = 0, const char* name = 0 );
+		KexiDBConnectionTabWidget( TQWidget* parent = 0, const char* name = 0 );
 		virtual ~KexiDBConnectionTabWidget();
 
 		/*! Sets connection data \a data.
diff --git a/kexi/widget/kexidbdrivercombobox.cpp b/kexi/widget/kexidbdrivercombobox.cpp
index e083ac1c..e1719576 100644
--- a/kexi/widget/kexidbdrivercombobox.cpp
+++ b/kexi/widget/kexidbdrivercombobox.cpp
@@ -23,9 +23,9 @@
 
 #include <kiconloader.h>
 
-KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, 
+KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, 
 	Options options)
- : KComboBox(tqparent, "KexiDBDriverComboBox")
+ : KComboBox(parent, "KexiDBDriverComboBox")
 {
 	//retrieve list of drivers and sort it: file-based first, then server-based
 	TQStringList captionsForFileBasedDrivers, captionsForServerBasedDrivers;
diff --git a/kexi/widget/kexidbdrivercombobox.h b/kexi/widget/kexidbdrivercombobox.h
index cdd18f76..31b4eb04 100644
--- a/kexi/widget/kexidbdrivercombobox.h
+++ b/kexi/widget/kexidbdrivercombobox.h
@@ -65,7 +65,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBDriverComboBox : public KComboBox
 		    If \a includeFileBasedDrivers is set to false, then only those drivers
 		    that are for database servers (those which have X-Kexi-DriverType=Network
 		    in their .desktop file) are shown. */
-		KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, 
+		KexiDBDriverComboBox(TQWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, 
 			Options options = ShowAll );
 
 		~KexiDBDriverComboBox();
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index ca2480f6..b07dc997 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -30,10 +30,10 @@
 #include "kexidatasourcewizard.h"
 #include "kexidswelcome.h"
 
-KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *tqparent)
- : TQWidget(tqparent)
+KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
+ : TQWidget(parent)
 {
-	m_wiz = tqparent;
+	m_wiz = parent;
 	KexiDSPixmap *pic = new KexiDSPixmap(this);
 
 	TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this);
diff --git a/kexi/widget/kexidswelcome.h b/kexi/widget/kexidswelcome.h
index dc7cbd14..978beaad 100644
--- a/kexi/widget/kexidswelcome.h
+++ b/kexi/widget/kexidswelcome.h
@@ -35,7 +35,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDSWelcome : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiDSWelcome(KexiDataSourceWizard *tqparent);
+		KexiDSWelcome(KexiDataSourceWizard *parent);
 		~KexiDSWelcome();
 
 	protected slots:
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index f45faaa1..07627f32 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -81,8 +81,8 @@ class KexiEditorPrivate {
 #endif
 };
 
-KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
-	: KexiViewBase(mainWin, tqparent, name)
+KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+	: KexiViewBase(mainWin, parent, name)
 	, d(new KexiEditorPrivate())
 {
 	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
diff --git a/kexi/widget/kexieditor.h b/kexi/widget/kexieditor.h
index 022b0dd9..2c659f01 100644
--- a/kexi/widget/kexieditor.h
+++ b/kexi/widget/kexieditor.h
@@ -48,12 +48,12 @@ class KEXIEXTWIDGETS_EXPORT KexiEditor : public KexiViewBase
 		* 
 		* \param mainWin The \a KexiMainWindow instance this KexiEditor
 		*        belongs too.
-		* \param tqparent The tqparent \a TQWidget this KexiEditor is child
+		* \param parent The parent \a TQWidget this KexiEditor is child
 		*        of.  You don't need to free the KexiEditor cause TQt 
 		*        will handle that for us.
 		* \param name The name this KexiEditor has. Used only for debugging.
 		*/
-		KexiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 
 		/**
 		* Destructor.
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 0439a178..e1afd1f8 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -70,8 +70,8 @@ class KexiFieldComboBox::Private
 
 //------------------------
 
-KexiFieldComboBox::KexiFieldComboBox(TQWidget *tqparent, const char *name)
- : KComboBox(true/*rw*/, tqparent, name)
+KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name)
+ : KComboBox(true/*rw*/, parent, name)
  , d(new Private())
 {
 	setInsertionPolicy(NoInsertion);
diff --git a/kexi/widget/kexifieldcombobox.h b/kexi/widget/kexifieldcombobox.h
index 9619f407..8785b73b 100644
--- a/kexi/widget/kexifieldcombobox.h
+++ b/kexi/widget/kexifieldcombobox.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldComboBox : public KComboBox
   TQ_OBJECT
 
 	public:
-		KexiFieldComboBox(TQWidget *tqparent, const char *name = 0);
+		KexiFieldComboBox(TQWidget *parent, const char *name = 0);
 		virtual ~KexiFieldComboBox();
 
 //		/*! Sets table or query schema \a schema. 
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index e9796abf..521b1ce3 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -42,8 +42,8 @@
 #include <kexidragobjects.h>
 #include <kexiutils/utils.h>
 
-KexiFieldListView::KexiFieldListView(TQWidget *tqparent, const char *name, int options)
- : KListView(tqparent, name)
+KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int options)
+ : KListView(parent, name)
  , m_schema(0)
  , m_keyIcon(SmallIcon("key"))
  , m_noIcon(KexiUtils::emptyIcon(KIcon::Small))
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index e133aeae..50d94dba 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -45,7 +45,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
 			AllowMultiSelection = 4 //!< if set, multiple selection is allowed
 		};
 
-		KexiFieldListView(TQWidget *tqparent, const char *name = 0, 
+		KexiFieldListView(TQWidget *parent, const char *name = 0, 
 			int options = ShowDataTypes | AllowMultiSelection );
 		virtual ~KexiFieldListView();
 
diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp
index aec34dc4..e41681ab 100644
--- a/kexi/widget/kexifilterdlg.cpp
+++ b/kexi/widget/kexifilterdlg.cpp
@@ -30,8 +30,8 @@
 #include "kexifilterdlg.h"
 #include "kexiquerydesignersqleditor.h"
 
-KexiFilterDlg::KexiFilterDlg(KexiProject *project, TQWidget *tqparent, const char *name)
- : TQDialog(tqparent, name)
+KexiFilterDlg::KexiFilterDlg(KexiProject *project, TQWidget *parent, const char *name)
+ : TQDialog(parent, name)
 {
 	m_project = project;
 
diff --git a/kexi/widget/kexifilterdlg.h b/kexi/widget/kexifilterdlg.h
index 4a3d7e79..a92824e2 100644
--- a/kexi/widget/kexifilterdlg.h
+++ b/kexi/widget/kexifilterdlg.h
@@ -33,7 +33,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFilterDlg : public TQDialog
   TQ_OBJECT
 
 	public:
-		KexiFilterDlg(KexiProject *p, TQWidget *tqparent=0, const char *name=0);
+		KexiFilterDlg(KexiProject *p, TQWidget *parent=0, const char *name=0);
 		~KexiFilterDlg();
 
 		TQPushButton	*createMiniButton(const TQString &text);
diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp
index 94a62e0a..2717e0e9 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -23,8 +23,8 @@
 #include <kmimetype.h>
 #include <kexidb/driver.h>
 
-KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* tqparent )
-	: KexiPrjTypeSelectorBase( tqparent, "KexiPrjTypeSelector" )
+KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
+	: KexiPrjTypeSelectorBase( parent, "KexiPrjTypeSelector" )
 {
 	TQString none;
 	icon_file->setPixmap( 
diff --git a/kexi/widget/kexiprjtypeselector.h b/kexi/widget/kexiprjtypeselector.h
index 13e46484..717ad724 100644
--- a/kexi/widget/kexiprjtypeselector.h
+++ b/kexi/widget/kexiprjtypeselector.h
@@ -29,7 +29,7 @@ class KEXIEXTWIDGETS_EXPORT KexiPrjTypeSelector : public KexiPrjTypeSelectorBase
   TQ_OBJECT
 
 	public:
-		KexiPrjTypeSelector( TQWidget* tqparent = 0 );
+		KexiPrjTypeSelector( TQWidget* parent = 0 );
 		~KexiPrjTypeSelector();
 
 	protected slots:
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 5c36cfb0..02b050b8 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name)
+KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
+ : TQWidget(parent, name)
 {
 	TQHBoxLayout *hlyr = new TQHBoxLayout(this);
 	m_objectIconLabel = new TQLabel(this);
@@ -103,8 +103,8 @@ class KexiPropertyEditorView::Private
 
 //------------------------------
 
-KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent)
-	: TQWidget(tqparent, "KexiPropertyEditorView")
+KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* parent)
+	: TQWidget(parent, "KexiPropertyEditorView")
 	, d(new Private())
 {
 	setCaption(i18n("Properties"));
diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h
index 79adb9e0..66cc0ac7 100644
--- a/kexi/widget/kexipropertyeditorview.h
+++ b/kexi/widget/kexipropertyeditorview.h
@@ -47,7 +47,7 @@ namespace KoProperty {
 class KEXIEXTWIDGETS_EXPORT KexiObjectInfoLabel : public TQWidget
 {
 	public:
-		KexiObjectInfoLabel(TQWidget* tqparent, const char* name = 0);
+		KexiObjectInfoLabel(TQWidget* parent, const char* name = 0);
 		~KexiObjectInfoLabel();
 
 		void setObjectClassIcon(const TQString& name);
@@ -85,7 +85,7 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent);
+		KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* parent);
 		virtual ~KexiPropertyEditorView();
 
 		/*! Helper function. Updates \a infoLabel widget by reusing properties provided 
diff --git a/kexi/widget/kexiquerydesignersqleditor.cpp b/kexi/widget/kexiquerydesignersqleditor.cpp
index 1c68138f..d5e1f887 100644
--- a/kexi/widget/kexiquerydesignersqleditor.cpp
+++ b/kexi/widget/kexiquerydesignersqleditor.cpp
@@ -22,8 +22,8 @@
 #include "kexiquerydesignersqleditor.h"
 
 KexiQueryDesignerSQLEditor::KexiQueryDesignerSQLEditor(
-	KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
-	: KexiEditor(mainWin, tqparent, name)
+	KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+	: KexiEditor(mainWin, parent, name)
 {
 	setHighlightMode("sql");
 }
diff --git a/kexi/widget/kexiquerydesignersqleditor.h b/kexi/widget/kexiquerydesignersqleditor.h
index 9b1f9f9b..a0bd4bee 100644
--- a/kexi/widget/kexiquerydesignersqleditor.h
+++ b/kexi/widget/kexiquerydesignersqleditor.h
@@ -33,7 +33,7 @@ class KEXIEXTWIDGETS_EXPORT KexiQueryDesignerSQLEditor : public KexiEditor
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiQueryDesignerSQLEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiQueryDesignerSQLEditor();
 };
 
diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp
index bcef819f..04257ec2 100644
--- a/kexi/widget/kexiqueryparameters.cpp
+++ b/kexi/widget/kexiqueryparameters.cpp
@@ -29,7 +29,7 @@
 #include "utils/kexidatetimeformatter.h"
 
 //static
-TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, 
+TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *parent, 
 	const KexiDB::Driver &driver, KexiDB::QuerySchema& querySchema, bool &ok)
 {
 	Q_UNUSED(driver);
@@ -48,7 +48,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 //! @todo add support for unsigned parameter here
 			KexiDB::getLimitsForType((*it).type, minValue, maxValue);
 			const int result = KInputDialog::getInteger(
-				caption, (*it).message, 0, minValue, maxValue, 1/*step*/, 10/*base*/, &ok, tqparent);
+				caption, (*it).message, 0, minValue, maxValue, 1/*step*/, 10/*base*/, &ok, parent);
 			if (!ok)
 				return TQValueList<TQVariant>(); //cancelled
 			values.append(result);
@@ -58,7 +58,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 			TQStringList list;
 			list << i18n("Boolean True - Yes", "Yes") << i18n("Boolean False - No", "No");
 			const TQString result = KInputDialog::getItem(
-				caption, (*it).message, list, 0/*current*/, false /*!editable*/, &ok, tqparent);
+				caption, (*it).message, list, 0/*current*/, false /*!editable*/, &ok, parent);
 			if (!ok || result.isEmpty())
 				return TQValueList<TQVariant>(); //cancelled
 			values.append( TQVariant( result==list.first(), 1 ) );
@@ -67,7 +67,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 		case KexiDB::Field::Date: {
 			KexiDateFormatter df;
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, 
+				caption, (*it).message, TQString(), &ok, parent, 0/*name*/, 
 //! @todo add validator
 				0/*validator*/, df.inputMask() );
 			if (!ok)
@@ -79,7 +79,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 			KexiDateFormatter df;
 			KexiTimeFormatter tf;
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, 
+				caption, (*it).message, TQString(), &ok, parent, 0/*name*/, 
 //! @todo add validator
 				0/*validator*/, dateTimeInputMask(df, tf) );
 			if (!ok)
@@ -90,7 +90,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 		case KexiDB::Field::Time: {
 			KexiTimeFormatter tf;
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, 
+				caption, (*it).message, TQString(), &ok, parent, 0/*name*/, 
 //! @todo add validator
 				0/*validator*/, tf.inputMask() );
 			if (!ok)
@@ -103,7 +103,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 			// KInputDialog::getDouble() does not work well, use getText and double validator
 			KDoubleValidator validator(0);
 			const TQString textResult = KInputDialog::getText( caption, (*it).message, TQString(), &ok, 
-				tqparent, 0, &validator);
+				parent, 0, &validator);
 			if (!ok || textResult.isEmpty())
 				return TQValueList<TQVariant>(); //cancelled
 //! @todo this value will be still rounded: consider storing them as a decimal type 
@@ -117,7 +117,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 		case KexiDB::Field::Text:
 		case KexiDB::Field::LongText: {
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent);
+				caption, (*it).message, TQString(), &ok, parent);
 			if (!ok)
 				return TQValueList<TQVariant>(); //cancelled
 			values.append( result );
diff --git a/kexi/widget/kexiqueryparameters.h b/kexi/widget/kexiqueryparameters.h
index b80a37ad..986c1ce9 100644
--- a/kexi/widget/kexiqueryparameters.h
+++ b/kexi/widget/kexiqueryparameters.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiQueryParameters
 	//! @todo support defaults 
 	//! @todo support validation rules, e.g. min/max value, unsigned
 	//! @todo support Enum type (list of strings, need support for keys and user-visible strings)
-		static TQValueList<TQVariant> getParameters(TQWidget *tqparent, const KexiDB::Driver &driver, 
+		static TQValueList<TQVariant> getParameters(TQWidget *parent, const KexiDB::Driver &driver, 
 			KexiDB::QuerySchema& querySchema, bool &ok);
 };
 
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index b88ad3ae..db9dbb14 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -44,8 +44,8 @@ class KexiScrollViewData
 static KStaticDeleter<KexiScrollViewData> KexiScrollView_data_deleter;
 KexiScrollViewData* KexiScrollView_data = 0;
 
-KexiScrollView::KexiScrollView(TQWidget *tqparent, bool preview)
- : TQScrollView(tqparent, "kexiscrollview", WStaticContents)
+KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
+ : TQScrollView(parent, "kexiscrollview", WStaticContents)
  , m_widget(0)
  , m_helpFont(font())
  , m_preview(preview)
diff --git a/kexi/widget/kexiscrollview.h b/kexi/widget/kexiscrollview.h
index 92615cf3..1fccdbd6 100644
--- a/kexi/widget/kexiscrollview.h
+++ b/kexi/widget/kexiscrollview.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiScrollView : public TQScrollView
   TQ_OBJECT
 
 	public:
-		KexiScrollView(TQWidget *tqparent, bool preview);
+		KexiScrollView(TQWidget *parent, bool preview);
 		virtual ~KexiScrollView();
 
 		void setWidget(TQWidget *w);
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 7bc3fe5f..7e6989f3 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -32,7 +32,7 @@
 class KexiSectionHeader::BoxLayout : public TQBoxLayout
 {
 	public:
-		BoxLayout( KexiSectionHeader* tqparent, Direction d, int margin = 0, 
+		BoxLayout( KexiSectionHeader* parent, Direction d, int margin = 0, 
 			int spacing = -1, const char * name = 0 );
 		virtual void addItem( TQLayoutItem * item );
 		TQGuardedPtr<KexiViewBase> view;
@@ -56,8 +56,8 @@ class KexiSectionHeaderPrivate
 
 //==========================
 
-KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* tqparent )
-	: TQWidget(tqparent, "KexiSectionHeader")
+KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* parent )
+	: TQWidget(parent, "KexiSectionHeader")
 	, d( new KexiSectionHeaderPrivate() )
 {
 	d->orientation = o;
@@ -138,8 +138,8 @@ TQSize KexiSectionHeader::tqsizeHint() const
 
 //======================
 
-KexiSectionHeader::BoxLayout::BoxLayout( KexiSectionHeader* tqparent, Direction d, int margin, int spacing, const char * name )
- : TQBoxLayout(tqparent, d, margin, spacing, name )
+KexiSectionHeader::BoxLayout::BoxLayout( KexiSectionHeader* parent, Direction d, int margin, int spacing, const char * name )
+ : TQBoxLayout(parent, d, margin, spacing, name )
 {
 }
 
diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h
index 9e8d1215..9ed31a35 100644
--- a/kexi/widget/kexisectionheader.h
+++ b/kexi/widget/kexisectionheader.h
@@ -32,7 +32,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget
 		class BoxLayout;
 
 		KexiSectionHeader(const TQString &caption, Qt::Orientation o, 
-			TQWidget* tqparent = 0 );
+			TQWidget* parent = 0 );
 
 		virtual ~KexiSectionHeader();
 
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 94a088a0..81bab0c6 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -28,24 +28,24 @@
 
 #include <core/kexi.h>
 
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, const TQString& text,
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text,
 	const TQString& icon, const char* name)
- : TQToolButton(tqparent, name)
+ : TQToolButton(parent, name)
 {
 	init();
 	update(text, SmallIconSet(icon));
 }
 
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, const TQString& text,
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text,
 	const TQIconSet& iconSet, const char* name)
- : TQToolButton(tqparent, name)
+ : TQToolButton(parent, name)
 {
 	init();
 	update(text, iconSet);
 }
 
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, KAction* action)
- : TQToolButton(tqparent, action->name())
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, KAction* action)
+ : TQToolButton(parent, action->name())
  , m_action(action)
 {
 	init();
diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h
index 90ba7e5e..53efb0d1 100644
--- a/kexi/widget/kexismalltoolbutton.h
+++ b/kexi/widget/kexismalltoolbutton.h
@@ -32,13 +32,13 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton
   TQ_OBJECT
 
 	public:
-		KexiSmallToolButton(TQWidget* tqparent, const TQString& text, 
+		KexiSmallToolButton(TQWidget* parent, const TQString& text, 
 			const TQString& icon = TQString(), const char* name = 0);
 
-		KexiSmallToolButton(TQWidget* tqparent, const TQString& text, 
+		KexiSmallToolButton(TQWidget* parent, const TQString& text, 
 			const TQIconSet& iconSet, const char* name = 0);
 
-		KexiSmallToolButton(TQWidget* tqparent, KAction *action);
+		KexiSmallToolButton(TQWidget* parent, KAction *action);
 		
 		virtual ~KexiSmallToolButton();
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index fecc5b76..0aeddca4 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -40,8 +40,8 @@
 #include "pixmapcollection.h"
 
 /// Pixmap Collection
-PixmapCollection::PixmapCollection(const TQString &collectionName, TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+PixmapCollection::PixmapCollection(const TQString &collectionName, TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
 	m_name = collectionName;
 }
@@ -150,8 +150,8 @@ PixmapCollection::load(TQDomNode node)
 }
 
 //// A dialog to load a KDE icon by its name
-LoadIconDialog::LoadIconDialog(TQWidget *tqparent)
-: KDialogBase(tqparent, "loadicon_dialog", true, i18n("Load KDE Icon by Name"), Ok|Cancel, Ok, false)
+LoadIconDialog::LoadIconDialog(TQWidget *parent)
+: KDialogBase(parent, "loadicon_dialog", true, i18n("Load KDE Icon by Name"), Ok|Cancel, Ok, false)
 {
 	TQFrame *frame = makeMainWidget();
 	TQGridLayout *l = new TQGridLayout(frame, 2, 3, 0, 6);
@@ -230,8 +230,8 @@ TQString LoadIconDialog::iconName()
 }
 
 /// Pixmap Collection Editor Dialog
-PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *tqparent)
-: KDialogBase(tqparent, "pixcollection_dialog", true,
+PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent)
+: KDialogBase(parent, "pixcollection_dialog", true,
 	i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false)
 {
 	m_collection = collection;
@@ -372,8 +372,8 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 }
 
 //// A Dialog to choose a pixmap from the PixmapCollection
-PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *tqparent)
-: KDialogBase(tqparent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
+PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent)
+: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
    User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection...")))
 {
 	m_collection = collection;
diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h
index 3ac4c417..833fbd98 100644
--- a/kexi/widget/pixmapcollection.h
+++ b/kexi/widget/pixmapcollection.h
@@ -46,7 +46,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
   TQ_OBJECT
 
 	public:
-		PixmapCollection(const TQString &collectionName, TQObject *tqparent = 0, const char *name = 0);
+		PixmapCollection(const TQString &collectionName, TQObject *parent = 0, const char *name = 0);
 		~PixmapCollection() {;}
 
 		TQString addPixmapPath(const KURL &url);
@@ -80,7 +80,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionEditor : public KDialogBase
   TQ_OBJECT
 
 	public:
-		PixmapCollectionEditor(PixmapCollection *collection, TQWidget *tqparent = 0);
+		PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent = 0);
 		~PixmapCollectionEditor() {;}
 
 	protected:
@@ -109,7 +109,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionChooser : public KDialogBase
   TQ_OBJECT
 
 	public:
-		PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *tqparent = 0);
+		PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent = 0);
 		~PixmapCollectionChooser() {;}
 
 		TQPixmap  pixmap();
@@ -132,7 +132,7 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		LoadIconDialog(TQWidget *tqparent = 0);
+		LoadIconDialog(TQWidget *parent = 0);
 		~LoadIconDialog() {;}
 
 		int iconSize();
@@ -152,8 +152,8 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
 class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public KIconViewItem
 {
 	public:
-		PixmapIconViewItem(KIconView *tqparent, const TQString &text, const TQPixmap &icon)
-		: KIconViewItem(tqparent, text, icon)  { m_name = text; }
+		PixmapIconViewItem(KIconView *parent, const TQString &text, const TQPixmap &icon)
+		: KIconViewItem(parent, text, icon)  { m_name = text; }
 		~PixmapIconViewItem() {;}
 
 		void setName(const TQString &name) { m_name = name; }
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index b1fc22d2..18c19ef9 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -45,8 +45,8 @@
 #include "kexirelationviewconnection.h"
 #include <kexi.h>
 
-KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
- : TQScrollView(tqparent, name, WStaticContents)
+KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
+ : TQScrollView(parent, name, WStaticContents)
 {
 //	m_relation=relation;
 //	m_relation->incUsageCount();
@@ -74,11 +74,11 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 */	
 #if 0
 	m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "",
-		this, TQT_SLOT(removeSelectedTableQuery()), tqparent->actionCollection(), "relationsview_removeSelectedTableQuery");
+		this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
 	m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "",
-		this, TQT_SLOT(removeSelectedConnection()), tqparent->actionCollection(), "relationsview_removeSelectedConnection");
+		this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
 	m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "",
-		this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery");
+		this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
 //	invalidateActions();
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index dcf78834..6bc31b31 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -71,7 +71,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
   TQ_OBJECT
 
 	public:
-		KexiRelationView(TQWidget *tqparent, const char *name=0);
+		KexiRelationView(TQWidget *parent, const char *name=0);
 		virtual ~KexiRelationView();
 
 		//! \return a dictionary of added tables
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index f294b49c..c0635c1b 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -40,9 +40,9 @@
 
 KexiRelationViewConnection::KexiRelationViewConnection(
 	KexiRelationViewTableContainer *masterTbl, KexiRelationViewTableContainer *detailsTbl, 
-	SourceConnection &c, KexiRelationView *tqparent)
+	SourceConnection &c, KexiRelationView *parent)
 {
-	m_parent = tqparent;
+	m_parent = parent;
 //	kdDebug() << "KexiRelationViewConnection::KexiRelationViewConnection()" << endl;
 
 	m_masterTable = masterTbl;
diff --git a/kexi/widget/relations/kexirelationviewconnection.h b/kexi/widget/relations/kexirelationviewconnection.h
index 7b596210..745a5e23 100644
--- a/kexi/widget/relations/kexirelationviewconnection.h
+++ b/kexi/widget/relations/kexirelationviewconnection.h
@@ -33,7 +33,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewConnection
 	public:
 
 		KexiRelationViewConnection(KexiRelationViewTableContainer *masterTbl, 
-			KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *tqparent);
+			KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *parent);
 		~KexiRelationViewConnection();
 
 
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index a45a9ad1..94a17f4d 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -43,10 +43,10 @@
 #include "kexirelationview.h"
 
 KexiRelationViewTableContainer::KexiRelationViewTableContainer(
-	KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema)
- : TQFrame(tqparent,"KexiRelationViewTableContainer" )
+	KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema)
+ : TQFrame(parent,"KexiRelationViewTableContainer" )
 // , m_table(t)
- , m_parent(tqparent)
+ , m_parent(parent)
 //	, m_mousePressed(false)
 {
 
@@ -66,7 +66,7 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved()));
 	connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag()));
 
-	m_tableView = new KexiRelationViewTable(schema, tqparent, this, "KexiRelationViewTable");
+	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
 	m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	
@@ -176,8 +176,8 @@ void KexiRelationViewTableContainer::unsetFocus()
 //BEGIN KexiRelatoinViewTableContainerHeader
 
 KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader(
-	const TQString& text,TQWidget *tqparent)
-	:TQLabel(text,tqparent),m_dragging(false) 
+	const TQString& text,TQWidget *parent)
+	:TQLabel(text,parent),m_dragging(false) 
 {
 	setMargin(1);
 	m_activeBG = KGlobalSettings::activeTitleColor();
@@ -292,8 +292,8 @@ void KexiRelationViewTableContainerHeader::mouseReleaseEvent(TQMouseEvent *ev) {
 //=====================================================================================
 
 KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, 
-	KexiRelationView *view, TQWidget *tqparent, const char *name)
- : KexiFieldListView(tqparent, name, KexiFieldListView::ShowAsterisk)
+	KexiRelationView *view, TQWidget *parent, const char *name)
+ : KexiFieldListView(parent, name, KexiFieldListView::ShowAsterisk)
  , m_view(view)
 {
 	setSchema(tableOrQuerySchema);
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index deabc2e0..5c622dad 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -43,9 +43,9 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame
   TQ_OBJECT
 
 	public:
-//		KexiRelationViewTableContainer(KexiRelationView *tqparent, KexiDB::TableSchema *t);
+//		KexiRelationViewTableContainer(KexiRelationView *parent, KexiDB::TableSchema *t);
 		KexiRelationViewTableContainer(
-			KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema);
+			KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema);
 
 		virtual ~KexiRelationViewTableContainer();
 
@@ -85,7 +85,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame
 class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem
 {
 	public:
-		KexiRelationViewTableItem(TQListView *tqparent, TQListViewItem *after,
+		KexiRelationViewTableItem(TQListView *parent, TQListViewItem *after,
 			TQString key, TQString field);
 		virtual void paintFocus ( TQPainter * p, const TQColorGroup & cg, const TQRect & r );
 };*/
@@ -98,8 +98,8 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
 
 	public:
 		KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, 
-			KexiRelationView *view, TQWidget *tqparent, const char *name = 0);
-//		KexiRelationViewTable(TQWidget *tqparent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0);
+			KexiRelationView *view, TQWidget *parent, const char *name = 0);
+//		KexiRelationViewTable(TQWidget *parent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0);
 		virtual ~KexiRelationViewTable();
 
 //		KexiDB::TableSchema *table() const { return m_table; };
@@ -133,7 +133,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public TQL
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *tqparent);
+		KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *parent);
 		virtual ~KexiRelationViewTableContainerHeader();
 
 		virtual void setFocus();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index ee9caeed..4b952163 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -41,9 +41,9 @@
 #include "kexirelationviewtable.h"
 #include "kexirelationviewconnection.h"
 
-KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, 
+KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, 
 	const char *name)
-	: KexiViewBase(win, tqparent, name)
+	: KexiViewBase(win, parent, name)
 	, m_win(win)
 {
 	m_conn = m_win->project()->dbConnection();
@@ -118,7 +118,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent,
 	if(!embedd)
 	{
 /*todo		setContextHelp(i18n("Relations"), i18n("To create a relationship simply drag the source field onto the target field. "
-			"An arrowhead is used to show which table is the tqparent (master) and which table is the child (slave) in the relationship."));*/
+			"An arrowhead is used to show which table is the parent (master) and which table is the child (slave) in the relationship."));*/
 	}
 #endif
 //	else
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 20a70174..39ac549a 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -47,7 +47,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, const char *name=0);
+		KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, const char *name=0);
 		virtual ~KexiRelationWidget();
 
 		//! \return a dictionary of added tables
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index dbf95ad6..7ad76c34 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -80,8 +80,8 @@ public:
 
 //======================================================
 
-KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
  , d ( new Private() )
 {
 	setName("KexiBlobTableEdit");
@@ -490,8 +490,8 @@ public:
 	TQCache<TQPixmap> pixmapCache;
 };
 
-KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
  , d( new Private() )
 {
 	setName("KexiKIconTableEdit");
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index fb64c21d..77a211d2 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -38,7 +38,7 @@ class KexiBlobTableEdit : public KexiTableEdit
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiBlobTableEdit();
 
 		bool valueIsNull();
@@ -129,7 +129,7 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
 class KexiKIconTableEdit : public KexiTableEdit
 {
 	public:
-		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
 		virtual ~KexiKIconTableEdit();
 
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index a9220ea8..8f199b5d 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -31,8 +31,8 @@
 #include <kglobalsettings.h>
 
 
-KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
 {
 	setName("KexiBoolTableEdit");
 	kdDebug() << "KexiBoolTableEdit: m_origValue.typeName()==" << m_origValue.typeName() << endl;
diff --git a/kexi/widget/tableview/kexibooltableedit.h b/kexi/widget/tableview/kexibooltableedit.h
index 3fc87d58..4f4ebad5 100644
--- a/kexi/widget/tableview/kexibooltableedit.h
+++ b/kexi/widget/tableview/kexibooltableedit.h
@@ -33,7 +33,7 @@ class KexiBoolTableEdit : public KexiTableEdit
   TQ_OBJECT
 
 	public:
-		KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
 		virtual ~KexiBoolTableEdit();
 
diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp
index a2c79a88..9cfcfe27 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.cpp
+++ b/kexi/widget/tableview/kexicelleditorfactory.cpp
@@ -146,7 +146,7 @@ static bool hasEnumType( const KexiTableViewColumn &column )
 	return true;
 }
 
-KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, TQWidget* tqparent)
+KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, TQWidget* parent)
 {
 	init();
 	KexiDB::Field *realField;
@@ -187,7 +187,7 @@ KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column,
 	}
 #endif
 
-	return item->createEditor(column, tqparent);
+	return item->createEditor(column, parent);
 }
 
 KexiCellEditorFactoryItem* KexiCellEditorFactory::item( uint type, const TQString& subType )
diff --git a/kexi/widget/tableview/kexicelleditorfactory.h b/kexi/widget/tableview/kexicelleditorfactory.h
index 26b48bb6..06795ac0 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.h
+++ b/kexi/widget/tableview/kexicelleditorfactory.h
@@ -51,10 +51,10 @@ class KEXIDATATABLE_EXPORT KexiCellEditorFactory
 		 If still no item found, the default is tried. Eventually, may return NULL. */
 		static KexiCellEditorFactoryItem* item( uint type, const TQString& subType = TQString() );
 
-//		static KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* tqparent = 0);
-		/*! Creates a new editor for \a column. If \a tqparent is of TQScrollView, the new editor
-		 will be created inside tqparent->viewport() instead. */
-		static KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0);
+//		static KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* parent = 0);
+		/*! Creates a new editor for \a column. If \a parent is of TQScrollView, the new editor
+		 will be created inside parent->viewport() instead. */
+		static KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0);
 
 	protected:
 		static void init();
@@ -69,8 +69,8 @@ class KEXIDATATABLE_EXPORT KexiCellEditorFactoryItem
 		TQString className() { return m_className; }
 
 	protected:
-//		virtual KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* tqparent = 0) = 0;
-		virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0) = 0;
+//		virtual KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* parent = 0) = 0;
+		virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0) = 0;
 
 		TQString m_className;
 	friend class KexiCellEditorFactory;
diff --git a/kexi/widget/tableview/kexicomboboxbase.h b/kexi/widget/tableview/kexicomboboxbase.h
index f36dd822..17b12072 100644
--- a/kexi/widget/tableview/kexicomboboxbase.h
+++ b/kexi/widget/tableview/kexicomboboxbase.h
@@ -122,7 +122,7 @@ class KEXIDATATABLE_EXPORT KexiComboBoxBase
 		//! Implement this as signal
 		virtual void acceptRequested() = 0;
 
-		//! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) 
+		//! Implement this to return a position \a pos mapped from parent (e.g. viewport) 
 		//! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed.
 		virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const = 0;
 
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 4fe8b940..6a2feec8 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -38,8 +38,8 @@
 class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 {
 	public:
-		KexiComboBoxPopup_KexiTableView(TQWidget* tqparent=0)
-		 : KexiDataTableView(tqparent, "KexiComboBoxPopup_tv")
+		KexiComboBoxPopup_KexiTableView(TQWidget* parent=0)
+		 : KexiDataTableView(parent, "KexiComboBoxPopup_tv")
 		{
 			init();
 		}
@@ -103,16 +103,16 @@ class KexiComboBoxPopupPrivate
 
 const int KexiComboBoxPopup::defaultMaxRows = 8;
 
-KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* tqparent, KexiTableViewColumn &column)
- : TQFrame( tqparent, "KexiComboBoxPopup", WType_Popup )
+KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* parent, KexiTableViewColumn &column)
+ : TQFrame( parent, "KexiComboBoxPopup", WType_Popup )
 {
 	init();
 	//setup tv data
 	setData(&column, 0);
 }
 
-KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* tqparent, KexiDB::Field &field)
- : TQFrame( tqparent, "KexiComboBoxPopup", WType_Popup )
+KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* parent, KexiDB::Field &field)
+ : TQFrame( parent, "KexiComboBoxPopup", WType_Popup )
 {
 	init();
 	//setup tv data
diff --git a/kexi/widget/tableview/kexicomboboxpopup.h b/kexi/widget/tableview/kexicomboboxpopup.h
index d78955b2..876be9bc 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.h
+++ b/kexi/widget/tableview/kexicomboboxpopup.h
@@ -42,10 +42,10 @@ class KexiComboBoxPopup : public TQFrame
 		 If the column is lookup column, it's definition is used to display
 		 one or more column within the popup. Otherwise column.field() is used
 		 to display single-column data. */
-		KexiComboBoxPopup(TQWidget* tqparent, KexiTableViewColumn &column);
+		KexiComboBoxPopup(TQWidget* parent, KexiTableViewColumn &column);
 
 		/*! Alternative constructor supporting lookup fields and enum hints. */
-		KexiComboBoxPopup(TQWidget* tqparent, KexiDB::Field &field);
+		KexiComboBoxPopup(TQWidget* parent, KexiDB::Field &field);
 
 		virtual ~KexiComboBoxPopup();
 
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 8b803746..3ae97974 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -61,8 +61,8 @@ public:
 
 //======================================================
 
-KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
  , KexiComboBoxBase()
  , d(new Private())
 {
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.h b/kexi/widget/tableview/kexicomboboxtableedit.h
index 7b8a7339..55d128c3 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.h
+++ b/kexi/widget/tableview/kexicomboboxtableedit.h
@@ -40,7 +40,7 @@ class KexiComboBoxTableEdit : public KexiInputTableEdit, public KexiComboBoxBase
   TQ_OBJECT
 
 	public:
-		KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiComboBoxTableEdit();
 
 		//! Implemented for KexiComboBoxBase
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 5668fbfd..257cf0aa 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -111,8 +111,8 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn
 		kexiwarn << "KexiDataAwarePropertySet::insert() invalid args: rew="<< row<< " propertyset="<< set<< endl;
 		return;
 	}
-	if (set->tqparent() && set->tqparent()!=this) {
-		kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's tqparent must be NULL or this KexiDataAwarePropertySet" << endl;
+	if (set->parent() && set->parent()!=this) {
+		kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's parent must be NULL or this KexiDataAwarePropertySet" << endl;
 		return;
 	}
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index 8d6212c4..e24fbd8a 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -107,7 +107,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 		 The property set \a set will be owned by this object, so you should not
 		 delete this property set by hand but call removeCurrentPropertySet()
 		 or remove(uint) instead.
-		 Note that property set's tqparent (TQObject::tqparent()) must be null
+		 Note that property set's parent (TQObject::parent()) must be null
 		 or qual to this KexiDataAwarePropertySet object, otherwise this method
 		 will fail with a warning.
 		*/
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 7d7dbde6..a132e829 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -33,14 +33,14 @@
 #include "kexidatatableview.h"
 
 
-KexiDataTableView::KexiDataTableView(TQWidget *tqparent, const char *name)
- : KexiTableView(0, tqparent, name)
+KexiDataTableView::KexiDataTableView(TQWidget *parent, const char *name)
+ : KexiTableView(0, parent, name)
 {
 	init();
 }
 
-KexiDataTableView::KexiDataTableView(TQWidget *tqparent, const char *name, KexiDB::Cursor *cursor)
- : KexiTableView(0, tqparent, name)
+KexiDataTableView::KexiDataTableView(TQWidget *parent, const char *name, KexiDB::Cursor *cursor)
+ : KexiTableView(0, parent, name)
 {
 	init();
 	setData(cursor);
diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h
index 7835289f..000762f2 100644
--- a/kexi/widget/tableview/kexidatatableview.h
+++ b/kexi/widget/tableview/kexidatatableview.h
@@ -44,7 +44,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView
 		/**
 		 * creates a blank widget
 		 */
-		KexiDataTableView(TQWidget *tqparent, const char *name =0);
+		KexiDataTableView(TQWidget *parent, const char *name =0);
 
 		/*! Creates a table widget and fills it using data from \a cursor.
 		 Cursor will be opened (with open()) if it is not yet opened.
@@ -52,7 +52,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView
 		 and Connection::executeQuery()), otherwise the table view remain not filled with data.
 		 Cursor \a cursor will not be owned by this object.
 		 */
-		KexiDataTableView(TQWidget *tqparent, const char *name, KexiDB::Cursor *cursor);
+		KexiDataTableView(TQWidget *parent, const char *name, KexiDB::Cursor *cursor);
 
 		~KexiDataTableView();
 
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index a0b5185e..b68b4787 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -48,8 +48,8 @@
 #include <kexiutils/utils.h>
 
 
-KexiDateTableEdit::KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiDateTableEdit::KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
 {
 	setName("KexiDateTableEdit");
 
@@ -225,7 +225,7 @@ bool KexiDateTableEdit::eventFilter( TQObject *o, TQEvent *e )
 		}
 	}
 #ifdef TQ_WS_WIN //tmp
-	else if (e->type()==TQEvent::FocusIn && o->tqparent() && o->tqparent()->tqparent()==m_edit
+	else if (e->type()==TQEvent::FocusIn && o->parent() && o->parent()->parent()==m_edit
 		&& m_setNumberOnFocus >= 0 && m_dte_date_obj)
 	{
 		// there was a number character passed as 'add' parameter in init():
diff --git a/kexi/widget/tableview/kexidatetableedit.h b/kexi/widget/tableview/kexidatetableedit.h
index aad46c4b..2346dfd1 100644
--- a/kexi/widget/tableview/kexidatetableedit.h
+++ b/kexi/widget/tableview/kexidatetableedit.h
@@ -37,7 +37,7 @@ class KexiDateTableEdit : public KexiInputTableEdit
   TQ_OBJECT
 
 	public:
-		KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiDateTableEdit();
 		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
 			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index 46f687f0..35c599cc 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -47,8 +47,8 @@
 
 #include <kexiutils/utils.h>
 
-KexiDateTimeTableEdit::KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiDateTimeTableEdit::KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
 {
 	setName("KexiDateTimeTableEdit");
 
diff --git a/kexi/widget/tableview/kexidatetimetableedit.h b/kexi/widget/tableview/kexidatetimetableedit.h
index 6fb88a67..0e12fa84 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.h
+++ b/kexi/widget/tableview/kexidatetimetableedit.h
@@ -37,7 +37,7 @@ class KexiDateTimeTableEdit : public KexiInputTableEdit
   TQ_OBJECT
 
 	public:
-		KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiDateTimeTableEdit();
 		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
 			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 575ae1e6..1b834fe9 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -43,7 +43,7 @@
 class MyLineEdit : public KLineEdit
 {
 	public:
-		MyLineEdit(TQWidget *tqparent, const char *name) : KLineEdit(tqparent,name)
+		MyLineEdit(TQWidget *parent, const char *name) : KLineEdit(parent,name)
 		{}
 	protected:
 		virtual void drawFrame ( TQPainter * p ) {
@@ -60,8 +60,8 @@ class MyLineEdit : public KLineEdit
 
 //======================================================
 
-KexiInputTableEdit::KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiInputTableEdit::KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
 {
 	setName("KexiInputTableEdit");
 //	m_type = f.type(); //copied because the rest of code uses m_type
diff --git a/kexi/widget/tableview/kexiinputtableedit.h b/kexi/widget/tableview/kexiinputtableedit.h
index 3b4cf015..89e64264 100644
--- a/kexi/widget/tableview/kexiinputtableedit.h
+++ b/kexi/widget/tableview/kexiinputtableedit.h
@@ -36,7 +36,7 @@ class KEXIDATATABLE_EXPORT KexiInputTableEdit : public KexiTableEdit
   TQ_OBJECT
 
 	public:
-		KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
 		virtual ~KexiInputTableEdit();
 
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index fd4870fb..e531b814 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -30,12 +30,12 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* tqparent)
-: TQWidget(dynamic_cast<TQScrollView*>(tqparent) ? dynamic_cast<TQScrollView*>(tqparent)->viewport() : tqparent)
+KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent)
+: TQWidget(dynamic_cast<TQScrollView*>(parent) ? dynamic_cast<TQScrollView*>(parent)->viewport() : parent)
  ,m_column(&column)
 // ,m_field(&f)
 // ,m_type(f.type()) //copied because the rest of code uses m_type
- ,m_scrollView(dynamic_cast<TQScrollView*>(tqparent))
+ ,m_scrollView(dynamic_cast<TQScrollView*>(parent))
  ,m_usesSelectedTextColor(true)
  ,m_view(0)
 // ,m_hasFocusableWidget(true)
diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h
index ef618178..4630757c 100644
--- a/kexi/widget/tableview/kexitableedit.h
+++ b/kexi/widget/tableview/kexitableedit.h
@@ -42,7 +42,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
   TQ_OBJECT
 
 	public:
-		KexiTableEdit(KexiTableViewColumn &column, TQWidget* tqparent = 0);
+		KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent = 0);
 
 		virtual ~KexiTableEdit();
 
@@ -184,7 +184,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 		 for the editor, its events will be filtered, it will be resized when neede, and so on. */
 		void setViewWidget(TQWidget *v);
 
-		/*! Moves child widget within the viewport if the tqparent is scrollview (otherwise does nothing). 
+		/*! Moves child widget within the viewport if the parent is scrollview (otherwise does nothing). 
 		 Use this for child widgets that are outside of this editor widget, instead of calling TQWidget::move(). */
 		void moveChild( TQWidget * child, int x, int y );
 
@@ -195,7 +195,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 		KexiTableViewColumn *m_column;
 		int m_leftMargin;
 		int m_rightMargin, m_rightMarginWhenFocused;
-		TQScrollView* m_scrollView; //!< may be 0 if the tqparent is not a scrollview
+		TQScrollView* m_scrollView; //!< may be 0 if the parent is not a scrollview
 		bool m_usesSelectedTextColor : 1; //!< set in ctor, @see usesSelectedTextColor()
 
 	private:
@@ -211,7 +211,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 			virtual ~factoryclassname(); \
 	\
 		protected: \
-			virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0); \
+			virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0); \
 	};
 
 //! Implementation of cell editor factory
@@ -226,9 +226,9 @@ factoryclassname::~factoryclassname() \
 {} \
 \
 KexiTableEdit* factoryclassname::createEditor( \
-	KexiTableViewColumn &column, TQWidget* tqparent) \
+	KexiTableViewColumn &column, TQWidget* parent) \
 { \
-	return new itemclassname(column, tqparent); \
+	return new itemclassname(column, parent); \
 }
 
 #endif
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index d164f68a..4ed993cd 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -174,8 +174,8 @@ void KexiTableViewCellToolTip::maybeTip( const TQPoint & p )
 
 //-----------------------------------------
 
-KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* tqparent, const char* name)
-: TQScrollView(tqparent, name, /*TQt::WRepaintNoErase | */TQt::WStaticContents /*| TQt::WResizeNoErase*/)
+KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const char* name)
+: TQScrollView(parent, name, /*TQt::WRepaintNoErase | */TQt::WStaticContents /*| TQt::WResizeNoErase*/)
 , KexiRecordNavigatorHandler()
 , KexiSharedActionClient()
 , KexiDataAwareObjectInterface()
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 6c03215b..9cfcf47e 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -149,7 +149,7 @@ public:
 		TQColor rowMouseOverAlternateHighlightingColor;
 	};
 	
-	KexiTableView(KexiTableViewData* data=0, TQWidget* tqparent=0, const char* name=0);
+	KexiTableView(KexiTableViewData* data=0, TQWidget* parent=0, const char* name=0);
 	virtual ~KexiTableView();
 
 	/*! \return current appearance settings */
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 1fb65c6a..5905706b 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -122,7 +122,7 @@ KexiTableViewColumn::KexiTableViewColumn(
 	}
 	init();
 	//setup column's readonly flag: true, if
-	// - it's not from tqparent table's field, or
+	// - it's not from parent table's field, or
 	// - if the query itself is coming from read-only connection, or
 	// - if the query itself is stored (i.e. has connection) and lookup column is defined
 	const bool columnFromMasterTable = query.masterTable()==columnInfo->field->table();
@@ -168,7 +168,7 @@ void KexiTableViewColumn::init()
 void KexiTableViewColumn::setValidator( KexiUtils::Validator* v )
 {
 	if (m_validator) {//remove old one
-		if (!m_validator->tqparent()) //destroy if has no tqparent
+		if (!m_validator->parent()) //destroy if has no parent
 			delete m_validator;
 	}
 	m_validator = v;
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index dec81f95..7263f3fe 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -85,7 +85,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewColumn {
 
 		/*! \return true if the column is read-only
 		 For db-aware column this can depend on whether the column 
-		 is in tqparent table of this query. \sa setReadOnly() */
+		 is in parent table of this query. \sa setReadOnly() */
 		bool isReadOnly() const;
 
 //TODO: synchronize this with table view:
@@ -123,7 +123,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewColumn {
 		inline TQString captionAliasOrName() const { return m_captionAliasOrName; }
 
 		/*! Assigns validator \a v for this column. 
-		 If the validator has no tqparent object, it will be owned by the column, 
+		 If the validator has no parent object, it will be owned by the column, 
 		 so you shouldn't care about destroying it. */
 		void setValidator( KexiUtils::Validator* v );
 
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index f6a839e3..4a00be38 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -58,8 +58,8 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 		TQColor m_backgroundColor;
 };
 
-KexiTableViewHeader::KexiTableViewHeader(TQWidget * tqparent, const char * name) 
-	: TQHeader(tqparent, name)
+KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) 
+	: TQHeader(parent, name)
 	, m_lastToolTipSection(-1)
 	, m_selectionBackgroundColor(tqApp->tqpalette().active().highlight())
 	, m_selectedSection(-1)
diff --git a/kexi/widget/tableview/kexitableviewheader.h b/kexi/widget/tableview/kexitableviewheader.h
index efc35055..eae13a71 100644
--- a/kexi/widget/tableview/kexitableviewheader.h
+++ b/kexi/widget/tableview/kexitableviewheader.h
@@ -36,7 +36,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewHeader : public TQHeader
   TQ_OBJECT
 
 	public:
-		KexiTableViewHeader(TQWidget * tqparent = 0, const char * name = 0);
+		KexiTableViewHeader(TQWidget * parent = 0, const char * name = 0);
 
 		virtual ~KexiTableViewHeader();
 
diff --git a/kexi/widget/tableview/kexitextformatter.h b/kexi/widget/tableview/kexitextformatter.h
index 12e67a37..9ec87656 100644
--- a/kexi/widget/tableview/kexitextformatter.h
+++ b/kexi/widget/tableview/kexitextformatter.h
@@ -53,7 +53,7 @@ class KEXIDATATABLE_EXPORT KexiTextFormatter
 		 A field schema set using setField() is used to perform the calculation. */
 		bool valueIsValid(const TQString& text) const;
 
-		/*! \return input tqmask for intering values related to a field schema 
+		/*! \return input mask for intering values related to a field schema 
 		 which has been set using setField(). */
 		TQString inputMask() const;
 
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index 5f3313f7..8110716b 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -45,8 +45,8 @@
 
 #include <kexiutils/utils.h>
 
-KexiTimeTableEdit::KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiTimeTableEdit::KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
 {
 	setName("KexiTimeTableEdit");
 
diff --git a/kexi/widget/tableview/kexitimetableedit.h b/kexi/widget/tableview/kexitimetableedit.h
index 6c427bbd..0231a9bf 100644
--- a/kexi/widget/tableview/kexitimetableedit.h
+++ b/kexi/widget/tableview/kexitimetableedit.h
@@ -35,7 +35,7 @@ class KexiTimeTableEdit : public KexiInputTableEdit
   TQ_OBJECT
 
 	public:
-		KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiTimeTableEdit();
 		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
 			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index 2c6f86aa..fa5c35ab 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -30,8 +30,8 @@
 
 #include <kexiutils/utils.h>
 
-KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent)
- : KexiToolTip(text, tqparent)
+KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* parent)
+ : KexiToolTip(text, parent)
  , m_opacity(0.0)
 {
 	TQPalette pal( palette() );
@@ -49,7 +49,7 @@ KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent)
 
 	setAutoMask( false );
 
-	//generate tqmask
+	//generate mask
 	TQPixmap maskPm(size());
 	maskPm.fill( black );
 	TQPainter maskPainter(&maskPm);
diff --git a/kexi/widget/utils/kexiarrowtip.h b/kexi/widget/utils/kexiarrowtip.h
index 791535fa..f4d87d41 100644
--- a/kexi/widget/utils/kexiarrowtip.h
+++ b/kexi/widget/utils/kexiarrowtip.h
@@ -31,7 +31,7 @@ class KEXIGUIUTILS_EXPORT KexiArrowTip : public KexiToolTip
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiArrowTip(const TQString& text, TQWidget* tqparent);
+		KexiArrowTip(const TQString& text, TQWidget* parent);
 		virtual ~KexiArrowTip();
 
 		inline TQString text() const { return m_value.toString(); }
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index b5c22372..777fea1b 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -26,8 +26,8 @@
 #include <tqstyle.h>
 #include <tqapplication.h>
 
-KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *tqparent )
- : KPushButton(tqparent)
+KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent )
+ : KPushButton(parent)
 {
 	m_paintedCombo = new KComboBox(this);
 	m_paintedCombo->hide();
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h
index 970e46c3..f480de74 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.h
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h
@@ -30,7 +30,7 @@ class KComboBox;
 class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton
 {
 	public:
-		KexiComboBoxDropDownButton( TQWidget *tqparent );
+		KexiComboBoxDropDownButton( TQWidget *parent );
 		virtual ~KexiComboBoxDropDownButton();
 
 	protected:
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index f882f6fa..3c6b22f0 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -39,8 +39,8 @@
 class KexiImageContextMenu::Private
 {
 public:
-	Private(TQWidget *tqparent)
-	 : actionCollection(tqparent)
+	Private(TQWidget *parent)
+	 : actionCollection(parent)
 	{
 	}
 
@@ -55,8 +55,8 @@ public:
 
 //------------
 
-KexiImageContextMenu::KexiImageContextMenu(TQWidget* tqparent)
- : KPopupMenu(tqparent)
+KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent)
+ : KPopupMenu(parent)
  , d( new Private(this) )
 {
 	setName("KexiImageContextMenu");
diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h
index 2f73b18e..50bb96a0 100644
--- a/kexi/widget/utils/kexicontextmenuutils.h
+++ b/kexi/widget/utils/kexicontextmenuutils.h
@@ -53,7 +53,7 @@ class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu
   TQ_OBJECT
 
 	public:
-		KexiImageContextMenu(TQWidget *tqparent);
+		KexiImageContextMenu(TQWidget *parent);
 		virtual ~KexiImageContextMenu();
 
 		KActionCollection* actionCollection() const;
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 1e7b9bc9..8f4d0b96 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -317,9 +317,9 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
 
 TQString dateTimeInputMask(const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter)
 {
-	TQString tqmask(dateFormatter.inputMask());
-	tqmask.truncate(dateFormatter.inputMask().length()-2);
-	return tqmask + " " + timeFormatter.inputMask();
+	TQString mask(dateFormatter.inputMask());
+	mask.truncate(dateFormatter.inputMask().length()-2);
+	return mask + " " + timeFormatter.inputMask();
 }
 
 TQDateTime stringToDateTime(
diff --git a/kexi/widget/utils/kexidatetimeformatter.h b/kexi/widget/utils/kexidatetimeformatter.h
index 1340320b..f011a0e2 100644
--- a/kexi/widget/utils/kexidatetimeformatter.h
+++ b/kexi/widget/utils/kexidatetimeformatter.h
@@ -50,7 +50,7 @@ class KEXIGUIUTILS_EXPORT KexiDateFormatter
 		//! \return null string if \a date is invalid
 		TQString dateToString( const TQDate& date ) const;
 
-		//! \return Input tqmask generated using the formatter settings. 
+		//! \return Input mask generated using the formatter settings. 
 		//! Can be used in TQLineEdit::setInputMask().
 		TQString inputMask() const { return m_inputMask; }
 
@@ -62,7 +62,7 @@ class KEXIGUIUTILS_EXPORT KexiDateFormatter
 		bool isEmpty( const TQString& str ) const;
 
 	protected:
-		//! Input tqmask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
+		//! Input mask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
 		TQString m_inputMask;
 
 		//! Order of date sections
@@ -111,7 +111,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter
 		//! \return null string if \a time is invalid
 		TQString timeToString( const TQTime& time ) const;
 
-		//! \return Input tqmask generated using the formatter settings. 
+		//! \return Input mask generated using the formatter settings. 
 		//! Can be used in TQLineEdit::setInputMask().
 		TQString inputMask() const { return m_inputMask; }
 
@@ -120,7 +120,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter
 		bool isEmpty( const TQString& str ) const;
 
 	protected:
-		//! Input tqmask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
+		//! Input mask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
 		TQString m_inputMask;
 
 //		//! Order of date sections
@@ -140,7 +140,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter
 		TQRegExp *m_hmsRegExp, *m_hmRegExp;
 };
 
-//! \return a date/time input tqmask using date and time formatter. 
+//! \return a date/time input mask using date and time formatter. 
 //! Date is separated from time by one space character.
 KEXIGUIUTILS_EXPORT TQString dateTimeInputMask(
 	const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter);
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index b2ed022e..909d507c 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -25,8 +25,8 @@
 #include <tqstyle.h>
 #include <tqapplication.h>
 
-KexiDropDownButton::KexiDropDownButton(TQWidget *tqparent)
- : TQToolButton(tqparent, "KexiDBImageBox::Button")
+KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
+ : TQToolButton(parent, "KexiDBImageBox::Button")
 {
 	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 //! @todo get this from a KStyle
diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h
index a2d280a7..e61ab9f5 100644
--- a/kexi/widget/utils/kexidropdownbutton.h
+++ b/kexi/widget/utils/kexidropdownbutton.h
@@ -33,7 +33,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton
   TQ_OBJECT
 
 	public:
-		KexiDropDownButton(TQWidget *tqparent);
+		KexiDropDownButton(TQWidget *parent);
 		virtual ~KexiDropDownButton();
 
 		virtual void drawButton( TQPainter *p );
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index c7c7687c..dc655c63 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -66,16 +66,16 @@ KexiFlowLayoutIterator::takeCurrent()
 
 //// The tqlayout itself
 
-KexiFlowLayout::KexiFlowLayout(TQWidget *tqparent, int border, int space, const char *name)
- : TQLayout(tqparent, border, space, name)
+KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
+ : TQLayout(parent, border, space, name)
 {
 	m_orientation =Qt::Horizontal;
 	m_justify = false;
 	m_cached_width = 0;
 }
 
-KexiFlowLayout::KexiFlowLayout(TQLayout* tqparent, int space, const char *name)
- : TQLayout( tqparent, space, name )
+KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name)
+ : TQLayout( parent, space, name )
 {
 	m_orientation =Qt::Horizontal;
 	m_justify = false;
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index e410fb83..83d2f172 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -27,8 +27,8 @@
 class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 {
 	public:
-		KexiFlowLayout(TQWidget *tqparent, int border=0, int space=-1, const char *name=0);
-		KexiFlowLayout(TQLayout* tqparent, int space=-1, const char *name=0);
+		KexiFlowLayout(TQWidget *parent, int border=0, int space=-1, const char *name=0);
+		KexiFlowLayout(TQLayout* parent, int space=-1, const char *name=0);
 		KexiFlowLayout(int space=-1, const char *name=0);
 
 		~KexiFlowLayout();
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index ce92444f..18d34447 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -29,8 +29,8 @@
 
 #include "kexigradientwidget.h"
 
-KexiGradientWidget::KexiGradientWidget( TQWidget *tqparent, const char *name, WFlags f )
-	: TQWidget( tqparent, name, f ), p_displayMode( NoGradient ),
+KexiGradientWidget::KexiGradientWidget( TQWidget *parent, const char *name, WFlags f )
+	: TQWidget( parent, name, f ), p_displayMode( NoGradient ),
 	p_gradientType( VerticalGradient ),
 	p_color1( TQt::white ), p_color2( TQt::blue ), p_currentChild( 0 ),
 	p_opacity( 0.5 ), p_cacheDirty( true )
@@ -179,7 +179,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 		Get the part of the tempPixmap that is
 		under the current child-widget.
 		*/
-		if ( TQT_BASE_OBJECT(childWidget->tqparent()) == TQT_BASE_OBJECT(this) ) {
+		if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
 			area = childWidget->tqgeometry();
 		} else {
 			area.setTopLeft( childWidget->mapTo( this,
@@ -310,11 +310,11 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 		return;
 
 	/**
-	Exclude widgtes that don't have a tqparent.
+	Exclude widgtes that don't have a parent.
 	This happens when tqchildren are removed
 	which are in the knownWidgets-list.
 	*/
-	if ( childWidget->tqparent() == 0L )
+	if ( childWidget->parent() == 0L )
 		return;
 
 	/**
@@ -329,7 +329,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 	Get the part of the tempPixmap that is
 	under the current child-widget.
 	*/
-	if ( TQT_BASE_OBJECT(childWidget->tqparent()) == TQT_BASE_OBJECT(this) ) {
+	if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
 		area = childWidget->tqgeometry();
 	} else {
 		area.setTopLeft( childWidget->mapTo( this,
diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h
index 3a90add8..05d6f68f 100644
--- a/kexi/widget/utils/kexigradientwidget.h
+++ b/kexi/widget/utils/kexigradientwidget.h
@@ -69,7 +69,7 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget {
 			EllipticGradient = KImageEffect::EllipticGradient
 		};
 
-		KexiGradientWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
+		KexiGradientWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 
 		virtual ~KexiGradientWidget();
 
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index 654f3be7..b22e0500 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -116,8 +116,8 @@ public:
 
 //----------------------------------------------------------------
 
-KexiRecordMarker::KexiRecordMarker(TQWidget *tqparent, const char* name)
- : TQWidget(tqparent, name)
+KexiRecordMarker::KexiRecordMarker(TQWidget *parent, const char* name)
+ : TQWidget(parent, name)
  , d( new Private() )
 {
 	initRecordMarkerImages();
diff --git a/kexi/widget/utils/kexirecordmarker.h b/kexi/widget/utils/kexirecordmarker.h
index 1348ca1d..e309c5a1 100644
--- a/kexi/widget/utils/kexirecordmarker.h
+++ b/kexi/widget/utils/kexirecordmarker.h
@@ -34,7 +34,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordMarker : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiRecordMarker(TQWidget *tqparent, const char* name = 0);
+		KexiRecordMarker(TQWidget *parent, const char* name = 0);
 		~KexiRecordMarker();
 
 		int rows() const;
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 6fe7fbdc..4c1dd02b 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -65,14 +65,14 @@ KexiRecordNavigatorHandler::~KexiRecordNavigatorHandler()
 
 //--------------------------------------------------
 
-KexiRecordNavigator::KexiRecordNavigator(TQWidget *tqparent, int leftMargin, const char *name)
- : TQFrame(tqparent, name)
+KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const char *name)
+ : TQFrame(parent, name)
  , m_view(0)
  , m_isInsertingEnabled(true)
  , d( new KexiRecordNavigatorPrivate() )
 {
-	if (tqparent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
-		setParentView( dynamic_cast<TQScrollView*>(tqparent) );
+	if (parent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
+		setParentView( dynamic_cast<TQScrollView*>(parent) );
 	setFrameStyle(TQFrame::NoFrame);
 	d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr");
 
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 29faf115..9eae328b 100644
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@ -68,7 +68,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame
   TQ_OBJECT
 
 	public:
-		KexiRecordNavigator(TQWidget *tqparent, int leftMargin = 0, const char *name=0);
+		KexiRecordNavigator(TQWidget *parent, int leftMargin = 0, const char *name=0);
 		virtual ~KexiRecordNavigator();
 
 		void setParentView(TQScrollView *view);
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index d5df13aa..7d71752c 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -29,8 +29,8 @@
 #include <tqtimer.h>
 
 
-KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* tqparent)
- : TQWidget(tqparent, "KexiToolTip", TQt::WStyle_Customize | TQt::WType_Popup | TQt::WStyle_NoBorder 
+KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* parent)
+ : TQWidget(parent, "KexiToolTip", TQt::WStyle_Customize | TQt::WType_Popup | TQt::WStyle_NoBorder 
 	| TQt::WX11BypassWM | TQt::WDestructiveClose)
  , m_value(value)
 {
diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h
index 3ff93120..cfa1b483 100644
--- a/kexi/widget/utils/kexitooltip.h
+++ b/kexi/widget/utils/kexitooltip.h
@@ -29,7 +29,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiToolTip(const TQVariant& value, TQWidget* tqparent);
+		KexiToolTip(const TQVariant& value, TQWidget* parent);
 		virtual ~KexiToolTip();
 
 		virtual TQSize tqsizeHint() const;
diff --git a/kexi/widget/utils/klistviewitemtemplate.h b/kexi/widget/utils/klistviewitemtemplate.h
index 3807d43c..45a5b889 100644
--- a/kexi/widget/utils/klistviewitemtemplate.h
+++ b/kexi/widget/utils/klistviewitemtemplate.h
@@ -27,22 +27,22 @@ template<class type>
 class KListViewItemTemplate : public KListViewItem
 {
 	public:
-		KListViewItemTemplate(type _data, TQListView *tqparent)
-		 : KListViewItem(tqparent), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent)
-		 : KListViewItem(tqparent), data(_data) {}
-		KListViewItemTemplate(type _data, TQListView *tqparent, TQListViewItem *after)
-		 : KListViewItem(tqparent, after), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQListViewItem *after)
-		 : KListViewItem(tqparent, after), data(_data) {}
-		KListViewItemTemplate(type _data, TQListView *tqparent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
-		KListViewItemTemplate(type _data, TQListView *tqparent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent)
+		 : KListViewItem(parent), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent)
+		 : KListViewItem(parent), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after)
+		 : KListViewItem(parent, after), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after)
+		 : KListViewItem(parent, after), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
 		
 		type data;
 };