Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

154 files changed, 766 insertions, 766 deletions

diff --git a/kexi/3rdparty/kexisql/src/pager.c b/kexi/3rdparty/kexisql/src/pager.c
index 5259e0853..566c778c3 100644
--- a/kexi/3rdparty/kexisql/src/pager.c
+++ b/kexi/3rdparty/kexisql/src/pager.c
@@ -435,7 +435,7 @@ static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
 /*
 ** Unlock the database and clear the in-memory cache.  This routine
 ** sets the state of the pager back to what it was when it was first
-** opened.  Any outstanding pages are tqinvalidated and subsequent attempts
+** opened.  Any outstanding pages are invalidated and subsequent attempts
 ** to access those pages will likely result in a coredump.
 */
 static void pager_reset(Pager *pPager){
@@ -1059,7 +1059,7 @@ int sqlitepager_truncate(Pager *pPager, Pgno nPage){
 ** Shutdown the page cache.  Free all memory and close all files.
 **
 ** If a transaction was in progress when this routine is called, that
-** transaction is rolled back.  All outstanding pages are tqinvalidated
+** transaction is rolled back.  All outstanding pages are invalidated
 ** and their memory is freed.  Any attempt to use a page associated
 ** with this page cache after this function returns will likely
 ** result in a coredump.
diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c
index cc13aec80..28136e76e 100644
--- a/kexi/3rdparty/kexisql/src/select.c
+++ b/kexi/3rdparty/kexisql/src/select.c
@@ -1985,7 +1985,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 ** This routine does NOT free the Select structure passed in.  The
 ** calling function needs to do that.
 **
-** The pParent, tqparentTab, and *pParentAgg fields are filled in if this
+** 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.
@@ -2003,7 +2003,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 ** pParent will be NULL.  During the processing of the outer query, this 
 ** routine is called recursively to handle the subquery.  For the recursive
 ** call, pParent will point to the outer query.  Because the subquery is
-** the second element in a three-way join, the tqparentTab parameter will
+** the second element in a three-way join, the parentTab parameter will
 ** be 1 (the 2nd value of a 0-indexed array.)
 */
 int sqliteSelect(
@@ -2012,7 +2012,7 @@ int sqliteSelect(
   int eDest,             /* How to dispose of the results */
   int iParm,             /* A parameter used by the eDest disposal method */
   Select *pParent,       /* Another SELECT for which this is a sub-query */
-  int tqparentTab,         /* Index in pParent->pSrc of this query */
+  int parentTab,         /* Index in pParent->pSrc of this query */
   int *pParentAgg        /* True if pParent uses aggregate functions */
 ){
   int i;
@@ -2232,7 +2232,7 @@ int sqliteSelect(
   ** If flattening is a possiblity, do so and return immediately.  
   */
   if( pParent && pParentAgg &&
-      flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){
+      flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){
     if( isAgg ) *pParentAgg = 1;
     return rc;
   }
@@ -2414,10 +2414,10 @@ int sqliteSelect(
   ** the use of the temporary table.
   */
   if( pParent ){
-    assert( pParent->pSrc->nSrc>tqparentTab );
-    assert( pParent->pSrc->a[tqparentTab].pSelect==p );
+    assert( pParent->pSrc->nSrc>parentTab );
+    assert( pParent->pSrc->a[parentTab].pSelect==p );
     sqliteSelectDelete(p);
-    pParent->pSrc->a[tqparentTab].pSelect = 0;
+    pParent->pSrc->a[parentTab].pSelect = 0;
   }
 
   /* The SELECT was successfully coded.   Set the return code to 0
diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c
index dcf56bf53..6ac810587 100644
--- a/kexi/3rdparty/kexisql/src/vdbe.c
+++ b/kexi/3rdparty/kexisql/src/vdbe.c
@@ -309,7 +309,7 @@ static int toInt(const char *zNum, int *pNum){
 ** Convert the given stack entity into a integer if it isn't one
 ** already.
 **
-** Any prior string or real representation is tqinvalidated.  
+** Any prior string or real representation is invalidated.  
 ** NULLs are converted into 0.
 */
 #define Integerify(P) if(((P)->flags&MEM_Int)==0){ hardIntegerify(P); }
diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c
index 2b94ad3c7..58b6e3d0d 100644
--- a/kexi/3rdparty/kexisql/src/where.c
+++ b/kexi/3rdparty/kexisql/src/where.c
@@ -36,7 +36,7 @@ struct ExprInfo {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bittqmasks.  The VDBE cursor numbers
+** between VDBE cursor numbers and bitmasks.  The VDBE cursor numbers
 ** are small integers contained in SrcList_item.iCursor and Expr.iTable
 ** fields.  For any given WHERE clause, we want to track which cursors
 ** are being used, so we assign a single bit in a 32-bit word to track
@@ -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 tqmaskSet; /* The expression tqmask set */
+  ExprMaskSet maskSet; /* The expression tqmask 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 */
@@ -407,7 +407,7 @@ WhereInfo *sqliteWhereBegin(
   ** array fills up, the last entry might point to an expression which
   ** contains additional unfactored AND operators.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   memset(aExpr, 0, sizeof(aExpr));
   nExpr = exprSplit(ARRAYSIZE(aExpr), aExpr, pWhere);
   if( nExpr==ARRAYSIZE(aExpr) ){
@@ -440,21 +440,21 @@ WhereInfo *sqliteWhereBegin(
   /* Analyze all of the subexpressions.
   */
   for(i=0; i<nExpr; i++){
-    exprAnalyze(&tqmaskSet, &aExpr[i]);
+    exprAnalyze(&maskSet, &aExpr[i]);
 
     /* If we are executing a trigger body, remove all references to
-    ** new.* and old.* tables from the prerequisite tqmasks.
+    ** new.* and old.* tables from the prerequisite masks.
     */
     if( pParse->trigStack ){
       int x;
       if( (x = pParse->trigStack->newIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
       }
       if( (x = pParse->trigStack->oldIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
@@ -482,7 +482,7 @@ WhereInfo *sqliteWhereBegin(
   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(&tqmaskSet, iCur);   /* Cursor tqmask for this table */
+    int tqmask = getMask(&maskSet, iCur);   /* Cursor tqmask for this table */
     Table *pTab = pTabList->a[i].pTab;
     Index *pIdx;
     Index *pBestIdx = 0;
@@ -1132,7 +1132,7 @@ WhereInfo *sqliteWhereBegin(
       pLevel->p1 = pLevel->iCur;
       pLevel->p2 = start;
     }
-    loopMask |= getMask(&tqmaskSet, iCur);
+    loopMask |= getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.
@@ -1179,7 +1179,7 @@ WhereInfo *sqliteWhereBegin(
   if( pushKey && !haveKey ){
     sqliteVdbeAddOp(v, OP_Recno, pTabList->a[0].iCursor, 0);
   }
-  freeMaskSet(&tqmaskSet);
+  freeMaskSet(&maskSet);
   return pWInfo;
 }
 
diff --git a/kexi/3rdparty/kexisql3/src/alter.c b/kexi/3rdparty/kexisql3/src/alter.c
index 73c49b1ff..72ebd6c7e 100644
--- a/kexi/3rdparty/kexisql3/src/alter.c
+++ b/kexi/3rdparty/kexisql3/src/alter.c
@@ -53,7 +53,7 @@ static void renameTableFunc(
 
   /* The principle used to locate the table name in the CREATE TABLE 
   ** statement is that the table name is the first token that is immediatedly
-  ** followed by a left tqparenthesis - TK_LP.
+  ** followed by a left parenthesis - TK_LP.
   */
   if( zSql ){
     do {
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 65cddcd4b..fb54c9c4a 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -2080,7 +2080,7 @@ int sqlite3BtreeCommitStmt(Btree *pBt){
 ** Rollback the active statement subtransaction.  If no subtransaction
 ** is active this routine is a no-op.
 **
-** All cursors will be tqinvalidated by this operation.  Any attempt
+** All cursors will be invalidated by this operation.  Any attempt
 ** to use a cursor that was open at the beginning of this operation
 ** will result in an error.
 */
@@ -3670,9 +3670,9 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   int szCell;
   CellInfo info;
   Btree *pBt = pPage->pBt;
-  int tqparentIdx = pParent->nCell;   /* pParent new divider cell index */
-  int tqparentSize;                   /* Size of new divider cell */
-  u8 tqparentCell[64];                /* Space for the new divider cell */
+  int parentIdx = pParent->nCell;   /* pParent new divider cell index */
+  int parentSize;                   /* Size of new divider cell */
+  u8 parentCell[64];                /* Space for the new divider cell */
 
   /* Allocate a new page. Insert the overflow cell from pPage
   ** into it. Then remove the overflow cell from pPage.
@@ -3697,16 +3697,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   */
   assert( pPage->nCell>0 );
   parseCellPtr(pPage, findCell(pPage, pPage->nCell-1), &info);
-  rc = fillInCell(pParent, tqparentCell, 0, info.nKey, 0, 0, &tqparentSize);
+  rc = fillInCell(pParent, parentCell, 0, info.nKey, 0, 0, &parentSize);
   if( rc!=SQLITE_OK ){
     return rc;
   }
-  assert( tqparentSize<64 );
-  rc = insertCell(pParent, tqparentIdx, tqparentCell, tqparentSize, 0, 4);
+  assert( parentSize<64 );
+  rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4);
   if( rc!=SQLITE_OK ){
     return rc;
   }
-  put4byte(findOverflowCell(pParent,tqparentIdx), pPage->pgno);
+  put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno);
   put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew);
 
 #ifndef SQLITE_OMIT_AUTOVACUUM
diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c
index 469d05faa..b49a37d5b 100644
--- a/kexi/3rdparty/kexisql3/src/pager.c
+++ b/kexi/3rdparty/kexisql3/src/pager.c
@@ -839,7 +839,7 @@ static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
 /*
 ** Unlock the database and clear the in-memory cache.  This routine
 ** sets the state of the pager back to what it was when it was first
-** opened.  Any outstanding pages are tqinvalidated and subsequent attempts
+** opened.  Any outstanding pages are invalidated and subsequent attempts
 ** to access those pages will likely result in a coredump.
 */
 static void pager_reset(Pager *pPager){
@@ -1948,7 +1948,7 @@ int sqlite3pager_truncate(Pager *pPager, Pgno nPage){
 ** Shutdown the page cache.  Free all memory and close all files.
 **
 ** If a transaction was in progress when this routine is called, that
-** transaction is rolled back.  All outstanding pages are tqinvalidated
+** transaction is rolled back.  All outstanding pages are invalidated
 ** and their memory is freed.  Any attempt to use a page associated
 ** with this page cache after this function returns will likely
 ** result in a coredump.
diff --git a/kexi/3rdparty/kexisql3/src/parse.y b/kexi/3rdparty/kexisql3/src/parse.y
index c591c99d9..7487c731a 100644
--- a/kexi/3rdparty/kexisql3/src/parse.y
+++ b/kexi/3rdparty/kexisql3/src/parse.y
@@ -398,7 +398,7 @@ seltablist(A) ::= stl_prefix(X) LP seltablist_paren(S) RP
 }
 
 // A seltablist_paren nonterminal represents anything in a FROM that
-// is contained inside tqparentheses.  This can be either a subquery or
+// is contained inside parentheses.  This can be either a subquery or
 // a grouping of table and subqueries.
 //
 %type seltablist_paren {Select*}
diff --git a/kexi/3rdparty/kexisql3/src/pragma.c b/kexi/3rdparty/kexisql3/src/pragma.c
index 618ce9e1a..181d9a94e 100644
--- a/kexi/3rdparty/kexisql3/src/pragma.c
+++ b/kexi/3rdparty/kexisql3/src/pragma.c
@@ -86,7 +86,7 @@ static int getTempStore(const char *z){
 ** Invalidate temp storage, either when the temp storage is changed
 ** from default, or when 'file' and the temp_store_directory has changed
 */
-static int tqinvalidateTempStorage(Parse *pParse){
+static int invalidateTempStorage(Parse *pParse){
   sqlite3 *db = pParse->db;
   if( db->aDb[1].pBt!=0 ){
     if( db->flags & SQLITE_InTrans ){
@@ -112,7 +112,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){
   int ts = getTempStore(zStorageType);
   sqlite3 *db = pParse->db;
   if( db->temp_store==ts ) return SQLITE_OK;
-  if( tqinvalidateTempStorage( pParse ) != SQLITE_OK ){
+  if( invalidateTempStorage( pParse ) != SQLITE_OK ){
     return SQLITE_ERROR;
   }
   db->temp_store = ts;
@@ -377,7 +377,7 @@ void sqlite3Pragma(
   ** Return or set the local value of the temp_store_directory flag.  Changing
   ** the value sets a specific directory to be used for temporary files.
   ** Setting to a null string reverts to the default temporary directory search.
-  ** If temporary directory is changed, then tqinvalidateTempStorage.
+  ** If temporary directory is changed, then invalidateTempStorage.
   **
   */
   if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){
@@ -397,7 +397,7 @@ void sqlite3Pragma(
        || (TEMP_STORE==1 && db->temp_store<=1)
        || (TEMP_STORE==2 && db->temp_store==1)
       ){
-        tqinvalidateTempStorage(pParse);
+        invalidateTempStorage(pParse);
       }
       sqliteFree(sqlite3_temp_directory);
       if( zRight[0] ){
diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c
index 0f465c096..fd8b41a84 100644
--- a/kexi/3rdparty/kexisql3/src/select.c
+++ b/kexi/3rdparty/kexisql3/src/select.c
@@ -2569,7 +2569,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
 ** This routine does NOT free the Select structure passed in.  The
 ** calling function needs to do that.
 **
-** The pParent, tqparentTab, and *pParentAgg fields are filled in if this
+** 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.
@@ -2587,7 +2587,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
 ** pParent will be NULL.  During the processing of the outer query, this 
 ** routine is called recursively to handle the subquery.  For the recursive
 ** call, pParent will point to the outer query.  Because the subquery is
-** the second element in a three-way join, the tqparentTab parameter will
+** the second element in a three-way join, the parentTab parameter will
 ** be 1 (the 2nd value of a 0-indexed array.)
 */
 int sqlite3Select(
@@ -2596,7 +2596,7 @@ int sqlite3Select(
   int eDest,             /* How to dispose of the results */
   int iParm,             /* A parameter used by the eDest disposal method */
   Select *pParent,       /* Another SELECT for which this is a sub-query */
-  int tqparentTab,         /* Index in pParent->pSrc of this query */
+  int parentTab,         /* Index in pParent->pSrc of this query */
   int *pParentAgg,       /* True if pParent uses aggregate functions */
   char *aff              /* If eDest is SRT_Union, the affinity string */
 ){
@@ -2735,7 +2735,7 @@ int sqlite3Select(
   */
 #ifndef SQLITE_OMIT_VIEW
   if( pParent && pParentAgg &&
-      flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){
+      flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){
     if( isAgg ) *pParentAgg = 1;
     goto select_end;
   }
@@ -3105,10 +3105,10 @@ int sqlite3Select(
   ** the use of the temporary table.
   */
   if( pParent ){
-    assert( pParent->pSrc->nSrc>tqparentTab );
-    assert( pParent->pSrc->a[tqparentTab].pSelect==p );
+    assert( pParent->pSrc->nSrc>parentTab );
+    assert( pParent->pSrc->a[parentTab].pSelect==p );
     sqlite3SelectDelete(p);
-    pParent->pSrc->a[tqparentTab].pSelect = 0;
+    pParent->pSrc->a[parentTab].pSelect = 0;
   }
 #endif
 
diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c
index c5582b5c4..1b5678fd6 100644
--- a/kexi/3rdparty/kexisql3/src/vdbe.c
+++ b/kexi/3rdparty/kexisql3/src/vdbe.c
@@ -121,7 +121,7 @@ int sqlite3_sort_count = 0;
 ** Convert the given stack entity into a integer if it isn't one
 ** already.
 **
-** Any prior string or real representation is tqinvalidated.  
+** Any prior string or real representation is invalidated.  
 ** NULLs are converted into 0.
 */
 #define Integerify(P) sqlite3VdbeMemIntegerify(P)
@@ -129,7 +129,7 @@ int sqlite3_sort_count = 0;
 /*
 ** Convert P so that it has type MEM_Real.
 **
-** Any prior string or integer representation is tqinvalidated.
+** Any prior string or integer representation is invalidated.
 ** NULLs are converted into 0.0.
 */
 #define Realify(P) sqlite3VdbeMemRealify(P)
diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c
index 6b37312de..33c812bf9 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeaux.c
+++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c
@@ -189,20 +189,20 @@ static int opcodeNoPush(u8 op){
   ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains
   ** one bit for opcodes 16 to 31, and so on.
   **
-  ** 16-bit bittqmasks (rather than 32-bit) are specified in opcodes.h 
+  ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h 
   ** because the file is generated by an awk program. Awk manipulates
   ** all numbers as floating-point and we don't want to risk a rounding
   ** error if someone builds with an awk that uses (for example) 32-bit 
   ** IEEE floats.
   */ 
-  static const u32 tqmasks[5] = {
+  static const u32 masks[5] = {
     NOPUSH_MASK_0 + (NOPUSH_MASK_1<<16),
     NOPUSH_MASK_2 + (NOPUSH_MASK_3<<16),
     NOPUSH_MASK_4 + (NOPUSH_MASK_5<<16),
     NOPUSH_MASK_6 + (NOPUSH_MASK_7<<16),
     NOPUSH_MASK_8 + (NOPUSH_MASK_9<<16)
   };
-  return (tqmasks[op>>5] & (1<<(op&0x1F)));
+  return (masks[op>>5] & (1<<(op&0x1F)));
 }
 
 #ifndef NDEBUG
diff --git a/kexi/3rdparty/kexisql3/src/vdbemem.c b/kexi/3rdparty/kexisql3/src/vdbemem.c
index a7ecce53f..0b7e193be 100644
--- a/kexi/3rdparty/kexisql3/src/vdbemem.c
+++ b/kexi/3rdparty/kexisql3/src/vdbemem.c
@@ -151,7 +151,7 @@ int sqlite3VdbeMemNulTerminate(Mem *pMem){
 ** are converted using sqlite3_snprintf().  Converting a BLOB to a string
 ** is a no-op.
 **
-** Existing representations MEM_Int and MEM_Real are *not* tqinvalidated.
+** Existing representations MEM_Int and MEM_Real are *not* invalidated.
 **
 ** A MEM_Null value will never be passed to this function. This function is
 ** used for converting values to text for returning to the user (i.e. via
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index ab19f2883..f4b8ba51a 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -114,13 +114,13 @@ struct WhereClause {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bits of the bittqmasks in WhereTerm.
+** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
 **
 ** The VDBE cursor numbers are small integers contained in 
 ** SrcList_item.iCursor and Expr.iTable fields.  For any given WHERE 
 ** clause, the cursor numbers might not begin with 0 and they might
 ** contain gaps in the numbering sequence.  But we want to make maximum
-** use of the bits in our bittqmasks.  This structure provides a mapping
+** use of the bits in our bitmasks.  This structure provides a mapping
 ** from the sparse cursor numbers into consecutive integers beginning
 ** with 0.
 **
@@ -146,7 +146,7 @@ struct ExprMaskSet {
 
 
 /*
-** Bittqmasks for the operators that indices are able to exploit.  An
+** Bitmasks for the operators that indices are able to exploit.  An
 ** OR-ed combination of these values can be used when searching for
 ** terms in the where clause.
 */
@@ -301,7 +301,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 ** 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
-** the bittqmasks together.
+** the bitmasks together.
 */
 static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
 static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
@@ -458,7 +458,7 @@ static void exprAnalyze(SrcList*, ExprMaskSet*, WhereClause*, int);
 */
 static void exprAnalyzeAll(
   SrcList *pTabList,       /* the FROM clause */
-  ExprMaskSet *pMaskSet,   /* table tqmasks */
+  ExprMaskSet *pMaskSet,   /* table masks */
   WhereClause *pWC         /* the WHERE clause to be analyzed */
 ){
   int i;
@@ -536,7 +536,7 @@ static int isLikeOrGlob(
 */
 static void exprAnalyze(
   SrcList *pSrc,            /* the FROM clause */
-  ExprMaskSet *pMaskSet,    /* table tqmasks */
+  ExprMaskSet *pMaskSet,    /* table masks */
   WhereClause *pWC,         /* the WHERE clause */
   int idxTerm               /* Index of the term to be analyzed */
 ){
@@ -1382,7 +1382,7 @@ WhereInfo *sqlite3WhereBegin(
   int brk, cont = 0;         /* Addresses used during code generation */
   Bittqmask notReady;          /* Cursors that are not yet positioned */
   WhereTerm *pTerm;          /* A single term in the WHERE clause */
-  ExprMaskSet tqmaskSet;       /* The expression tqmask set */
+  ExprMaskSet maskSet;       /* The expression tqmask 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 */
@@ -1400,7 +1400,7 @@ WhereInfo *sqlite3WhereBegin(
   /* Split the WHERE clause into separate subexpressions where each
   ** subexpression is separated by an AND operator.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   whereClauseInit(&wc, pParse);
   whereSplit(&wc, pWhere, TK_AND);
     
@@ -1429,9 +1429,9 @@ WhereInfo *sqlite3WhereBegin(
   ** and work forward so that the added virtual terms are never processed.
   */
   for(i=0; i<pTabList->nSrc; i++){
-    createMask(&tqmaskSet, pTabList->a[i].iCursor);
+    createMask(&maskSet, pTabList->a[i].iCursor);
   }
-  exprAnalyzeAll(pTabList, &tqmaskSet, &wc);
+  exprAnalyzeAll(pTabList, &maskSet, &wc);
   if( sqlite3_malloc_failed ){
     goto whereBeginNoMem;
   }
@@ -1469,7 +1469,7 @@ WhereInfo *sqlite3WhereBegin(
     Bittqmask m;                  /* Bittqmask value for j or bestJ */
 
     for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){
-      m = getMask(&tqmaskSet, pTabItem->iCursor);
+      m = getMask(&maskSet, pTabItem->iCursor);
       if( (m & notReady)==0 ){
         if( j==iFrom ) iFrom++;
         continue;
@@ -1506,7 +1506,7 @@ WhereInfo *sqlite3WhereBegin(
     }else{
       pLevel->iIdxCur = -1;
     }
-    notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor);
+    notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor);
     pLevel->iFrom = bestJ;
   }
   TRACE(("*** Optimizer Finished ***\n"));
@@ -1854,7 +1854,7 @@ WhereInfo *sqlite3WhereBegin(
       pLevel->p1 = iCur;
       pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk);
     }
-    notReady &= ~getMask(&tqmaskSet, iCur);
+    notReady &= ~getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 016eb767f..09bad9d5c 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -19,8 +19,8 @@
 
 // Description: Page Layout Dialog (sources)
 
-#ifndef kopagetqlayoutcolumns_h
-#define kopagetqlayoutcolumns_h
+#ifndef kopagelayoutcolumns_h
+#define kopagelayoutcolumns_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
index 780bc792a..325fe45e7 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
@@ -95,5 +95,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
index 4e3a00a4d..de8db04b6 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutheader_h
-#define kopagetqlayoutheader_h
+#ifndef kopagelayoutheader_h
+#define kopagelayoutheader_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index 4488c6f44..b3bd79783 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -217,5 +217,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 3f46def2a..5d7c0494b 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutsize_h
-#define kopagetqlayoutsize_h
+#ifndef kopagelayoutsize_h
+#define kopagelayoutsize_h
 
 #include <tqgroupbox.h>
 #include <KoGlobal.h>
diff --git a/kexi/core/kexidataiteminterface.cpp b/kexi/core/kexidataiteminterface.cpp
index 2dd9c8130..b95d7472e 100644
--- a/kexi/core/kexidataiteminterface.cpp
+++ b/kexi/core/kexidataiteminterface.cpp
@@ -135,9 +135,9 @@ bool KexiDataItemInterface::valueIsValid()
 	return true;
 }
 
-void KexiDataItemInterface::setParentDataItemInterface(KexiDataItemInterface* tqparentDataItemInterface)
+void KexiDataItemInterface::setParentDataItemInterface(KexiDataItemInterface* parentDataItemInterface)
 {
-	m_parentDataItemInterface = tqparentDataItemInterface;
+	m_parentDataItemInterface = parentDataItemInterface;
 }
 
 bool KexiDataItemInterface::cursorAtNewRow()
diff --git a/kexi/core/kexidataiteminterface.h b/kexi/core/kexidataiteminterface.h
index db6a9afe4..ad3a3d25a 100644
--- a/kexi/core/kexidataiteminterface.h
+++ b/kexi/core/kexidataiteminterface.h
@@ -192,11 +192,11 @@ class KEXICORE_EXPORT KexiDataItemInterface
 		 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. */
-		void setParentDataItemInterface(KexiDataItemInterface* tqparentDataItemInterface);
+		void setParentDataItemInterface(KexiDataItemInterface* parentDataItemInterface);
 
 		/*! \return a pointer to a Parent Data Item Interface. 
 		 @see setParentDataItemInterface() */
-		inline KexiDataItemInterface* tqparentInterface() const { return m_parentDataItemInterface; }
+		inline KexiDataItemInterface* parentInterface() const { return m_parentDataItemInterface; }
 
 		/*! Handles action having standard name \a actionName. 
 		 Action could be: "edit_cut", "edit_paste", etc.
@@ -239,7 +239,7 @@ class KEXICORE_EXPORT KexiDataItemInterface
 		bool m_listenerIsTQObject;
 		TQVariant m_origValue;
 
-		/*! @see tqparentDataItemInterface() */
+		/*! @see parentDataItemInterface() */
 		KexiDataItemInterface* m_parentDataItemInterface;
 		bool m_hasFocusableWidget : 1;
 		bool m_disable_signalValueChanged : 1;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 1469575b1..01f20d8c6 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -394,7 +394,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 	addActionProxyChild( newView ); //new proxy child
 	m_stack->raiseWidget( newView );
 	newView->propertySetSwitched();
-	m_parentWindow->tqinvalidateSharedActions( TQT_TQOBJECT(newView) );
+	m_parentWindow->invalidateSharedActions( TQT_TQOBJECT(newView) );
 	TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok?
 //	setFocus();
 	return true;
@@ -633,7 +633,7 @@ void KexiDialogBase::activate()
 	}
 	if (v)
 		v->updateActions(true);
-//js: not neeed??	m_parentWindow->tqinvalidateSharedActions(this);
+//js: not neeed??	m_parentWindow->invalidateSharedActions(this);
 }
 
 void KexiDialogBase::deactivate()
@@ -647,14 +647,14 @@ void KexiDialogBase::sendDetachedStateToCurrentView()
 {
 	KexiViewBase *v = selectedView();
 	if (v)
-		v->tqparentDialogDetached();
+		v->parentDialogDetached();
 }
 
 void KexiDialogBase::sendAttachedStateToCurrentView()
 {
 	KexiViewBase *v = selectedView();
 	if (v)
-		v->tqparentDialogAttached();
+		v->parentDialogAttached();
 }
 
 #include "kexidialogbase.moc"
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index 68c712364..6479ae5b9 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -238,13 +238,13 @@ class KEXICORE_EXPORT KexiDialogBase :
 		tristate storeNewData();
 
 		/*! Reimplemented - we're informing the current view about performed detaching by calling
-		 KexiViewBase::tqparentDialogDetached(), so the view can react on this event
-		 (by default KexiViewBase::tqparentDialogDetached() does nothing, you can reimplement it). */
+		 KexiViewBase::parentDialogDetached(), so the view can react on this event
+		 (by default KexiViewBase::parentDialogDetached() does nothing, you can reimplement it). */
 		void sendDetachedStateToCurrentView();
 
 		/*! W're informing the current view about performed atttaching by calling
-		 KexiViewBase::tqparentDialogAttached(), so the view can react on this event
-		 (by default KexiViewBase::tqparentDialogAttached() does nothing, you can reimplement it). */
+		 KexiViewBase::parentDialogAttached(), so the view can react on this event
+		 (by default KexiViewBase::parentDialogAttached() does nothing, you can reimplement it). */
 		void sendAttachedStateToCurrentView();
 
 	signals:
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index b00cbc1b4..a98ac5a6c 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -44,7 +44,7 @@ void KexiSharedActionHostPrivate::slotAction(const TQString& act_id)
 {
 	TQWidget *w = host->focusWindow(); //tqfocusWidget();
 //	while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase"))
-//		w = w->tqparentWidget();
+//		w = w->parentWidget();
 
 	KexiActionProxy *proxy = w ? actionProxies[ w ] : 0;
 
@@ -113,7 +113,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
 		return; //sanity
 	TQWidget *fw = d->mainWin->tqfocusWidget();
 	while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw))
-		fw = fw->tqparentWidget();
+		fw = fw->parentWidget();
 	if (!fw)
 		return;
 
@@ -137,7 +137,7 @@ KMainWindow* KexiSharedActionHost::mainWindow() const
 	return d->mainWin;
 }
 
-void KexiSharedActionHost::tqinvalidateSharedActions(TQObject *o)
+void KexiSharedActionHost::invalidateSharedActions(TQObject *o)
 {
 	if (!d)
 		return;
@@ -208,7 +208,7 @@ TQWidget* KexiSharedActionHost::focusWindow()
 		fw = aw->tqfocusWidget();
 	}
 	while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw)))
-		fw = fw->tqparentWidget();
+		fw = fw->parentWidget();
 	return fw;
 }
 
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 035ce3526..235ca9b8e 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -100,13 +100,13 @@ class KEXICORE_EXPORT KexiSharedActionHost
 		 Otherwise the action is disabled.
 
 		 If \a o is not KexiDialogBase or its child,
-		 actions are only tqinvalidated if these come from mainwindow's KActionCollection
+		 actions are only invalidated if these come from mainwindow's KActionCollection
 		 (thus part-actions are untouched when the focus is e.g. in the Property Editor.
 
 		 Call this method when it is known that some actions need invalidation 
 		 (e.g. when new window is activated). See how it is used in KexiMainWindowImpl.
 		*/
-		virtual void tqinvalidateSharedActions(TQObject *o);
+		virtual void invalidateSharedActions(TQObject *o);
 
 		void setActionAvailable(const char *action_name, bool avail);
 
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index d31a15fa6..be201c9bf 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -41,7 +41,7 @@ KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const ch
  , m_dirty(false)
 {
 	TQWidget *wi=this;
-	while ((wi = wi->tqparentWidget()) && !wi->inherits("KexiDialogBase"))
+	while ((wi = wi->parentWidget()) && !wi->inherits("KexiDialogBase"))
 		;
 	m_dialog = (wi && wi->inherits("KexiDialogBase")) ? static_cast<KexiDialogBase*>(wi) : 0;
 	if (m_dialog) {
@@ -74,7 +74,7 @@ tristate KexiViewBase::afterSwitchFrom(int /* mode */)
 
 TQSize KexiViewBase::preferredSizeHint(const TQSize& otherSize)
 {
-	KexiDialogBase* dlg = tqparentDialog();
+	KexiDialogBase* dlg = parentDialog();
 	if (dlg && dlg->mdiParent()) {
 		TQRect r = dlg->mdiParent()->mdiAreaContentsRect();
 		return otherSize.boundedTo( TQSize(
@@ -103,14 +103,14 @@ KoProperty::Set *KexiViewBase::propertySet()
 
 void KexiViewBase::propertySetSwitched()
 {
-	if (tqparentDialog())
-		m_mainWin->propertySetSwitched( tqparentDialog(), false );
+	if (parentDialog())
+		m_mainWin->propertySetSwitched( parentDialog(), false );
 }
 
 void KexiViewBase::propertySetReloaded(bool preservePrevSelection, const TQCString& propertyToSelect)
 {
-	if (tqparentDialog())
-		m_mainWin->propertySetSwitched( tqparentDialog(), true, preservePrevSelection, propertyToSelect );
+	if (parentDialog())
+		m_mainWin->propertySetSwitched( parentDialog(), true, preservePrevSelection, propertyToSelect );
 }
 
 void KexiViewBase::setDirty(bool set)
@@ -240,7 +240,7 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 			if (e->type()==TQEvent::FocusIn && m_actionProxyParent) {
 				m_actionProxyParent->m_focusedChild = this;
 			}
-//			m_mainWin->tqinvalidateSharedActions(this);
+//			m_mainWin->invalidateSharedActions(this);
 		}
 	}
 	return false;
@@ -286,7 +286,7 @@ void KexiViewBase::setFocus()
 		else
 			setFocusInternal();
 	}
-	m_mainWin->tqinvalidateSharedActions(TQT_TQOBJECT(this));
+	m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this));
 }
 
 KAction* KexiViewBase::sharedAction( const char *action_name )
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 24f5d8adc..60beadf89 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -62,11 +62,11 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		inline KexiMainWindow *mainWin() const { return m_mainWin; }
 
 		//! \return tqparent KexiDialogBase that contains this view, or 0 if no dialog contain this view
-		KexiDialogBase* tqparentDialog() const { return m_dialog; }
+		KexiDialogBase* parentDialog() const { return m_dialog; }
 
 		/*! Added for convenience.
 		 \return KexiPart object that was used to create this view (with a dialog)
-		 or 0 if this view is not created using KexiPart. \sa tqparentDialog() */
+		 or 0 if this view is not created using KexiPart. \sa parentDialog() */
 		KexiPart::Part* part() const;
 
 		/*! \return preferred size hint, that can be used to resize the view.
@@ -237,13 +237,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		 - it is called by KexiDialogBase::youAreDetached().
 		 Default implementation does nothing.
 		 Implement it if you want to perform some appropriate actions. */
-		virtual void tqparentDialogDetached() {};
+		virtual void parentDialogDetached() {};
 
 		/*! Allows to react on tqparent 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. */
-		virtual void tqparentDialogAttached() {};
+		virtual void parentDialogAttached() {};
 
 		TQString m_defaultIconName;
 
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 bca5a3874..16195281a 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
@@ -246,7 +246,7 @@ After switching to the form's <em>data view</em> you can try whether the action
 </ul>
 
 <a name="form_layouts"></a>
-<H3>5.4.9. Widget tqlayouts</H3>
+<H3>5.4.9. Widget layouts</H3>
 <p>
 In most cases form widgets should be reasonable placed and aligned. Positioning, aligning and resizing widgets by hand is not easy and these parameters are not adjusted when the user resizes the form. In fact the situation is even worse because you cannot assume a given form requires a given space because users have different font sizes and display resolutions.
 </p>
@@ -256,7 +256,7 @@ The following example presents a form where text fields and labels were placed b
  <br>An example form with widgets that cannot not fit in the window<br><br>
 </p>
 <p>
-Using special tool called <em>widget tqlayouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
+Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
 </p>
 <p>
 Using tqlayout in this form improves tqalignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
@@ -311,9 +311,9 @@ Besides the grid type, there are other widget tqlayout types.
 </p>
 
 <a name="form_springs"></a>
-<H4>Springs in widget tqlayouts</H4>
+<H4>Springs in widget layouts</H4>
 <p>
-A <em>spring</em> in widget tqlayouts is a special, invisible element allowing to adjust widget's position and size within tqlayouts. Such a spring stretches or squeezes a widget on the right, top, bottom or left hand, so it can have desired size and position.
+A <em>spring</em> in widget layouts is a special, invisible element allowing to adjust widget's position and size within layouts. Such a spring stretches or squeezes a widget on the right, top, bottom or left hand, so it can have desired size and position.
 </p>
 <p>To use a spring:
 <ol>
@@ -331,9 +331,9 @@ To make springs work you need to create a global widget tqlayout i.e. a tqlayout
 </p>
 
 <a name="advanced_form_layouts"></a>
-<H4>Advanced widget tqlayouts</H4>
+<H4>Advanced widget layouts</H4>
 <p>
-Widget tqlayouts can be combined (or nested). On the following example you can identify two nested tqlayouts:
+Widget layouts can be combined (or nested). On the following example you can identify two nested layouts:
 </p>
 <p>
 <ol>
@@ -343,7 +343,7 @@ Widget tqlayouts can be combined (or nested). On the following example you can i
 </p>
 <p>
  <img src="img/05_04_08_form_advanced_layout.png">
- <br>Two widget tqlayouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
+ <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
 </p>
 <p>
 The horizontal tqlayout is treat in the example as a single widget by the grid tqlayout - it takes exactly one &quot;cell&quot; of the grid.
@@ -356,11 +356,11 @@ After opening a form designed this way in the data view, you can notice (by resi
 </ul>
 <p>
  <img src="img/05_04_08_form_advanced_layout_view.png">
- <br>The form using the two tqlayouts displayed in data view<br><br>
+ <br>The form using the two layouts displayed in data view<br><br>
 </p>
 
-<a name="tqlayout_breaking"></a>
-<H4>Removing widget tqlayouts</H4>
+<a name="layout_breaking"></a>
+<H4>Removing widget layouts</H4>
 <p>
 To remove widget tqlayout without removing widgets, perform one of these actions:
 <ul>
@@ -373,7 +373,7 @@ To remove widget tqlayout without removing widgets, perform one of these actions
 <p>Removing widget tqlayout using the <em>Break Layout</em> command will not remove widgets contained in the tqlayout. If you want to remove the widgets as well, just select the tqlayout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -&gt <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command.
 </p>
 
-<a name="tqlayout_size_types"></a>
+<a name="layout_size_types"></a>
 <H4>Size policies for widgets within a tqlayout</H4>
 <p>
 Instead of setting a fixed size for your widgets, in &kexi; you can choose between various widget's <em>size policies</em>. A size policy is a flexible strategy for controlling how a widget is stretched (or shrunk) depending on other neighbouring widgets and space available within the form.
diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt
index 278770d82..65aa60081 100644
--- a/kexi/doc/handbook/translation-status.txt
+++ b/kexi/doc/handbook/translation-status.txt
@@ -68,10 +68,10 @@ DONE    5.4.6. Assigning data sources
 DONE    5.4.7. Inserting text labels
 DONE    5.4.8. Actions
 DONE      * Assigning actions to form buttons
-DONE    5.4.9. Widget tqlayouts
-DONE      * Springs in widget tqlayouts
-DONE      * Advanced widget tqlayouts
-DONE      * Removing widget tqlayouts
+DONE    5.4.9. Widget layouts
+DONE      * Springs in widget layouts
+DONE      * Advanced widget layouts
+DONE      * Removing widget layouts
 DONE      * Size policies for widgets within a tqlayout
 DONE    5.4.10. Setting widgets size and position by hand
 DONE    5.4.11. Setting the tab order
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index dbd89e1d3..b7712aa87 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -219,7 +219,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 </property>
 </widget>
 </widget>
-<tqlayoutDefaults spacing="6" margin="11" />
+<layoutDefaults spacing="6" margin="11" />
 <tabstops>
 <tabstop>TextLabel1</tabstop>
 <tabstop>TextLabel2</tabstop>
@@ -330,7 +330,7 @@ INSERT INTO "kexi__objectdata" VALUES(96, '<!DOCTYPE UI>
    <data format="XBM.GZ" length="79" >789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
   </image>
  </images>
- <tqlayoutDefaults spacing="6" margin="11" />
+ <layoutDefaults spacing="6" margin="11" />
  <tabstops>
   <tabstop>SubReport1</tabstop>
  </tabstops>
@@ -607,7 +607,7 @@ INSERT INTO "kexi__objectdata" VALUES(105, '<!DOCTYPE UI>
 <includehint>kcombobox.h</includehint>
 <includehint>klineedit.h</includehint>
 </includehints>
-<tqlayoutDefaults spacing="6" margin="11" />
+<layoutDefaults spacing="6" margin="11" />
 <tabstops>
 <tabstop>TextLabel1</tabstop>
 <tabstop>image</tabstop>
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index d628d53fb..c08e44e6d 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -236,7 +236,7 @@ AlignWidgetsCommand::execute()
 
 	int gridX = m_form->gridSize();
 	int gridY = m_form->gridSize();
-	TQWidget *tqparentWidget = m_form->selectedWidgets()->first()->tqparentWidget();
+	TQWidget *parentWidget = m_form->selectedWidgets()->first()->parentWidget();
 	int tmpx, tmpy;
 
 	WidgetList list;
@@ -265,7 +265,7 @@ AlignWidgetsCommand::execute()
 
 		case AlignToLeft:
 		{
-			tmpx = tqparentWidget->width();
+			tmpx = parentWidget->width();
 			for(TQWidget *w = list.first(); w; w = list.next())
 			{
 				if(w->x() < tmpx)
@@ -293,7 +293,7 @@ AlignWidgetsCommand::execute()
 
 		case AlignToTop:
 		{
-			tmpy = tqparentWidget->height();
+			tmpy = parentWidget->height();
 			for(TQWidget *w = list.first(); w; w = list.next())
 			{
 				if(w->y() < tmpy)
@@ -378,11 +378,11 @@ AdjustSizeCommand::AdjustSizeCommand(int type, WidgetList &list, Form *form)
 {
 	for(TQWidget *w = list.first(); w; w = list.next())
 	{
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		m_sizes.insert(w->name(), w->size());
@@ -446,8 +446,8 @@ AdjustSizeCommand::execute()
 						s.setWidth(30);
 					if(s.height() < 30)
 						s.setHeight(30);
-					// small hack for flow tqlayouts
-					int type = item->container() ? item->container()->tqlayoutType() : Container::NoLayout;
+					// small hack for flow layouts
+					int type = item->container() ? item->container()->layoutType() : Container::NoLayout;
 					if(type == Container::HFlow)
 						s.setWidth(s.width() + 5);
 					else if(type == Container::VFlow)
@@ -846,11 +846,11 @@ InsertWidgetCommand::debug()
 
 /// CreateLayoutCommand ///////////////
 
-CreateLayoutCommand::CreateLayoutCommand(int tqlayoutType, WidgetList &list, Form *form)
- : m_form(form), m_type(tqlayoutType)
+CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form *form)
+ : m_form(form), m_type(layoutType)
 {
 	WidgetList *m_list=0;
-	switch(tqlayoutType)
+	switch(layoutType)
 	{
 		case Container::HBox:
 		case Container::Grid:
@@ -890,7 +890,7 @@ CreateLayoutCommand::execute()
 		case Container::HSplitter: case Container::VSplitter:
 			classname = TQSPLITTER_OBJECT_NAME_STRING; break;
 		default:
-			classname = Container::tqlayoutTypeToString(m_type).latin1();
+			classname = Container::layoutTypeToString(m_type).latin1();
 	}
 
 	if(m_name.isEmpty())// the name must be generated only once
@@ -1017,11 +1017,11 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container)
 	m_containername = container->toplevel()->widget()->name();
 	m_name = container->widget()->name();
 	m_form = container->form();
-	m_type = container->tqlayoutType();
+	m_type = container->layoutType();
 
 	for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next())
 	{
-		TQRect r(container->widget()->mapTo(container->widget()->tqparentWidget(), tree->widget()->pos()), tree->widget()->size());
+		TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size());
 		m_pos.insert(tree->widget()->name(), r);
 	}
 }
@@ -1385,7 +1385,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 	{
 		TQWidget *w = it.current();
 		// Don't delete tabwidget or widgetstack pages
-		if(w->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
 			list.remove(w);
 			continue;
@@ -1399,8 +1399,8 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 		if (!item)
 			return;
 
-		// We need to store both tqparentContainer and tqparentWidget as they may be different (eg for TabWidget page)
-		m_containers.insert(item->name().latin1(), m_form->tqparentContainer(item->widget())->widget()->name());
+		// 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);
 		form->connectionBuffer()->saveAllConnectionsForWidget(item->widget()->name(), m_domDoc);
@@ -1421,7 +1421,7 @@ DeleteWidgetCommand::execute()
 		if (!item || !item->widget())
 			continue;
 
-		Container *cont = m_form->tqparentContainer(item->widget());
+		Container *cont = m_form->parentContainer(item->widget());
 		if (!containerToSelect)
 			containerToSelect = cont;
 		cont->deleteWidget(item->widget());
@@ -1476,7 +1476,7 @@ void
 DeleteWidgetCommand::debug()
 {
 	kdDebug() << "DeleteWidgetCommand: containers=" << m_containers.keys()
-		<< " tqparents=" << m_parents.keys() << " form=" << m_form->widget()->name() << endl;
+		<< " parents=" << m_parents.keys() << " form=" << m_form->widget()->name() << endl;
 }
 
 // CutWidgetCommand
@@ -1510,7 +1510,7 @@ void
 CutWidgetCommand::debug()
 {
 	kdDebug() << "CutWidgetCommand: containers=" << m_containers.keys()
-		<< " tqparents=" << m_parents.keys() << " form=" << m_form->widget()->name()
+		<< " parents=" << m_parents.keys() << " form=" << m_form->widget()->name()
 		<< " data=\"" << m_data.left(80) << "...\"" << endl;
 }
 
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index c38f9b86a..d998ad360 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -209,7 +209,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
 {
 	public:
-		CreateLayoutCommand(int tqlayoutType, WidgetList &list, Form *form);
+		CreateLayoutCommand(int layoutType, WidgetList &list, Form *form);
 		CreateLayoutCommand() {;} // for BreakLayoutCommand
 
 		virtual void execute();
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 03302d3aa..fff9a47c5 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -405,7 +405,7 @@ ConnectionDialog::removeItem()
 	if(m_table->currentRow() == -1 || m_table->currentRow()>=m_table->rows())
 		return;
 
-	int confirm = KMessageBox::warningContinueCancel(tqparentWidget(),
+	int confirm = KMessageBox::warningContinueCancel(parentWidget(),
 		TQString("<qt>")+i18n("Do you want to delete this connection ?")+"</qt>", TQString(), KGuiItem(i18n("&Delete Connection")),
 		"dontAskBeforeDeleteConnection"/*config entry*/);
 	if(confirm == KMessageBox::Cancel)
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index a68e34d2e..a9942d1ce 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -299,7 +299,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			{
 				if(!m_toplevel && m_moving == m_container) // no effect for form
 					return false;
-				if((!m_moving) || (!m_moving->tqparentWidget()))// || (m_moving->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+				if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 						return true;
 
 				moveSelectedWidgetsBy(mev->x() - m_grab.x(), mev->y() - m_grab.y());
@@ -915,7 +915,7 @@ Container::createGridLayout(bool testOnly)
 }
 
 TQString
-Container::tqlayoutTypeToString(int type)
+Container::layoutTypeToString(int type)
 {
 	switch(type)
 	{
@@ -1110,24 +1110,24 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		int tmpx = w->x() + realdx;
 		int tmpy = w->y() + realdy;
 		if(tmpx < 0)
 			dx = TQMAX(0 - w->x(), dx); // because dx is <0
-		else if(tmpx > w->tqparentWidget()->width() - gridX)
-			dx = TQMIN(w->tqparentWidget()->width() - gridX - w->x(), dx);
+		else if(tmpx > w->parentWidget()->width() - gridX)
+			dx = TQMIN(w->parentWidget()->width() - gridX - w->x(), dx);
 
 		if(tmpy < 0)
 			dy = TQMAX(0 - w->y(), dy); // because dy is <0
-		else if(tmpy > w->tqparentWidget()->height() - gridY)
-			dy = TQMIN(w->tqparentWidget()->height() - gridY - w->y(), dy);
+		else if(tmpy > w->parentWidget()->height() - gridY)
+			dy = TQMIN(w->parentWidget()->height() - gridY - w->y(), dy);
 	}
 
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
@@ -1136,11 +1136,11 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		int tmpx, tmpy;
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index a76c913a8..f2ae1f145 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -107,13 +107,13 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		TQLayout* tqlayout() const { return m_layout; }
 
 		//! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
-		LayoutType tqlayoutType() const { return m_layType; }
+		LayoutType layoutType() const { return m_layType; }
 
 		//! \return the margin of this Container.
-		int tqlayoutMargin() { return m_margin; }
+		int layoutMargin() { return m_margin; }
 
 		//! \return the spacing of this Container.
-		int tqlayoutSpacing() { return m_spacing; }
+		int layoutSpacing() { return m_spacing; }
 
 		/*! Sets this Container to use \a type of tqlayout. The widget are inserted
 		 automatically in the tqlayout following their positions.
@@ -126,8 +126,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! Sets the margin of this Container.
 		void setLayoutMargin(int margin) { m_margin = margin;}
 
-		//! \return the string representing the tqlayoutType \a type.
-		static TQString tqlayoutTypeToString(int type);
+		//! \return the string representing the layoutType \a type.
+		static TQString layoutTypeToString(int type);
 
 		//! \return the LayoutType (an int) for a given tqlayout name.
 		static LayoutType stringToLayoutType(const TQString &name);
diff --git a/kexi/formeditor/events.cpp b/kexi/formeditor/events.cpp
index d7d623588..ff16bcd91 100644
--- a/kexi/formeditor/events.cpp
+++ b/kexi/formeditor/events.cpp
@@ -67,18 +67,18 @@ ConnectionBuffer::allConnectionsForWidget(const TQString &widget)
 }
 
 void
-ConnectionBuffer::save(TQDomNode &tqparentNode)
+ConnectionBuffer::save(TQDomNode &parentNode)
 {
 	if(isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement connections;
-	if(!tqparentNode.namedItem("connections").isNull())
-		connections = tqparentNode.namedItem("connections").toElement();
+	if(!parentNode.namedItem("connections").isNull())
+		connections = parentNode.namedItem("connections").toElement();
 	else
 		connections = domDoc.createElement("connections");
-	tqparentNode.appendChild(connections);
+	parentNode.appendChild(connections);
 
 	for(Connection *c = first(); c; c = next())
 	{
@@ -109,10 +109,10 @@ ConnectionBuffer::save(TQDomNode &tqparentNode)
 }
 
 void
-ConnectionBuffer::saveAllConnectionsForWidget(const TQString &widget, TQDomNode tqparentNode)
+ConnectionBuffer::saveAllConnectionsForWidget(const TQString &widget, TQDomNode parentNode)
 {
 	ConnectionBuffer *buff = allConnectionsForWidget(widget);
-	buff->save(tqparentNode);
+	buff->save(parentNode);
 	delete buff;
 }
 
diff --git a/kexi/formeditor/events.h b/kexi/formeditor/events.h
index 727b3a43b..a0ee3bacc 100644
--- a/kexi/formeditor/events.h
+++ b/kexi/formeditor/events.h
@@ -60,15 +60,15 @@ class KFORMEDITOR_EXPORT ConnectionBuffer : public ConnectionList
 		ConnectionBuffer();
 		~ConnectionBuffer() {;}
 
-		void save(TQDomNode &tqparentNode);
-		void load(TQDomNode tqparentNode);
+		void save(TQDomNode &parentNode);
+		void load(TQDomNode parentNode);
 
 		/*! This function is called when a widget is renamed from \a oldname
 		to \a newname. All the Connections for this widget are updated. */
 		void    fixName(const TQString &oldname, const TQString &newName);
 
 		ConnectionBuffer*     allConnectionsForWidget(const TQString &widget);
-		void     saveAllConnectionsForWidget(const TQString &widget, TQDomNode tqparentNode);
+		void     saveAllConnectionsForWidget(const TQString &widget, TQDomNode parentNode);
 		void     removeAllConnectionsForWidget(const TQString &widget);
 };
 
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ada3f9948..15011e50f 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -651,12 +651,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 	//m_widget = w;
 //	m_container = container;
 
-	if((classname == "KFDTabWidget") || (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		if(w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+		if(w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 		{
-			//m_widget = w->tqparentWidget()->tqparentWidget();
-			setWidget(w->tqparentWidget()->tqparentWidget(), m_container->toplevel());
+			//m_widget = w->parentWidget()->parentWidget();
+			setWidget(w->parentWidget()->parentWidget(), m_container->toplevel());
 //			m_container = m_container->toplevel();
 		}
 
@@ -668,12 +668,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 			menu->setItemEnabled(id, false);
 		return true;
 	}
-	else if(w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+	else if(w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 	{
-		//m_widget = w->tqparentWidget();
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget(); //m_widget;
+		//m_widget = w->parentWidget();
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
 		setWidget(
-			w->tqparentWidget(),
+			w->parentWidget(),
 			container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
 		);
 //		m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
@@ -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 &tqparentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
 {
-	if((name == "title") && (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget()->tqparentWidget());
-		KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
+		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
 	}
-	else if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+	else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
-		KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "id", stack->id(w));
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
+		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
 	}
 	else
 		return false;
@@ -743,15 +743,15 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW
 	TQString name = node.attribute("name");
 	if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget());
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
 		tab->addTab(w, node.firstChild().toElement().text());
 		item->addModifiedProperty("title", node.firstChild().toElement().text());
 		return true;
 	}
 
-	if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+	if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
 		int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 		stack->addWidget(w, id);
 		stack->raiseWidget(w);
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index b8623fad6..c8bdc1a63 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -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 &tqparentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
 		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 b625c7121..7460b480a 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -667,7 +667,7 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
 }
 
 bool
-StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &domDoc)
 {
 	if(name == "list_items" && classname == "KComboBox")
 	{
@@ -676,7 +676,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		{
 			TQDomElement item = domDoc.createElement("item");
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", combo->text(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 		return true;
 	}
@@ -687,7 +687,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		{
 			TQDomElement item = domDoc.createElement("item");
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", listbox->text(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 		return true;
 	}
@@ -703,14 +703,14 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "resizable", listview->header()->isResizeEnabled(i));
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "clickable", listview->header()->isClickEnabled(i));
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "fullwidth", listview->header()->isStretchEnabled(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 
 		// Then we save the list view items
 		TQListViewItem *item = listview->firstChild();
 		while(item)
 		{
-			saveListItem(item, tqparentNode, domDoc);
+			saveListItem(item, parentNode, domDoc);
 			item = item->nextSibling();
 		}
 		return true;
@@ -720,10 +720,10 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 }
 
 void
-StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc)
 {
 	TQDomElement element = domDoc.createElement("item");
-	tqparentNode.appendChild(element);
+	parentNode.appendChild(element);
 
 	// We save the text of each column
 	for(int i = 0; i < item->listView()->columns(); i++)
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index f5bd5528f..5d9032f0f 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 
 		virtual bool saveSpecialProperty(const TQCString &classname,
 			const TQString &name, const TQVariant &value, TQWidget *w,
-			TQDomElement &tqparentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &tqparent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
 			TQWidget *w, KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -91,7 +91,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 			const TQCString &property, bool isTopLevel);
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
-		void saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc);
+		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
 		void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
 
 	private:
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 41afdf374..6acf139cb 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -173,11 +173,11 @@ Form::commonParentContainer(WidgetList *wlist)
 	ObjectTreeItem *item = 0;
 	WidgetList *list = new WidgetList();
 
-	// Creates a list of all widget tqparents
+	// Creates a list of all widget parents
 	for(TQWidget *w = wlist->first(); w; w = wlist->next())
 	{
-		if(list->tqfindRef(w->tqparentWidget()) == -1)
-			list->append(w->tqparentWidget());
+		if(list->tqfindRef(w->parentWidget()) == -1)
+			list->append(w->parentWidget());
 	}
 
 	removeChildrenFromList(*list);
@@ -193,7 +193,7 @@ Form::commonParentContainer(WidgetList *wlist)
 }
 
 Container*
-Form::tqparentContainer(TQWidget *w)
+Form::parentContainer(TQWidget *w)
 {
 	ObjectTreeItem *it;
 	if(!w)
@@ -245,14 +245,14 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 		return;
 	}
 
-	//raise selected widget and all possible tqparents
+	//raise selected widget and all possible parents
 	TQWidget *wtmp = w;
-	while(!dontRaise && wtmp && wtmp->tqparentWidget() && (wtmp != widget()))
+	while(!dontRaise && wtmp && wtmp->parentWidget() && (wtmp != widget()))
 	{
 		wtmp->raise();
 		if(d->resizeHandles[ wtmp->name() ])
 			d->resizeHandles[ wtmp->name() ]->raise();
-		wtmp = wtmp->tqparentWidget();
+		wtmp = wtmp->parentWidget();
 	}
 
 	if (wtmp)
@@ -268,11 +268,11 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 	emitActionSignals(false);
 
 	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their tqparent
-	if(!FormManager::self()->isTopLevel(w) && w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+	if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 	{
-		w = w->tqparentWidget();
-		if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
-			w = w->tqparentWidget();
+		w = w->parentWidget();
+		if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+			w = w->parentWidget();
 	}
 
 	if(w && w != widget())
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index dbe64b520..d41d7a293 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -181,7 +181,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		 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.
 		 */
-		Container* tqparentContainer(TQWidget *w=0);
+		Container* parentContainer(TQWidget *w=0);
 
 		/*! \return The \ref Container which is a tqparent of all widgets in \a wlist.
 		 Used by \ref activeContainer(), and to find where
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 4b46f8fe6..dbfdc10a9 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -183,11 +183,11 @@ FormIO::saveFormToDom(Form *form, TQDomDocument &domDoc)
 	// Save the toplevel widgets, and so the whole Form
 	saveWidget(form->objectTree(), uiElement, domDoc);
 
-	// We then save the tqlayoutdefaults element
-	TQDomElement tqlayoutDefaults = domDoc.createElement("tqlayoutDefaults");
-	tqlayoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing()));
-	tqlayoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin()));
-	uiElement.appendChild(tqlayoutDefaults);
+	// We then save the layoutdefaults element
+	TQDomElement layoutDefaults = domDoc.createElement("layoutDefaults");
+	layoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing()));
+	layoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin()));
+	uiElement.appendChild(layoutDefaults);
 
 	/// Save tab Stops
 	if(form->autoTabStops())
@@ -398,7 +398,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name, 
+FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name, 
 	const TQVariant &value, TQWidget *w, WidgetLibrary *lib)
 {
 	// Widget specific properties and attributes ///////////////
@@ -416,7 +416,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 	{
 		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, tqparentNode, tqparent);
+			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, tqparent);
 		return;
 	}
 
@@ -449,7 +449,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 			type.appendChild(valueE);
 		}
 		propertyE.appendChild(type);
-		tqparentNode.appendChild(propertyE);
+		parentNode.appendChild(propertyE);
 		return;
 	}
 
@@ -464,17 +464,17 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 			valueE = tqparent.createTextNode(m_currentItem->pixmapName(property));
 		type.appendChild(valueE);
 		propertyE.appendChild(type);
-		tqparentNode.appendChild(propertyE);
+		parentNode.appendChild(propertyE);
 		return;
 	}
 
 	// Saving a "normal" property
 	writeVariant(tqparent, propertyE, value);
-	tqparentNode.appendChild(propertyE);
+	parentNode.appendChild(propertyE);
 }
 
 void
-FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value)
+FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value)
 {
 	TQDomElement type;
 	TQDomText valueE;
@@ -721,16 +721,16 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVari
 			break;
 	}
 
-	tqparentNode.appendChild(type);
+	parentNode.appendChild(type);
 }
 
 void
-FormIO::savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value)
+FormIO::savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value)
 {
 	TQDomElement propertyE = domDoc.createElement(tagName);
 	propertyE.setAttribute("name", property);
 	writeVariant(domDoc, propertyE, value);
-	tqparentNode.appendChild(propertyE);
+	parentNode.appendChild(propertyE);
 }
 
 TQVariant
@@ -1019,22 +1019,22 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	}
 	// Saving container 's tqlayout if there is one
 	TQDomElement tqlayout;
-	if(item->container() && item->container()->tqlayoutType() != Container::NoLayout)
+	if(item->container() && item->container()->layoutType() != Container::NoLayout)
 	{
 		if(item->container()->tqlayout()) // there is a tqlayout
 		{
 			tqlayout = domDoc.createElement("temp");
 			savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
-			if(item->modifiedProperties()->tqcontains("tqlayoutMargin"))
-				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->tqlayoutMargin());
-			if(item->modifiedProperties()->tqcontains("tqlayoutSpacing"))
-				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->tqlayoutSpacing());
+			if(item->modifiedProperties()->tqcontains("layoutMargin"))
+				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
+			if(item->modifiedProperties()->tqcontains("layoutSpacing"))
+				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
 			tclass.appendChild(tqlayout);
 		}
 	}
 
-	int tqlayoutType = item->container() ? item->container()->tqlayoutType() : Container::NoLayout;
-	switch(tqlayoutType) {
+	int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
+	switch(layoutType) {
 		case Container::Grid: // grid tqlayout
 		{
 			tqlayout.setTagName("grid");
@@ -1075,7 +1075,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 			WidgetList *list = (WidgetList*)flow->widgetList();
 
 			// save some special properties
-			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::tqlayoutTypeToString(item->container()->tqlayoutType()) );
+			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
 			savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
 
 			// fill the widget's grid info, ie just simulate grid tqlayout
@@ -1231,7 +1231,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 
 	m_currentItem = item;
 	// if we are inside a Grid, we need to insert the widget in the good cell
-	if(container->tqlayoutType() == Container::Grid)  {
+	if(container->layoutType() == Container::Grid)  {
 		TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
 		if(el.hasAttribute("rowspan")) { // widget spans multiple cells
 			if(tqlayout)
@@ -1420,21 +1420,21 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 		}
 		else if(tag == "grid") {
 			// first, see if it is flow tqlayout
-			TQString tqlayoutName;
+			TQString layoutName;
 			for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling())  {
 				if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout"))  {
-					tqlayoutName = child.toElement().text();
+					layoutName = child.toElement().text();
 					break;
 				}
 			}
 
-			 if(tqlayoutName == "HFlow") {
+			 if(layoutName == "HFlow") {
 				item->container()->m_layType = Container::HFlow;
 				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
 				tqlayout->setOrientation(Qt::Horizontal);
 				item->container()->m_layout = (TQLayout*)tqlayout;
 			}
-			else if(tqlayoutName == "VFlow") {
+			else if(layoutName == "VFlow") {
 				item->container()->m_layType = Container::VFlow;
 				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
 				tqlayout->setOrientation(Qt::Vertical);
diff --git a/kexi/formeditor/formIO.h b/kexi/formeditor/formIO.h
index f23084337..5556b2400 100644
--- a/kexi/formeditor/formIO.h
+++ b/kexi/formeditor/formIO.h
@@ -149,12 +149,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static void loadWidget(Container *container,
 			const TQDomElement &el, TQWidget *tqparent=0);
 
-		/*! Save an element in the \a domDoc as child of \a tqparentNode.
+		/*! Save an element in the \a domDoc as child of \a parentNode.
 		  The element will be saved like this :
 		  \code  <$(tagName) name = "$(property)">< value_as_XML ><$(tagName)/>
 		  \endcode
 		*/
-		static void savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName,
+		static void savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName,
 			const TQString &property, const TQVariant &value);
 
 		/*! Read an object property in the DOM doc.
@@ -165,7 +165,7 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static TQVariant readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name);
 
 		/*! Write an object property in the DOM doc.
-		   \param tqparentNode the DOM document to write to
+		   \param parentNode the DOM document to write to
 		   \param name   the name of the property being saved
 		   \param value  the value of this property
 		   \param w      the widget whose property is being saved
@@ -174,12 +174,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 			 Properties of subwidget are saved with subwidget="true" arribute added 
 			 to 'property' XML element.
 		*/
-		static void savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name,
+		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, 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 tqparentNode.*/
-		static void writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value);
+		/*! 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);
 
 		/*! Creates a toplevel widget from the TQDomElement \a element in the Form \a form,
 		 with \a tqparent as tqparent widget.
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 85001f5e4..4004fcd4f 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -890,7 +890,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	PLUG_ACTION("edit_paste", true);
 	PLUG_ACTION("edit_delete", !toplevelWidgetSelected);
 	separatorNeeded = true;
-	PLUG_ACTION("tqlayout_menu", enableLayout);
+	PLUG_ACTION("layout_menu", enableLayout);
 	PLUG_ACTION("break_layout", enableLayout);
 	separatorNeeded = true;
 	PLUG_ACTION("align_menu", !toplevelWidgetSelected);
@@ -1050,49 +1050,49 @@ FormManager::slotConnectionCreated(Form *form, Connection &connection)
 }
 
 void
-FormManager::tqlayoutHBox()
+FormManager::layoutHBox()
 {
 	createLayout(Container::HBox);
 }
 
 void
-FormManager::tqlayoutVBox()
+FormManager::layoutVBox()
 {
 	createLayout(Container::VBox);
 }
 
 void
-FormManager::tqlayoutGrid()
+FormManager::layoutGrid()
 {
 	createLayout(Container::Grid);
 }
 
 void
-FormManager::tqlayoutHSplitter()
+FormManager::layoutHSplitter()
 {
 	createLayout(Container::HSplitter);
 }
 
 void
-FormManager::tqlayoutVSplitter()
+FormManager::layoutVSplitter()
 {
 	createLayout(Container::VSplitter);
 }
 
 void
-FormManager::tqlayoutHFlow()
+FormManager::layoutHFlow()
 {
 	createLayout(Container::HFlow);
 }
 
 void
-FormManager::tqlayoutVFlow()
+FormManager::layoutVFlow()
 {
 	createLayout(Container::VFlow);
 }
 
 void
-FormManager::createLayout(int tqlayoutType)
+FormManager::createLayout(int layoutType)
 {
 	WidgetList *list = m_active->selectedWidgets();
 	// if only one widget is selected (a container), we modify its tqlayout
@@ -1105,15 +1105,15 @@ FormManager::createLayout(int tqlayoutType)
 		ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
 		if(!item || !item->container() || !m_propSet->tqcontains("tqlayout"))
 			return;
-		(*m_propSet)["tqlayout"] = Container::tqlayoutTypeToString(tqlayoutType);
+		(*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
 		return;
 	}
 
-	TQWidget *tqparent = list->first()->tqparentWidget();
+	TQWidget *tqparent = list->first()->parentWidget();
 	for(TQWidget *w = list->first(); w; w = list->next())
 	{
-		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->tqparentWidget()->name() << " insteaed of " << tqparent->name() << endl;
-		if(w->tqparentWidget() != tqparent)
+		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->parentWidget()->name() << " insteaed of " << tqparent->name() << endl;
+		if(w->parentWidget() != tqparent)
 		{
 			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
 		   "All selected widgets must have the same tqparent."));
@@ -1122,7 +1122,7 @@ FormManager::createLayout(int tqlayoutType)
 		}
 	}
 
-	KCommand *com = new CreateLayoutCommand(tqlayoutType, *list, m_active);
+	KCommand *com = new CreateLayoutCommand(layoutType, *list, m_active);
 	m_active->addCommand(com, true);
 }
 
@@ -1244,11 +1244,11 @@ FormManager::alignWidgets(int type)
 	if(!activeForm() || !activeForm()->objectTree() || (activeForm()->selectedWidgets()->count() < 2))
 		return;
 
-	TQWidget *tqparentWidget = activeForm()->selectedWidgets()->first()->tqparentWidget();
+	TQWidget *parentWidget = activeForm()->selectedWidgets()->first()->parentWidget();
 
 	for(TQWidget *w = activeForm()->selectedWidgets()->first(); w; w = activeForm()->selectedWidgets()->next())
 	{
-		if(w->tqparentWidget() != tqparentWidget)
+		if(w->parentWidget() != parentWidget)
 		{
 			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same tqparent widget" << endl;
 			return;
@@ -1512,16 +1512,16 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
 	}
 	const bool twoSelected = form->selectedWidgets()->count()==2;
 	// Layout actions
-	enableAction("tqlayout_menu", multiple || containerSelected);
-	enableAction("tqlayout_hbox", multiple || containerSelected);
-	enableAction("tqlayout_vbox", multiple || containerSelected);
-	enableAction("tqlayout_grid", multiple || containerSelected);
-	enableAction("tqlayout_hsplitter", twoSelected);
-	enableAction("tqlayout_vsplitter", twoSelected);
+	enableAction("layout_menu", multiple || containerSelected);
+	enableAction("layout_hbox", multiple || containerSelected);
+	enableAction("layout_vbox", multiple || containerSelected);
+	enableAction("layout_grid", multiple || containerSelected);
+	enableAction("layout_hsplitter", twoSelected);
+	enableAction("layout_vsplitter", twoSelected);
 
 	KFormDesigner::Container *container = activeForm() ? activeForm()->activeContainer() : 0;
 	if (container)
-		enableAction("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+		enableAction("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 
 	emit widgetSelected(form, true);
 }
@@ -1553,13 +1553,13 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
-	enableAction("tqlayout_menu", hasChildren);
-	enableAction("tqlayout_hbox", hasChildren);
-	enableAction("tqlayout_vbox", hasChildren);
-	enableAction("tqlayout_grid", hasChildren);
-	enableAction("tqlayout_hsplitter", twoSelected);
-	enableAction("tqlayout_vsplitter", twoSelected);
-	enableAction("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	enableAction("layout_menu", hasChildren);
+	enableAction("layout_hbox", hasChildren);
+	enableAction("layout_vbox", hasChildren);
+	enableAction("layout_grid", hasChildren);
+	enableAction("layout_hsplitter", twoSelected);
+	enableAction("layout_vsplitter", twoSelected);
+	enableAction("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 
 	emit formWidgetSelected( form );
 }
@@ -1631,12 +1631,12 @@ FormManager::disableWidgetActions()
 	enableAction("format_raise", false);
 	enableAction("format_lower", false);
 
-	enableAction("tqlayout_menu", false);
-	enableAction("tqlayout_hbox", false);
-	enableAction("tqlayout_vbox", false);
-	enableAction("tqlayout_grid", false);
-	enableAction("tqlayout_hsplitter", false);
-	enableAction("tqlayout_vsplitter", false);
+	enableAction("layout_menu", false);
+	enableAction("layout_hbox", false);
+	enableAction("layout_vbox", false);
+	enableAction("layout_grid", false);
+	enableAction("layout_hsplitter", false);
+	enableAction("layout_vsplitter", false);
 	enableAction("break_layout", false);
 }
 
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index a4622d1bf..e7934cc24 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -259,19 +259,19 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		void editConnections();
 
 		//! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
-		void tqlayoutHBox();
+		void layoutHBox();
 		//! Lay out selected widgets using VBox tqlayout.
-		void tqlayoutVBox();
+		void layoutVBox();
 		//! Lay out selected widgets using Grid tqlayout.
-		void tqlayoutGrid();
+		void layoutGrid();
 		//! Lay out selected widgets in an horizontal splitter
-		void  tqlayoutHSplitter();
+		void  layoutHSplitter();
 		//! Lay out selected widgets in a verticak splitter
-		void  tqlayoutVSplitter();
+		void  layoutVSplitter();
 		//! Lay out selected widgets using HFlow tqlayout
-		void tqlayoutHFlow();
+		void layoutHFlow();
 		//! Lay out selected widgets using VFlow tqlayout.
-		void tqlayoutVFlow();
+		void layoutVFlow();
 
 		//! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
 		void breakLayout();
@@ -421,7 +421,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
 		  currently selected widgets (that must have the same tqparent).
 		  Calls \ref CreateLayoutCommand. */
-		void createLayout(int tqlayoutType);
+		void createLayout(int layoutType);
 
 		/*! Function called by all other AlignWidgets*() function. Calls \ref AlignWidgetsCommand. */
 		void alignWidgets(int type);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index a79374cdd..8ab3ae0d6 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -69,11 +69,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -215,9 +215,9 @@ KFormDesignerKDevPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -405,12 +405,12 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
 			multiple = true;
 	}
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", multiple);
-	ENABLE_ACTION("tqlayout_vbox", multiple);
-	ENABLE_ACTION("tqlayout_grid", multiple);
+	ENABLE_ACTION("layout_hbox", multiple);
+	ENABLE_ACTION("layout_vbox", multiple);
+	ENABLE_ACTION("layout_grid", multiple);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -420,10 +420,10 @@ KFormDesignerKDevPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", true);
-	ENABLE_ACTION("tqlayout_vbox", true);
-	ENABLE_ACTION("tqlayout_grid", true);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_hbox", true);
+	ENABLE_ACTION("layout_vbox", true);
+	ENABLE_ACTION("layout_grid", true);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -486,9 +486,9 @@ KFormDesignerKDevPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
 	ENABLE_ACTION("break_layout", false);
 }
 
@@ -616,10 +616,10 @@ void
 FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -639,7 +639,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 548b4a357..72f2ef82f 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 *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index 5f17d8497..f9dad43a7 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -37,14 +37,14 @@ using namespace KFormDesigner;
 
 
 ObjectTreeItem::ObjectTreeItem(const TQString &classn, const TQString &name, TQWidget *widget,
- Container *tqparentContainer, Container *container)
+ Container *parentContainer, Container *container)
  : m_enabled(true), m_row(-1), m_col(-1), m_rowspan(-1), m_colspan(-1), m_span(false)
 {
 	m_className = classn;
 	m_name = name;
 	m_widget = widget;
 	m_container = container;
-	m_eater = new EventEater(widget, tqparentContainer);
+	m_eater = new EventEater(widget, parentContainer);
 	m_parent = 0;
 	m_subprops = 0;
 }
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index ca301f4d5..ae9b1e262 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -64,7 +64,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 class KFORMEDITOR_EXPORT ObjectTreeItem
 {
 	public:
-		ObjectTreeItem(const TQString &className, const TQString &name, TQWidget *widget, Container *tqparentContainer, Container *container=0);
+		ObjectTreeItem(const TQString &className, const TQString &name, TQWidget *widget, Container *parentContainer, Container *container=0);
 		virtual ~ObjectTreeItem();
 
 		TQString name() const { return m_name; }
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index ac1cb4cb0..c2448c6eb 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -36,7 +36,7 @@
 using namespace KFormDesigner;
 
 ResizeHandle::ResizeHandle(ResizeHandleSet *set, HandlePos pos, bool editing)
- : TQWidget(set->m_widget->tqparentWidget()), m_set(set)
+ : TQWidget(set->m_widget->parentWidget()), m_set(set)
 {
 //	setBackgroundMode(TQt::NoBackground);
 	m_dragging = false;
@@ -226,16 +226,16 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev)
 		tmpw += tmpx;
 		tmpx = 0;
 	}
-	else if(tmpx + tmpw > m_set->m_widget->tqparentWidget()->width())
-		tmpw = m_set->m_widget->tqparentWidget()->width() - tmpx;
+	else if(tmpx + tmpw > m_set->m_widget->parentWidget()->width())
+		tmpw = m_set->m_widget->parentWidget()->width() - tmpx;
 
 	if(tmpy < 0)
 	{
 		tmph += tmpy;
 		tmpy = 0;
 	}
-	else if(tmpy + tmph > m_set->m_widget->tqparentWidget()->height())
-		tmph = m_set->m_widget->tqparentWidget()->height() - tmpy;
+	else if(tmpy + tmph > m_set->m_widget->parentWidget()->height())
+		tmph = m_set->m_widget->parentWidget()->height() - tmpy;
 
 	const bool shouldBeMoved = (tmpx != m_set->m_widget->x()) || (tmpy != m_set->m_widget->y());
 	const bool shouldBeResized = (tmpw != m_set->m_widget->width()) || (tmph != m_set->m_widget->height());
@@ -272,16 +272,16 @@ void ResizeHandle::paintEvent( TQPaintEvent * )
 	/*TQPainter p(this);
 	p.setRasterOp(XorROP);
 	p.fillRect(TQRect(0, 0, 6, 6),white);
-	bitBlt( this, TQPoint(0,0), tqparentWidget(), rect(), XorROP);*/
+	bitBlt( this, TQPoint(0,0), parentWidget(), rect(), XorROP);*/
 }
 
 /////////////// ResizeHandleSet //////////////////
 
 ResizeHandleSet::ResizeHandleSet(TQWidget *modify, Form *form, bool editing)
-: TQObject(modify->tqparentWidget()), /*m_widget(modify),*/ m_form(form)
+: TQObject(modify->parentWidget()), /*m_widget(modify),*/ m_form(form)
 {
 	m_widget = 0;
-	/*TQWidget *tqparent = modify->tqparentWidget();
+	/*TQWidget *tqparent = modify->parentWidget();
 
 	handles[0] = new ResizeHandle( modify, ResizeHandle::TopLeft, editing);
 	handles[1] = new ResizeHandle( modify, ResizeHandle::TopCenter, editing);
diff --git a/kexi/formeditor/scripting/scriptIO.cpp b/kexi/formeditor/scripting/scriptIO.cpp
index ee0b1f592..b124a99aa 100644
--- a/kexi/formeditor/scripting/scriptIO.cpp
+++ b/kexi/formeditor/scripting/scriptIO.cpp
@@ -27,30 +27,30 @@
 #include "main/scriptcontainer.h"
 
 bool
-ScriptIO::saveFormEvents(TQDomNode &tqparentNode, FormScript *formScript)
+ScriptIO::saveFormEvents(TQDomNode &parentNode, FormScript *formScript)
 {
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 
 	// Save the form's code
 	if(!formScript->getCode().isEmpty()) {
 		TQDomElement  script = domDoc.createElement("script");
 		script.setAttribute("language", formScript->scriptContainer()->getInterpreterName());
-		tqparentNode.appendChild(script);
+		parentNode.appendChild(script);
 		TQDomText scriptCode = domDoc.createTextNode(formScript->getCode());
 		script.appendChild(scriptCode);
 	}
 
 	// Save all form events
 	if(!formScript->eventList()->isEmpty())
-		saveEventList(formScript->eventList(), tqparentNode);
+		saveEventList(formScript->eventList(), parentNode);
 	return true;
 }
 
 bool
-ScriptIO::loadFormEvents(TQDomNode &tqparentNode, Form *form, ScriptManager *manager)
+ScriptIO::loadFormEvents(TQDomNode &parentNode, Form *form, ScriptManager *manager)
 {
-	TQDomElement script = tqparentNode.namedItem("script").toElement();
-	TQDomElement events = tqparentNode.namedItem("events").toElement();
+	TQDomElement script = parentNode.namedItem("script").toElement();
+	TQDomElement events = parentNode.namedItem("events").toElement();
 
 	// Load script code
 	FormScript *formScript = new FormScript(form, manager);
@@ -76,15 +76,15 @@ ScriptIO::saveAllEventsForWidget(TQObject *widget, FormScript *formScript, TQDom
 }
 
 void
-ScriptIO::saveEvent(Event *event, TQDomNode &tqparentNode)
+ScriptIO::saveEvent(Event *event, TQDomNode &parentNode)
 {
 	if(!event)
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement eventNode = domDoc.createElement("event");
 	eventNode.setAttribute("type", event->type());
-	tqparentNode.appendChild(eventNode);
+	parentNode.appendChild(eventNode);
 
 	switch(event->type()) {
 		case Event::Slot: {
@@ -138,14 +138,14 @@ ScriptIO::saveEvent(Event *event, TQDomNode &tqparentNode)
 }
 
 void
-ScriptIO::saveEventList(EventList *list, TQDomNode &tqparentNode)
+ScriptIO::saveEventList(EventList *list, TQDomNode &parentNode)
 {
 	if(!list || list->isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement events = domDoc.createElement("events");
-	tqparentNode.appendChild(events);
+	parentNode.appendChild(events);
 
 	TQValueListConstIterator<Event*> endIt = list->constEnd();
 	for(TQValueListConstIterator<Event*> it =  list->constBegin(); it != endIt; ++it)
diff --git a/kexi/formeditor/scripting/scriptIO.h b/kexi/formeditor/scripting/scriptIO.h
index 319de0fdd..9261d75c8 100644
--- a/kexi/formeditor/scripting/scriptIO.h
+++ b/kexi/formeditor/scripting/scriptIO.h
@@ -42,17 +42,17 @@ class ScriptIO
 		/*! Save the evnts of a form.
 		 Creates an \<events\> tag, and then one \<event\> tag for each event.
 		 Each event tqcontains \<sender\> and \<receiver\> tags, with attributes depending on event type. */
-		static bool  saveFormEvents(TQDomNode &tqparentNode, FormScript *script);
-		/*! Reads the \<events\> tag (\a tqparentNode), then creates and fills a FormScript object linked to this \a form.
+		static bool  saveFormEvents(TQDomNode &parentNode, FormScript *script);
+		/*! Reads the \<events\> tag (\a parentNode), then creates and fills a FormScript object linked to this \a form.
 		 The new FormScript object is then added  to ScriptManager list.*/
-		static bool  loadFormEvents(TQDomNode &tqparentNode, Form *form, ScriptManager *manager);
+		static bool  loadFormEvents(TQDomNode &parentNode, Form *form, ScriptManager *manager);
 
 		/*! Save only the events related to widget \a name in the FormScript \a fscript.
 		 Used eg when copying/pasting widgets to keep also events related to it.*/
 		static bool  saveAllEventsForWidget(TQObject *widget, FormScript *fscript, TQDomNode &node);
 
-		static void  saveEvent(Event *event, TQDomNode &tqparentNode);
-		static void  saveEventList(EventList *list, TQDomNode &tqparentNode);
+		static void  saveEvent(Event *event, TQDomNode &parentNode);
+		static void  saveEventList(EventList *list, TQDomNode &parentNode);
 		static void  loadEvent(TQDomNode &node, EventList *list, Form *form);
 
 	protected:
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index 4bea0294c..be8cfb4a6 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -123,10 +123,10 @@ Spring::isPropertyVisible(const TQCString &name)
 
 
 void
-Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparentNode, TQDomDocument &domDoc, bool insideGridLayout)
+Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode, TQDomDocument &domDoc, bool insideGridLayout)
 {
 	TQDomElement tclass = domDoc.createElement("spacer");
-	tqparentNode.appendChild(tclass);
+	parentNode.appendChild(tclass);
 
 	if(insideGridLayout)
 	{
@@ -141,7 +141,7 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparentNo
 
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget());
 
-	if(tqparentNode.tagName() == "widget")
+	if(parentNode.tagName() == "widget")
 		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
 	if(!item->widget()->tqsizeHint().isValid())
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 0e1745dcd..d95e96ae6 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -98,11 +98,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerPart *part = new KFormDesignerPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerPart *part = new KFormDesignerPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -219,22 +219,22 @@ KFormDesignerPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	KActionMenu *tqlayoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "tqlayout_menu");
-	tqlayoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox"));
-	tqlayoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox"));
-	tqlayoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid"));
-	tqlayoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHFlow()), actionCollection(), "tqlayout_hflow"));
-	tqlayoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVFlow()), actionCollection(), "tqlayout_vflow"));
-	tqlayoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()), actionCollection(), "tqlayout_hsplitter"));
-	tqlayoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()), actionCollection(), "tqlayout_vsplitter"));
+	KActionMenu *layoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu");
+	layoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
+	layoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
+	layoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
+	layoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
+	layoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
+	layoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
+	layoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
 	new KAction(i18n("&Ungroup Widgets"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 /*
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
-	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()), actionCollection(), "tqlayout_hsplitter");
-	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()), actionCollection(), "tqlayout_vsplitter");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
+	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 */
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -433,15 +433,15 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
 	}
 	const bool twoSelected = form->selectedWidgets()->count()==2;
 	// Layout actions
-	ENABLE_ACTION("tqlayout_menu", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_hbox", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_vbox", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_grid", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_hsplitter", twoSelected);
-	ENABLE_ACTION("tqlayout_vsplitter", twoSelected);
+	ENABLE_ACTION("layout_menu", multiple || containerSelected);
+	ENABLE_ACTION("layout_hbox", multiple || containerSelected);
+	ENABLE_ACTION("layout_vbox", multiple || containerSelected);
+	ENABLE_ACTION("layout_grid", multiple || containerSelected);
+	ENABLE_ACTION("layout_hsplitter", twoSelected);
+	ENABLE_ACTION("layout_vsplitter", twoSelected);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -454,13 +454,13 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form)
 	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_menu", hasChildren);
-	ENABLE_ACTION("tqlayout_hbox", hasChildren);
-	ENABLE_ACTION("tqlayout_vbox", hasChildren);
-	ENABLE_ACTION("tqlayout_grid", hasChildren);
-	ENABLE_ACTION("tqlayout_hsplitter", twoSelected);
-	ENABLE_ACTION("tqlayout_vsplitter", twoSelected);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_menu", hasChildren);
+	ENABLE_ACTION("layout_hbox", hasChildren);
+	ENABLE_ACTION("layout_vbox", hasChildren);
+	ENABLE_ACTION("layout_grid", hasChildren);
+	ENABLE_ACTION("layout_hsplitter", twoSelected);
+	ENABLE_ACTION("layout_vsplitter", twoSelected);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -523,12 +523,12 @@ KFormDesignerPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_menu", false);
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
-	ENABLE_ACTION("tqlayout_hsplitter", false);
-	ENABLE_ACTION("tqlayout_vsplitter", false);
+	ENABLE_ACTION("layout_menu", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
+	ENABLE_ACTION("layout_hsplitter", false);
+	ENABLE_ACTION("layout_vsplitter", false);
 	ENABLE_ACTION("break_layout", false);
 }
 #endif
@@ -640,10 +640,10 @@ void
 FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -663,7 +663,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 7ffb8705a..5b264b035 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 *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 12585b6cb..f26661ab2 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -64,9 +64,9 @@ WidgetInfo::WidgetInfo(WidgetFactory *f)
 {
 }
 
-WidgetInfo::WidgetInfo(WidgetFactory *f, const char* tqparentFactoryName,
+WidgetInfo::WidgetInfo(WidgetFactory *f, const char* parentFactoryName,
 	const char* inheritedClassName)
- : m_parentFactoryName( TQCString("kformdesigner_")+tqparentFactoryName )
+ : m_parentFactoryName( TQCString("kformdesigner_")+parentFactoryName )
  , m_inheritedClassName(inheritedClassName)
  , m_inheritedClass(0)
  , m_overriddenAlternateNames(0)
@@ -188,7 +188,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 {
 //#ifdef KEXI_KTEXTEDIT
 	if (multiLine) {
-		KTextEdit *textedit = new KTextEdit(text, TQString(), w->tqparentWidget());
+		KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget());
 		textedit->setTextFormat(TQt::PlainText);
 		textedit->tqsetAlignment(align);
 		if (dynamic_cast<TQTextEdit*>(w)) {
@@ -228,7 +228,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 //#else
 	}
 	else {
-		KLineEdit *editor = new KLineEdit(text, w->tqparentWidget());
+		KLineEdit *editor = new KLineEdit(text, w->parentWidget());
 		editor->tqsetAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
@@ -643,7 +643,7 @@ WidgetFactory::saveSpecialProperty(const TQCString &, const TQString &, const TQ
 bool WidgetFactory::inheritsFactories()
 {
 	for (TQAsciiDictIterator<WidgetInfo> it(m_classesByName); it.current(); ++it) {
-		if (!it.current()->tqparentFactoryName().isEmpty())
+		if (!it.current()->parentFactoryName().isEmpty())
 			return true;
 	}
 	return false;
@@ -667,11 +667,11 @@ void WidgetFactory::setEditor(TQWidget *widget, TQWidget *editor)
 	if (!widget)
 		return;
 	WidgetInfo *winfo = m_classesByName[widget->className()];
-	if (!winfo || winfo->tqparentFactoryName().isEmpty()) {
+	if (!winfo || winfo->parentFactoryName().isEmpty()) {
 		m_editor = editor;
 	}
 	else {
-		WidgetFactory *f = m_library->factory(winfo->tqparentFactoryName());
+		WidgetFactory *f = m_library->factory(winfo->parentFactoryName());
 		if (f!=this)
 			f->setEditor(widget, editor);
 		m_editor = editor; //keep a copy
@@ -683,7 +683,7 @@ TQWidget *WidgetFactory::editor(TQWidget *widget) const
 	if (!widget)
 		return 0;
 	WidgetInfo *winfo = m_classesByName[widget->className()];
-	if (!winfo || winfo->tqparentFactoryName().isEmpty()) {
+	if (!winfo || winfo->parentFactoryName().isEmpty()) {
 		return m_editor;
 	}
 	else {
@@ -697,8 +697,8 @@ TQWidget *WidgetFactory::editor(TQWidget *widget) const
 void WidgetFactory::setWidget(TQWidget *widget, Container* container)
 {
 	WidgetInfo *winfo = widget ? m_classesByName[widget->className()] : 0;
-	if (winfo && !winfo->tqparentFactoryName().isEmpty()) {
-		WidgetFactory *f = m_library->factory(winfo->tqparentFactoryName());
+	if (winfo && !winfo->parentFactoryName().isEmpty()) {
+		WidgetFactory *f = m_library->factory(winfo->parentFactoryName());
 		if (f!=this)
 			f->setWidget(widget, container);
 	}
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 2cb74fc8d..eab422ce0 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -70,7 +70,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 
 		WidgetInfo(WidgetFactory *f);
 
-		WidgetInfo(WidgetFactory *f, const char* tqparentFactoryName, const char* inheritedClassName = 0);
+		WidgetInfo(WidgetFactory *f, const char* parentFactoryName, const char* inheritedClassName = 0);
 
 		virtual ~WidgetInfo();
 
@@ -146,7 +146,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 		 If cancelled value is returned, there is no overriding (the default). */
 		tristate autoSyncForProperty(const char *propertyName) const;
 
-		TQCString tqparentFactoryName() const { return m_parentFactoryName; }
+		TQCString parentFactoryName() const { return m_parentFactoryName; }
 
 		WidgetInfo* inheritedClass() const { return m_inheritedClass; }
 
@@ -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 &tqparentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &tqparent);
 
 		/*! 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 265153e74..ac663f8bf 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -135,13 +135,13 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f)
 			continue; //this class is hidden
 		// check if we want to inherit a widget from a different factory
 		if (!w->m_parentFactoryName.isEmpty() && !w->m_inheritedClassName.isEmpty()) {
-			WidgetFactory *tqparentFactory = d->factories[w->m_parentFactoryName];
-			if (!tqparentFactory) {
+			WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName];
+			if (!parentFactory) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className()
 					<< "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl;
 				continue;
 			}
-			WidgetInfo* inheritedClass = tqparentFactory->m_classesByName[ w->m_inheritedClassName ];
+			WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ];
 			if (!inheritedClass) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->m_inheritedClassName
 					<< "' - no such class to inherit in factory '" << w->m_parentFactoryName << "'" << endl;
@@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname)
 }
 
 bool
-WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent)
+WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
 {
 	loadFactories();
 	WidgetInfo *wi = d->widgets.tqfind(classname);
 	if (!wi)
 		return false;
 
-	if (wi->factory()->saveSpecialProperty(classname, name, value, w, tqparentNode, tqparent))
+	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent))
 		return true;
 	//try from inherited class
 	if (wi->inheritedClass())
-		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, tqparentNode, tqparent);
+		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent);
 	return false;
 }
 
@@ -649,11 +649,11 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString&
 		return TQString();
 
 	//try in tqparent factory, if exists
-	WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
+	if (!parentFactory)
 		return TQString();
 
-	return tqparentFactory->propertyDescForName(propertyName);
+	return parentFactory->propertyDescForName(propertyName);
 }
 
 TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString& name)
@@ -667,11 +667,11 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString&
 		return TQString();
 
 	//try in tqparent factory, if exists
-	WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
+	if (!parentFactory)
 		return TQString();
 
-	return tqparentFactory->propertyDescForValue(name);
+	return parentFactory->propertyDescForValue(name);
 }
 
 void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo& winfo, TQWidget* w )
@@ -681,10 +681,10 @@ void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo
 	winfo.factory()->setPropertyOptions(buf, winfo, w);
 	if (winfo.m_parentFactoryName.isEmpty())
 		return;
-	WidgetFactory *tqparentFactory = d->factories[winfo.m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo.m_parentFactoryName];
+	if (!parentFactory)
 		return;
-	tqparentFactory->setPropertyOptions(buf, winfo, w);
+	parentFactory->setPropertyOptions(buf, winfo, w);
 }
 
 WidgetFactory* WidgetLibrary::factory(const char* factoryName) const
diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index d8a6529a5..22d4c05f0 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -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 &tqparentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
 		bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			ObjectTreeItem *item);
 		bool isPropertyVisible(const TQCString &classname, TQWidget *w,
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index e1c3a1e97..55bd4c60c 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "tqlayout") || (property == "tqlayoutMargin") || (property == "tqlayoutSpacing")) {
+	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -901,7 +901,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 		return;
 
 	TQStringList list;
-	TQString value = Container::tqlayoutTypeToString(container->tqlayoutType());
+	TQString value = Container::layoutTypeToString(container->layoutType());
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
@@ -912,17 +912,17 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	updatePropertyValue(item, "tqlayout");
 
-	p = new KoProperty::Property("tqlayoutMargin", container->tqlayoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
+	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutMargin");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutMargin");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
-	p = new KoProperty::Property("tqlayoutSpacing", container->tqlayoutSpacing(), 
+	p = new KoProperty::Property("layoutSpacing", container->layoutSpacing(), 
 		i18n("Layout Spacing"), i18n("Layout Spacing"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutSpacing");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutSpacing");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
 }
@@ -951,19 +951,19 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 
 		container->setLayout(type);
 		bool show = (type != Container::NoLayout);
-		if(show != d->set["tqlayoutMargin"].isVisible())  {
-			d->set["tqlayoutMargin"].setVisible(show);
-			d->set["tqlayoutSpacing"].setVisible(show);
+		if(show != d->set["layoutMargin"].isVisible())  {
+			d->set["layoutMargin"].setVisible(show);
+			d->set["layoutSpacing"].setVisible(show);
 			KFormDesigner::FormManager::self()->showPropertySet(this, true/*force*/);
 		}
 		return;
 	}
 
-	if(prop == "tqlayoutMargin" && container->tqlayout()) {
+	if(prop == "layoutMargin" && container->tqlayout()) {
 		container->setLayoutMargin(value.toInt());
 		container->tqlayout()->setMargin(value.toInt());
 	}
-	else if(prop == "tqlayoutSpacing" && container->tqlayout())  {
+	else if(prop == "layoutSpacing" && container->tqlayout())  {
 		container->setLayoutSpacing(value.toInt());
 		container->tqlayout()->setSpacing(value.toInt());
 	}
diff --git a/kexi/kexidb/connection.h b/kexi/kexidb/connection.h
index 79bd38406..3d4eb82cb 100644
--- a/kexi/kexidb/connection.h
+++ b/kexi/kexidb/connection.h
@@ -232,7 +232,7 @@ class KEXI_DB_EXPORT Connection : public TQObject, public KexiDB::Object
 		Transaction beginTransaction();
 
 /*! \todo for nested transactions:
-		Tansaction* beginTransaction(transaction *tqparent_transaction);
+		Tansaction* beginTransaction(transaction *parent_transaction);
 */
 		/*! Commits transaction \a trans.
 		 If there is not \a trans argument passed, and there is default transaction 
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index 0428fdcfd..ffa45c9b7 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -246,7 +246,7 @@ TQString UnaryExpr::debugString()
 
 TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
 {
-	if (m_token=='(') //tqparentheses (special case)
+	if (m_token=='(') //parentheses (special case)
 		return "(" + (m_arg ? m_arg->toString(params) : "<NULL>") + ")";
 	if (m_token < 255 && isprint(m_token))
 		return tokenToDebugString() + (m_arg ? m_arg->toString(params) : "<NULL>");
diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h
index c5f28d5b3..f77dba2b4 100644
--- a/kexi/kexidb/fieldlist.h
+++ b/kexi/kexidb/fieldlist.h
@@ -135,7 +135,7 @@ class KEXI_DB_EXPORT FieldList
 		/*! \return a string that is a result of all field names concatenated 
 		 and with \a separator. This is usable e.g. as argument like "field1,field2" 
 		 for "INSERT INTO (xxx) ..". The result of this method is effectively cached,
-		 and it is tqinvalidated when set of fields changes (e.g. using clear() 
+		 and it is invalidated when set of fields changes (e.g. using clear() 
 		 or addField()).
 		 \a tableAlias, if provided is prepended to each field, so the resulting 
 		 names will be in form tableAlias.fieldName. This option is used for building 
diff --git a/kexi/kexidb/indexschema.cpp b/kexi/kexidb/indexschema.cpp
index c672305a2..4775125b8 100644
--- a/kexi/kexidb/indexschema.cpp
+++ b/kexi/kexidb/indexschema.cpp
@@ -41,11 +41,11 @@ IndexSchema::IndexSchema(TableSchema *tableSchema)
 	m_master_owned_rels.setAutoDelete(true); //rels at the master-side are owned
 }
 
-IndexSchema::IndexSchema(const IndexSchema& idx, TableSchema& tqparentTable)
+IndexSchema::IndexSchema(const IndexSchema& idx, TableSchema& parentTable)
 //	: FieldList(static_cast<const FieldList&>(idx))//fields are not owned by IndexSchema object
 	: FieldList(false)//fields are not owned by IndexSchema object
 	, SchemaData(static_cast<const SchemaData&>(idx))
-	, m_tableSchema(&tqparentTable)
+	, m_tableSchema(&parentTable)
 	, m_primary( idx.m_primary )
 	, m_unique( idx.m_unique )
 	, m_isAutoGenerated( idx.m_isAutoGenerated )
@@ -55,14 +55,14 @@ IndexSchema::IndexSchema(const IndexSchema& idx, TableSchema& tqparentTable)
 
 	//deep copy of the fields
 	for (Field::ListIterator f_it(idx.m_fields); f_it.current(); ++f_it) {
-		Field *tqparentTableField = tqparentTable.field( f_it.current()->name() );
-		if (!tqparentTableField) {
-			KexiDBWarn << "IndexSchema::IndexSchema(const IndexSchema& idx, const TableSchema& tqparentTable): "
-				"cannot find field '" << f_it.current()->name() << " in tqparentTable. Empty index will be created!" << endl;
+		Field *parentTableField = parentTable.field( f_it.current()->name() );
+		if (!parentTableField) {
+			KexiDBWarn << "IndexSchema::IndexSchema(const IndexSchema& idx, const TableSchema& parentTable): "
+				"cannot find field '" << f_it.current()->name() << " in parentTable. Empty index will be created!" << endl;
 			FieldList::clear();
 			break;
 		}
-		addField( tqparentTableField );
+		addField( parentTableField );
 	}
 
 //js TODO: copy relationships!
diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h
index 60d1d7ac7..12feae04f 100644
--- a/kexi/kexidb/indexschema.h
+++ b/kexi/kexidb/indexschema.h
@@ -56,7 +56,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 
 		/*! Copy constructor. Copies all attributes from index \a idx, and 
 		 fields assigned with it but the fields are taken (by name) from 
-		 \a tqparentTable, not from \a idx itself, so it's possible to copy of index
+		 \a parentTable, not from \a idx itself, so it's possible to copy of index
 		 for a copy of table. 
 
 		 To copy an index within the same table it's enough to call: 
@@ -65,7 +65,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 		 \endcode
 		 @todo All relationships should be also copied
 		 */
-		IndexSchema(const IndexSchema& idx, TableSchema& tqparentTable);
+		IndexSchema(const IndexSchema& idx, TableSchema& parentTable);
 
 		/*! Destroys the index. Field objects are not deleted.
 		 All Relationship objects listed in masterRelationships() list 
diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp
index 66ed43969..62a0665e1 100644
--- a/kexi/kexidb/lookupfieldschema.cpp
+++ b/kexi/kexidb/lookupfieldschema.cpp
@@ -254,12 +254,12 @@ LookupFieldSchema *LookupFieldSchema::loadFromDom(const TQDomElement& lookupEl)
 }
 
 /* static */
-void LookupFieldSchema::saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& tqparentEl)
+void LookupFieldSchema::saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& parentEl)
 {
 	TQDomElement lookupColumnEl, rowSourceEl, rowSourceTypeEl, nameEl;
 	if (!lookupSchema.rowSource().name().isEmpty()) {
 		lookupColumnEl = doc.createElement("lookup-column");
-		tqparentEl.appendChild( lookupColumnEl );
+		parentEl.appendChild( lookupColumnEl );
 
 		rowSourceEl = doc.createElement("row-source");
 		lookupColumnEl.appendChild( rowSourceEl );
diff --git a/kexi/kexidb/lookupfieldschema.h b/kexi/kexidb/lookupfieldschema.h
index 35d3b59fe..a4d6407a6 100644
--- a/kexi/kexidb/lookupfieldschema.h
+++ b/kexi/kexidb/lookupfieldschema.h
@@ -212,8 +212,8 @@ class KEXI_DB_EXPORT LookupFieldSchema
 		 @return a new LookupFieldSchema object even if lookupEl contains no valid contents. */
 		static LookupFieldSchema* loadFromDom(const TQDomElement& lookupEl);
 
-		/*! Saves data of lookup column schema to \a tqparentEl DOM element of \a doc document. */
-		static void saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& tqparentEl);
+		/*! Saves data of lookup column schema to \a parentEl DOM element of \a doc document. */
+		static void saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& parentEl);
 
 		/*! Sets property of name \a propertyName and value \a value for the lookup schema \a lookup
 		 \return true on successful set and false on failure because of invalid value or invalid property name. */
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index 426dec488..7775885d7 100644
--- a/kexi/kexidb/parser/sqlparser.y
+++ b/kexi/kexidb/parser/sqlparser.y
@@ -1003,7 +1003,7 @@ aExpr9 '/' aExpr8
 aExpr9
 ;
 
-/* tqparenthesis, unary operators, and terminals precedence */
+/* parenthesis, unary operators, and terminals precedence */
 aExpr9:
 /* --- unary logical left --- */
 '-' aExpr9
diff --git a/kexi/kexidb/queryschema.h b/kexi/kexidb/queryschema.h
index a68acffe7..7c6821d16 100644
--- a/kexi/kexidb/queryschema.h
+++ b/kexi/kexidb/queryschema.h
@@ -357,7 +357,7 @@ class KEXI_DB_EXPORT QuerySchema : public FieldList, public SchemaData
 		/*! Removes \a table schema from this query. 
 		 This does not destroy \a table object but only takes it out of the list. 
 		 If this table was master for the query, master table information is also
-		 tqinvalidated. */
+		 invalidated. */
 		void removeTable(TableSchema *table);
 
 		/*! \return table with name \a tableName or 0 if this query has no such table. */
@@ -694,7 +694,7 @@ class KEXI_DB_EXPORT QuerySchema : public FieldList, public SchemaData
 		 for \a infolist, with "," between each one. 
 		 This is usable e.g. as argument like "field1,field2" 
 		 for "INSERT INTO (xxx) ..". The result of this method is effectively cached,
-		 and it is tqinvalidated when set of fields changes (e.g. using clear() 
+		 and it is invalidated when set of fields changes (e.g. using clear() 
 		 or addField()).
 		 
 		 This method is similar to FieldList::sqlFieldsList() it just uses
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index a44f9c362..36267b1fa 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -946,22 +946,22 @@ TQVariant KexiDB::loadPropertyValueFromDom( const TQDomNode& node )
 	return TQVariant();
 }
 
-TQDomElement KexiDB::saveNumberElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+TQDomElement KexiDB::saveNumberElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 	const TQString& elementName, int value)
 {
 	TQDomElement el( doc.createElement(elementName) );
-	tqparentEl.appendChild( el );
+	parentEl.appendChild( el );
 	TQDomElement numberEl( doc.createElement("number") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( TQString::number(value) ) );
 	return el;
 }
 
-TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 	const TQString& elementName, bool value)
 {
 	TQDomElement el( doc.createElement(elementName) );
-	tqparentEl.appendChild( el );
+	parentEl.appendChild( el );
 	TQDomElement numberEl( doc.createElement("bool") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( 
diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h
index fff7a0719..b8ee03b5b 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -350,20 +350,20 @@ namespace KexiDB
 	KEXI_DB_EXPORT TQString loadStringPropertyValueFromDom( const TQDomNode& node, bool* ok );
 
 	/*! Saves integer element for value \a value to \a doc document within tqparent element
-	 \a tqparentEl. The value will be enclosed in "number" element and "elementName" element.
-	 Example: saveNumberElementToDom(doc, tqparentEl, "height", 15) will create 
+	 \a parentEl. The value will be enclosed in "number" element and "elementName" element.
+	 Example: saveNumberElementToDom(doc, parentEl, "height", 15) will create 
 	 \code
 	  <height><number>15</number></height>
 	 \endcode
 	 \return the reference to element created with tag elementName. */
-	KEXI_DB_EXPORT TQDomElement saveNumberElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+	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
-	 \a tqparentEl. Like saveNumberElementToDom() but creates "bool" tags. True/false values will be
+	 \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. */
-	KEXI_DB_EXPORT TQDomElement saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+	KEXI_DB_EXPORT TQDomElement saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 		const TQString& elementName, bool value);
 
 	/*! \return an empty value that can be set for a database field of type \a type having 
diff --git a/kexi/kexiutils/styleproxy.cpp b/kexi/kexiutils/styleproxy.cpp
index 56bf83913..54c34bd4c 100644
--- a/kexi/kexiutils/styleproxy.cpp
+++ b/kexi/kexiutils/styleproxy.cpp
@@ -21,10 +21,10 @@
 
 using namespace KexiUtils;
 
-StyleProxy::StyleProxy(TQStyle* tqparentStyle) 
+StyleProxy::StyleProxy(TQStyle* parentStyle) 
  : TQStyle()
 {
-	setParentStyle(tqparentStyle);
+	setParentStyle(parentStyle);
 }
 
 StyleProxy::~StyleProxy()
@@ -37,7 +37,7 @@ void StyleProxy::setParentStyle(TQStyle* style)
 	m_style = TQStyleFactory::create(style->name());
 }
 
-TQStyle* StyleProxy::tqparentStyle() const
+TQStyle* StyleProxy::parentStyle() const
 {
 	return m_style;
 }
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index 779298ee9..867ef23d5 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -48,13 +48,13 @@ namespace KexiUtils {
 class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 {
 	public:
-		/*! Creates a new style proxy object. \a tqparentStyle pointer will not be kept
+		/*! Creates a new style proxy object. \a parentStyle pointer will not be kept
 		 (because it's most likely owned by the application: a new TQStyle instance 
 		 for this name will be created internally. */
-		StyleProxy(TQStyle* tqparentStyle);
+		StyleProxy(TQStyle* parentStyle);
 		virtual ~StyleProxy();
 
-		TQStyle* tqparentStyle() const;
+		TQStyle* parentStyle() const;
 		void setParentStyle(TQStyle* style);
 
 		virtual void polish( TQWidget *w ) { m_style->polish(w); }
diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui
index 5c7e66304..6eea74536 100644
--- a/kexi/main/kexifinddialogbase.ui
+++ b/kexi/main/kexifinddialogbase.ui
@@ -90,7 +90,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="7" colspan="1">
             <property name="name">
-                <cstring>tqlayout_btn</cstring>
+                <cstring>layout_btn</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -340,7 +340,7 @@
     <tabstop>m_wholeWords</tabstop>
     <tabstop>m_promptOnReplace</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index a2cf0e0cb..795ddd537 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -242,7 +242,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	d->config = kapp->config();
 
 	if ( !initialGeometrySet() ) {
-		int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+		int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 		d->config->setGroup("MainWindow");
 		TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
@@ -348,7 +348,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	m_pTaskBar->setCaption(i18n("Task Bar"));	//js TODO: move this to KMDIlib
 
 //	if (!userMode()) {
-		tqinvalidateActions();
+		invalidateActions();
 		d->timer.singleShot(0,this,TQT_SLOT(slotLastActions()));
 //	}
 
@@ -1112,13 +1112,13 @@ void KexiMainWindowImpl::initActions()
 	acat->addAction("scriptpart_create", Kexi::NoActionCategory);
 }
 
-void KexiMainWindowImpl::tqinvalidateActions()
+void KexiMainWindowImpl::invalidateActions()
 {
-	tqinvalidateProjectWideActions();
-	tqinvalidateSharedActions();
+	invalidateProjectWideActions();
+	invalidateSharedActions();
 }
 
-void KexiMainWindowImpl::tqinvalidateSharedActions(TQObject *o)
+void KexiMainWindowImpl::invalidateSharedActions(TQObject *o)
 {
 	//TODO: enabling is more complex...
 /*	d->action_edit_cut->setEnabled(true);
@@ -1127,21 +1127,21 @@ void KexiMainWindowImpl::tqinvalidateSharedActions(TQObject *o)
 
 	if (!o)
 		o = TQT_TQOBJECT(focusWindow());
-	KexiSharedActionHost::tqinvalidateSharedActions(o);
+	KexiSharedActionHost::invalidateSharedActions(o);
 }
 
-void KexiMainWindowImpl::tqinvalidateSharedActions()
+void KexiMainWindowImpl::invalidateSharedActions()
 {
-	tqinvalidateSharedActions(0);
+	invalidateSharedActions(0);
 }
 
 // unused, I think
-void KexiMainWindowImpl::tqinvalidateSharedActionsLater()
+void KexiMainWindowImpl::invalidateSharedActionsLater()
 {
-	TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(tqinvalidateSharedActions()));
+	TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(invalidateSharedActions()));
 }
 
-void KexiMainWindowImpl::tqinvalidateProjectWideActions()
+void KexiMainWindowImpl::invalidateProjectWideActions()
 {
 //	stateChanged("project_opened",d->prj ? StateNoReverse : StateReverse);
 
@@ -1234,7 +1234,7 @@ void KexiMainWindowImpl::tqinvalidateProjectWideActions()
 		d->propEditorTabWidget->setEnabled(d->prj);
 }
 
-void KexiMainWindowImpl::tqinvalidateViewModeActions()
+void KexiMainWindowImpl::invalidateViewModeActions()
 {
 	if (d->curDialog) {
 		//update toggle action
@@ -1341,7 +1341,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 	initNavigator();
 	Kexi::recentProjects().addProjectData( newProjectData );
 	updateReadOnlyState();
-	tqinvalidateActions();
+	invalidateActions();
 //	d->disableErrorMessages = true;
 	enableMessages( false );
 
@@ -1556,8 +1556,8 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0);
 #if defined(KDOCKWIDGET_P)
 	if (d->propEditor) {
-				KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
-				KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+				KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
+				KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 				if(ds)
 					ds->setSeparatorPosInPercent(d->config->readNumEntry("RightDockPosition", 80/* % */));
 	}
@@ -1579,8 +1579,8 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	d->restoreNavigatorWidth();
 
 #ifndef PROPEDITOR_VISIBILITY_CHANGES
-//	KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget();
-//	KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+//	KDockWidget *dw = (KDockWidget *)d->nav->parentWidget();
+//	KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //	const int pos = ds->separatorPos();
 
 	//if (!d->curDialog || d->curDialog->currentViewMode()==Kexi::DataViewMode)
@@ -1624,8 +1624,8 @@ tristate KexiMainWindowImpl::closeProject()
 #if defined(KDOCKWIDGET_P)
 	//remember docks position - will be used on storeSettings()
 	if (d->propEditor) {
-		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
-		KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
+		KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 		if (ds)
 			d->propEditorDockSeparatorPos = ds->separatorPosInPercent();
 	}
@@ -1635,14 +1635,14 @@ tristate KexiMainWindowImpl::closeProject()
 		if (d->propEditor) {
 			if (d->openedDialogsCount() == 0)
 				makeWidgetDockVisible(d->propEditorTabWidget);
-			KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
-			KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
+			KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 			if(ds)
 				ds->setSeparatorPosInPercent(80);
 		}
 
-		KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget();
-		KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->nav->parentWidget();
+		KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 		int dwWidth = dw->width();
 		if (ds) {
 				if (d->openedDialogsCount()!=0 && d->propEditorTabWidget && d->propEditorTabWidget->isVisible())
@@ -1691,7 +1691,7 @@ tristate KexiMainWindowImpl::closeProject()
 //	Kexi::partManager().unloadAllParts();
 
 	updateReadOnlyState();
-	tqinvalidateActions();
+	invalidateActions();
 //	if (!userMode())
 		updateAppCaption();
 
@@ -1772,15 +1772,15 @@ void KexiMainWindowImpl::initNavigator()
 		d->forceHideProjectNavigatorOnCreation = false;
 	}
 
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiMainWindowImpl::slotLastActions()
 {
 #if defined(KDOCKWIDGET_P)
 	if (mdiMode()==KMdi::ChildframeMode || mdiMode()==KMdi::TabPageMode) {
-//		KDockWidget *dw = (KDockWidget *)d->propEditor->tqparentWidget();
-		//KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+//		KDockWidget *dw = (KDockWidget *)d->propEditor->parentWidget();
+		//KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //		Q_UNUSED(ds);
 //1		ds->resize(ds->width()*3, ds->height());
 //1		ds->setSeparatorPos(30, true);
@@ -1813,9 +1813,9 @@ void KexiMainWindowImpl::initPropertyEditor()
 		d->propEditorTabWidget->setFont(f);
 
 		if (mdiMode()==KMdi::ChildframeMode || mdiMode()==KMdi::TabPageMode) {
-		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
 	#if defined(KDOCKWIDGET_P)
-			KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //			ds->setKeepSize(true);
 			makeWidgetDockVisible(d->propEditorTabWidget);
 	//		ds->show();
@@ -2070,7 +2070,7 @@ KexiMainWindowImpl::restoreSettings()
 	if ( !initialGeometrySet() ) {
 		// Default size
 //		int restoredWidth, restoredHeight;
-    	int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+    	int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 //#if KDE_IS_VERSION(3,1,90)
 //		restoredWidth = KGlobalSettings::screenGeometry(scnum).width();
@@ -2134,11 +2134,11 @@ KexiMainWindowImpl::storeSettings()
 			d->propEditorDockSeparatorPos = 80;
 		if (d->nav && d->navDockSeparatorPos >= 0 && d->navDockSeparatorPos <= 100) {
 			d->config->setGroup("MainWindow");
-			//KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget();
+			//KDockWidget *dw = (KDockWidget *)d->nav->parentWidget();
 			//int w = dw->width();
 			//int ww = width();
 			//int d1 = (100 * dw->width()) / width() + 1;
-			//KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			//KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 			//int d2 = ds->separatorPosInPercent();
 			if (d->wasAutoOpen && d->dialogExistedBeforeCloseProject) {
 #ifdef TQ_WS_WIN
@@ -2440,7 +2440,7 @@ void KexiMainWindowImpl::activeWindowChanged(KMdiChildView *v)
 		d->curDialog->selectedView()->propertySetSwitched();
 
 	if (dialogChanged) {
-//		tqinvalidateSharedActions();
+//		invalidateSharedActions();
 		//update property editor's contents...
 //		if ((KexiPropertyBuffer*)d->propBuffer!=d->curDialog->propertyBuffer()) {
 //		propertyBufferSwitched();//d->curDialog);
@@ -2457,8 +2457,8 @@ void KexiMainWindowImpl::activeWindowChanged(KMdiChildView *v)
 	}
 //	if (!d->curDialog.isNull())
 //		d->last_checked_mode = d->actions_for_view_modes[ d->curDialog->currentViewMode() ];
-	tqinvalidateViewModeActions();
-	tqinvalidateActions();
+	invalidateViewModeActions();
+	invalidateActions();
 	d->updateFindDialogContents();
 	if (dlg)
 		dlg->setFocus();
@@ -2648,7 +2648,7 @@ KexiMainWindowImpl::createBlankProject()
 	initNavigator();
 	Kexi::recentProjects().addProjectData( new_data );
 
-	tqinvalidateActions();
+	invalidateActions();
 	updateAppCaption();
 	return true;
 }
@@ -2873,7 +2873,7 @@ KexiMainWindowImpl::slotProjectSave()
 		return;
 	saveObject( d->curDialog );
 	updateAppCaption();
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void
@@ -2992,8 +2992,8 @@ void KexiMainWindowImpl::slotViewPropertyEditor()
 	d->block_KMdiMainFrm_eventFilter=false;
 
 /*#if defined(KDOCKWIDGET_P)
-		KDockWidget *dw = (KDockWidget *)d->propEditor->tqparentWidget();
-		KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->propEditor->parentWidget();
+		KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 		ds->setSeparatorPos(80,true);//d->config->readNumEntry("RightDockPosition", 80), true);
 #endif*/
 }
@@ -3038,8 +3038,8 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	d->curDialogViewGUIClient=viewClient; //remember
 
 	d->updatePropEditorVisibility(viewMode);
-	tqinvalidateProjectWideActions();
-	tqinvalidateSharedActions();
+	invalidateProjectWideActions();
+	invalidateSharedActions();
 	d->updateFindDialogContents();
 	return true;
 }
@@ -3060,7 +3060,7 @@ void KexiMainWindowImpl::slotViewTextMode()
 	switchToViewMode(Kexi::TextViewMode);
 }
 
-void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar)
+void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool layoutTaskBar)
 {
 	if (d->insideCloseDialog && dynamic_cast<KexiDialogBase *>(pWnd)) {
 		d->windowsToClose.append(dynamic_cast<KexiDialogBase *>(pWnd));
@@ -3075,7 +3075,7 @@ void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar)
 		}
 	}
 	*/
-	closeDialog(dynamic_cast<KexiDialogBase *>(pWnd), tqlayoutTaskBar);
+	closeDialog(dynamic_cast<KexiDialogBase *>(pWnd), layoutTaskBar);
 }
 
 tristate KexiMainWindowImpl::getNewObjectInfo(
@@ -3187,7 +3187,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 	//item id changed to final one: update association in dialogs' dictionary
 //	d->dialogs.take(oldItemID);
 	d->updateDialogId(dlg, oldItemID);
-	tqinvalidateProjectWideActions();
+	invalidateProjectWideActions();
 	return true;
 }
 
@@ -3196,7 +3196,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg)
 	return closeDialog(dlg, true);
 }
 
-tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges)
+tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges)
 {
 	if (!dlg) 
 		return true;
@@ -3338,7 +3338,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskB
 
 	const bool isInMaximizedChildFrmMode = this->isInMaximizedChildFrmMode();
 
-	KMdiMainFrm::closeWindow(dlg, tqlayoutTaskBar);
+	KMdiMainFrm::closeWindow(dlg, layoutTaskBar);
 
 	//focus navigator if nothing else available
 	if (d->openedDialogsCount()==0) {
@@ -3348,7 +3348,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskB
 		d->updatePropEditorVisibility(0);
 	}
 
-	tqinvalidateActions();
+	invalidateActions();
 	d->insideCloseDialog = false;
 	if (!d->windowsToClose.isEmpty()) //continue 'close all'
 		closeDialog(d->windowsToClose.take(0), true);
@@ -3395,7 +3395,7 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool
 TQWidget* KexiMainWindowImpl::findWindow(TQWidget *w)
 {
 	while (w && !acceptsSharedActions(TQT_TQOBJECT(w)))
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	return w;
 }
 
@@ -3452,24 +3452,24 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			if (!d->focus_before_popup.isNull()) {
 				d->focus_before_popup->setFocus();
 				d->focus_before_popup=0;
-				tqinvalidateSharedActions();
+				invalidateSharedActions();
 			} else {
 				if (focus_w) {
 					focus_w->setFocus();
-					tqinvalidateSharedActions();
+					invalidateSharedActions();
 				}
 			}
 		}
 		return false;
 	}
 
-	/*! On mouse click on the findow, make sure it's focused and actions are tqinvalidated */
+	/*! On mouse click on the findow, make sure it's focused and actions are invalidated */
 	if (e->type()==TQEvent::MouseButtonPress) {
 		TQWidget *w = findWindow(TQT_TQWIDGET(obj));
 		KexiVDebug << "MouseButtonPress EVENT " <<  (w ? w->name() : 0) << endl;
 		if (w) {
 			w->setFocus();
-			tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+			invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 		}
 	}
 	TQWidget *w = findWindow(TQT_TQWIDGET(obj));
@@ -3509,20 +3509,20 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 //			if (d->actionProxies[ w ])
 //			if (d->actionProxies[ focus_w ]) {
 			if (actionProxyFor( focus_w )) {
-//				tqinvalidateSharedActions();
+//				invalidateSharedActions();
 			}
 			else {
 /*			TQObject* o = tqfocusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
 				o = o->tqparent();*/
-//js				tqinvalidateSharedActions(focus_w);
+//js				invalidateSharedActions(focus_w);
 			}
 		}
 //		/*|| e->type()==TQEvent::FocusOut*/) && /*(!obj->inherits("KexiDialogBase")) &&*/ d->actionProxies[ obj ]) {
-//		tqinvalidateSharedActions();
+//		invalidateSharedActions();
 	}
 	if (e->type()==TQEvent::FocusOut && focus_w && focus_w==d->curDialog && actionProxyFor( obj )) {
-		tqinvalidateSharedActions(d->curDialog);
+		invalidateSharedActions(d->curDialog);
 	}
 #endif
 
@@ -3530,7 +3530,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		//d->nav->setFocus();
 		d->focus_before_popup->setFocus();
 		d->focus_before_popup=0;
-		tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+		invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 		return true;
 	}
 
@@ -3538,11 +3538,11 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 	if (e->type()==TQEvent::FocusOut) {
 		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
-				tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+				invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 				d->focus_before_popup=d->curDialog;
 			}
 			else {
-//not needed???			tqinvalidateSharedActions(focus_w);
+//not needed???			invalidateSharedActions(focus_w);
 				d->focus_before_popup=focus_w;
 			}
 		}
@@ -3568,7 +3568,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			else if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 				d->focus_before_popup=w;
 			}
-			//tqinvalidateSharedActions();
+			//invalidateSharedActions();
 		} else if (e->type()==TQEvent::Hide) {
 			setFocus();
 			return false;
@@ -3666,9 +3666,9 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening
 		d->curDialogViewGUIClient=viewClient; //remember
 	}
 
-	tqinvalidateViewModeActions();
+	invalidateViewModeActions();
 	if (viewMode!=dlg->currentViewMode())
-		tqinvalidateSharedActions();
+		invalidateSharedActions();
 
 #ifndef KEXI_NO_PENDING_DIALOGS
 	d->removePendingDialog( dlg->id() );
@@ -3711,7 +3711,7 @@ KexiMainWindowImpl::openObjectFromNavigator(KexiPart::Item* item, int viewMode,
 	openingCancelled = false;
 	if (dlg) {
 		if (activateWindow(dlg)) {//item->identifier())) {//just activate
-			tqinvalidateViewModeActions();
+			invalidateViewModeActions();
 			return dlg;
 		}
 	}
@@ -3932,7 +3932,7 @@ void KexiMainWindowImpl::slotDirtyFlagChanged(KexiDialogBase* dlg)
 	if(!userMode())
 		d->nav->updateItemName( *item, dlg->dirty() );
 
-	tqinvalidateActions();
+	invalidateActions();
 	updateAppCaption();
 }
 
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index a2d820e8c..9dbedae33 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -113,7 +113,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 	public slots:
 		/*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed.
 			Just calls closeDialog(). Use closeDialog() if you need, not this one. */
-		virtual void closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar = true);
+		virtual void closeWindow(KMdiChildView *pWnd, bool layoutTaskBar = true);
 
 		/*! Reimplemented for internal reasons. */
 		virtual void addWindow( KMdiChildView* pView, int flags = KMdi::StandardAdd );
@@ -125,7 +125,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 messages asking for saving the will be skipped and the changes will be dropped. 
 		 This should not be usually used, maybe except for test suites 
 		 (see kexi/tests/altertable/ directory). */
-		tristate closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges = false);
+		tristate closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges = false);
 
 		virtual void detachWindow(KMdiChildView *pWnd,bool bShow=true);
 		virtual void attachWindow(KMdiChildView *pWnd,bool bShow=true,bool bAutomaticResize=false);
@@ -255,20 +255,20 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		void storeSettings();
 
 		/*! Invalidates availability of all actions for current application state. */
-		void tqinvalidateActions();
+		void invalidateActions();
 
 		/*! Invalidates action availability for current application state.
 		 These actions are dependent on curently selected dialog. */
-		virtual void tqinvalidateSharedActions(TQObject *o);
+		virtual void invalidateSharedActions(TQObject *o);
 
 		/*! Invalidates action availability for current application state.
 		 These actions only depend on project availability, not on curently selected dialog. */
-		void tqinvalidateProjectWideActions();
+		void invalidateProjectWideActions();
 
 		/*! Invalidates action availability for current application state.
 		 These actions only depend on curently selected dialog and currently selected view
 		 (KexiViewBase derived object) within this dialog. */
-		void tqinvalidateViewModeActions();
+		void invalidateViewModeActions();
 
 		/*! Shows dialog for creating new blank project,
 		 and creates one. Dialog is not shown if option for automatic creation
@@ -401,8 +401,8 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		virtual void fillWindowMenu();
 
-		void tqinvalidateSharedActions();
-		void tqinvalidateSharedActionsLater();
+		void invalidateSharedActions();
+		void invalidateSharedActionsLater();
 
 		//! Updates the statusbar, navigator and "Insert->....." actions, dependent on read-only state.
 		//! Only called on project opening and closing.
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 0abd513ad..cf5f44c26 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -202,9 +202,9 @@ public:
 /*
 void updatePropEditorDockWidthInfo() {
 		if (propEditor) {
-			KDockWidget *dw = (KDockWidget *)propEditor->tqparentWidget();
+			KDockWidget *dw = (KDockWidget *)propEditor->parentWidget();
 #if defined(KDOCKWIDGET_P)
-			KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 			if (ds) {
 				propEditorDockSeparatorPos = ds->separatorPosInPercent();*/
 /*				if (propEditorDockSeparatorPos<=0) {
@@ -273,8 +273,8 @@ void updatePropEditorDockWidthInfo() {
 					origFocusWidget->setFocus();
 /*moved
 #if defined(KDOCKWIDGET_P)
-				KDockWidget *dw = (KDockWidget *)propEditor->tqparentWidget();
-				KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+				KDockWidget *dw = (KDockWidget *)propEditor->parentWidget();
+				KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 				ds->setSeparatorPosInPercent(config->readNumEntry("RightDockPosition", 80));//%
 #endif*/
 			}
@@ -285,8 +285,8 @@ void updatePropEditorDockWidthInfo() {
 	{
 #if defined(KDOCKWIDGET_P)
 			if (wnd->mdiMode()==KMdi::ChildframeMode || wnd->mdiMode()==KMdi::TabPageMode) {
-				KDockWidget *dw = (KDockWidget *)nav->tqparentWidget();
-				KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+				KDockWidget *dw = (KDockWidget *)nav->parentWidget();
+				KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //				ds->setKeepSize(true);
 
 				config->setGroup("MainWindow");
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 23058e059..2e26b356b 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -60,7 +60,7 @@ KexiNewStuff::install(const TQString &fileName)
 	}
 	const KArchiveDirectory *archiveDir = archive.directory();
 	const TQString destDir = KFileDialog::getExistingDirectory(
-		":DownloadExampleDatabases", tqparentWidget(),
+		":DownloadExampleDatabases", parentWidget(),
 		i18n("Choose Directory Where to Install Example Database"));
 	if (destDir.isEmpty()) {
 		kdDebug() << TQString("KexiNewStuff::install: Destination-directory is empty.") << endl;
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 798ae0e55..6b169f7ec 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -434,7 +434,7 @@
     <tabstop>openDataLink</tabstop>
     <tabstop>saveSetupLink</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index a6c4d1609..797dcc2a9 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -225,7 +225,7 @@ void KexiConnSelectorWidget::showSimpleConn()
 //		static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
 		d->stack->addWidget(m_fileDlg);
 
-		for (TQWidget *w = tqparentWidget(true);w;w=w->tqparentWidget(true)) {
+		for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
 			if (w->isDialog()) {
 //#ifndef TQ_WS_WIN
 				connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject()));
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui
index 908404c06..5c7bb64dd 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -281,5 +281,5 @@
     <tabstop>btn_remove</tabstop>
     <tabstop>descriptionEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index 1770a6dd5..7b711ea30 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -87,7 +87,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 162263079..79f763ee6 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -87,7 +87,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index 101be957f..f11d7f581 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -123,5 +123,5 @@
 <tabstops>
     <tabstop>btn_advanced</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index aa36a55a1..18c805441 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -124,5 +124,5 @@
 <tabstops>
     <tabstop>list</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index 0d20fe3ec..b423d467a 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -137,5 +137,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index c19a96c0b..667c52888 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -46,7 +46,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 	setMode( mode );
 	
 	TQPoint point( 0, 0 );
-	reparent( tqparentWidget(), point );
+	reparent( parentWidget(), point );
 
 	if (tqlayout())
 		tqlayout()->setMargin(0);
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 4fd7497b5..bf20fbfb5 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -445,7 +445,7 @@ void ImportWizard::arriveSrcConnPage()
 			}*/
 			//m_srcConn->m_file->label->hide();
 			//m_srcConn->m_file->btn_advanced->hide();
-			//m_srcConn->m_file->label->tqparentWidget()->hide();
+			//m_srcConn->m_file->label->parentWidget()->hide();
 		}
 //	} else {
 //		m_srcConn->showAdvancedConn();
diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
index 0947c8a15..a6033c706 100644
--- a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
+++ b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
@@ -26,8 +26,8 @@ KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f
 }
 
 KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, 
-	const char* tqparentFactoryName, const char* inheritedClassName)
- : KFormDesigner::WidgetInfo(f, tqparentFactoryName, inheritedClassName)
+	const char* parentFactoryName, const char* inheritedClassName)
+ : KFormDesigner::WidgetInfo(f, parentFactoryName, inheritedClassName)
 {
 	init();
 }
diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.h b/kexi/plugins/forms/kexidataawarewidgetinfo.h
index eddcf909d..41e67d85d 100644
--- a/kexi/plugins/forms/kexidataawarewidgetinfo.h
+++ b/kexi/plugins/forms/kexidataawarewidgetinfo.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiDataAwareWidgetInfo : public KFormDesigner::Widge
 		KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f);
 		
 		KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, 
-			const char* tqparentFactoryName, const char* inheritedClassName = 0);
+			const char* parentFactoryName, const char* inheritedClassName = 0);
 
 		virtual ~KexiDataAwareWidgetInfo();
 
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 400e6d376..3e1e5c4b0 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->tqparentInterface()) //item with tqparent interface: collect tqparent instead...
+		if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead...
 			continue;
 #if 0 //! @todo reenable when subform is moved to KexiDBForm
 		KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface...
@@ -183,7 +183,7 @@ bool KexiFormDataProvider::cursorAtNewRow() const
 	return false;
 }
 
-void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidSources,
+void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSources,
  KexiDB::QuerySchema* query)
 {
 	//fill m_fieldNumbersForDataItems mapping from data item to field number
@@ -222,7 +222,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		//all previous indices have corresponding data source
 //		for (; i < (*it); i++) {
 //			newIndices[i] = number++;
-			//kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl;
+			//kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl;
 //		}
 		//this index have no corresponding data source
 //		newIndices[i]=-1;
@@ -230,14 +230,14 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		if (item)
 			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		m_dataItems.remove(*it);
-		kexipluginsdbg << "tqinvalidateDataSources(): " << (*it) << " -> " << -1 << endl;
+		kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl;
 //		i++;
 	}
 #endif
 	//fill remaining part of the vector
 //	for (; i < dataFieldsCount; i++) { //m_dataItems.count(); i++) {
 		//newIndices[i] = number++;
-		//kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl;
+		//kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl;
 	//}
 
 #if 0
@@ -247,11 +247,11 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		bool ok;
 		const int newIndex = newIndices.at( it.data(), &ok );
 		if (ok && newIndex!=-1) {
-			kexipluginsdbg << "tqinvalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
+			kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
 			newFieldNumbersForDataItems.tqreplace(it.key(), newIndex);
 		}
 		else {
-			kexipluginsdbg << "tqinvalidateDataSources(): removing " << it.key()->dataSource() << endl;
+			kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl;
 			m_dataItems.remove(it.key());
 			it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		}
@@ -266,7 +266,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		query->debug();
 
 	//if (query && m_dataItems.count()!=query->fieldCount()) {
-	//	kdWarning() << "KexiFormDataProvider::tqinvalidateDataSources(): m_dataItems.count()!=query->fieldCount() ("
+	//	kdWarning() << "KexiFormDataProvider::invalidateDataSources(): m_dataItems.count()!=query->fieldCount() ("
 	//	 << m_dataItems.count() << "," << query->fieldCount() << ")" << endl;
 	//}
 	//i = 0;
diff --git a/kexi/plugins/forms/kexidataprovider.h b/kexi/plugins/forms/kexidataprovider.h
index f1e9d7557..9c630cb41 100644
--- a/kexi/plugins/forms/kexidataprovider.h
+++ b/kexi/plugins/forms/kexidataprovider.h
@@ -74,7 +74,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataProvider : public KexiDataItemChangesList
 		 \a invalidSources is the set of data sources that should 
 		 be omitted for fillDataItems(). 
 		 Used by KexiFormView::initDataSource(). */
-		void tqinvalidateDataSources( const TQDict<char>& invalidSources, 
+		void invalidateDataSources( const TQDict<char>& invalidSources, 
 			KexiDB::QuerySchema* query = 0 );
 
 		/*! Fills the same data provided by \a value to every data item (other than \a item) 
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 5f379e6ea..8683c2bb7 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -646,7 +646,7 @@ KexiDBFactory::isPropertyVisibleInternal(const TQCString& classname, TQWidget *w
 	}
 	else if(classname == "KexiDBCheckBox") {
 		//hide text property if the widget is a child of an autofield beause there's already "caption" for this purpose
-		if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->tqparentWidget()))
+		if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->parentWidget()))
 			return false;
 		ok = property!="autoRepeat";
 	}
diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h
index f15f8c395..79873b726 100644
--- a/kexi/plugins/forms/kexidbfactory.h
+++ b/kexi/plugins/forms/kexidbfactory.h
@@ -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 &tqparentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
 		//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.cpp b/kexi/plugins/forms/kexiformdataiteminterface.cpp
index 9a861917f..c588c7b13 100644
--- a/kexi/plugins/forms/kexiformdataiteminterface.cpp
+++ b/kexi/plugins/forms/kexiformdataiteminterface.cpp
@@ -61,8 +61,8 @@ void KexiFormDataItemInterface::setDisplayDefaultValue(TQWidget* widget, bool di
 
 void KexiFormDataItemInterface::cancelEditor()
 {
-	TQWidget *tqparentWidget = dynamic_cast<TQWidget*>(this)->tqparentWidget();
-	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(tqparentWidget, "KexiFormScrollView");
+	TQWidget *parentWidget = dynamic_cast<TQWidget*>(this)->parentWidget();
+	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(parentWidget, "KexiFormScrollView");
 	if (view)
 		view->cancelEditor();
 }
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 9f2884181..ce9b142bd 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -70,7 +70,7 @@ KAction* KexiFormManager::action( const char* name )
 	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
 	if (!formViewWidget)
 		return 0;
-	return formViewWidget->tqparentDialog()->mainWin()->actionCollection()->action(n.data());
+	return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data());
 }
 
 KexiFormView* KexiFormManager::activeFormViewWidget() const
@@ -90,7 +90,7 @@ void KexiFormManager::enableAction( const char* name, bool enable )
 	KexiFormView* formViewWidget = activeFormViewWidget();
 	if (!formViewWidget)
 		return;
-//	if (TQString(name)=="tqlayout_menu")
+//	if (TQString(name)=="layout_menu")
 //		kdDebug() << "!!!!!!!!!!! " << enable << endl;
 	formViewWidget->setAvailable(translateName( name ).latin1(), enable);
 }
diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h
index d25cf78e6..34decc1d5 100644
--- a/kexi/plugins/forms/kexiformmanager.h
+++ b/kexi/plugins/forms/kexiformmanager.h
@@ -77,7 +77,7 @@ TQString KexiFormManager::translateName( const char* name ) const
 {
 	TQString n( name );
 	//translate to our name space:
-	if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("tqlayout_")
+	if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("layout_")
 		|| n=="format_raise" || n=="format_raise" || n=="taborder" | n=="break_layout")
 	{
 		n.prepend("formpart_");
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 2486416e2..3f1d3466f 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -428,7 +428,7 @@ void KexiFormPart::slotAssignAction()
 	if (!formViewWidget)
 		return;
 
-	KexiMainWindow * mainWin = formViewWidget->tqparentDialog()->mainWin();
+	KexiMainWindow * mainWin = formViewWidget->parentDialog()->mainWin();
 	KexiActionSelectionDialog dlg(mainWin, dbform, data, 
 		propSet->property("name").value().toCString());
 
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 2ddcb123c..057e0a33a 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -557,7 +557,7 @@ void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName)
 		item = dynamic_cast<KexiFormDataItemInterface*>(w);
 		if (item)
 			break;
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	}
 	if (item)
 		item->handleAction(actionName);
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 189d515f3..3f30fff29 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -121,12 +121,12 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
 		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo()));
 
 		plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()) );
-		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()) );
-		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()) );
+		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) );
+		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) );
+		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) );
 #ifdef KEXI_SHOW_SPLITTER_WIDGET
-		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()) );
-		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()) );
+		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) );
+		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) );
 #endif
 		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) );
 
@@ -167,7 +167,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
 KexiFormView::~KexiFormView()
 {
 	if (m_cursor) {
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->deleteCursor(m_cursor);
 		m_cursor = 0;
 	}
@@ -184,7 +184,7 @@ void
 KexiFormView::deleteQuery()
 {
 	if (m_cursor) {
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->deleteCursor(m_cursor);
 		m_cursor = 0;
 	}
@@ -229,7 +229,7 @@ KexiFormView::initForm()
 			KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted()));
 	}
 
-	const bool newForm = tqparentDialog()->id() < 0;
+	const bool newForm = parentDialog()->id() < 0;
 
 	KexiDB::FieldList *fields = 0;
 	if (newForm) {
@@ -296,7 +296,7 @@ void KexiFormView::updateAutoFieldsDataSource()
 	//(this data has not been stored in the form)
 	TQString dataSourceString( m_dbform->dataSource() );
 	TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() );
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(
 		conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query())
@@ -325,7 +325,7 @@ void KexiFormView::updateValuesForSubproperties()
 	//(this data has not been stored in the form)
 	TQString dataSourceString( m_dbform->dataSource() );
 	TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() );
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(
 		conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query())
@@ -390,7 +390,7 @@ KexiFormView::loadForm()
 {
 //@todo also load m_resizeMode !
 
-	kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl;
+	kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << parentDialog()->id() << endl;
 	// If we are previewing the Form, use the tempData instead of the form stored in the db
 	if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() )
 	{
@@ -416,7 +416,7 @@ KexiFormView::loadForm()
 void
 KexiFormView::slotPropertySetSwitched(KoProperty::Set *set, bool forceReload, const TQCString& propertyToSelect)
 {
-//	if (set && tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog())
+//	if (set && parentDialog()!=parentDialog()->mainWin()->currentDialog())
 	if (form() != KFormDesigner::FormManager::self()->activeForm())
 		return; //this is not the current form view
 	m_propertySet = set;
@@ -470,7 +470,7 @@ tristate
 KexiFormView::afterSwitchFrom(int mode)
 {
 	if (mode == 0 || mode == Kexi::DesignViewMode) {
-		if (tqparentDialog()->neverSaved()) {
+		if (parentDialog()->neverSaved()) {
 			m_dbform->resize(TQSize(400, 300));
 			m_scrollView->refreshContentsSizeLater(true,true);
 			//m_delayedFormContentsResizeOnShow = false;
@@ -521,7 +521,7 @@ KexiFormView::afterSwitchFrom(int mode)
 		initDataSource();
 
 		//handle events for this form
-		m_scrollView->setMainWidgetForEventHandling(tqparentDialog()->mainWin(), m_dbform);
+		m_scrollView->setMainWidgetForEventHandling(parentDialog()->mainWin(), m_dbform);
 
 		//set focus on 1st focusable widget which has valid dataSource property set
 		if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
@@ -555,7 +555,7 @@ KexiFormView::afterSwitchFrom(int mode)
 
 	//dirty only if it's a new object
 	if (mode == 0)
-		setDirty( tqparentDialog()->partItem()->neverSaved() );
+		setDirty( parentDialog()->partItem()->neverSaved() );
 
 	if (mode==Kexi::DataViewMode && viewMode()==Kexi::DesignViewMode) {
 //		slotPropertySetSwitched
@@ -590,7 +590,7 @@ void KexiFormView::initDataSource()
 		//collect all data-aware widgets and create query schema
 		m_scrollView->setMainDataSourceWidget(m_dbform);
 		sources = m_scrollView->usedDataSources();
-		conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		conn = parentDialog()->mainWin()->project()->dbConnection();
 		if (dataSourceMimeTypeString.isEmpty() /*table type is the default*/ 
 			|| dataSourceMimeTypeString=="kexi/table")
 		{
@@ -681,7 +681,7 @@ void KexiFormView::initDataSource()
 			if (ok) //input cancelled
 				m_cursor = conn->executeQuery( *m_query, params );
 		}
-		m_scrollView->tqinvalidateDataSources( invalidSources, m_query );
+		m_scrollView->invalidateDataSources( invalidSources, m_query );
 		ok = m_cursor!=0;
 	}
 
@@ -730,7 +730,7 @@ KexiFormView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel)
 	}
 	if (!storeData()) {
 		//failure: remove object's schema data to avoid garbage
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->removeObject( s->id() );
 		delete s;
 		return 0;
@@ -742,12 +742,12 @@ tristate
 KexiFormView::storeData(bool dontAsk)
 {
 	Q_UNUSED(dontAsk);
-	kexipluginsdbg << "KexiDBForm::storeData(): " << tqparentDialog()->partItem()->name() 
-		<< " [" << tqparentDialog()->id() << "]" << endl;
+	kexipluginsdbg << "KexiDBForm::storeData(): " << parentDialog()->partItem()->name() 
+		<< " [" << parentDialog()->id() << "]" << endl;
 
 	//-- first, store local BLOBs, so identifiers can be updated
 //! @todo remove unused data stored previously
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableSchema *blobsTable = conn->tableSchema("kexi__blobs");
 	if (!blobsTable) { //compatibility check for older Kexi project versions
 //! @todo show message about missing kexi__blobs?
@@ -767,7 +767,7 @@ KexiFormView::storeData(bool dontAsk)
 	}
 	KexiBLOBBuffer *blobBuf = KexiBLOBBuffer::self();
 	KexiFormView *designFormView 
-		= dynamic_cast<KexiFormView*>( tqparentDialog()->viewForMode(Kexi::DesignViewMode) );
+		= dynamic_cast<KexiFormView*>( parentDialog()->viewForMode(Kexi::DesignViewMode) );
 	if (designFormView) {
 		for (TQMapConstIterator<TQWidget*, KexiBLOBBuffer::Id_t> it = tempData()->unsavedLocalBLOBs.constBegin(); 
 			it!=tempData()->unsavedLocalBLOBs.constEnd(); ++it)
@@ -874,7 +874,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
 
 	KFormDesigner::Container *container = f->activeContainer();
 	setAvailable("formpart_break_layout", container ?
-		(container->tqlayoutType() != KFormDesigner::Container::NoLayout) : false );
+		(container->layoutType() != KFormDesigner::Container::NoLayout) : false );
 }
 
 void
@@ -890,7 +890,7 @@ KexiFormView::slotFormWidgetSelected(KFormDesigner::Form *f)
 	setAvailable("formpart_layout_hbox", true);
 	setAvailable("formpart_layout_vbox", true);
 	setAvailable("formpart_layout_grid", true);
-	setAvailable("formpart_break_layout", (f->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	setAvailable("formpart_break_layout", (f->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -967,9 +967,9 @@ KexiFormView::setRedoEnabled(bool enabled)
 TQSize
 KexiFormView::preferredSizeHint(const TQSize& otherSize)
 {
-	if (tqparentDialog()->neverSaved()) {
+	if (parentDialog()->neverSaved()) {
 		//ignore otherSize if possible
-//		return KexiViewBase::preferredSizeHint( (tqparentDialog() && tqparentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize);
+//		return KexiViewBase::preferredSizeHint( (parentDialog() && parentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize);
 	}
 
 	return (m_dbform->size()
@@ -1087,7 +1087,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	if (fields.isEmpty())
 		return;
 
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(conn, sourceName.latin1(), sourceMimeType=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query()) {
 		kexipluginswarn << "KexiFormView::insertAutoFields(): no such table/query \""
@@ -1132,7 +1132,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 		while (targetContainerWidget 
 			&& !dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
 		{
-			targetContainerWidget = targetContainerWidget->tqparentWidget();
+			targetContainerWidget = targetContainerWidget->parentWidget();
 		}
 		if (dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
 			targetContainer = dynamic_cast<KFormDesigner::Container*>(targetContainerWidget);
@@ -1264,12 +1264,12 @@ void KexiFormView::updateActions(bool activated)
 }*/
 
 /*
-void KexiFormView::tqparentDialogDetached()
+void KexiFormView::parentDialogDetached()
 {
 	m_dbform->updateTabStopsOrder(form());
 }
 
-void KexiFormView::tqparentDialogAttached(KMdiChildFrm *)
+void KexiFormView::parentDialogAttached(KMdiChildFrm *)
 {
 	m_dbform->updateTabStopsOrder(form());
 }*/
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index e699afa12..b05a544c7 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -141,7 +141,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiFormPart::TempData* tempData() const {
-			return dynamic_cast<KexiFormPart::TempData*>(tqparentDialog()->tempData()); }
+			return dynamic_cast<KexiFormPart::TempData*>(parentDialog()->tempData()); }
 		KexiFormPart* formPart() const { return dynamic_cast<KexiFormPart*>(part()); }
 
 //moved to formmanager		void disableWidgetActions();
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 4926a3342..521dce2a3 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -193,7 +193,7 @@ KexiDBAutoField::createEditor()
 			TQWidget::setFocusPolicy(newSubwidget->focusPolicy());
 		}
 		setFocusProxy(newSubwidget); //ok?
-		if (tqparentWidget())
+		if (parentWidget())
 			newSubwidget->setPalette( tqApp->palette() );
 		copyPropertiesToEditor();
 //		KFormDesigner::installRecursiveEventFilter(newSubwidget, this);
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index a908c2fdb..f977a9629 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -477,9 +477,9 @@ TQVariant KexiDBComboBox::valueFromInternalEditor()
 TQPoint KexiDBComboBox::mapFromParentToGlobal(const TQPoint& pos) const
 {
 //	const KexiFormScrollView* view = KexiUtils::findParentConst<const KexiFormScrollView>(this, "KexiFormScrollView"); 
-	if (!tqparentWidget())
+	if (!parentWidget())
 		return TQPoint(-1,-1);
-	return tqparentWidget()->mapToGlobal(pos);
+	return parentWidget()->mapToGlobal(pos);
 //	return view->viewport()->mapToGlobal(pos);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 8c9534d2b..cca955e5c 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -210,10 +210,10 @@ void
 KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
@@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -425,7 +425,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						while (dataItemIface) {
 							if (dataItemIface->keyPressed(ke))
 								return false;
-							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->tqparentInterface()); //try in tqparent, e.g. in combobox
+							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox
 						}
 						break;
 					}
@@ -491,13 +491,13 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			if (tab || backtab) {
 				//the watched widget can be a subwidget of a real widget, e.g. a drop down button of image box: find it
 				while (!KexiFormPart::library()->widgetInfoForClassName(realWidget->className()))
-					realWidget = realWidget->tqparentWidget();
+					realWidget = realWidget->parentWidget();
 				if (!realWidget)
 					return true; //ignore
 				//the watched widget can be a subwidget of a real widget, e.g. autofield: find it
 				//TQWidget* realWidget = TQT_TQWIDGET(watched);
-				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface())
-					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface() );
+				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
+					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() );
 
 				d->setOrderedFocusWidgetsIteratorTo( realWidget );
 				kexipluginsdbg << realWidget->name() << endl;
@@ -585,7 +585,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 				TQWidget *dataItem = dynamic_cast<TQWidget*>(watched);
 				while (dataItem) {
 					while (dataItem && !dynamic_cast<KexiDataItemInterface*>(dataItem))
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 					if (!dataItem)
 						break;
 					kexipluginsdbg << "KexiDBForm: FocusIn: FOUND " << dataItem->className() << " " << dataItem->name() << endl;
@@ -600,7 +600,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						break;
 					}
 					else
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 
 					dataItem->update();
 				}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5f2f20e3b..0e79fada1 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -608,9 +608,9 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	if (!m_lineWidthChanged) {
 		KexiFrame::setLineWidth( ds.isEmpty() ? 0 : 1 );
 	}
-	if (!m_paletteBackgroundColorChanged && tqparentWidget()) {
+	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? tqparentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
 	}
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h
index 4457a8d0d..92a87280d 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.h
+++ b/kexi/plugins/forms/widgets/kexidblineedit.h
@@ -38,7 +38,7 @@ void setLighterGrayBackgroundColor(TQWidget* widget);
 
 //! @short Line edit widget for Kexi forms
 /*! Handles many data types. User input is validated by using validators 
- and/or input tqmasks.
+ and/or input masks.
 */
 class KEXIFORMUTILS_EXPORT KexiDBLineEdit :
 	public KLineEdit,
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8cb4f7959..6fcd851a0 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 *tqparentForm, TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_parentForm(tqparentForm), m_form(0), m_widget(0)
+KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name)
+: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -74,7 +74,7 @@ KexiDBSubForm::setFormName(const TQString &name)
 		return;
 	}
 
-	TQWidget *pw = tqparentWidget();
+	TQWidget *pw = parentWidget();
 	KexiFormView *view = 0;
 	TQStringList list;
 	while(pw) {
@@ -87,18 +87,18 @@ KexiDBSubForm::setFormName(const TQString &name)
 		}
 		else if(! view && pw->isA("KexiFormView"))
 			view = static_cast<KexiFormView*>(pw); // we need a KexiFormView*
-		pw = pw->tqparentWidget();
+		pw = pw->parentWidget();
 	}
 
-	if (!view || !view->tqparentDialog() || !view->tqparentDialog()->mainWin()
-		|| !view->tqparentDialog()->mainWin()->project()->dbConnection())
+	if (!view || !view->parentDialog() || !view->parentDialog()->mainWin()
+		|| !view->parentDialog()->mainWin()->project()->dbConnection())
 		return;
 
-	KexiDB::Connection *conn = view->tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = view->parentDialog()->mainWin()->project()->dbConnection();
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*conn, name, KexiPart::FormObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h
index ea2bdbd3f..cbbc6250a 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 *tqparentForm, TQWidget *tqparent, const char *name);
+		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name);
 		~KexiDBSubForm() {}
 
 		//! \return the name of the subform to display inside this widget
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index bc3efc620..3060db2a7 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -329,8 +329,8 @@ if ( m_mode == Clipboard )
 		{
 			actionButton( Ok )->setEnabled( false );
 			m_cancelled = true;
-			if (tqparentWidget())
-				tqparentWidget()->raise();
+			if (parentWidget())
+				parentWidget()->raise();
 			return;
 		}
 	}
@@ -443,8 +443,8 @@ bool KexiCSVImportDialog::openData()
 			.tqarg(TQDir::convertSeparators(m_fname)) );
 		actionButton( Ok )->setEnabled( false );
 		m_cancelled = true;
-		if (tqparentWidget())
-			tqparentWidget()->raise();
+		if (parentWidget())
+			parentWidget()->raise();
 		return false;
 	}
 	return true;
@@ -1570,7 +1570,7 @@ void KexiCSVImportDialog::accept()
 	TQDialog::accept();
 	KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".")
 		.tqarg(m_destinationTableSchema->name()));
-	tqparentWidget()->raise();
+	parentWidget()->raise();
 	m_conn = 0;
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index cc3b6754e..d44b8aeec 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -206,7 +206,7 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 578ba69bd..aed4a9bdf 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -96,7 +96,7 @@ void KexiMacroProperty::init()
 	m_property->setType( KEXIMACRO_PROPERTYEDITORTYPE ); // use our own propertytype
 }
 
-KoProperty::Property* KexiMacroProperty::tqparentProperty() const
+KoProperty::Property* KexiMacroProperty::parentProperty() const
 {
 	return m_property;
 }
@@ -178,15 +178,15 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
 	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl;
 
 	KoProperty::CustomProperty* customproperty = tqparent->customProperty();
-	KexiMacroProperty* tqparentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
-	if(! tqparentcustomproperty) {
+	KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
+	if(! parentcustomproperty) {
 		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl;
 		return 0;
 	}
 
-	KSharedPtr<KoMacro::MacroItem> macroitem = tqparentcustomproperty->macroItem();
+	KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
 	Q_ASSERT( macroitem.data() != 0 );
-	const TQString name = tqparentcustomproperty->name();
+	const TQString name = parentcustomproperty->name();
 	Q_ASSERT(! name.isEmpty());
 
 	KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name);
@@ -297,14 +297,14 @@ class EditListBoxItem : public ListBoxItem
 				kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl;
 				return;
 			}
-			KoProperty::Property* tqparentproperty = m_macroproperty->tqparentProperty();
-			if(! tqparentproperty) {
-				kdWarning() << "EditListBoxItem::EditListBoxItem() No tqparentproperty defined" << endl;
+			KoProperty::Property* parentproperty = m_macroproperty->parentProperty();
+			if(! parentproperty) {
+				kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl;
 				return;
 			}
 			KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
 			if(! variable.data()) {
-				kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << tqparentproperty->name() << endl;
+				kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl;
 				return;
 			}
 
@@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem
 				variable->text(), // caption
 				TQString(), // description
 				type, // type
-				0 //tqparentproperty // tqparent
+				0 //parentproperty // tqparent
 			);
 
 			m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop);
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h
index b1c256e9e..b80857d11 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.h
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.h
@@ -52,7 +52,7 @@ class KexiMacroProperty
 		virtual ~KexiMacroProperty();
 
 		/** @return the tqparent @a KoProperty::Property instance. */
-		KoProperty::Property* tqparentProperty() const;
+		KoProperty::Property* parentProperty() const;
 
 		/** This function is called by @ref KoProperty::Property::setValue() 
 		when a custom property is set.
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index deec96331..11d9cee53 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData()
 
 tristate KexiMacroTextView::storeData(bool /*dontAsk*/)
 {
-	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()).tqarg(d->editor->text()) << endl;
+	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl;
 	return storeDataBlock( d->editor->text() );
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index 507764a77..e13483c1b 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -139,7 +139,7 @@ KexiDB::SchemaData* KexiMacroView::storeNewData(const KexiDB::SchemaData& sdata,
 	if(! storeData()) {
 		kexipluginsdbg << "KexiMacroView::storeNewData() Failed to store the data." << endl;
 		//failure: remove object's schema data to avoid garbage
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->removeObject( schema->id() );
 		delete schema;
 		return 0;
@@ -154,7 +154,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/)
 	TQDomElement macroelem = d->macro->toXML();
 	domdoc.appendChild(macroelem);
 	const TQString xml = domdoc.toString(2);
-	const TQString name = TQString("%1 [%2]").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id());
+	const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id());
 	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl;
 	return storeDataBlock(xml);
 }
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index cddfa20e6..a1f28a794 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -128,7 +128,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index dd5a00d80..e7526413b 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -79,7 +79,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index a6205222a..5be541454 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -349,7 +349,7 @@ KexiRelationWidget *KexiQueryDesignerGuiEditor::relationView() const
 KexiQueryPart::TempData *
 KexiQueryDesignerGuiEditor::tempData() const
 {
-	return static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 }
 
 static TQString msgCannotSwitch_EmptyDesign() {
@@ -581,7 +581,7 @@ KexiQueryDesignerGuiEditor::beforeSwitchTo(int mode, bool &dontStore)
 //		if (!d->dataTable->dataAwareObject()->acceptRowEdit())
 	//		return cancelled;
 
-		if (!dirty() && tqparentDialog()->neverSaved()) {
+		if (!dirty() && parentDialog()->neverSaved()) {
 			KMessageBox::information(this, msgCannotSwitch_EmptyDesign());
 			return cancelled;
 		}
@@ -618,13 +618,13 @@ tristate
 KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 {
 	const bool was_dirty = dirty();
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	if (mode==Kexi::NoViewMode || (mode==Kexi::DataViewMode && !tempData()->query())) {
 		//this is not a SWITCH but a fresh opening in this view mode
 		if (!m_dialog->neverSaved()) {
 			if (!loadLayout()) {
 				//err msg
-				tqparentDialog()->settqStatus(conn,
+				parentDialog()->settqStatus(conn,
 					i18n("Query definition loading failed."),
 					i18n("Query design may be corrupted so it could not be opened even in text view.\n"
 						"You can delete the query and create it again."));
@@ -633,13 +633,13 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 			// Invalid queries case:
 			// KexiDialogBase::switchToViewMode() first opens DesignViewMode,
 			// and then KexiQueryPart::loadSchemaData() doesn't allocate QuerySchema object
-			// do we're carefully looking at tqparentDialog()->schemaData()
-			KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+			// do we're carefully looking at parentDialog()->schemaData()
+			KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 			if (q) {
 				KexiDB::ResultInfo result;
 				showFieldsForQuery( q, result );
 				if (!result.success) {
-					tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true;
 					return false;
 				}
@@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 				KexiDB::ResultInfo result;
 				showFieldsAndRelationsForQuery( tempData()->query(), result );
 				if (!result.success) {
-					tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					return false;
 				}
 			}
@@ -813,7 +813,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 	KexiDB::BaseExpr* e = query->whereExpression();
 	KexiDB::BaseExpr* eItem = 0;
 	while (e) {
-		//eat tqparentheses because the expression can be (....) AND (... AND ... )
+		//eat parentheses because the expression can be (....) AND (... AND ... )
 		while (e && e->toUnary() && e->token()=='(')
 			e = e->toUnary()->arg();
 
@@ -826,7 +826,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 			e = 0;
 		}
 
-		//eat tqparentheses
+		//eat parentheses
 		while (eItem && eItem->toUnary() && eItem->token()=='(')
 			eItem = eItem->toUnary()->arg();
 
@@ -1077,13 +1077,13 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 		//in a case when query tqlayout was not saved, build tqlayout by hand
 		// -- dynamic cast because of a need for handling invalid queries
 		//    (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
-		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 		if (q) {
 			showTablesForQuery( q );
 			KexiDB::ResultInfo result;
 			showRelationsForQuery( q, result );
 			if (!result.success) {
-				tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+				parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 				return false;
 			}
 		}
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 36455837f..e6eb98355 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -222,7 +222,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore)
 			}
 		}
 		else {
-			const bool designViewWasVisible = tqparentDialog()->viewForMode(mode)!=0;
+			const bool designViewWasVisible = parentDialog()->viewForMode(mode)!=0;
 			//should we check SQL text?
 			if (designViewWasVisible 
 				&& !d->justSwitchedFromNoViewMode //unchanged, but we should check SQL text
@@ -274,7 +274,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore)
 	}
 
 	setDirty(true);*/
-//	if (tqparentDialog()->hasFocus())
+//	if (parentDialog()->hasFocus())
 	d->editor->setFocus();
 	return true;
 }
@@ -287,13 +287,13 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode)
 	if (mode==Kexi::NoViewMode) {
 		//User opened text view _directly_. 
 		//This flag is set to indicate for beforeSwitchTo() that even if text has not been changed,
-		//SQL text should be tqinvalidated.
+		//SQL text should be invalidated.
 		d->justSwitchedFromNoViewMode = true;
 	}
 	KexiQueryPart::TempData * temp = tempData();
 	KexiDB::QuerySchema *query = temp->query();
 	if (!query) {//try to just get saved schema, instead of temporary one
-		query = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		query = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 	}
 
 	if (mode!=0/*failure only if it is switching from prev. view*/ && !query) {
@@ -441,7 +441,7 @@ void KexiQueryDesignerSQLView::slotSelectQuery()
 KexiQueryPart::TempData *
 KexiQueryDesignerSQLView::tempData() const
 {	
-	return dynamic_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+	return dynamic_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 }
 
 KexiDB::SchemaData*
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index cf5400dc1..9d7cc542a 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 	}
 	d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params);
 	if (!d->cursor) {
-		tqparentDialog()->settqStatus(tqparentDialog()->mainWin()->project()->dbConnection(), 
+		parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), 
 			i18n("Query executing failed."));
 		//todo: also provide server result and sql statement
 		return false;
@@ -108,13 +108,13 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 tristate KexiQueryView::afterSwitchFrom(int mode)
 {
 	if (mode==Kexi::NoViewMode) {
-		KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 		const tristate result = executeQuery(querySchema);
 		if (true != result)
 			return result;
 	}
 	else if (mode==Kexi::DesignViewMode || Kexi::TextViewMode) {
-		KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+		KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 
 		//remember what view we should use to store data changes, if needed
 //		if (temp->queryChangedInPreviousView)
@@ -131,7 +131,7 @@ tristate KexiQueryView::afterSwitchFrom(int mode)
 
 KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel)
 {
-	KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag();
+	KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag();
 	if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
 		return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeNewData(sdata, cancel);
 	if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
@@ -141,7 +141,7 @@ KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata,
 
 tristate KexiQueryView::storeData(bool dontAsk)
 {
-	KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag();
+	KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag();
 	if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
 		return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeData(dontAsk);
 	if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
diff --git a/kexi/plugins/reports/kexireportfactory.h b/kexi/plugins/reports/kexireportfactory.h
index ab2ce7a18..1813fce71 100644
--- a/kexi/plugins/reports/kexireportfactory.h
+++ b/kexi/plugins/reports/kexireportfactory.h
@@ -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 &tqparentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
 		//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 11c49c84b..4e04beae5 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -121,10 +121,10 @@ void
 KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -144,7 +144,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp
index 913a493ea..403c02777 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -187,7 +187,7 @@ KexiReportView::initForm()
 
 	// Show the form wizard if this is a new Form
 //	KexiDB::FieldList *fields = 0;
-	if(tqparentDialog()->id() < 0)
+	if(parentDialog()->id() < 0)
 	{
 #ifndef NO_DSWIZARD
 		KexiDataSourceWizard *w = new KexiDataSourceWizard(mainWin(), (TQWidget*)mainWin(), "datasource_wizard");
@@ -220,7 +220,7 @@ KexiReportView::loadForm()
 
 //@todo also load m_resizeMode !
 
-	kexipluginsdbg << "KexiReportForm::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl;
+	kexipluginsdbg << "KexiReportForm::loadForm() Loading the form with id : " << parentDialog()->id() << endl;
 	// If we are previewing the Form, use the tempData instead of the form stored in the db
 	if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() ) {
 		KFormDesigner::FormIO::loadFormFromString(form(), m_reportform, tempData()->tempForm);
@@ -322,7 +322,7 @@ tristate
 KexiReportView::storeData(bool dontAsk)
 {
 	Q_UNUSED(dontAsk)
-	kexipluginsdbg << "KexiReportForm::storeData(): " << tqparentDialog()->partItem()->name() << " [" << tqparentDialog()->id() << "]" << endl;
+	kexipluginsdbg << "KexiReportForm::storeData(): " << parentDialog()->partItem()->name() << " [" << parentDialog()->id() << "]" << endl;
 	TQString data;
 	KFormDesigner::FormIO::saveFormToString(tempData()->form, data);
 	if (!storeDataBlock(data))
diff --git a/kexi/plugins/reports/kexireportview.h b/kexi/plugins/reports/kexireportview.h
index 02b4b48a8..2b88c1819 100644
--- a/kexi/plugins/reports/kexireportview.h
+++ b/kexi/plugins/reports/kexireportview.h
@@ -107,7 +107,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportView : public KexiViewBase
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiReportPart::TempData* tempData() const {
-			return static_cast<KexiReportPart::TempData*>(tqparentDialog()->tempData()); }
+			return static_cast<KexiReportPart::TempData*>(parentDialog()->tempData()); }
 		KexiReportPart* reportPart() const { return static_cast<KexiReportPart*>(part()); }
 
 		void disableWidgetActions();
diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp
index 393beaad4..c3ca65e44 100644
--- a/kexi/plugins/reports/reportwidgets.cpp
+++ b/kexi/plugins/reports/reportwidgets.cpp
@@ -145,16 +145,16 @@ KexiSubReport::setReportName(const TQString &name)
 		return;
 
 	// we need a KexiReportView*
-	TQWidget *w = tqparentWidget();
+	TQWidget *w = parentWidget();
 	while(w && !w->isA("KexiReportView"))
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	KexiReportView *view = (KexiReportView*)w;
 	if(!view)
 		return;
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*(view->connection()), name, KexiPart::ReportObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 0c95cb0ea..39f84599a 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -295,7 +295,7 @@ KexiDB::SchemaData* KexiScriptDesignView::storeNewData(const KexiDB::SchemaData&
     if(! storeData()) {
         kdWarning() << "KexiScriptDesignView::storeNewData Failed to store the data." << endl;
         //failure: remove object's schema data to avoid garbage
-        KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+        KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
         conn->removeObject( s->id() );
         delete s;
         return 0;
@@ -306,7 +306,7 @@ KexiDB::SchemaData* KexiScriptDesignView::storeNewData(const KexiDB::SchemaData&
 
 tristate KexiScriptDesignView::storeData(bool /*dontAsk*/)
 {
-    kexipluginsdbg << "KexiScriptDesignView::storeData(): " << tqparentDialog()->partItem()->name() << " [" << tqparentDialog()->id() << "]" << endl;
+    kexipluginsdbg << "KexiScriptDesignView::storeData(): " << parentDialog()->partItem()->name() << " [" << parentDialog()->id() << "]" << endl;
 
     TQDomDocument domdoc("script");
     TQDomElement scriptelem = domdoc.createElement("script");
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 3a2734aa7..43fa7e255 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -238,19 +238,19 @@ def runGuiApp(copycenter, name):
 			f.close()
 			print "File \%s\" successfully written." % filename
 
-		def addItem(self, pluginimpl, afteritem = None, tqparentitem = None):
+		def addItem(self, pluginimpl, afteritem = None, parentitem = None):
 			#print "CopyJobWidget.addItem"
 			class ListViewItem(qt.QListViewItem):
-				def __init__(self, pluginimpl, listview, tqparentitem = None, afteritem = None):
+				def __init__(self, pluginimpl, listview, parentitem = None, afteritem = None):
 					self.pluginimpl = pluginimpl
-					if tqparentitem == None:
+					if parentitem == None:
 						qt.QListViewItem.__init__(self,listview)
 						self.setOpen(True)
 					else:
 						if afteritem == None:
-							qt.QListViewItem.__init__(self,tqparentitem)
+							qt.QListViewItem.__init__(self,parentitem)
 						else:
-							qt.QListViewItem.__init__(self,tqparentitem,afteritem)
+							qt.QListViewItem.__init__(self,parentitem,afteritem)
 						self.setRenameEnabled(1,True)
 				def startRename(self, columnindex):
 					qt.QListViewItem.startRename(self,columnindex)
@@ -274,7 +274,7 @@ def runGuiApp(copycenter, name):
 						if qt.QListViewItem.text(self,0).tqcontains("password"):
 							return "*" * len(str(qt.QListViewItem.text(self,1)))
 					return qt.QListViewItem.text(self,columnindex)
-			return ListViewItem(pluginimpl, self.listview, tqparentitem, afteritem)
+			return ListViewItem(pluginimpl, self.listview, parentitem, afteritem)
 
 		def updateItem(self,pluginname,pluginimpl):
 			#print "CopyJobWidget.updateItem"
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.cpp b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
index 2b0b36089..e1b8ddb96 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.cpp
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
@@ -73,7 +73,7 @@ tristate KexiTableDesigner_DataView::afterSwitchFrom(int mode)
 
 KexiTablePart::TempData* KexiTableDesigner_DataView::tempData() const
 {
-	return static_cast<KexiTablePart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiTablePart::TempData*>(parentDialog()->tempData());
 }
 
 #include "kexitabledesigner_dataview.moc"
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index a612453a8..2f6cd21ce 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -588,13 +588,13 @@ tristate KexiTableDesignerView::beforeSwitchTo(int mode, bool &dontStore)
 	else */
 	tristate res = true;
 	if (mode==Kexi::DataViewMode) {
-		if (!dirty() && tqparentDialog()->neverSaved()) {
+		if (!dirty() && parentDialog()->neverSaved()) {
 			KMessageBox::sorry(this, i18n("Cannot switch to data view, because table design is empty.\n"
 				"First, please create your design.") );
 			return cancelled;
 		}
 //<temporary>
-		else if (dirty() && !tqparentDialog()->neverSaved()) {
+		else if (dirty() && !parentDialog()->neverSaved()) {
 //			cancelled = (KMessageBox::No == KMessageBox::questionYesNo(this, i18n("Saving changes for existing table design is not yet supported.\nDo you want to discard your changes now?")));
 
 //			KexiDB::Connection *conn = mainWin()->project()->dbConnection();
@@ -1406,7 +1406,7 @@ KexiDB::SchemaData* KexiTableDesignerView::storeNewData(const KexiDB::SchemaData
 		KexiDB::Connection *conn = mainWin()->project()->dbConnection();
 		res = conn->createTable(tempData()->table);
 		if (res!=true)
-			tqparentDialog()->settqStatus(conn, "");
+			parentDialog()->settqStatus(conn, "");
 	}
 
 	if (res == true) {
@@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 
 			res = conn->alterTable(*tempData()->table, *newTable);
 			if (res != true)
-				tqparentDialog()->settqStatus(conn, "");
+				parentDialog()->settqStatus(conn, "");
 		}
 		else {
 			KexiDB::AlterTableHandler::ExecutionArguments args;
@@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 				<< res.toString() << endl;
 			if (true != res) {
 				alterTableHandler->debugError();
-				tqparentDialog()->settqStatus(alterTableHandler, "");
+				parentDialog()->settqStatus(alterTableHandler, "");
 			}
 		}
 	}
@@ -1521,7 +1521,7 @@ tristate KexiTableDesignerView::simulateAlterTableExecution(TQString *debugTarge
 {
 #ifndef KEXI_NO_UNDOREDO_ALTERTABLE
 # ifdef KEXI_DEBUG_GUI
-	if (mainWin()->activeWindow() != tqparentDialog()) //to avoid executing for multiple alter table views
+	if (mainWin()->activeWindow() != parentDialog()) //to avoid executing for multiple alter table views
 		return false;
 	if (!tempData()->table || !m_dialog->schemaData())
 		return false;
@@ -1566,7 +1566,7 @@ tristate KexiTableDesignerView::executeRealAlterTable()
 
 KexiTablePart::TempData* KexiTableDesignerView::tempData() const
 {
-	return static_cast<KexiTablePart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiTablePart::TempData*>(parentDialog()->tempData());
 }
 
 /*void KexiTableDesignerView::slotAboutToUpdateRow(
@@ -1910,10 +1910,10 @@ void KexiTableDesignerView::propertySetSwitched()
 {
 	KexiDataTable::propertySetSwitched();
 
-	//if (tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog())
+	//if (parentDialog()!=parentDialog()->mainWin()->currentDialog())
 	//	return; //this is not the current dialog's view
 	
-	static_cast<KexiTablePart*>(tqparentDialog()->part())->lookupColumnPage()
+	static_cast<KexiTablePart*>(parentDialog()->part())->lookupColumnPage()
 		->assignPropertySet(propertySet());
 }
 
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index cf98b6837..c546327b6 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -277,7 +277,7 @@ TQString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable,
 	return i18n("Do you want to save the design now?")
 	+ ( (emptyTable || skipWarning) ? TQString() :
 		(TQString("\n\n") + designerView->part()->i18nMessage(":additional message before saving design", 
-		designerView->tqparentDialog())) );
+		designerView->parentDialog())) );
 }
 
 void KexiTableDesignerViewPrivate::updateIconForItem(KexiTableItem &item, KoProperty::Set& set)
diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi
index 057301a3d..8c13ad399 100644
--- a/kexi/tests/altertable/1.kexi
+++ b/kexi/tests/altertable/1.kexi
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 1c5589c45..6155eb63d 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -461,7 +461,7 @@ bool AlterTableTester::closeWindow(KexiDialogBase* dlg)
 	if (!dlg)
 		return true;
 	TQString name = dlg->partItem()->name();
-	tristate result = true == win->closeDialog(dlg, true/*tqlayoutTaskBar*/, true/*doNotSaveChanges*/);
+	tristate result = true == win->closeDialog(dlg, true/*layoutTaskBar*/, true/*doNotSaveChanges*/);
 	kdDebug() << TQString("Closing window for table '%1': %2").tqarg(name)
 		.tqarg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl;
 	return result == true;
diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
index 41e4294b7..568e0781e 100644
--- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui
+++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
@@ -309,7 +309,7 @@
     <tabstop>m_caseSensitive</tabstop>
     <tabstop>m_wholeWords</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kexi/tests/newapi/statements.txt b/kexi/tests/newapi/statements.txt
index c0cc8e7c4..3d108ce76 100644
--- a/kexi/tests/newapi/statements.txt
+++ b/kexi/tests/newapi/statements.txt
@@ -47,7 +47,7 @@ select 2+3*4 from cars;
 select (2+3)*4 from cars;
 -- OK202: support for aliases for complex-expression columns
 select (2+3)*4 from cars;
--- ER203: column names are tqinvalidated inside a complex expressions
+-- ER203: column names are invalidated inside a complex expressions
 select one*two from persons;
 -- ER204: like ER106, but ambiguous column is inside a complex expression
 select id*2 from persons p, cars p;
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index fc4888528..6dd4fbf8d 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -449,7 +449,7 @@
     <tabstop>titleEdit</tabstop>
     <tabstop>frmEngine</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index 6c173b421..f1f161deb 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -185,7 +185,7 @@
 <Q_SLOTS>
     <slot access="protected">slotCBToggled( bool on )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index 069a89b0c..059bf0803 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -158,5 +158,5 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index fbcf91de9..f5bc4d9ea 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -112,14 +112,14 @@ PixmapCollection::tqcontains(const TQString &name)
 }
 
 void
-PixmapCollection::save(TQDomNode tqparentNode)
+PixmapCollection::save(TQDomNode parentNode)
 {
 	if(m_pixmaps.isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement collection = domDoc.createElement("collection");
-	tqparentNode.appendChild(collection);
+	parentNode.appendChild(collection);
 
 	PixmapMap::ConstIterator it;
 	PixmapMap::ConstIterator endIt = m_pixmaps.constEnd();
@@ -282,7 +282,7 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 void
 PixmapCollectionEditor::newItemByName()
 {
-	LoadIconDialog d(tqparentWidget());
+	LoadIconDialog d(parentWidget());
 	if(d.exec()== TQDialog::Accepted)
 	{
 		if(d.iconName().isEmpty())
@@ -296,7 +296,7 @@ PixmapCollectionEditor::newItemByName()
 void
 PixmapCollectionEditor::newItemByPath()
 {
-	KURL url = KFileDialog::getImageOpenURL("::kexi", tqparentWidget());
+	KURL url = KFileDialog::getImageOpenURL("::kexi", parentWidget());
 	if(url.isEmpty())
 		return;
 	TQString name = m_collection->addPixmapPath(url);
@@ -310,7 +310,7 @@ PixmapCollectionEditor::removeItem()
 	if( !item )
 	  return;
 
-	int confirm = KMessageBox::questionYesNo(tqparentWidget(), TQString("<qt>")+
+	int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+
 		i18n("Do you want to remove item \"%1\" from collection \"%2\"?")
 		.tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>");
 	if(confirm == KMessageBox::No)
@@ -427,7 +427,7 @@ PixmapCollectionChooser::getPixmap(const TQString &name)
 void
 PixmapCollectionChooser::slotUser1()
 {
-	PixmapCollectionEditor dialog(m_collection, tqparentWidget());
+	PixmapCollectionEditor dialog(m_collection, parentWidget());
 	dialog.exec();
 
 	m_iconView->clear();
diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h
index 53637e285..caf11fd5e 100644
--- a/kexi/widget/pixmapcollection.h
+++ b/kexi/widget/pixmapcollection.h
@@ -56,7 +56,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
 		bool   tqcontains(const TQString &name);
 		TQPixmap  getPixmap(const TQString &name);
 
-		void save(TQDomNode tqparentNode);
+		void save(TQDomNode parentNode);
 		void load(TQDomNode node);
 
 		TQString collectionName() {return m_name; }
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index ae35334bf..2be89bb08 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -81,7 +81,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 		this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
-//	tqinvalidateActions();
+//	invalidateActions();
 
 #if 0
 
@@ -91,7 +91,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 	m_removeSelectedTableQueryAction->plug( m_popup );
 	m_removeSelectedConnectionAction->plug( m_popup );
 
-	tqinvalidateActions();
+	invalidateActions();
 #endif
 
 	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
@@ -334,7 +334,7 @@ KexiRelationView::setReadOnly(bool b)
 {
 	m_readOnly=b;
 //TODO
-//	tqinvalidateActions();
+//	invalidateActions();
 /*	TableList::Iterator it, end( m_tables.end() );	
  	for ( it=m_tables.begin(); it != end; ++it)
 	{
@@ -381,7 +381,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev)
 		updateContents(cview->connectionRect());
 		m_selectedConnection = cview;
 		emit connectionViewGotFocus();
-//		tqinvalidateActions();
+//		invalidateActions();
 
 		if(ev->button() == Qt::RightButton) {//show popup
 			kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl;
@@ -395,7 +395,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev)
 	}
 	//connection not found
 	clearSelection();
-//	tqinvalidateActions();
+//	invalidateActions();
 	if(ev->button() == Qt::RightButton) {//show popup on view background area
 //		TQPopupMenu m;
 //			m_removeSelectedConnectionAction->plug( &m );
@@ -415,13 +415,13 @@ void KexiRelationView::clearSelection()
 		m_focusedTableView->unsetFocus();
 		m_focusedTableView = 0;
 //		setFocus();
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 	if (m_selectedConnection) {
 		m_selectedConnection->setSelected(false);
 		updateContents(m_selectedConnection->connectionRect());
 		m_selectedConnection = 0;
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 }
 
@@ -516,7 +516,7 @@ KexiRelationView::removeSelectedObject()
 #endif
 		delete m_selectedConnection;
 		m_selectedConnection = 0;
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 	else if (m_focusedTableView) {
 		KexiRelationViewTableContainer *tmp = m_focusedTableView;
@@ -580,7 +580,7 @@ void KexiRelationView::slotTableViewGotFocus()
 //	if (m_focusedTableView)
 //		m_focusedTableView->unsetFocus();
 	m_focusedTableView = (KexiRelationViewTableContainer*)sender();
-//	tqinvalidateActions();
+//	invalidateActions();
 	emit tableViewGotFocus();
 }
 
@@ -614,12 +614,12 @@ void KexiRelationView::tableHeaderContextMenuRequest(const TQPoint& pos)
 	if (m_focusedTableView != sender())
 		return;
 	kdDebug() << "HEADER CTXT MENU!" <<endl;
-	tqinvalidateActions();
+	invalidateActions();
 	m_tableQueryPopup->exec(pos);	
 }
 
 //! Invalidates all actions availability
-void KexiRelationView::tqinvalidateActions()
+void KexiRelationView::invalidateActions()
 {
 	setAvailable("edit_delete", m_selectedConnection || m_focusedTableView);
 }
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index b5d1785df..dcf78834b 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -151,7 +151,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		void recalculateSize(int width, int height);
 		void stretchExpandSize();
-//		void		tqinvalidateActions();
+//		void		invalidateActions();
 //		void clearTableSelection();
 //		void clearConnSelection();
 
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index c850d7221..2145cf203 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -214,7 +214,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 			diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY;
 			if ((abs(diffX)>2) || (abs(diffY)>2))
 			{
-				TQPoint newPos=tqparentWidget()->pos()+TQPoint(diffX,diffY);
+				TQPoint newPos=parentWidget()->pos()+TQPoint(diffX,diffY);
 //correct the x position
 				if (newPos.x()<0) {
 					m_offsetX+=newPos.x();
@@ -244,7 +244,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 				}
 //move and update helpers
 
-				tqparentWidget()->move(newPos);
+				parentWidget()->move(newPos);
 				m_grabX=TQT_TQMOUSEEVENT(ev)->globalPos().x();
 				m_grabY=TQT_TQMOUSEEVENT(ev)->globalPos().y();
 //				kdDebug()<<"HEADER:emitting moved"<<endl;
@@ -258,7 +258,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 
 void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) {
 	kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl;
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 	ev->accept();
 	if (ev->button()==Qt::LeftButton) {
 		m_dragging=true;
@@ -270,7 +270,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) {
 		return;
 	}
 	if (ev->button()==Qt::RightButton) {
-		emit static_cast<KexiRelationViewTableContainer*>(tqparentWidget())
+		emit static_cast<KexiRelationViewTableContainer*>(parentWidget())
 			->contextMenuRequest(ev->globalPos());
 	}
 //	TQLabel::mousePressEvent(ev);
@@ -410,11 +410,11 @@ KexiRelationViewTable::slotContentsMoving(int,int)
 
 void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 {
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 	setFocus();
 	KListView::contentsMousePressEvent(ev);
 //	if (ev->button()==Qt::RightButton)
-//		static_cast<KexiRelationView*>(tqparentWidget())->executePopup(ev->pos());
+//		static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos());
 }
 
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 7ef5a9617..e48a5d007 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -129,7 +129,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent,
 		TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable()));
 #endif
 
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 KexiRelationWidget::~KexiRelationWidget()
@@ -228,39 +228,39 @@ void KexiRelationWidget::tableViewGotFocus()
 //	if (m_focusedTableView)
 //		m_focusedTableView->unsetFocus();
 //	m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::connectionViewGotFocus()
 {
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::emptyAreaGotFocus()
 {
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::tableContextMenuRequest(const TQPoint& pos)
 {
-	tqinvalidateActions();
+	invalidateActions();
 	executePopup( pos );
 }
 
 void KexiRelationWidget::connectionContextMenuRequest(const TQPoint& pos)
 {
-	tqinvalidateActions();
+	invalidateActions();
 	executePopup( pos );
 //	m_connectionPopup->exec(pos);
 }
 
 void KexiRelationWidget::emptyAreaContextMenuRequest( const TQPoint& /*pos*/ )
 {
-	tqinvalidateActions();
+	invalidateActions();
 	//TODO
 }
 
-void KexiRelationWidget::tqinvalidateActions()
+void KexiRelationWidget::invalidateActions()
 {
 	setAvailable("edit_delete", m_relationView->selectedConnection() || m_relationView->focusedTableView());
 }
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 869dbf112..20a701746 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -115,7 +115,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 		void executePopup( TQPoint pos = TQPoint(-1,-1) );
 
 		//! Invalidates all actions availability.
-		void tqinvalidateActions();
+		void invalidateActions();
 
 		//! Fills table's combo box with all available table names.
 		void fillTablesCombo();
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 4352c2604..dbf95ad67 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -88,7 +88,7 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqpa
 //	m_proc = 0;
 //	m_content = 0;
 	m_hasFocusableWidget = false;
-	d->button = new KexiDropDownButton( tqparentWidget() /*usually a viewport*/ );
+	d->button = new KexiDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	TQToolTip::add(d->button, i18n("Click to show available actions for this cell"));
 
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 19cf0b998..89ba63cf9 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -482,7 +482,7 @@ void KexiComboBoxBase::slotItemSelected(KexiTableItem*)
 		if (valueToSet.toString().isEmpty() && !m_insideCreatePopup) {
 			clear();
 			TQWidget* thisWidget = dynamic_cast<TQWidget*>(this);
-			thisWidget->tqparentWidget()->setFocus();
+			thisWidget->parentWidget()->setFocus();
 			return;
 		}
 	}
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 65edd806d..4fe8b9403 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -298,9 +298,9 @@ void KexiComboBoxPopup::updateSize(int minWidth)
 
 	d->tv->adjustColumnWidthToContents(-1);
 
-	KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(tqparentWidget());
+	KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(parentWidget());
 	const int width = TQMAX( d->tv->tableSize().width(), 
-		(te ? te->totalSize().width() : (tqparentWidget()?tqparentWidget()->width():0/*sanity*/)) );
+		(te ? te->totalSize().width() : (parentWidget()?parentWidget()->width():0/*sanity*/)) );
 	kexidbg << "KexiComboBoxPopup::updateSize(): size=" << size() << endl;
 	resize( TQMAX(minWidth, width)/*+(d->tv->columns()>1?2:0)*/ /*(d->updateSizeCalled?0:1)*/, d->tv->rowHeight() * rows +2 );
 	kexidbg << "KexiComboBoxPopup::updateSize(): size after=" << size() << endl;
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index ba61e3057..4695dbf8e 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -68,7 +68,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 {
 	setName("KexiComboBoxTableEdit");
 	m_setVisibleValueOnSetValueInternal = true;
-	d->button = new KexiComboBoxDropDownButton( tqparentWidget() /*usually a viewport*/ );
+	d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	d->button->setFocusPolicy( TQ_NoFocus );
 	connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked()));
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 799a1a8bf..9fc319ff9 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -128,7 +128,7 @@ KexiTableViewCellToolTip::KexiTableViewCellToolTip( KexiTableView * tableView )
 
 KexiTableViewCellToolTip::~KexiTableViewCellToolTip()
 {
-	remove(tqparentWidget());
+	remove(parentWidget());
 }
 
 void KexiTableViewCellToolTip::maybeTip( const TQPoint & p )
@@ -718,8 +718,8 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 	int x2 = w - 1;
 	int y2 = h - 1;
 
-/*	if (0==qstrcmp("KexiComboBoxPopup",tqparentWidget()->className())) {
-	  kexidbg  << tqparentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl;
+/*	if (0==qstrcmp("KexiComboBoxPopup",parentWidget()->className())) {
+	  kexidbg  << parentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl;
 	}*/
 
 	//	Draw our lines
@@ -923,7 +923,7 @@ TQPoint KexiTableView::viewportToContents2( const TQPoint& vp )
 
 void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch )
 {
-//  qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)tqparentWidget()->caption(),cx,cy,cw,ch);
+//  qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)parentWidget()->caption(),cx,cy,cw,ch);
 
 	// Regions work with shorts, so avoid an overflow and adjust the
 	// table size to the visible size
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index 56241fcba..b22d619d4 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -285,7 +285,7 @@ public:
 	inline bool isDBAware() { return m_cursor; }
 
 	/*! For db-aware data set only: table name is returned;
-	 equivalent to cursor()->query()->tqparentTable()->name(). */
+	 equivalent to cursor()->query()->parentTable()->name(). */
 	TQString dbTableName() const;
 
 	inline KexiDB::Cursor* cursor() const { return m_cursor; }
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 05212dd12..f6a839e3f 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -31,8 +31,8 @@
 class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 {
 	public:
-		KexiTableViewHeaderStyle(TQStyle *tqparentStyle, TQWidget *widget)
-		 : KexiUtils::StyleProxy(tqparentStyle)
+		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
+		 : KexiUtils::StyleProxy(parentStyle)
 		{
 			setBackgroundColor( widget->tqpalette().active().background() );
 		}
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index a805f5e3c..2c6f86aad 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -50,13 +50,13 @@ KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent)
 	setAutoMask( false );
 
 	//generate tqmask
-	TQPixmap tqmaskPm(size());
-	tqmaskPm.fill( black );
-	TQPainter tqmaskPainter(&tqmaskPm);
-	drawFrame(tqmaskPainter);
-	TQImage tqmaskImg( tqmaskPm.convertToImage() );
+	TQPixmap maskPm(size());
+	maskPm.fill( black );
+	TQPainter maskPainter(&maskPm);
+	drawFrame(maskPainter);
+	TQImage maskImg( maskPm.convertToImage() );
 	TQBitmap bm;
-	bm = tqmaskImg.createHeuristicMask();
+	bm = maskImg.createHeuristicMask();
 	setMask( bm );
 }
 
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index d7150c6bf..e5f98aee3 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -244,7 +244,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		}
 
 //		kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
-		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child tqlayouts)
+		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if ((x + oSizeHint.width()) > r.right() && h > 0) {
 			// do the tqlayout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
@@ -360,7 +360,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 			continue;
 		}
 
-		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child tqlayouts)
+		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if (y + oSizeHint.height() > r.bottom() && w > 0) {
 			// do the tqlayout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);