Rename a number of old tq methods that are no longer tq specific

344 files changed, 2637 insertions, 2637 deletions

diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index edcba8c9..02e01249 100644
--- a/kexi/3rdparty/kexisql/src/btree.c
+++ b/kexi/3rdparty/kexisql/src/btree.c
@@ -101,7 +101,7 @@ typedef struct FreelistInfo FreelistInfo;
 ** This routine rounds up a number of bytes to the next multiple of 4.
 **
 ** This might need to change for computer architectures that require
-** and 8-byte tqalignment boundry for structures.
+** and 8-byte alignment boundry for structures.
 */
 #define ROUNDUP(X)  ((X+3) & ~3)
 
@@ -726,7 +726,7 @@ int sqliteBtreeOpen(
 }
 
 /*
-** Close an open database and tqinvalidate all cursors.
+** Close an open database and invalidate all cursors.
 */
 static int fileBtreeClose(Btree *pBt){
   while( pBt->pCursor ){
@@ -1998,7 +1998,7 @@ static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){
 }
 
 /*
-** Reparent all tqchildren of the given page to be the given page.
+** Reparent all children of the given page to be the given page.
 ** In other words, for every child of pPage, invoke reparentPage()
 ** to make sure that each child knows that pPage is its parent.
 **
@@ -2321,7 +2321,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   ** the siblings.  An attempt is made to find NN siblings on either
   ** side of pPage.  More siblings are taken from one side, however, if
   ** pPage there are fewer than NN siblings on the other side.  If pParent
-  ** has NB or fewer tqchildren then all tqchildren of pParent are taken.
+  ** has NB or fewer children then all children of pParent are taken.
   */
   nxDiv = idx - NN;
   if( nxDiv + NB > pParent->nCell ){
@@ -2547,7 +2547,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   }
 
   /*
-  ** Reparent tqchildren of all cells.
+  ** Reparent children of all cells.
   */
   for(i=0; i<nNew; i++){
     reparentChildPages(pBt, apNew[i]);
@@ -2794,7 +2794,7 @@ static int fileBtreeCreateTable(Btree *pBt, int *piTable){
 }
 
 /*
-** Erase the given database page and all its tqchildren.  Return
+** Erase the given database page and all its children.  Return
 ** the page to the freelist.
 */
 static int clearDatabasePage(Btree *pBt, Pgno pgno, int freePageFlag){
@@ -3274,8 +3274,8 @@ static int keyCompare(
 **      3.  Make sure no key is less than or equal to zLowerBound.
 **      4.  Make sure no key is greater than or equal to zUpperBound.
 **      5.  Check the integrity of overflow pages.
-**      6.  Recursively call checkTreePage on all tqchildren.
-**      7.  Verify that the depth of all tqchildren is the same.
+**      6.  Recursively call checkTreePage on all children.
+**      7.  Verify that the depth of all children is the same.
 **      8.  Make sure this page is at least 33% full or else it is
 **          the root of the tree.
 */
diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c
index 86feaa5b..3954fe6d 100644
--- a/kexi/3rdparty/kexisql/src/btree_rb.c
+++ b/kexi/3rdparty/kexisql/src/btree_rb.c
@@ -319,7 +319,7 @@ static void print_node(BtRbNode *pNode)
 
 /* 
  * Check the following properties of the red-black tree:
- * (1) - If a node is red, both of it's tqchildren are black
+ * (1) - If a node is red, both of it's children are black
  * (2) - Each path from a given node to a leaf (NULL) node passes thru the
  *       same number of black nodes 
  *
@@ -951,10 +951,10 @@ static int memRbtreeDelete(RbtCursor* pCur)
   }
 
   /* First do a standard binary-tree delete (node pZ is to be deleted). How
-   * to do this depends on how many tqchildren pZ has:
+   * to do this depends on how many children pZ has:
    *
-   * If pZ has no tqchildren or one child, then splice out pZ.  If pZ has two
-   * tqchildren, splice out the successor of pZ and replace the key and data of
+   * If pZ has no children or one child, then splice out pZ.  If pZ has two
+   * children, splice out the successor of pZ and replace the key and data of
    * pZ with the key and data of the spliced out successor.  */
   if( pZ->pLeft && pZ->pRight ){
     BtRbNode *pTmp;
@@ -1008,7 +1008,7 @@ static int memRbtreeDelete(RbtCursor* pCur)
   }
 
   /* pZ now points at the spliced out node. pChild is the only child of pZ, or
-   * NULL if pZ has no tqchildren. If pZ is black, and not the tree root, then we
+   * NULL if pZ has no children. If pZ is black, and not the tree root, then we
    * will have violated the "same number of black nodes in every path to a
    * leaf" property of the red-black tree. The code in do_delete_balancing()
    * repairs this. */
diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c
index 79eb15e5..85872a5a 100644
--- a/kexi/3rdparty/kexisql/src/os.c
+++ b/kexi/3rdparty/kexisql/src/os.c
@@ -531,11 +531,11 @@ int sqliteOsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -650,7 +650,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -724,7 +724,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 4ed6c51a..212be42e 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -126,7 +126,7 @@
 **      8       4      Right child (the Ptr(N+1) value).  Omitted on leaves.
 **
 ** The flags define the format of this btree page.  The leaf flag means that
-** this page has no tqchildren.  The zerodata flag means that this page carries
+** this page has no children.  The zerodata flag means that this page carries
 ** only keys and no data.  The intkey flag means that the key is a integer
 ** which is stored in the key size entry of the cell header rather than in
 ** the payload area.
@@ -212,7 +212,7 @@
 #include <assert.h>
 
 /* Round up a number to the next larger multiple of 8.  This is used
-** to force 8-byte tqalignment on 64-bit architectures.
+** to force 8-byte alignment on 64-bit architectures.
 */
 #define ROUND8(x)   ((x+7)&~7)
 
@@ -1286,14 +1286,14 @@ int sqlite3BtreeOpen(
 #endif
   }
   pBt->usableSize = pBt->pageSize - nReserve;
-  assert( (pBt->pageSize & 7)==0 );  /* 8-byte tqalignment of pageSize */
+  assert( (pBt->pageSize & 7)==0 );  /* 8-byte alignment of pageSize */
   sqlite3pager_set_pagesize(pBt->pPager, pBt->pageSize);
   *ppBtree = pBt;
   return SQLITE_OK;
 }
 
 /*
-** Close an open database and tqinvalidate all cursors.
+** Close an open database and invalidate all cursors.
 */
 int sqlite3BtreeClose(Btree *pBt){
   while( pBt->pCursor ){
@@ -1658,7 +1658,7 @@ int sqlite3BtreeBeginTrans(Btree *pBt, int wrflag){
 #ifndef SQLITE_OMIT_AUTOVACUUM
 
 /*
-** Set the pointer-map entries for all tqchildren of page pPage. Also, if
+** Set the pointer-map entries for all children of page pPage. Also, if
 ** pPage contains cells that point to overflow pages, set the pointer
 ** map entries for the overflow pages as well.
 */
@@ -3425,7 +3425,7 @@ static int reparentPage(Btree *pBt, Pgno pgno, MemPage *pNewParent, int idx){
 
 
 /*
-** Change the pParent pointer of all tqchildren of pPage to point back
+** Change the pParent pointer of all children of pPage to point back
 ** to pPage.
 **
 ** In other words, for every child of pPage, invoke reparentPage()
@@ -3879,7 +3879,7 @@ static int balance_nonroot(MemPage *pPage){
   ** the siblings.  An attempt is made to find NN siblings on either
   ** side of pPage.  More siblings are taken from one side, however, if
   ** pPage there are fewer than NN siblings on the other side.  If pParent
-  ** has NB or fewer tqchildren then all tqchildren of pParent are taken.
+  ** has NB or fewer children then all children of pParent are taken.
   */
   nxDiv = idx - NN;
   if( nxDiv + NB > pParent->nCell ){
@@ -3911,7 +3911,7 @@ static int balance_nonroot(MemPage *pPage){
   }
 
   /* Make nMaxCells a multiple of 2 in order to preserve 8-byte
-  ** tqalignment */
+  ** alignment */
   nMaxCells = (nMaxCells + 1)&~1;
 
   /*
@@ -3930,13 +3930,13 @@ static int balance_nonroot(MemPage *pPage){
   }
   szCell = (int*)&apCell[nMaxCells];
   aCopy[0] = (u8*)&szCell[nMaxCells];
-  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
+  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
   for(i=1; i<NB; i++){
     aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
+    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
   }
   aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
+  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
 #ifndef SQLITE_OMIT_AUTOVACUUM
   if( pBt->autoVacuum ){
     aFrom = &aSpace[5*pBt->pageSize];
@@ -4199,7 +4199,7 @@ static int balance_nonroot(MemPage *pPage){
 #ifndef SQLITE_OMIT_AUTOVACUUM
     /* If this is an auto-vacuum database, update the pointer map entries
     ** that point to the siblings that were rearranged. These can be: left
-    ** tqchildren of cells, the right-child of the page, or overflow pages
+    ** children of cells, the right-child of the page, or overflow pages
     ** pointed to by cells.
     */
     if( pBt->autoVacuum ){
@@ -4284,7 +4284,7 @@ static int balance_nonroot(MemPage *pPage){
   }
 
   /*
-  ** Reparent tqchildren of all cells.
+  ** Reparent children of all cells.
   */
   for(i=0; i<nNew; i++){
     rc = reparentChildPages(apNew[i]);
@@ -4842,7 +4842,7 @@ int sqlite3BtreeCreateTable(Btree *pBt, int *piTable, int flags){
 }
 
 /*
-** Erase the given database page and all its tqchildren.  Return
+** Erase the given database page and all its children.  Return
 ** the page to the freelist.
 */
 static int clearDatabasePage(
@@ -5457,8 +5457,8 @@ static void checkList(
 **  NO  3.  Make sure no key is less than or equal to zLowerBound.
 **  NO  4.  Make sure no key is greater than or equal to zUpperBound.
 **      5.  Check the integrity of overflow pages.
-**      6.  Recursively call checkTreePage on all tqchildren.
-**      7.  Verify that the depth of all tqchildren is the same.
+**      6.  Recursively call checkTreePage on all children.
+**      7.  Verify that the depth of all children is the same.
 **      8.  Make sure this page is at least 33% full or else it is
 **          the root of the tree.
 */
diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c
index 9818c954..67ed7975 100644
--- a/kexi/3rdparty/kexisql3/src/build.c
+++ b/kexi/3rdparty/kexisql3/src/build.c
@@ -2331,7 +2331,7 @@ void sqlite3CreateIndex(
     sqliteFree(zStmt);
 
     /* Fill the index with data and reparse the schema. Code an OP_Expire
-    ** to tqinvalidate all pre-compiled statements.
+    ** to invalidate all pre-compiled statements.
     */
     if( pTblName ){
       sqlite3RefillIndex(pParse, pIndex, iMem);
diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c
index ac209552..8d9cfbbd 100644
--- a/kexi/3rdparty/kexisql3/src/expr.c
+++ b/kexi/3rdparty/kexisql3/src/expr.c
@@ -623,7 +623,7 @@ void sqlite3ExprListDelete(ExprList *pList){
 ** Walk an expression tree.  Call xFunc for each node visited.
 **
 ** The return value from xFunc determines whether the tree walk continues.
-** 0 means continue walking the tree.  1 means do not walk tqchildren
+** 0 means continue walking the tree.  1 means do not walk children
 ** of the current node but continue with siblings.  2 means abandon
 ** the tree walk completely.
 **
@@ -1949,7 +1949,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
   */
   op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1);
 
-  /* Verify correct tqalignment of TK_ and OP_ constants
+  /* Verify correct alignment of TK_ and OP_ constants
   */
   assert( pExpr->op!=TK_ISNULL || op==OP_NotNull );
   assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull );
diff --git a/kexi/3rdparty/kexisql3/src/main.c b/kexi/3rdparty/kexisql3/src/main.c
index 8d6acd5c..83356f43 100644
--- a/kexi/3rdparty/kexisql3/src/main.c
+++ b/kexi/3rdparty/kexisql3/src/main.c
@@ -467,7 +467,7 @@ int sqlite3_create_function(
   /* Check if an existing function is being overridden or deleted. If so,
   ** and there are active VMs, then return SQLITE_BUSY. If a function
   ** is being overridden/deleted but there are no active VMs, allow the
-  ** operation to continue but tqinvalidate all precompiled statements.
+  ** operation to continue but invalidate all precompiled statements.
   */
   p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0);
   if( p && p->iPrefEnc==enc && p->nArg==nArg ){
@@ -667,7 +667,7 @@ const char *sqlite3_errmsg(sqlite3 *db){
 ** error.
 */
 const void *sqlite3_errmsg16(sqlite3 *db){
-  /* Because all the characters in the string are in the tqunicode
+  /* Because all the characters in the string are in the unicode
   ** range 0x00-0xFF, if we pad the big-endian string with a 
   ** zero byte, we can obtain the little-endian string with
   ** &big_endian[1].
@@ -934,7 +934,7 @@ int sqlite3_create_collation(
 
   /* Check if this call is removing or replacing an existing collation 
   ** sequence. If so, and there are active VMs, return busy. If there
-  ** are no active VMs, tqinvalidate any pre-compiled statements.
+  ** are no active VMs, invalidate any pre-compiled statements.
   */
   pColl = sqlite3FindCollSeq(db, (u8)enc, zName, strlen(zName), 0);
   if( pColl && pColl->xCmp ){
diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c
index f393b423..285d0805 100644
--- a/kexi/3rdparty/kexisql3/src/os_mac.c
+++ b/kexi/3rdparty/kexisql3/src/os_mac.c
@@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c
index 8c729136..2b0a00ec 100644
--- a/kexi/3rdparty/kexisql3/src/os_win.c
+++ b/kexi/3rdparty/kexisql3/src/os_win.c
@@ -104,7 +104,7 @@ static WCHAR *utf8ToUnicode(const char *zFilename){
 ** Convert UTF-32 to UTF-8.  Space to hold the returned string is
 ** obtained from sqliteMalloc().
 */
-static char *tqunicodeToUtf8(const WCHAR *zWideFilename){
+static char *unicodeToUtf8(const WCHAR *zWideFilename){
   int nByte;
   char *zFilename;
 
@@ -449,7 +449,7 @@ int sqlite3OsTempFileName(char *zBuf){
     char *zMulti;
     WCHAR zWidePath[SQLITE_TEMPNAME_SIZE];
     GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath);
-    zMulti = tqunicodeToUtf8(zWidePath);
+    zMulti = unicodeToUtf8(zWidePath);
     if( zMulti ){
       strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30);
       zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0;
@@ -881,7 +881,7 @@ char *sqlite3OsFullPathname(const char *zRelative){
     if( zTemp==0 ) return 0;
     GetFullPathNameW(zWide, nByte, zTemp, &zNotUsedW);
     sqliteFree(zWide);
-    zFull = tqunicodeToUtf8(zTemp);
+    zFull = unicodeToUtf8(zTemp);
     sqliteFree(zTemp);
   }else{
     nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c
index 60cb43bd..4b981350 100644
--- a/kexi/3rdparty/kexisql3/src/pager.c
+++ b/kexi/3rdparty/kexisql3/src/pager.c
@@ -1076,7 +1076,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){
 **
 ** The master journal file contains the names of all child journals.
 ** To tell if a master journal can be deleted, check to each of the
-** tqchildren.  If all tqchildren are either missing or do not refer to
+** children.  If all children are either missing or do not refer to
 ** a different master journal, then this master journal can be deleted.
 */
 static int pager_delmaster(const char *zMaster){
diff --git a/kexi/3rdparty/kexisql3/src/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c
index 23bfa533..a0c7be87 100644
--- a/kexi/3rdparty/kexisql3/src/prepare.c
+++ b/kexi/3rdparty/kexisql3/src/prepare.c
@@ -527,7 +527,7 @@ int sqlite3_prepare16(
 
   if( zTail8 && pzTail ){
     /* If sqlite3_prepare returns a tail pointer, we calculate the
-    ** equivalent pointer into the UTF-16 string by counting the tqunicode
+    ** equivalent pointer into the UTF-16 string by counting the unicode
     ** characters between zSql8 and zTail8, and then returning a pointer
     ** the same number of characters into the UTF-16 string.
     */
diff --git a/kexi/3rdparty/kexisql3/src/sqlite3.h b/kexi/3rdparty/kexisql3/src/sqlite3.h
index be29db69..414c6cac 100644
--- a/kexi/3rdparty/kexisql3/src/sqlite3.h
+++ b/kexi/3rdparty/kexisql3/src/sqlite3.h
@@ -1248,7 +1248,7 @@ int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
 ** is NULL pointer, then SQLite does a search for an appropriate temporary
 ** file directory.
 **
-** Once sqlite3_open() has been called, changing this variable will tqinvalidate
+** Once sqlite3_open() has been called, changing this variable will invalidate
 ** the current temporary database, if any.
 */
 extern char *sqlite3_temp_directory;
diff --git a/kexi/3rdparty/kexisql3/src/utf.c b/kexi/3rdparty/kexisql3/src/utf.c
index 5efbfe78..d42ab759 100644
--- a/kexi/3rdparty/kexisql3/src/utf.c
+++ b/kexi/3rdparty/kexisql3/src/utf.c
@@ -43,11 +43,11 @@
 **
 ** When converting malformed UTF-8 strings to UTF-16, one instance of the
 ** replacement character U+FFFD for each byte that cannot be interpeted as
-** part of a valid tqunicode character.
+** part of a valid unicode character.
 **
 ** When converting malformed UTF-16 strings to UTF-8, one instance of the
 ** replacement character U+FFFD for each pair of bytes that cannot be
-** interpeted as part of a valid tqunicode character.
+** interpeted as part of a valid unicode character.
 **
 ** This file contains the following public routines:
 **
@@ -427,10 +427,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem){
 #endif /* SQLITE_OMIT_UTF16 */
 
 /*
-** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero,
-** return the number of tqunicode characters in pZ up to (but not including)
+** pZ is a UTF-8 encoded unicode string. If nByte is less than zero,
+** return the number of unicode characters in pZ up to (but not including)
 ** the first 0x00 byte. If nByte is not less than zero, return the
-** number of tqunicode characters in the first nByte of pZ (or up to 
+** number of unicode characters in the first nByte of pZ (or up to 
 ** the first 0x00, whichever comes first).
 */
 int sqlite3utf8CharLen(const char *z, int nByte){
@@ -451,10 +451,10 @@ int sqlite3utf8CharLen(const char *z, int nByte){
 
 #ifndef SQLITE_OMIT_UTF16
 /*
-** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero,
+** pZ is a UTF-16 encoded unicode string. If nChar is less than zero,
 ** return the number of bytes up to (but not including), the first pair
 ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero,
-** then return the number of bytes in the first nChar tqunicode characters
+** then return the number of bytes in the first nChar unicode characters
 ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first).
 */
 int sqlite3utf16ByteLen(const void *zIn, int nChar){
diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h
index 89174271..4c732b09 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeInt.h
+++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h
@@ -133,7 +133,7 @@ typedef struct Mem Mem;
 ** No other flags may be set in this case.
 **
 ** If the MEM_Str flag is set then Mem.z points at a string representation.
-** Usually this is encoded in the same tqunicode encoding as the main
+** Usually this is encoded in the same unicode encoding as the main
 ** database (see below for exceptions). If the MEM_Term flag is also
 ** set, then the string is nul terminated. The MEM_Int and MEM_Real 
 ** flags may coexist with the MEM_Str flag.
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index 5ab2e4e6..c0457ffc 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -85,7 +85,7 @@ struct WhereTerm {
   i16 leftColumn;         /* Column number of X in "X <op> <expr>" */
   u16 operator;           /* A WO_xx value describing <op> */
   u8 flags;               /* Bit flags.  See below */
-  u8 nChild;              /* Number of tqchildren that must disable us */
+  u8 nChild;              /* Number of children that must disable us */
   WhereClause *pWC;       /* The clause this term is part of */
   Bitmask prereqRight;    /* Bitmask of tables used by pRight */
   Bitmask prereqAll;      /* Bitmask of tables referenced by p */
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index 8ea3b0b9..be51e60e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -23,20 +23,20 @@
 #include <KoUnitWidgets.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
+    m_preview = new KoPagePreview( previewPane, "Preview", layout );
     lay->addWidget(m_preview);
     lay = new TQHBoxLayout(columnSpacingPane);
     m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
     m_spacing->setValue(  m_columns.ptColumnSpacing );
     m_spacing->setUnit( unit );
     double dStep = KoUnit::fromUserValue( 0.2, unit );
-    m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
     lay->addWidget(m_spacing);
     labelSpacing->setBuddy( m_spacing );
     nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
     emit propertyChange(m_columns);
 }
 
-void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
-    m_preview->setPageLayout( tqlayout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
+    m_preview->setPageLayout( layout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 8ebac1b2..b9dcd6c2 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
      * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
-     * @param tqlayout the page tqlayout that the preview should be initialzed with.
+     * @param layout the page layout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
 
     /**
-     * Update the page preview widget with the param tqlayout.
-     * @param tqlayout the new tqlayout
+     * Update the page preview widget with the param layout.
+     * @param layout the new layout
      */
-    void setLayout(KoPageLayout &tqlayout);
+    void setLayout(KoPageLayout &layout);
 public slots:
 
     /**
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
index 325fe45e..07cced25 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
index 00296957..5878ead5 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
@@ -20,7 +20,7 @@
 #include <KoPageLayoutHeader.moc>
 #include <KoUnitWidgets.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index b3bd7978..7f36378e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index 649f4c26..83cdfbb0 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -27,15 +27,15 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqhbox.h>
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent) {
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -60,7 +60,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
@@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
@@ -159,9 +159,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     // ------------- spacers -----------
     TQWidget* spacer1 = new TQWidget( this );
     TQWidget* spacer2 = new TQWidget( this );
-    spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
-    spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
     grid1->addWidget( spacer1, 4, 0 );
     grid1->addWidget( spacer2, 4, 1 );
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 06c08517..8e503551 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
     /**
      * Contructor
      * @param parent the parent widget
-     * @param tqlayout the page tqlayout that this widget should be initialzed with.
+     * @param layout the page layout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
@@ -76,11 +76,11 @@ public slots:
 signals:
     /**
      * Emitted whenever the user changed something in the dialog.
-     * @param tqlayout the update tqlayout structure with currently displayed info.
+     * @param layout the update layout structure with currently displayed info.
      * Note that the info may not be fully correct and physically possible (in which
      * case queryClose will return false)
      */
-    void propertyChange(KoPageLayout &tqlayout);
+    void propertyChange(KoPageLayout &layout);
 
 protected:
     TQComboBox *cpgUnit;
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index 3541e6ea..a88e3bcd 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -133,7 +133,7 @@ void KoGlobal::createListOfLanguages()
     // currently have en_GB or en_US etc.
 
     const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
-                                                            TQString::tqfromLatin1("*/entry.desktop"));
+                                                            TQString::fromLatin1("*/entry.desktop"));
     for ( TQStringList::ConstIterator it = translationList.begin();
           it != translationList.end(); ++it )
     {
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 7888ba7d..316eba19 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const
 
 void KoPageLayout::loadOasis(const TQDomElement &style)
 {
-    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
+    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
     if ( !properties.isNull() )
     {
         ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
 
 KoPageLayout KoPageLayout::standardLayout()
 {
-    KoPageLayout tqlayout;
-    tqlayout.format = KoPageFormat::defaultFormat();
-    tqlayout.orientation = PG_PORTRAIT;
-    tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
-    tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
-    tqlayout.ptLeft = MM_TO_POINT( 20.0 );
-    tqlayout.ptRight = MM_TO_POINT( 20.0 );
-    tqlayout.ptTop = MM_TO_POINT( 20.0 );
-    tqlayout.ptBottom = MM_TO_POINT( 20.0 ); 
-    return tqlayout;
+    KoPageLayout layout;
+    layout.format = KoPageFormat::defaultFormat();
+    layout.orientation = PG_PORTRAIT;
+    layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
+    layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
+    layout.ptLeft = MM_TO_POINT( 20.0 );
+    layout.ptRight = MM_TO_POINT( 20.0 );
+    layout.ptTop = MM_TO_POINT( 20.0 );
+    layout.ptBottom = MM_TO_POINT( 20.0 ); 
+    return layout;
 }
 
 struct PageFormatInfo
@@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
 {
     if ( format == PG_SCREEN )
     {
-            kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+            kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
             return KPrinter::A4;
     }
     else if ( format == PG_CUSTOM )
     {
-            kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+            kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
             return KPrinter::A4;
     }
     else if ( format <= PG_LAST_FORMAT )
@@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height )
 TQString KoPageFormat::formatString( KoFormat format )
 {
     if ( format <= PG_LAST_FORMAT )
-        return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
-    return TQString::tqfromLatin1( "A4" );
+        return TQString::fromLatin1( pageFormatInfo[ format ].shortName );
+    return TQString::fromLatin1( "A4" );
 }
 
 KoFormat KoPageFormat::formatFromString( const TQString & string )
 {
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
-        if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName ))
+        if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
             return pageFormatInfo[ i ].format;
     }
     // We do not know the format name, so we have a custom format
diff --git a/kexi/3rdparty/kolibs/koPageLayout.h b/kexi/3rdparty/kolibs/koPageLayout.h
index 724f9275..eb922846 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.h
+++ b/kexi/3rdparty/kolibs/koPageLayout.h
@@ -156,7 +156,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page tqlayout, including
+ * This structure defines the page layout, including
  * its size in pt, its format (e.g. A4), orientation, unit, margins etc.
  */
 struct KoPageLayout
@@ -193,18 +193,18 @@ struct KoPageLayout
 
 #ifndef SIMPLE_KOLIBS
     /**
-     * Save this page tqlayout to OASIS.
+     * Save this page layout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page tqlayout from OASIS
+     * Load this page layout from OASIS
      */
     KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 #endif
 
     /**
-     * @return a page tqlayout with the default page size depending on the locale settings,
+     * @return a page layout with the default page size depending on the locale settings,
      * default margins (2 cm), and portrait orientation.
      * @since 1.4
      */
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index d81d1870..b757eef9 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( tqlayout );
+    setPageLayout( layout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set tqlayout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
+/*=================== set layout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &layout )
 {
     // resolution[XY] is in pixel per pt
     double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
     double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
 
-    m_pageWidth = tqlayout.ptWidth * resolutionX;
-    m_pageHeight = tqlayout.ptHeight * resolutionY;
+    m_pageWidth = layout.ptWidth * resolutionX;
+    m_pageHeight = layout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
     m_pageWidth *= z;
     m_pageHeight *= z;
 
-    m_textFrameX = tqlayout.ptLeft * resolutionX * z;
-    m_textFrameY = tqlayout.ptTop * resolutionY * z;
-    m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
-    m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
+    m_textFrameX = layout.ptLeft * resolutionX * z;
+    m_textFrameY = layout.ptTop * resolutionY * z;
+    m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
+    m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
 
-    tqrepaint( true );
+    repaint( true );
 }
 
-/*=================== set tqlayout =================================*/
+/*=================== set layout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    tqrepaint( true );
+    repaint( true );
 }
 
 /*======================== draw contents =========================*/
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& tqlayout,
+                                  const KoPageLayout& layout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
 
     flags = tabs;
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
     m_pageSizeTab = 0;
     m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                  const KoPageLayout& tqlayout,
+                  const KoPageLayout& layout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = tqlayout;
+    m_layout = layout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         if ( tabs & COLUMNS ) columns = dlg->columns();
         if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu
     return res;
 }
 
-/*===================== get a standard page tqlayout ===============*/
+/*===================== get a standard page layout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
-    m_layout.ptWidth = tqlayout.ptWidth;
-    m_layout.ptHeight = tqlayout.ptHeight;
-    m_layout.ptLeft = tqlayout.ptLeft;
-    m_layout.ptRight = tqlayout.ptRight;
-    m_layout.ptTop = tqlayout.ptTop;
-    m_layout.ptBottom = tqlayout.ptBottom;
-    m_layout.format = tqlayout.format;
-    m_layout.orientation = tqlayout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
+    m_layout.ptWidth = layout.ptWidth;
+    m_layout.ptHeight = layout.ptHeight;
+    m_layout.ptLeft = layout.ptLeft;
+    m_layout.ptRight = layout.ptRight;
+    m_layout.ptTop = layout.ptTop;
+    m_layout.ptBottom = layout.ptBottom;
+    m_layout.format = layout.format;
+    m_layout.orientation = layout.orientation;
     if(m_columnsTab)
-        m_columnsTab->setLayout(tqlayout);
+        m_columnsTab->setLayout(layout);
 }
 
 /*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- header ---------------
     TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
-    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
-    gHead->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
+    gHead->layout()->setSpacing(KDialog::spacingHint());
+    gHead->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
 
     TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
     headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- footer ---------------
     TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
-    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
-    gFoot->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
+    gFoot->layout()->setSpacing(KDialog::spacingHint());
+    gFoot->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
 
     TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
     footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
     TQWidget *tab3 = addPage(i18n( "Col&umns" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab3);
     m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
-    m_columnsTab->tqlayout()->setMargin(0);
+    m_columnsTab->layout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
     connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
     TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab4);
     m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
-    m_headerTab->tqlayout()->setMargin(0);
+    m_headerTab->layout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 21fe7df3..1ed23ec5 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page tqlayout
+     *  set page layout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the tqlayout of the paper during printing.
+ *  With this dialog the user can specify the layout of the paper during printing.
  */
 class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
 {
@@ -92,14 +92,14 @@ public:
      *
      *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
-     *  @param tqlayout   The tqlayout.
+     *  @param layout   The layout.
      *  @param headfoot The header and the footer.
      *  @param flags     a variable with all features this dialog should show.
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
 
@@ -108,7 +108,7 @@ public:
      *
      *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
-     *  @param tqlayout     The tqlayout.
+     *  @param layout     The layout.
      *  @param headfoot   The header and the footer.
      *  @param columns    The number of columns on the page.
      *  @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
      *  @param unit       The unit to use for displaying the values to the user
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
-     *  Retrieves a standard page tqlayout.
+     *  Retrieves a standard page layout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the tqlayout
+     *  Returns the layout
      */
-    const KoPageLayout& tqlayout() const { return m_layout; }
+    const KoPageLayout& layout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // tqlayout
+    // layout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &tqlayout);
+    void sizeUpdated(KoPageLayout &layout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index 506e24e1..e8dd16ff 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -185,15 +185,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 {
     if ( ok )
         *ok = true;
-    if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM;
-    if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM;
-    if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM;
-    if ( _unitName == TQString::tqfromLatin1( "in" )
-         || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH;
-    if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI;
-    if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD;
-    if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC;
-    if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT;
+    if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM;
+    if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM;
+    if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM;
+    if ( _unitName == TQString::fromLatin1( "in" )
+         || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH;
+    if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI;
+    if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD;
+    if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC;
+    if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT;
     if ( ok )
         *ok = false;
     return U_PT;
@@ -201,14 +201,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 
 TQString KoUnit::unitName( Unit _unit )
 {
-    if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" );
-    if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" );
-    if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" );
-    if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" );
-    if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" );
-    if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" );
-    if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" );
-    return TQString::tqfromLatin1( "pt" );
+    if ( _unit == U_MM ) return TQString::fromLatin1( "mm" );
+    if ( _unit == U_CM ) return TQString::fromLatin1( "cm" );
+    if ( _unit == U_DM ) return TQString::fromLatin1( "dm" );
+    if ( _unit == U_INCH ) return TQString::fromLatin1( "in" );
+    if ( _unit == U_PI ) return TQString::fromLatin1( "pi" );
+    if ( _unit == U_DD ) return TQString::fromLatin1( "dd" );
+    if ( _unit == U_CC ) return TQString::fromLatin1( "cc" );
+    return TQString::fromLatin1( "pt" );
 }
 
 #ifndef SIMPLE_KOLIBS
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 16ec9a55..9943ee7e 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 // ----------------------------------------------------------------
@@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
@@ -222,7 +222,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
     : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    tqsetAlignment( TQt::AlignRight );
+    setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -234,7 +234,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub
     : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    tqsetAlignment( TQt::AlignRight );
+    setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( unit );
@@ -286,7 +286,7 @@ double KoUnitDoubleLineEdit::value( void ) const
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
      : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    lineEdit()->tqsetAlignment( TQt::AlignRight );
+    lineEdit()->setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -299,7 +299,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
      : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    lineEdit()->tqsetAlignment( TQt::AlignRight );
+    lineEdit()->setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
@@ -378,48 +378,48 @@ double KoUnitDoubleComboBox::value( void ) const
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
     : TQWidget( parent ), m_step( 1.0 )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
     : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index 24cd08e8..e297ee52 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -172,47 +172,47 @@ TQString Kexi::msgYouCanImproveData() {
 
 //--------------------------------------------------------------------------------
 
-ObjecttqStatus::ObjecttqStatus()
+ObjectStatus::ObjectStatus()
 : msgHandler(0)
 {
 }
 
-ObjecttqStatus::ObjecttqStatus(const TQString& message, const TQString& description)
+ObjectStatus::ObjectStatus(const TQString& message, const TQString& description)
 : msgHandler(0)
 {
-	settqStatus(message, description);
+	setStatus(message, description);
 }
 
-ObjecttqStatus::ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
+ObjectStatus::ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
 : msgHandler(0)
 {
-	settqStatus(dbObject, message, description);
+	setStatus(dbObject, message, description);
 }
 
-ObjecttqStatus::~ObjecttqStatus()
+ObjectStatus::~ObjectStatus()
 {
 	delete msgHandler;
 }
 
-const ObjecttqStatus& ObjecttqStatus::status() const
+const ObjectStatus& ObjectStatus::status() const
 {
 	return *this;
 }
 
-bool ObjecttqStatus::error() const
+bool ObjectStatus::error() const
 {
 	return !message.isEmpty() 
 		|| (dynamic_cast<KexiDB::Object*>((TQObject*)dbObj) && dynamic_cast<KexiDB::Object*>((TQObject*)dbObj)->error());
 }
 
-void ObjecttqStatus::settqStatus(const TQString& message, const TQString& description)
+void ObjectStatus::setStatus(const TQString& message, const TQString& description)
 {
 	this->dbObj=0;
 	this->message=message;
 	this->description=description;
 }
 
-void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
+void ObjectStatus::setStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
 {
 	if (dynamic_cast<TQObject*>(dbObject)) {
 		dbObj = dynamic_cast<TQObject*>(dbObject);
@@ -221,7 +221,7 @@ void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& messa
 	this->description=description;
 }
 
-void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description)
+void ObjectStatus::setStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description)
 {
 	if (result) {
 		if (message.isEmpty())
@@ -235,41 +235,41 @@ void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& mes
 			this->description = description + " " + result->desc;
 	}
 	else
-		cleartqStatus();
+		clearStatus();
 }
 
-void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
+void ObjectStatus::setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
 	const TQString& message, const TQString& description)
 {
 	if (!dbObject)
-		settqStatus(result, message, description);
+		setStatus(result, message, description);
 	else if (!result)
-		settqStatus(dbObject, message, description);
+		setStatus(dbObject, message, description);
 	else {
-		settqStatus(dbObject, message, description);
-		settqStatus(result, this->message, this->description);
+		setStatus(dbObject, message, description);
+		setStatus(result, this->message, this->description);
 	}
 }
 
-void ObjecttqStatus::cleartqStatus()
+void ObjectStatus::clearStatus()
 {
 	message=TQString();
 	description=TQString();
 }
 
-TQString ObjecttqStatus::singleStatusString() const { 
+TQString ObjectStatus::singleStatusString() const { 
 	if (message.isEmpty() || description.isEmpty())
 		return message;
 	return message + " " + description;
 }
 
-void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) {
+void ObjectStatus::append( const ObjectStatus& otherStatus ) {
 	if (message.isEmpty()) {
-		message = othertqStatus.message;
-		description = othertqStatus.description;
+		message = otherStatus.message;
+		description = otherStatus.description;
 		return;
 	}
-	const TQString s( othertqStatus.singleStatusString() );
+	const TQString s( otherStatus.singleStatusString() );
 	if (s.isEmpty())
 		return;
 	if (description.isEmpty()) {
@@ -283,7 +283,7 @@ void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) {
 class ObjectStatusMessageHandler : public KexiDB::MessageHandler
 {
 	public:
-		ObjectStatusMessageHandler(ObjecttqStatus *status) 
+		ObjectStatusMessageHandler(ObjectStatus *status) 
 			: KexiDB::MessageHandler()
 			, m_status(status)
 		{
@@ -295,18 +295,18 @@ class ObjectStatusMessageHandler : public KexiDB::MessageHandler
 		virtual void showErrorMessage(const TQString &title, 
 			const TQString &details = TQString())
 		{
-			m_status->settqStatus(title, details);
+			m_status->setStatus(title, details);
 		}
 		
 		virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString())
 		{
-			m_status->settqStatus(obj, msg);
+			m_status->setStatus(obj, msg);
 		}
 
-		ObjecttqStatus *m_status;
+		ObjectStatus *m_status;
 };
 
-ObjecttqStatus::operator KexiDB::MessageHandler*()
+ObjectStatus::operator KexiDB::MessageHandler*()
 {
 	if (!msgHandler)
 		msgHandler = new ObjectStatusMessageHandler(this);
@@ -330,14 +330,14 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text)
 	TQString msg;
 	if (feature_name.isEmpty())
 		msg = i18n("This function is not available for version %1 of %2 application.")
-			.tqarg(KEXI_VERSION_STRING)
-			.tqarg(KEXI_APP_NAME); 
+			.arg(KEXI_VERSION_STRING)
+			.arg(KEXI_APP_NAME); 
 	else {
 		TQString feature_name_(feature_name);
 		msg = i18n("\"%1\" function is not available for version %2 of %3 application.")
-			.tqarg(feature_name_.replace("&",""))
-			.tqarg(KEXI_VERSION_STRING)
-			.tqarg(KEXI_APP_NAME);
+			.arg(feature_name_.replace("&",""))
+			.arg(KEXI_VERSION_STRING)
+			.arg(KEXI_APP_NAME);
 	}
 
 	TQString extra_text_(extra_text);
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index 426854e6..5a6804a5 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -87,43 +87,43 @@ namespace Kexi
 	KEXICORE_EXPORT TQFont smallFont(TQWidget *init = 0);
 
 	/*! Helper class for storing object status. */
-	class KEXICORE_EXPORT ObjecttqStatus
+	class KEXICORE_EXPORT ObjectStatus
 	{
 		public:
-			ObjecttqStatus();
+			ObjectStatus();
 
-			ObjecttqStatus(const TQString& message, const TQString& description);
+			ObjectStatus(const TQString& message, const TQString& description);
 
-			ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description);
+			ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description);
 
-			~ObjecttqStatus();
+			~ObjectStatus();
 
-			const ObjecttqStatus& status() const;
+			const ObjectStatus& status() const;
 
 			bool error() const;
 
-			void settqStatus(const TQString& message, const TQString& description);
+			void setStatus(const TQString& message, const TQString& description);
 
 			//! Note: for safety, \a dbObject needs to be derived from TQObject, 
 			//! otherwise it won't be assigned
-			void settqStatus(KexiDB::Object* dbObject, 
+			void setStatus(KexiDB::Object* dbObject, 
 				const TQString& message = TQString(), const TQString& description = TQString());
 
-			void settqStatus(KexiDB::ResultInfo* result, 
+			void setStatus(KexiDB::ResultInfo* result, 
 				const TQString& message = TQString(), const TQString& description = TQString());
 
-			void settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
+			void setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
 				const TQString& message = TQString(), const TQString& description = TQString());
 
-			void cleartqStatus();
+			void clearStatus();
 
 			TQString singleStatusString() const;
 
-			void append( const ObjecttqStatus& othertqStatus );
+			void append( const ObjectStatus& otherStatus );
 
 			KexiDB::Object *dbObject() const { return dynamic_cast<KexiDB::Object*>((TQObject*)dbObj); }
 
-			//! Helper returning pseudo handler that just updates this ObjecttqStatus object 
+			//! Helper returning pseudo handler that just updates this ObjectStatus object 
 			//! by receiving a message
 			operator KexiDB::MessageHandler*();
 
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 49cbeb3b..851a4d3a 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -193,7 +193,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe
 {
 	TQPair<TQSignal*,bool> *p = m_signals[action_name];
 	if (!p || !p->second) {
-		//try in tqchildren...
+		//try in children...
 		if (alsoCheckInChildren) {
 			TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren );
 			for( ; it.current(); ++it ) {
@@ -217,7 +217,7 @@ bool KexiActionProxy::isSupported(const char* action_name) const
 {
 	TQPair<TQSignal*,bool> *p = m_signals[action_name];
 	if (!p) {
-		//not supported explicitly - try in tqchildren...
+		//not supported explicitly - try in children...
 		if (m_focusedChild)
 			return m_focusedChild->isSupported(action_name);
 		TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren );
@@ -234,7 +234,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild
 {
 	TQPair<TQSignal*,bool> *p = m_signals[action_name];
 	if (!p) {
-		//not supported explicitly - try in tqchildren...
+		//not supported explicitly - try in children...
 		if (alsoCheckInChildren) {
 			if (m_focusedChild)
 				return m_focusedChild->isAvailable(action_name, alsoCheckInChildren);
diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h
index facb09b3..163efced 100644
--- a/kexi/core/kexiactionproxy.h
+++ b/kexi/core/kexiactionproxy.h
@@ -150,7 +150,7 @@ class KEXICORE_EXPORT KexiActionProxy
 
 		/*! Adds \a child of this proxy. Children will receive activateSharedAction() event,
 		 If activateSharedAction() "event" is not consumed by the main proxy,
-		 we start to iterate over proxy tqchildren (in unspecified order) to and call 
+		 we start to iterate over proxy children (in unspecified order) to and call 
 		 activateSharedAction() on every child until one of them accept the "event".
 		 
 		 If proxy child is destroyed, it is automatically detached from its parent proxy. 
diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp
index a4c57791..aeb621c4 100644
--- a/kexi/core/kexiblobbuffer.cpp
+++ b/kexi/core/kexiblobbuffer.cpp
@@ -289,7 +289,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored)
 		KexiDB::RowData rowData;
 		tristate res = d->conn->querySingleRecord(
 			schema,
-//			TQString::tqfromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=")
+//			TQString::fromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=")
 //			+TQString::number(id), 
 			rowData); 
 		if (res!=true || rowData.size()<4) {
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index e806aaaf..4ec99e53 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index 451eb66a..01f0adb3 100644
--- a/kexi/core/kexidbshortcutfile.cpp
+++ b/kexi/core/kexidbshortcutfile.cpp
@@ -97,7 +97,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group
 		d->isDatabaseShortcut = false;
 	}
 	else {
-		//ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").tqarg(group).tqarg(type)
+		//ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").arg(group).arg(type)
 		return false;
 	}
 
@@ -194,9 +194,9 @@ bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data,
 				groupPrefix = "Database%1"; //do not i18n!
 
 			int number = 1;
-			while (config.hasGroup(groupPrefix.tqarg(number))) //a new group key couldn't exist
+			while (config.hasGroup(groupPrefix.arg(number))) //a new group key couldn't exist
 				number++;
-			groupKey = groupPrefix.tqarg(number);
+			groupKey = groupPrefix.arg(number);
 		}
 		if (_groupKey) //return this one (generated or found)
 			*_groupKey = groupKey;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index ff642741..67e81a5d 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -117,20 +117,20 @@ void KexiDialogBase::removeView(int mode)
 	m_openedViewModes ^= mode;
 }
 
-TQSize KexiDialogBase::tqminimumSizeHint() const
+TQSize KexiDialogBase::minimumSizeHint() const
 {
 	KexiViewBase *v = selectedView();
 	if (!v)
-		return KMdiChildView::tqminimumSizeHint();
-	return v->tqminimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0);
+		return KMdiChildView::minimumSizeHint();
+	return v->minimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0);
 }
 
-TQSize KexiDialogBase::tqsizeHint() const
+TQSize KexiDialogBase::sizeHint() const
 {
 	KexiViewBase *v = selectedView();
 	if (!v)
-		return KMdiChildView::tqsizeHint();
-	return v->preferredSizeHint( v->tqsizeHint() );
+		return KMdiChildView::sizeHint();
+	return v->preferredSizeHint( v->sizeHint() );
 }
 
 /*
@@ -377,9 +377,9 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 		delete newView;
 		kdDebug() << "Switching to mode " << newViewMode << " failed. Previous mode "
 			<< prevViewMode << " restored." << endl;
-		const Kexi::ObjecttqStatus status(*this);
-		settqStatus(mainWin()->project()->dbConnection(), 
-			i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(newViewMode)),"");
+		const Kexi::ObjectStatus status(*this);
+		setStatus(mainWin()->project()->dbConnection(), 
+			i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(newViewMode)),"");
 		append( status );
 		m_currentViewMode = prevViewMode;
 		return false;
@@ -517,7 +517,7 @@ tristate KexiDialogBase::storeNewData()
 	if (cancel)
 		return cancelled;
 	if (!m_schemaData) {
-		settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),"");
+		setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),"");
 		return false;
 	}
 
@@ -594,7 +594,7 @@ tristate KexiDialogBase::storeData(bool dontAsk)
 		return false;
 
 #define storeData_ERR \
-	settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),"");
+	setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),"");
 
 	//save changes using transaction
 	KexiDB::Transaction transaction = m_parentWindow->project()->dbConnection()->beginTransaction();
@@ -624,8 +624,8 @@ tristate KexiDialogBase::storeData(bool dontAsk)
 void KexiDialogBase::activate()
 {
 	KexiViewBase *v = selectedView();
-	//kdDebug() << "tqfocusWidget(): " << tqfocusWidget()->name() << endl;
-	if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//tqfocusWidget()))
+	//kdDebug() << "focusWidget(): " << focusWidget()->name() << endl;
+	if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//focusWidget()))
 		KMdiChildView::activate();
 	else {//ah, focused widget is not in this view, move focus:
 		if (v)
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index 6449004b..d98e9d04 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -75,7 +75,7 @@ class KEXICORE_EXPORT KexiDialogTempData : public TQObject
 class KEXICORE_EXPORT KexiDialogBase :
 	public KMdiChildView,
 	public KexiActionProxy,
-	public Kexi::ObjecttqStatus
+	public Kexi::ObjectStatus
 {
 	Q_OBJECT
   TQ_OBJECT
@@ -101,10 +101,10 @@ class KEXICORE_EXPORT KexiDialogBase :
 //		virtual TQWidget* mainWidget() = 0;
 
 		/*! reimplemented: minimum size hint is inherited from currently visible view. */
-		virtual TQSize tqminimumSizeHint() const;
+		virtual TQSize minimumSizeHint() const;
 
 		/*! reimplemented: size hint is inherited from currently visible view. */
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		KexiMainWindow *mainWin() const { return m_parentWindow; }
 
diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp
index 4121543e..5b2b2791 100644
--- a/kexi/core/kexiguimsghandler.cpp
+++ b/kexi/core/kexiguimsghandler.cpp
@@ -77,13 +77,13 @@ void KexiGUIMessageHandler::showErrorMessage(const TQString &msg, const TQString
 }
 
 void
-KexiGUIMessageHandler::showErrorMessage(Kexi::ObjecttqStatus *status)
+KexiGUIMessageHandler::showErrorMessage(Kexi::ObjectStatus *status)
 {
 	showErrorMessage("", status);
 }
 
 void
-KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status)
+KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjectStatus *status)
 {
 	if (status && status->error()) {
 		TQString msg(message);
@@ -106,7 +106,7 @@ KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqS
 	else {
 		showErrorMessage(message);
 	}
-	status->cleartqStatus();
+	status->clearStatus();
 }
 
 void
diff --git a/kexi/core/kexiguimsghandler.h b/kexi/core/kexiguimsghandler.h
index af407ab1..362884dc 100644
--- a/kexi/core/kexiguimsghandler.h
+++ b/kexi/core/kexiguimsghandler.h
@@ -32,8 +32,8 @@ class KEXICORE_EXPORT KexiGUIMessageHandler : public KexiDB::MessageHandler
 		virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString());
 
 		void showErrorMessage(const TQString&,const TQString&,KexiDB::Object *obj);
-		void showErrorMessage(Kexi::ObjecttqStatus *status);
-		void showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status);
+		void showErrorMessage(Kexi::ObjectStatus *status);
+		void showErrorMessage(const TQString &message, Kexi::ObjectStatus *status);
 
 		/*! Displays a "Sorry" message with \a title text and optional \a details. */
 		void showSorryMessage(const TQString &title, const TQString &details = TQString());
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 93d73cac..49b3c46d 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -54,7 +54,7 @@ class KexiInternalPartManager
 					fullname, 0, fullname);
 				if (!part) {
 					if (msgHdr)
-						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").tqarg(partName));
+						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").arg(partName));
 				}
 				else
 					m_parts.insert(partName, part);
@@ -118,8 +118,8 @@ KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog(
 	dlg->addView(view);
 	dlg->setCaption( view->caption() );
 	dlg->setTabCaption( view->caption() );
-	dlg->resize(view->tqsizeHint());
-	dlg->setMinimumSize(view->tqminimumSizeHint().width(),view->tqminimumSizeHint().height());
+	dlg->resize(view->sizeHint());
+	dlg->setMinimumSize(view->minimumSizeHint().width(),view->minimumSizeHint().height());
 	dlg->setId( mainWin->generatePrivateID() );
 	dlg->registerDialog();
 	return dlg;
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index ba54fea7..49f1aeab 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -66,7 +66,7 @@ public:
 				singleStatusString.prepend(TQString("\n\n")+i18n("Details:")+" ");
 			if (KMessageBox::No==KMessageBox::questionYesNo(0, 
 				((viewMode == Kexi::DesignViewMode) 
-					? i18n("Object \"%1\" could not be opened in Design View.").tqarg(item.name())
+					? i18n("Object \"%1\" could not be opened in Design View.").arg(item.name())
 					: i18n("Object could not be opened in Data View."))+"\n"
 				+ i18n("Do you want to open it in Text View?") + singleStatusString, 0, 
 				KStdGuiItem::open(), KStdGuiItem::cancel()))
@@ -242,11 +242,11 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 		d->instanceActionsInitialized = true;
 	}
 
-	m_status.cleartqStatus();
+	m_status.clearStatus();
 //	KexiDialogBase *dlg = createInstance(win,item,viewMode);
 //	if (!dlg)
 //		return 0;
-//	TQString capt = TQString("%1 : %2").tqarg(item.name()).tqarg(instanceName());
+//	TQString capt = TQString("%1 : %2").arg(item.name()).arg(instanceName());
 	KexiDialogBase *dlg = new KexiDialogBase(win);
 	dlg->m_supportedViewModes = m_supportedViewModes;
 //	dlg->m_neverSaved = item.neverSaved();
@@ -289,11 +289,11 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 		}
 		if (!dlg->m_schemaData) {
 			if (!m_status.error())
-				m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), 
+				m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), 
 					i18n("Could not load object's definition."), i18n("Object design may be corrupted."));
 			m_status.append( 
-				Kexi::ObjecttqStatus(i18n("You can delete \"%1\" object and create it again.")
-				.tqarg(item.name()), TQString()) );
+				Kexi::ObjectStatus(i18n("You can delete \"%1\" object and create it again.")
+				.arg(item.name()), TQString()) );
 
 			dlg->close();
 			delete dlg;
@@ -339,9 +339,9 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 	dlg->show();
 
 	if (dlg->mdiParent() && dlg->mdiParent()->state()==KMdiChildFrm::Normal) //only resize dialog if it is in normal state
-		dlg->resize(dlg->tqsizeHint());
+		dlg->resize(dlg->sizeHint());
 
-	dlg->setMinimumSize(dlg->tqminimumSizeHint().width(),dlg->tqminimumSizeHint().height());
+	dlg->setMinimumSize(dlg->minimumSizeHint().width(),dlg->minimumSizeHint().height());
 
 	//dirty only if it's a new object
 	if (dlg->selectedView())
@@ -366,8 +366,8 @@ KexiDB::SchemaData* Part::loadSchemaData(KexiDialogBase * /*dlg*/, const KexiDB:
 bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQString& dataID)
 {
 	if (!dlg->mainWin()->project()->dbConnection()->loadDataBlock( dlg->id(), dataString, dataID )) {
-		m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), 
-			i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) );
+		m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), 
+			i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").arg(dataID) );
 		m_status.append( *dlg );
 		return false;
 	}
@@ -431,11 +431,11 @@ tristate Part::rename(KexiMainWindow *win, KexiPart::Item &item, const TQString&
 GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, const char* nameSuffix)
  : TQObject(part, 
    (part->info()->objectName() 
-    + (nameSuffix ? TQString(":%1").tqarg(nameSuffix) : TQString())).latin1() )
+    + (nameSuffix ? TQString(":%1").arg(nameSuffix) : TQString())).latin1() )
  , KXMLGUIClient(win)
 {
 	if(!win->project()->data()->userMode())
-		setXMLFile(TQString::tqfromLatin1("kexi")+part->info()->objectName()
+		setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName()
 			+"part"+(partInstanceClient?"inst":"")+"ui.rc");
 
 //	new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, 
diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h
index f1168fd4..c448b8bf 100644
--- a/kexi/core/kexipart.h
+++ b/kexi/core/kexipart.h
@@ -186,7 +186,7 @@ class KEXICORE_EXPORT Part : public TQObject
 		/*! \return action collection for mode \a viewMode. */
 		KActionCollection* actionCollectionForMode(int viewMode) const;
 
-		const Kexi::ObjecttqStatus& lastOperationtqStatus() const { return m_status; }
+		const Kexi::ObjectStatus& lastOperationStatus() const { return m_status; }
 
 		/*! \return i18n'd message translated from \a englishMessage.
 		 This method is useful for messages like: 
@@ -309,7 +309,7 @@ class KEXICORE_EXPORT Part : public TQObject
 		GUIClient *m_guiClient;
 		TQIntDict<GUIClient> m_instanceGuiClients;
 		KexiMainWindow* m_mainWin;
-		Kexi::ObjecttqStatus m_status;
+		Kexi::ObjectStatus m_status;
 
 		/*! If you're implementing a new part, set this to value >0 in your ctor 
 		 if you have well known (ie registered ID) for your part.
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index f6fcd7d8..d651f8d0 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -131,7 +131,7 @@ Manager::part(Info *i)
 		if(!p) {
 			kdDebug() << "Manager::part(): failed :( (ERROR #" << error << ")" << endl;
 			kdDebug() << "  " << KLibLoader::self()->lastErrorMessage() << endl;
-			i->setBroken(true, i18n("Error while loading plugin \"%1\"").tqarg(i->objectName()));
+			i->setBroken(true, i18n("Error while loading plugin \"%1\"").arg(i->objectName()));
 			setError(i->errorMessage());
 			return 0;
 		}
@@ -198,7 +198,7 @@ Manager::infoForMimeType(const TQString &mimeType)
 	Info *i = mimeType.isEmpty() ? 0 : m_partsByMime[mimeType.latin1()];
 	if (i)
 		return i;
-	setError(i18n("No plugin for mime type \"%1\"").tqarg(mimeType));
+	setError(i18n("No plugin for mime type \"%1\"").arg(mimeType));
 	return 0;
 }
 
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 159de750..1dbe4eef 100644
--- a/kexi/core/kexiproject.cpp
+++ b/kexi/core/kexiproject.cpp
@@ -180,7 +180,7 @@ KexiProject::openInternal(bool *incompatibleWithKexi)
 		*incompatibleWithKexi = false;
 	kdDebug() << "KexiProject::open(): " << d->data->databaseName() <<" "<< d->data->connectionData()->driverName  << endl;
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not open project \"%1\".").tqarg(d->data->databaseName()));
+		i18n("Could not open project \"%1\".").arg(d->data->databaseName()));
 	
 	if (!createConnection()) {
 		kdDebug() << "KexiProject::open(): !createConnection()" << endl;
@@ -225,7 +225,7 @@ tristate
 KexiProject::create(bool forceOverwrite)
 {
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not create project \"%1\".").tqarg(d->data->databaseName()));
+		i18n("Could not create project \"%1\".").arg(d->data->databaseName()));
 		
 	if (!createConnection())
 		return false;
@@ -381,10 +381,10 @@ bool KexiProject::createInternalStructures(bool insideTransaction)
 			}
 			// 2.1 copy data (insert 0's into o_folder_id column)
 			if (!d->connection->executeSQL(
-					TQString::tqfromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) "
+					TQString::fromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) "
 					"SELECT o_data, o_name, o_caption, o_mime, 0 FROM kexi__blobs") )
 				// 2.2 remove the original kexi__blobs
-				|| !d->connection->executeSQL(TQString::tqfromLatin1("DROP TABLE kexi__blobs")) //lowlevel
+				|| !d->connection->executeSQL(TQString::fromLatin1("DROP TABLE kexi__blobs")) //lowlevel
 				// 2.3 rename the copy back into kexi__blobs
 				|| !d->connection->drv_alterTableName(*kexi__blobsCopy, "kexi__blobs")
 				)
@@ -529,9 +529,9 @@ KexiProject::initProject()
 		d->data->setDescription( str );
 /*	KexiDB::RowData data;
 	TQString sql = "select db_value from kexi__db where db_property='%1'";
-	if (d->connection->querySingleRecord( sql.tqarg("project_caption"), data ) && !data[0].toString().isEmpty())
+	if (d->connection->querySingleRecord( sql.arg("project_caption"), data ) && !data[0].toString().isEmpty())
 		d->data->setCaption(data[0].toString());
-	if (d->connection->querySingleRecord( sql.tqarg("project_desc"), data) && !data[0].toString().isEmpty())
+	if (d->connection->querySingleRecord( sql.arg("project_desc"), data) && !data[0].toString().isEmpty())
 		d->data->setDescription(data[0].toString());*/
 
 	return true;
@@ -735,10 +735,10 @@ KexiDialogBase* KexiProject::openObject(KexiMainWindow *wnd, KexiPart::Item& ite
 		return 0;
 	KexiDialogBase *dlg  = part->openInstance(wnd, item, viewMode, staticObjectArgs);
 	if (!dlg) {
-		if (part->lastOperationtqStatus().error())
-			setError(i18n("Opening object \"%1\" failed.").tqarg(item.name())+"<br>"
-				+part->lastOperationtqStatus().message, 
-				part->lastOperationtqStatus().description);
+		if (part->lastOperationStatus().error())
+			setError(i18n("Opening object \"%1\" failed.").arg(item.name())+"<br>"
+				+part->lastOperationStatus().message, 
+				part->lastOperationStatus().description);
 		return 0;
 	}
 	return dlg;
@@ -817,13 +817,13 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const
 		}
 		if (this->itemForMimeType(item.mimeType(), newName)!=0) {
 			setError( i18n("Could not use this name. Object with name \"%1\" already exists.")
-				.tqarg(newName) );
+				.arg(newName) );
 			return false;
 		}
 	}
 
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not rename object \"%1\".").tqarg(item.name()) );
+		i18n("Could not rename object \"%1\".").arg(item.name()) );
 	if (!checkWritable())
 		return false;
 	KexiPart::Part *part = findPartFor(item);
@@ -835,7 +835,7 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const
 		return false;
 	}
 	if (!part->rename(wnd, item, newName)) {
-		setError(part->lastOperationtqStatus().message, part->lastOperationtqStatus().description);
+		setError(part->lastOperationStatus().message, part->lastOperationStatus().description);
 		return false;
 	}
 	if (!d->connection->executeSQL( "update kexi__objects set o_name="
@@ -960,7 +960,7 @@ KexiProject::createBlankProject(bool &cancelled, KexiProjectData* data,
 		if (KMessageBox::Yes != KMessageBox::warningYesNo(0, "<qt>"+i18n(
 			"The project %1 already exists.\n"
 			"Do you want to replace it with a new, blank one?")
-				.tqarg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
+				.arg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
 			TQString(), KGuiItem(i18n("Replace")), KStdGuiItem::cancel() ))
 //todo add serverInfoString() for server-based prj
 		{
@@ -985,7 +985,7 @@ tristate KexiProject::dropProject(KexiProjectData* data,
 	KexiDB::MessageHandler* handler, bool dontAsk)
 {
 	if (!dontAsk && KMessageBox::Yes != KMessageBox::warningYesNo(0, 
-		i18n("Do you want to drop the project \"%1\"?").tqarg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
+		i18n("Do you want to drop the project \"%1\"?").arg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
 		return cancelled;
 
 	KexiProject prj( new KexiProjectData(*data), handler );
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index 9f0106bc..9b9203c8 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -155,13 +155,13 @@ TQString KexiProjectData::infoString(bool nobr) const
 {
 	if (constConnectionData()->fileName().isEmpty()) {
 		//server-based
-		return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").tqarg(databaseName()) + (nobr ? "</nobr>" : "")
+		return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").arg(databaseName()) + (nobr ? "</nobr>" : "")
 			+ (nobr ? " <nobr>" : " ") + i18n("database connection", "(connection %1)")
-			.tqarg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
+			.arg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
 	}
 	//file-based
 	return TQString(nobr ? "<nobr>" : "") 
-		+ TQString("\"%1\"").tqarg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
+		+ TQString("\"%1\"").arg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
 }
 
 void KexiProjectData::setReadOnly(bool set)
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 6a696461..1ba85265 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -42,7 +42,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h
 
 void KexiSharedActionHostPrivate::slotAction(const TQString& act_id)
 {
-	TQWidget *w = host->focusWindow(); //tqfocusWidget();
+	TQWidget *w = host->focusWindow(); //focusWidget();
 //	while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase"))
 //		w = w->parentWidget();
 
@@ -111,7 +111,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
 	}*/
 	if (!d)
 		return; //sanity
-	TQWidget *fw = d->mainWin->tqfocusWidget();
+	TQWidget *fw = d->mainWin->focusWidget();
 	while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw))
 		fw = fw->parentWidget();
 	if (!fw)
@@ -149,7 +149,7 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o)
 		KAction *a = *it;
 		if (!insideDialogBase && d->mainWin->actionCollection()!=a->parentCollection()) {
 			//o is not KexiDialogBase or its child:
-			// only tqinvalidate action if it comes from mainwindow's KActionCollection
+			// only invalidate action if it comes from mainwindow's KActionCollection
 			// (thus part-actions are untouched when the focus is e.g. in the Property Editor)
 			continue;
 		}
@@ -205,7 +205,7 @@ TQWidget* KexiSharedActionHost::focusWindow()
 		TQWidget *aw = TQT_TQWIDGET(tqApp->activeWindow());
 		if (!aw)
 			aw = d->mainWin;
-		fw = aw->tqfocusWidget();
+		fw = aw->focusWidget();
 	}
 	while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw)))
 		fw = fw->parentWidget();
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 91cc09f4..c7fcb181 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -69,7 +69,7 @@ class KEXICORE_EXPORT KexiSharedActionHost
 		 */
 		virtual bool acceptsSharedActions(TQObject *o);
 
-		/*! \return window widget that is currently focused (using TQWidget::tqfocusWidget())
+		/*! \return window widget that is currently focused (using TQWidget::focusWidget())
 		 and matches acceptsSharedActions(). If focused widget does not match,
 		 it's parent, grandparent, and so on is checked. If all this fails, 
 		 or no widget has focus, NULL is returned. 
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index e89f4a4e..65f2e68f 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -214,26 +214,26 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 {
 	if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
 //		//hp==true if currently focused widget is a child of this table view
-//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
+//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget());
 //		kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
 		if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) {
-			if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) {
+			if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) {
 				//focus out: when currently focused widget is not a parent of this view
 				emit focus(false);
 			} else if (e->type()==TQEvent::FocusIn) {
 				emit focus(true);
 			}
-			if (e->type()==TQEvent::FocusOut) { // && tqfocusWidget() && Kexi::hasParent( this, tqfocusWidget())) { // && tqfocusWidget()->inherits("KexiViewBase")) {
-//				kdDebug() << tqfocusWidget()->className() << " " << tqfocusWidget()->name()<< endl;
+			if (e->type()==TQEvent::FocusOut) { // && focusWidget() && Kexi::hasParent( this, focusWidget())) { // && focusWidget()->inherits("KexiViewBase")) {
+//				kdDebug() << focusWidget()->className() << " " << focusWidget()->name()<< endl;
 //				kdDebug() << o->className() << " " << o->name()<< endl;
 				KexiViewBase *v = KexiUtils::findParent<KexiViewBase>(o, "KexiViewBase") ;
-//				TQWidget *www=v->tqfocusWidget();
+//				TQWidget *www=v->focusWidget();
 				if (v) {
 					while (v->m_parentView)
 						v = v->m_parentView;
-					if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->tqfocusWidget()) ))
-						v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->tqfocusWidget());
-//					v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //tqfocusWidget();
+					if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->focusWidget()) ))
+						v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->focusWidget());
+//					v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //focusWidget();
 				}
 			}
 
@@ -263,7 +263,7 @@ void KexiViewBase::setViewWidget(TQWidget* w, bool focusProxy)
 
 void KexiViewBase::addChildView( KexiViewBase* childView )
 {
-	m_tqchildren.append( childView );
+	m_children.append( childView );
 	addActionProxyChild( childView );
 	childView->m_parentView = this;
 //	if (m_parentView)
@@ -318,8 +318,8 @@ void KexiViewBase::setAvailable(const char* action_name, bool set)
 void KexiViewBase::updateActions(bool activated)
 {
 	//do nothing here
-	//do the same for tqchildren :)
- 	for (TQPtrListIterator<KexiViewBase> it(m_tqchildren); it.current(); ++it) {
+	//do the same for children :)
+ 	for (TQPtrListIterator<KexiViewBase> it(m_children); it.current(); ++it) {
 		it.current()->updateActions(activated);
 	}
 }
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 139f0b2d..564f5a20 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 
 		/*! \return preferred size hint, that can be used to resize the view.
 		 It is computed using maximum of (a) \a otherSize and (b) current KMDI dock area's size,
-		 so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::tqsizeHint().
+		 so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::sizeHint().
 		 If you reimplement this method, do not forget to return value of
 		 yoursize.boundedTo( KexiViewBase::preferredSizeHint(otherSize) ). */
 		virtual TQSize preferredSizeHint(const TQSize& otherSize);
@@ -270,7 +270,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		 Can be useful when single class is used for more than one view (e.g. KexiDBForm). */
 		int m_viewMode;
 
-		TQPtrList<KexiViewBase> m_tqchildren;
+		TQPtrList<KexiViewBase> m_children;
 
 		bool m_dirty : 1;
 
diff --git a/kexi/doc/common/kde-default.css b/kexi/doc/common/kde-default.css
index 59366d38..032a00db 100644
--- a/kexi/doc/common/kde-default.css
+++ b/kexi/doc/common/kde-default.css
@@ -90,7 +90,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
 TABLE.programlisting
 TABLE.screen { border-style: none;
                background-color: rgb(224,224,224);
-               table-tqlayout: auto; /* 100%? */
+               table-layout: auto; /* 100%? */
                color: rgb(0,0,0); /* should be inherit */
                }
 
@@ -99,7 +99,7 @@ TABLE.screen { border-style: none;
 TABLE[class~=programlisting]
 TABLE[class~=screen] { border-style: none;
                        background-color: rgb(224,224,224);
-                       table-tqlayout: auto;
+                       table-layout: auto;
                        color: inherit;
                        }
 */
diff --git a/kexi/doc/common/kde-web.css b/kexi/doc/common/kde-web.css
index dfd98e8b..e61fa32a 100644
--- a/kexi/doc/common/kde-web.css
+++ b/kexi/doc/common/kde-web.css
@@ -85,7 +85,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
 TABLE.programlisting
 TABLE.screen { border-style: none;
                background-color: rgb(224,224,224);
-               table-tqlayout: auto; /* 100%? */
+               table-layout: auto; /* 100%? */
                color: rgb(0,0,0); /* should be inherit */
                }
 
@@ -94,7 +94,7 @@ TABLE.screen { border-style: none;
 TABLE[class~=programlisting]
 TABLE[class~=screen] { border-style: none;
                        background-color: rgb(224,224,224);
-                       table-tqlayout: auto;
+                       table-layout: auto;
                        color: inherit;
                        }
 */
diff --git a/kexi/doc/dev/kexi_guidelines.txt b/kexi/doc/dev/kexi_guidelines.txt
index ab713e34..7c2dfaba 100644
--- a/kexi/doc/dev/kexi_guidelines.txt
+++ b/kexi/doc/dev/kexi_guidelines.txt
@@ -19,7 +19,7 @@ Focus on:
   convert to QString only on data displaying)
 
 Idea 3
-Directories tqlayout:
+Directories layout:
 dialogs/
 +-altertable/
 +-datatable/
diff --git a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
index b7b62ab9..e7959df7 100644
--- a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
+++ b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
@@ -168,7 +168,7 @@ In this case the very way the spreadsheet works is problematic. Fields for data
 <a name="reports"></a>
 <h4>Reports</h4>
 <p>
-Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the tqlayout of fields.
+Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the layout of fields.
 </p>
 
 <a name="programming"></a>
diff --git a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html
index 2953a0f0..14c0b511 100644
--- a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html
+++ b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html
@@ -2,7 +2,7 @@
 <H2>5.1. Designing Database Tables</H2>
 
 <p>
-First, there will be two tables added to your database: <em>persons</em> and <em>phone_numbers</em>. These are exactly the same tables as described in chapter <a href="01_02_00_db_spreadsheet.html">1.2. A database and a spreadsheet</a>. A tqlayout for <em>Persons</em> can be found in section <a href="01_02_00_db_spreadsheet.html#data_integrity">Data integrity and validity</a> in that chapter.
+First, there will be two tables added to your database: <em>persons</em> and <em>phone_numbers</em>. These are exactly the same tables as described in chapter <a href="01_02_00_db_spreadsheet.html">1.2. A database and a spreadsheet</a>. A layout for <em>Persons</em> can be found in section <a href="01_02_00_db_spreadsheet.html#data_integrity">Data integrity and validity</a> in that chapter.
 </p>
 
 <p>
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 bfab0a72..9cb671d1 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
@@ -196,7 +196,7 @@ It is right moment for testing your form. Click the <nobr><img src="icons/state_
 To make it easier for the form's user to identify meaning of every field widget, these should have added text labels with appropriate titles. To create text labels <nobr><img src="icons/label.png" class="icon"> <em>Label</em></nobr> widget is used.
 </p>
 <p>
-Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left tqlayout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: <em>Name</em>, <em>Surname</em> and <em>Street</em>. Additionally, on the top of the form insert another label displaying name of the form, i.e. &quot;Persons&quot;. Enlarge this label's size and set larger font using <a href="aa_00_00_menu.html#menu_format_font">Format -&gt; Font</a> menu command.
+Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left layout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: <em>Name</em>, <em>Surname</em> and <em>Street</em>. Additionally, on the top of the form insert another label displaying name of the form, i.e. &quot;Persons&quot;. Enlarge this label's size and set larger font using <a href="aa_00_00_menu.html#menu_format_font">Format -&gt; Font</a> menu command.
 </p>
 <p>
  <br><img src="img/05_04_06_form_with_labels.png">
@@ -256,50 +256,50 @@ 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 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.
+Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget layout 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.
+Using layout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
  <br>
  <br><img src="img/05_04_08_form_well_fit.png">
- <br>Example form with tqlayout used<br><br>
+ <br>Example form with layout used<br><br>
 </p>
 <p>
-There are two methods to create widget tqlayout.
+There are two methods to create widget layout.
 <ul>
-<li>Select two or more widgets that should be placed in a common tqlayout, and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li>
-<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common tqlayout.</li>
+<li>Select two or more widgets that should be placed in a common layout, and select one of the layout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li>
+<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the layout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common layout.</li>
 </ul>
 In each of these cases you can also use <em>Format -&gt; Layout Widgets</em> menu. 
 </p>
 <p>
  <img src="img/05_04_08_form_layout_selecting.png">
- <br>Selecting widgets that will be put into a tqlayout<br>
+ <br>Selecting widgets that will be put into a layout<br>
  <br><img src="img/05_04_08_form_layout_selected.png">
  <br>Four widgets are selected<br><br>
  <br><img src="img/05_04_08_form_layout_popup.png"><br>
- <br>Using the context menu for putting the widgets into a grid tqlayout<br><br>
+ <br>Using the context menu for putting the widgets into a grid layout<br><br>
 </p>
 <p>
-Widget tqlayout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view.
+Widget layout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view.
 </p>
 <p>
  <br>
  <br><img src="img/05_04_08_form_layout_grid.png">
- <br>Widgets within a grid tqlayout<br><br>
+ <br>Widgets within a grid layout<br><br>
 </p>
 <p>
-Besides the grid type, there are other widget tqlayout types.
+Besides the grid type, there are other widget layout types.
 <ul>
 <li>vertical
  <br>
  <br><img src="img/05_04_08_form_layout_vertical.png">
- <br>Vertical widget tqlayout<br><br>
+ <br>Vertical widget layout<br><br>
 </li>
 <li>horizontal
  <br>
  <br><img src="img/05_04_08_form_layout_horizontal.png">
- <br>Horizontal widget tqlayout<br><br>
+ <br>Horizontal widget layout<br><br>
 </li>
 <!-- TODO podzia³ poziomy / pionowy 
  <br><img src="img/05_04_08_form_layout_vertical_splitter.png">
@@ -322,12 +322,12 @@ A <em>spring</em> in widget layouts is a special, invisible element allowing to
 </ol>
 </p>
 <p>
-For the following example, the spring has been inserted on the left hand of the text label &quot;Persons&quot;. The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal tqlayout with the label.
+For the following example, the spring has been inserted on the left hand of the text label &quot;Persons&quot;. The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal layout with the label.
  <br><img src="img/05_04_08_form_spring.png">
- <br>Horizontal tqlayout containing a spring and a text label<br><br>
+ <br>Horizontal layout containing a spring and a text label<br><br>
 </p>
 <p>
-To make springs work you need to create a global widget tqlayout i.e. a tqlayout for the form itself. Then, springs can use edges of the form as a boundary for expanding.
+To make springs work you need to create a global widget layout i.e. a layout for the form itself. Then, springs can use edges of the form as a boundary for expanding.
 </p>
 
 <a name="advanced_form_layouts"></a>
@@ -337,21 +337,21 @@ Widget layouts can be combined (or nested). On the following example you can ide
 </p>
 <p>
 <ol>
-<li>horizontal tqlayout with a spring, aligning the &quot;Persons&quot; text label to the right</li>
-<li>grid tqlayout grouping widgets on the whole form</li>
+<li>horizontal layout with a spring, aligning the &quot;Persons&quot; text label to the right</li>
+<li>grid layout grouping widgets on the whole form</li>
 </ol>
 </p>
 <p>
  <img src="img/05_04_08_form_advanced_layout.png">
- <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
+ <br>Two widget layouts combined: horizontal layout inside of a grid layout<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.
+The horizontal layout is treat in the example as a single widget by the grid layout - it takes exactly one &quot;cell&quot; of the grid.
 After opening a form designed this way in the data view, you can notice (by resizing the form) that:
 </p>
 <ul>
 <li>&quot;Persons&quot; text label thanks to the spring used is constantly aligned to the to the right side of the form</li>
-<li>text fields take all of the available width thanks to putting them into the grid tqlayout</li>
+<li>text fields take all of the available width thanks to putting them into the grid layout</li>
 <li>all the form's widgets are pushed to the top thanks to the spring used at the bottom of the form</li>
 </ul>
 <p>
@@ -362,24 +362,24 @@ After opening a form designed this way in the data view, you can notice (by resi
 <a name="layout_breaking"></a>
 <H4>Removing widget layouts</H4>
 <p>
-To remove widget tqlayout without removing widgets, perform one of these actions:
+To remove widget layout without removing widgets, perform one of these actions:
 <ul>
-<li>click with the &RMB; on the tqlayout's border and select <em>Break Layout</em> command from the context menu</li>
-<li>click with the &LMB; on the tqlayout's border and select <em>Format -&gt; Break Layout</em> menu command</li>
+<li>click with the &RMB; on the layout's border and select <em>Break Layout</em> command from the context menu</li>
+<li>click with the &LMB; on the layout's border and select <em>Format -&gt; Break Layout</em> menu command</li>
 </ul>
 </p>
 
 <H4>Notes</H4>
-<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>Removing widget layout using the <em>Break Layout</em> command will not remove widgets contained in the layout. If you want to remove the widgets as well, just select the layout 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="layout_size_types"></a>
-<H4>Size policies for widgets within a tqlayout</H4>
+<H4>Size policies for widgets within a layout</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.
 </p>
 <p>
-After putting widgets into a <em>tqlayout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire tqlayout itself. For example, three buttons put into the horizontal tqlayout will be resized to fit their visible text.
+After putting widgets into a <em>layout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire layout itself. For example, three buttons put into the horizontal layout will be resized to fit their visible text.
 </p>
 <p>
 For each widget inserted into the form, there are settings for size policy available in the <em>Property Editor</em>. The settings are presented as a group of properties called <em>Size Policy</em>.
@@ -403,12 +403,12 @@ There are following values available on the drop down list for <em>Horizontal Si
 <li><b>Fixed</b> value means that the widget cannot be automatically resized; it should maintain the constant size defined on design time (width or height),</li>
 <li><p><b>Minimum</b> value means that the original size of the widget is set as minimal allowed, it is sufficient and there is no need for expanding the widget, but the widget will be expanded if needed. This type of policy can be used to force widget to be expanded to the whole width or height, especially if you set a <em>stretch</em> value greater than 0.
  <br><img src="img/05_04_09_size_policy_minimum.png">
- <br>Text field and two buttons within a grid tqlayout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br>
+ <br>Text field and two buttons within a grid layout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br>
 </p></li>
 <li><b>Maximum</b> value means that the original size of the widget is set as maximum allowed and can be decreased without breaking the widget's usability and readability if other widgets need more space,</li>
 <li><p><b>Preferred</b> value means that the original size of the widget is the best and preferred; the widget can be shrunk or expanded however and it will stay readable,
  <br><img src="img/05_04_09_size_policy_preferred.png">
- <br>Text field and two buttons within a grid tqlayout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br>
+ <br>Text field and two buttons within a grid layout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br>
 </p></li>
 <li><b>Expanding</b> value means that the original size of the widget is reasonable but the widget can be also shrunk; it can be expanded as well to take as much space as possible,</li>
 <li><b>Minimum Expanding</b> value means that the original size of the widget is allowed; it can be expanded to take as much space as possible,</li>
@@ -432,7 +432,7 @@ The most frequently used size policies are <em>Preferred</em>, <em>Minimum</em>
 <a name="widget_adjusting"></a>
 <H3>5.4.10. Setting widgets size and position by hand</H3>
 <p>
-In case when your form has no main tqlayout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands:
+In case when your form has no main layout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands:
 </p>
 <ul>
 <li><p>Adjusting sizes of selected widgets. The commands are available in the <em>Format -&gt; Adjust Widgets Size</em> submenu of the Menubar and in the <em>Adjust Widgets Size</em> submenu of the context menu. Toolbar's drop down button <nobr><img src="icons/aogrid.png" class="icon"> <em>Adjust Widgets Size</em></nobr> is also available.
@@ -497,7 +497,7 @@ To change tab order, either:
 <li>Click a selected widget name on the widgets list and drag it to a desired position (up or down) using the mouse.
 </li>
 <li>Click a selected widget name on the widgets list and use <em>Move Up</em> or <em>Move Down</em> buttons, to move the widgets to a desired position.</li>
-<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left tqlayout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom.
+<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left layout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom.
  <br><img src="img/05_04_11_auto_tab_stop.png">
  <br>Automatic tab order for a form<br><br>
 </li>
diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt
index 65aa6008..acc00d00 100644
--- a/kexi/doc/handbook/translation-status.txt
+++ b/kexi/doc/handbook/translation-status.txt
@@ -72,7 +72,7 @@ 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      * Size policies for widgets within a layout
 DONE    5.4.10. Setting widgets size and position by hand
 DONE    5.4.11. Setting the tab order
 DONE  5.5. Entering data using forms
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index b7712aa8..7ac415e1 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -83,7 +83,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 <property name="text" >
 <string>Name</string>
 </property>
-<property name="tqalignment" >
+<property name="alignment" >
 <set>WordBreak|AlignBottom</set>
 </property>
 </widget>
@@ -141,7 +141,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 <property name="text" >
 <string>Surname</string>
 </property>
-<property name="tqalignment" >
+<property name="alignment" >
 <set>WordBreak|AlignBottom</set>
 </property>
 </widget>
@@ -157,7 +157,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 <height>70</height>
 </rect>
 </property>
-<property name="tqalignment" >
+<property name="alignment" >
 <set>AlignTop|AlignRight</set>
 </property>
 <property name="storedPixmapId" >
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index c9bad809..9f6f4cfd 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -19,7 +19,7 @@
 */
 #include <tqdom.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 #include <tqmetaobject.h>
@@ -127,7 +127,7 @@ PropertyCommand::unexecute()
 
 		WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widg);
 		TQWidget *subWidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widg;
-		if (-1!=subWidget->tqmetaObject()->findProperty( m_property, true ))
+		if (-1!=subWidget->metaObject()->findProperty( m_property, true ))
 			subWidget->setProperty(m_property, it.data());
 	}
 
@@ -139,9 +139,9 @@ TQString
 PropertyCommand::name() const
 {
 	if(m_oldvalues.count() >= 2)
-		return i18n("Change \"%1\" property for multiple widgets" ).tqarg(TQString(m_property));
+		return i18n("Change \"%1\" property for multiple widgets" ).arg(TQString(m_property));
 	else
-		return i18n("Change \"%1\" property for widget \"%2\"" ).tqarg(TQString(m_property)).tqarg(TQString(m_oldvalues.begin().key()));
+		return i18n("Change \"%1\" property for widget \"%2\"" ).arg(TQString(m_property)).arg(TQString(m_oldvalues.begin().key()));
 }
 
 void
@@ -435,10 +435,10 @@ AdjustSizeCommand::execute()
 		{
 			for(TQWidget *w = list.first(); w; w = list.next()) {
 				ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
-				if(item && !item->tqchildren()->isEmpty()) { // container
+				if(item && !item->children()->isEmpty()) { // container
 					TQSize s;
-					if(item->container() && item->container()->tqlayout())
-						s = w->tqsizeHint();
+					if(item->container() && item->container()->layout())
+						s = w->sizeHint();
 					else
 						s = getSizeFromChildren(item);
 					// minimum size for containers
@@ -457,9 +457,9 @@ AdjustSizeCommand::execute()
 				else if(item && item->container()) // empty container
 					w->resize(item->container()->form()->gridSize() * 5, item->container()->form()->gridSize() * 5); // basic size
 				else {
-					TQSize tqsizeHint(w->tqsizeHint());
-					if (tqsizeHint.isValid())
-						w->resize(tqsizeHint);
+					TQSize sizeHint(w->sizeHint());
+					if (sizeHint.isValid())
+						w->resize(sizeHint);
 				}
 			}
 			break;
@@ -545,17 +545,17 @@ AdjustSizeCommand::getSizeFromChildren(ObjectTreeItem *item)
 	{
 		TQSize s;
 		// get size for each container, and keep the biggest one
-		for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next())
+		for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next())
 			s = s.expandedTo(getSizeFromChildren(tree));
 		return s;
 	}
 
 	int tmpw = 0, tmph = 0;
-	for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) {
+	for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) {
 		if(!tree->widget())
 			continue;
-		tmpw = TQMAX(tmpw, tree->widget()->tqgeometry().right());
-		tmph = TQMAX(tmph, tree->widget()->tqgeometry().bottom());
+		tmpw = TQMAX(tmpw, tree->widget()->geometry().right());
+		tmph = TQMAX(tmph, tree->widget()->geometry().bottom());
 	}
 
 	return TQSize(tmpw, tmph) + TQSize(10, 10);
@@ -614,16 +614,16 @@ AdjustSizeCommand::debug()
 
 LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, 
 	const TQVariant &oldValue, const TQVariant &value)
- : PropertyCommand(buf, wname, oldValue, value, "tqlayout")
+ : PropertyCommand(buf, wname, oldValue, value, "layout")
 {
 	m_form = FormManager::self()->activeForm();
 	ObjectTreeItem* titem = m_form->objectTree()->lookup(wname);
 	if (!titem)
 		return; //better this than a crash
 	Container *m_container = titem->container();
-	// We save the tqgeometry of each wigdet
-	for(ObjectTreeItem *it = m_container->objectTree()->tqchildren()->first(); it; it = m_container->objectTree()->tqchildren()->next())
-		m_geometries.insert(it->name().latin1(), it->widget()->tqgeometry());
+	// We save the geometry of each wigdet
+	for(ObjectTreeItem *it = m_container->objectTree()->children()->first(); it; it = m_container->objectTree()->children()->next())
+		m_geometries.insert(it->name().latin1(), it->widget()->geometry());
 }
 
 void
@@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute()
 TQString
 LayoutPropertyCommand::name() const
 {
-	return i18n("Change tqlayout of widget \"%1\"").tqarg(TQString(m_oldvalues.begin().key()));
+	return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
 }
 
 void
@@ -740,7 +740,7 @@ InsertWidgetCommand::execute()
 		WidgetInfo *winfo = m_container->form()->library()->widgetInfoForClassName(m_class);
 		KMessageBox::sorry(FormManager::self()->activeForm() ? FormManager::self()->activeForm()->widget() : 0,
 				i18n("Could not insert widget of type \"%1\". A problem with widget's creation encountered.")
-				.tqarg(winfo ? winfo->name() : TQString()));
+				.arg(winfo ? winfo->name() : TQString()));
 		kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
 		return;
 	}
@@ -755,7 +755,7 @@ InsertWidgetCommand::execute()
 	// if the insertRect is invalid (ie only one point), we use widget' size hint
 	if(( (m_insertRect.width() < 21) && (m_insertRect.height() < 21)))
 	{
-		TQSize s = w->tqsizeHint();
+		TQSize s = w->sizeHint();
 
 		if(s.isEmpty())
 			s = TQSize(20, 20); // Minimum size to avoid creating a (0,0) widget
@@ -802,7 +802,7 @@ InsertWidgetCommand::execute()
 	for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it)
 		item->addModifiedProperty(*it, w->property(*it));
 
-	m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account
+	m_container->reloadLayout(); // reload the layout to take the new wigdet into account
 
 	m_container->setSelectedWidget(w, false);
 	if (m_container->form()->library()->internalProperty(w->className(), 
@@ -830,7 +830,7 @@ TQString
 InsertWidgetCommand::name() const
 {
 	if(!m_name.isEmpty())
-		return i18n("Insert widget \"%1\"").tqarg(TQString(m_name));
+		return i18n("Insert widget \"%1\"").arg(TQString(m_name));
 	else
 		return i18n("Insert widget");
 }
@@ -864,10 +864,10 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	}
 	for(TQWidget *w = list.first(); w; w = list.next())
 		m_list->append(w);
-	m_list->sort(); // we sort them now, before creating the tqlayout
+	m_list->sort(); // we sort them now, before creating the layout
 
 	for(TQWidget *w = m_list->first(); w; w = m_list->next())
-		m_pos.insert(w->name(), w->tqgeometry());
+		m_pos.insert(w->name(), w->geometry());
 	ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name());
 	if(item && item->parent()->container())
 		m_containername = item->parent()->name();
@@ -911,8 +911,8 @@ CreateLayoutCommand::execute()
 		return;
 
 	container->setSelectedWidget(0, false);
-	w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget
-	// tqsizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry
+	w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget
+	// sizeHint of these widgets depends on geometry, so give them appropriate geometry
 	if(m_type == Container::HFlow)
 		w->resize( TQSize(700, 20) );
 	else if(m_type == Container::VFlow)
@@ -938,7 +938,7 @@ CreateLayoutCommand::execute()
 		((TQSplitter*)w)->setOrientation(Qt::Vertical);
 	else if(tree->container()) {
 		tree->container()->setLayout((Container::LayoutType)m_type);
-		w->resize(tree->container()->tqlayout()->tqsizeHint()); // the tqlayout doesn't have its own size
+		w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size
 	}
 
 	container->setSelectedWidget(w, false);
@@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute()
 	if(!parent)
 		parent = m_form->objectTree();
 
-	// We reparent every widget to the Container and take them out of the tqlayout
+	// We reparent every widget to the Container and take them out of the layout
 	TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
 	for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it)
 	{
@@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute()
 	if (!titem)
 		return; //better this than a crash
 	TQWidget *w = titem->widget();
-	parent->container()->deleteWidget(w); // delete the tqlayout widget
+	parent->container()->deleteWidget(w); // delete the layout widget
 	FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
 }
 
@@ -1019,7 +1019,7 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container)
 	m_form = container->form();
 	m_type = container->layoutType();
 
-	for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next())
+	for(ObjectTreeItem *tree = container->objectTree()->children()->first(); tree; tree = container->objectTree()->children()->next())
 	{
 		TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size());
 		m_pos.insert(tree->widget()->name(), r);
@@ -1041,7 +1041,7 @@ BreakLayoutCommand::unexecute()
 TQString
 BreakLayoutCommand::name() const
 {
-	return i18n("Break Layout: \"%1\"").tqarg(m_name);
+	return i18n("Break Layout: \"%1\"").arg(m_name);
 }
 
 void
@@ -1208,7 +1208,7 @@ PasteWidgetCommand::changePos(TQDomElement &el, const TQPoint &newpos)
 {
 	//TQDomElement el = widg.cloneNode(true).toElement();
 	TQDomElement rect;
-	// Find the widget tqgeometry if there is one
+	// Find the widget geometry if there is one
 	for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		if((n.toElement().tagName() == "property") && (n.toElement().attribute("name") == "geometry"))
@@ -1249,13 +1249,13 @@ PasteWidgetCommand::fixPos(TQDomElement &el, Container *container)
 	int rh = h.text().toInt();
 	TQRect r(rx, ry, rw, rh);
 
-	TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false);
+	TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false);
 	if(!w)
 		return;
 
-	while((w->tqgeometry() == r) && (w != 0))// there is already a widget there, with the same size
+	while((w->geometry() == r) && (w != 0))// there is already a widget there, with the same size
 	{
-		w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false);
+		w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false);
 		r.moveBy(10,10);
 	}
 
@@ -1300,11 +1300,11 @@ PasteWidgetCommand::moveWidgetBy(TQDomElement &el, Container *container, const T
 	TQRect r(rx + p.x(), ry + p.y(), rw, rh);
 	kdDebug() << "Moving widget by " << p << " from " << rx << "  " << ry << " to " << r.topLeft() << endl;
 
-	TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false);
+	TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false);
 
-	while(w && (w->tqgeometry() == r))// there is already a widget there, with the same size
+	while(w && (w->geometry() == r))// there is already a widget there, with the same size
 	{
-		w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false);
+		w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false);
 		r.moveBy(10,10);
 	}
 
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index 64e5a253..41da4b60 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -105,7 +105,7 @@ class KFORMEDITOR_EXPORT GeometryPropertyCommand : public Command
 
 /*! This command is used when an item in 'Align Widgets position' is selected. You just need
 to give the list of widget names (the selected ones), and the
-  type of tqalignment (see the enum for possible values). */
+  type of alignment (see the enum for possible values). */
 class KFORMEDITOR_EXPORT AlignWidgetsCommand : public Command
 {
 	public:
@@ -150,7 +150,7 @@ class KFORMEDITOR_EXPORT AdjustSizeCommand : public Command
 		TQMap<TQCString, TQSize> m_sizes;
 };
 
-/*! This command is used when switching the tqlayout of a Container. It remembers the old pos
+/*! This command is used when switching the layout of a Container. It remembers the old pos
  of every widget inside the Container. */
 class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand
 {
@@ -203,7 +203,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 		TQRect m_insertRect;
 };
 
-/*! This command is used when creating a tqlayout from some widgets using "Lay out in..." menu item.
+/*! This command is used when creating a layout from some widgets using "Lay out in..." menu item.
  It remembers the old pos of every widget, and takes care of updating ObjectTree too. You need
  to supply a WidgetList of the selected widgets. */
 class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index f683ce74..3fe0ac61 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
@@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 , m_buffer(0)
 {
 	TQFrame *frame = makeMainWidget();
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6);
+	TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6);
 
 	// Setup the details widget /////////
 	TQHBox *details = new TQHBox(frame);
@@ -60,10 +60,10 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 
 	m_pixmapLabel = new TQLabel(details);
 	m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) );
-	m_pixmapLabel->tqsetAlignment(AlignHCenter | AlignTop);
+	m_pixmapLabel->setAlignment(AlignHCenter | AlignTop);
 
 	m_textLabel = new TQLabel(details);
-	m_textLabel->tqsetAlignment(AlignLeft | AlignTop);
+	m_textLabel->setAlignment(AlignLeft | AlignTop);
 	//setStatusOk();
 
 	// And the KexiTableView ////////
@@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 	initTable();
 	m_table->setData(m_data, false);
 	m_table->adjustColumnWidthToContents(0);
-	tqlayout->addWidget(m_table);
+	layout->addWidget(m_table);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
+	TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
 	KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame);
-	vtqlayout->addWidget(newItem);
+	vlayout->addWidget(newItem);
 	m_buttons.insert(BAdd, newItem);
 	connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
 
 	KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame);
-	vtqlayout->addWidget(delItem);
+	vlayout->addWidget(delItem);
 	m_buttons.insert(BRemove, delItem);
 	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
 
-	vtqlayout->addStretch();
+	vlayout->addStretch();
 
 	setInitialSize(TQSize(600, 300));
 	//setWFlags(WDestructiveClose);
@@ -289,7 +289,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item)
 	TQString signalArg(signal);
 	signalArg = signalArg.remove( TQRegExp(".*[(]|[)]") );
 
-	TQStrList slotList = tree->widget()->tqmetaObject()->slotNames(true);
+	TQStrList slotList = tree->widget()->metaObject()->slotNames(true);
 	TQStrListIterator it(slotList);
 	for(; it.current() != 0; ++it)
 	{
@@ -297,7 +297,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item)
 		TQString slotArg(*it);
 		slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") );
 
-		if(!signalArg.tqstartsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible
+		if(!signalArg.startsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible
 			continue;
 
 		KexiTableItem *item = m_slotsColumnData->createItem(); //new KexiTableItem(2);
@@ -315,7 +315,7 @@ ConnectionDialog::updateSignalList(KexiTableItem *item)
 		return;
 
 	m_signalsColumnData->deleteAllRows();
-	TQStrList signalList = tree->widget()->tqmetaObject()->signalNames(true);
+	TQStrList signalList = tree->widget()->metaObject()->signalNames(true);
 	TQStrListIterator it(signalList);
 	for(; it.current() != 0; ++it)
 	{
@@ -334,7 +334,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item)
 	{
 		if( !item || (*item)[i].toString().isEmpty())
 		{
-			setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").tqarg(m_data->column(i)->captionAliasOrName()),
+			setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").arg(m_data->column(i)->captionAliasOrName()),
 				item);
 			return;
 		}
@@ -346,7 +346,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item)
 	TQString slot = (*item)[4].toString();
 	slot = slot.remove( TQRegExp(".*[(]|[)]") );
 
-	if(!signal.tqstartsWith(slot, true))
+	if(!signal.startsWith(slot, true))
 	{
 		setStatusError( i18n("The signal/slot arguments are not compatible."), item);
 		return;
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index d1275adc..366f6a6d 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -23,7 +23,7 @@
 #include <tqrect.h>
 #include <tqevent.h>
 #include <tqvaluevector.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcursor.h>
 
 #include <kdebug.h>
@@ -73,7 +73,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev)
 		}
 	}
 //	else if(ev->type() == TQEvent::ChildInserted) {
-		// widget's tqchildren have changed, we need to reinstall filter
+		// widget's children have changed, we need to reinstall filter
 //		installRecursiveEventFilter(m_widget, this);
 //	}
 
@@ -180,7 +180,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 						unSelectWidget(m_moving);
 					else // the widget is the only selected, so it means we want to copy it
 					{
-						//m_copyRect = m_moving->tqgeometry();
+						//m_copyRect = m_moving->geometry();
 						m_state = CopyingWidget;
 						if(m_form->formWidget())
 							m_form->formWidget()->initBuffer();
@@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			return false;
 		}
 
-		case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse
+		case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse
 		{
 			if(m_form->interactiveMode())
 				m_state = MovingWidget;
@@ -408,7 +408,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 				ObjectTreeItem *item = form()->objectTree()->lookup(form()->selectedWidgets()->first()->name());
 				if(!item || !item->parent())
 					return true;
-				ObjectTreeList *list = item->parent()->tqchildren();
+				ObjectTreeList *list = item->parent()->children();
 				if(list->count() == 1)
 					return true;
 				int index = list->findRef(item);
@@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
 
 		//m_initialPos = TQPoint();
 	}
-	else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout
+	else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout
 		reloadLayout();
 
 	// cancel copying as user released Ctrl before releasing mouse button
@@ -639,7 +639,7 @@ Container::setLayout(LayoutType type)
 			return;
 		}
 	}
-	m_container->setGeometry(m_container->tqgeometry()); // just update tqlayout
+	m_container->setGeometry(m_container->geometry()); // just update layout
 	m_layout->activate();
 }
 
@@ -654,14 +654,14 @@ Container::reloadLayout()
 void
 Container::createBoxLayout(WidgetList *list)
 {
-	TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout);
+	TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout);
 
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		list->append( tree->widget());
 	list->sort();
 
 	for(TQWidget *obj = list->first(); obj; obj = list->next())
-		tqlayout->addWidget(obj);
+		layout->addWidget(obj);
 	delete list;
 }
 
@@ -669,7 +669,7 @@ void
 Container::createFlowLayout()
 {
 	KexiFlowLayout *flow = dynamic_cast<KexiFlowLayout*>(m_layout);
-	if(!flow || m_tree->tqchildren()->isEmpty())
+	if(!flow || m_tree->children()->isEmpty())
 		return;
 
 	const int offset = 15;
@@ -684,7 +684,7 @@ Container::createFlowLayout()
 	}
 
 	// fill the list
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		list->append( tree->widget());
 	list->sort();
 
@@ -741,11 +741,11 @@ Container::createGridLayout(bool testOnly)
 	int end=-1000;
 	bool same = false;
 
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		vlist->append( tree->widget());
 	vlist->sort();
 
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		hlist->append( tree->widget());
 	hlist->sort();
 
@@ -759,30 +759,30 @@ Container::createGridLayout(bool testOnly)
 
 			for(; it2.current() != 0; ++it2) {
 				TQWidget *nextw = it2.current();
-				if((w->y() >= nextw->y()) || (nextw->y() >= w->tqgeometry().bottom()))
+				if((w->y() >= nextw->y()) || (nextw->y() >= w->geometry().bottom()))
 					break;
 
-				if(!w->tqgeometry().intersects(nextw->tqgeometry()))
+				if(!w->geometry().intersects(nextw->geometry()))
 					break;
 				// If the geometries of the two widgets intersect each other,
 				// we move one of the widget to the rght or bottom of the other
 				if((nextw->y() - w->y()) > abs(nextw->x() - w->x()))
-					nextw->move(nextw->x(), w->tqgeometry().bottom()+1);
+					nextw->move(nextw->x(), w->geometry().bottom()+1);
 				else if(nextw->x() >= w->x())
-					nextw->move(w->tqgeometry().right()+1, nextw->y());
+					nextw->move(w->geometry().right()+1, nextw->y());
 				else
-					w->move(nextw->tqgeometry().right()+1, nextw->y());
+					w->move(nextw->geometry().right()+1, nextw->y());
 			}
 		}
 	}
 
-	// Then we count the number of rows in the tqlayout, and set their beginnings
+	// Then we count the number of rows in the layout, and set their beginnings
 	for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
 	{
 		TQWidget *w = it.current();
 		WidgetListIterator it2 = it;
 		if(!same) { // this widget will make a new row
-			end = w->tqgeometry().bottom();
+			end = w->geometry().bottom();
 			rows.append(w->y());
 		}
 
@@ -796,9 +796,9 @@ Container::createGridLayout(bool testOnly)
 		if(nextw->y() >= end)
 			same = false;
 		else {
-			same = !(same && (nextw->y() >= w->tqgeometry().bottom()));
+			same = !(same && (nextw->y() >= w->geometry().bottom()));
 			if(!same)
-				end = w->tqgeometry().bottom();
+				end = w->geometry().bottom();
 		}
 	}
 	kdDebug() << "the new grid will have n rows: n == " << rows.size() << endl;
@@ -811,7 +811,7 @@ Container::createGridLayout(bool testOnly)
 		TQWidget *w = it.current();
 		WidgetListIterator it2 = it;
 		if(!same) {
-			end = w->tqgeometry().right();
+			end = w->geometry().right();
 			cols.append(w->x());
 		}
 
@@ -823,25 +823,25 @@ Container::createGridLayout(bool testOnly)
 		if(nextw->x() >= end)
 			same = false;
 		else {
-			same = !(same && (nextw->x() >= w->tqgeometry().right()));
+			same = !(same && (nextw->x() >= w->geometry().right()));
 			if(!same)
-				end = w->tqgeometry().right();
+				end = w->geometry().right();
 		}
 	}
 	kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl;
 
-	// We create the tqlayout ..
-	TQGridLayout *tqlayout=0;
+	// We create the layout ..
+	TQGridLayout *layout=0;
 	if(!testOnly) {
-		tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
-		m_layout = (TQLayout*)tqlayout;
+		layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
+		m_layout = (TQLayout*)layout;
 	}
 
 	// .. and we fill it with widgets
 	for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
 	{
 		TQWidget *w = it.current();
-		TQRect r = w->tqgeometry();
+		TQRect r = w->geometry();
 		uint wcol=0, wrow=0, endrow=0, endcol=0;
 		uint i = 0;
 
@@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly)
 		ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
 		if(!endrow && !endcol) {
 			if(!testOnly)
-				tqlayout->addWidget(w, wrow, wcol);
+				layout->addWidget(w, wrow, wcol);
 			item->setGridPos(wrow, wcol, 0, 0);
 		}
 		else {
 			if(!endcol)  endcol = wcol;
 			if(!endrow)  endrow = wrow;
 			if(!testOnly)
-				tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
+				layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
 			item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1);
 		}
 	}
@@ -971,7 +971,7 @@ Container::drawConnection(TQMouseEvent *mev)
 	{
 		FormManager::self()->createdConnection()->setReceiver(m_moving->name());
 		FormManager::self()->createSlotMenu(m_moving);
-		m_container->tqrepaint();
+		m_container->repaint();
 		return;
 	}
 	// the user clicked outside the menu, we cancel the connection
@@ -997,12 +997,12 @@ Container::drawSelectionRect(TQMouseEvent *mev)
 	setSelectedWidget(m_container, false);
 	TQWidget *widgetToSelect = 0;
 	// We check which widgets are in the rect and select them
-	for(ObjectTreeItem *item = m_tree->tqchildren()->first(); item; item = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *item = m_tree->children()->first(); item; item = m_tree->children()->next())
 	{
 		TQWidget *w = item->widget();
 		if(!w)
 			continue;
-		if(w->tqgeometry().intersects(r) && w != m_container) {
+		if(w->geometry().intersects(r) && w != m_container) {
 			if (widgetToSelect)
 				setSelectedWidget(widgetToSelect, true/*add*/, false/*raise*/, true/*moreWillBeSelected*/);
 			widgetToSelect = w; //select later
@@ -1013,7 +1013,7 @@ Container::drawSelectionRect(TQMouseEvent *mev)
 
 	m_insertRect = TQRect();
 	m_state = DoingNothing;
-	m_container->tqrepaint();
+	m_container->repaint();
 }
 
 void
@@ -1070,7 +1070,7 @@ Container::drawCopiedWidgetRect(TQMouseEvent *mev)
 		//FormManager::self()->undo(); // undo last moving
 		//m_moving->move(m_initialPos);
 		if(m_form->formWidget())  {
-			m_container->tqrepaint();
+			m_container->repaint();
 			m_form->formWidget()->initBuffer();
 		}
 		m_state = CopyingWidget;
@@ -1081,7 +1081,7 @@ Container::drawCopiedWidgetRect(TQMouseEvent *mev)
 	if(m_form->formWidget())  {
 		TQValueList<TQRect> rectList;
 		for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next()) {
-			TQRect drawRect = w->tqgeometry();
+			TQRect drawRect = w->geometry();
 			TQPoint p = mev->pos() - m_grab;
 			drawRect.moveBy(p.x(), p.y());
 			p = m_container->mapTo(m_form->widget(), TQPoint(0, 0));
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index 36f35e82..bd46c7a1 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -104,9 +104,9 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		void setObjectTree(ObjectTreeItem *t) { m_tree = t; }
 
 		//! \return a pointer to the TQLayout of this Container, or 0 if there is not.
-		TQLayout* tqlayout() const { return m_layout; }
+		TQLayout* layout() const { return m_layout; }
 
-		//! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
+		//! \return the type of the layout associated to this Container's widget (see LayoutType enum).
 		LayoutType layoutType() const { return m_layType; }
 
 		//! \return the margin of this Container.
@@ -115,8 +115,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! \return the spacing of this Container.
 		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.
+		/*! Sets this Container to use \a type of layout. The widget are inserted
+		 automatically in the layout following their positions.
 		  \sa createBoxLayout(), createGridLayout() */
 		void setLayout(LayoutType type);
 
@@ -129,7 +129,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! \return the string representing the layoutType \a type.
 		static TQString layoutTypeToString(int type);
 
-		//! \return the LayoutType (an int) for a given tqlayout name.
+		//! \return the LayoutType (an int) for a given layout name.
 		static LayoutType stringToLayoutType(const TQString &name);
 
 		/*! Stops the inline editing of the current widget (as when you click
@@ -161,8 +161,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		 to Container's widget. */
 		void deleteWidget(TQWidget *w);
 
-		/*! Recreates the Container tqlayout. Calls this when a widget has been moved
-		 or added to update the tqlayout. */
+		/*! Recreates the Container layout. Calls this when a widget has been moved
+		 or added to update the layout. */
 		void reloadLayout();
 
 	protected slots:
@@ -178,7 +178,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		/*! Internal function to create a KexiFlowLayout. */
 		void createFlowLayout();
 
-		/*! Internal function to create a GridLayout. if \a testOnly is true, the tqlayout
+		/*! Internal function to create a GridLayout. if \a testOnly is true, the layout
 		  is simulated, and only the widget's grid info aris filled. */
 		void createGridLayout(bool testOnly=false);
 
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index d073b43d..5bfdfbfe 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klistview.h>
 #include <ktabwidget.h>
@@ -46,45 +46,45 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_contents = addPage(i18n("Contents"));
 
 	///////// Setup the "Contents" page /////////////////////////////
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(m_contents, 0, 6);
+	TQHBoxLayout *layout = new TQHBoxLayout(m_contents, 0, 6);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
+	TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
 	TQToolButton *newRow = new TQToolButton(m_contents);
 	newRow->setIconSet(BarIconSet("edit_add"));
 	newRow->setTextLabel(i18n("&Add Item"), true);
-	vtqlayout->addWidget(newRow);
+	vlayout->addWidget(newRow);
 	m_buttons.insert(BNewRow, newRow);
 	connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow()));
 
 	TQToolButton *newChild = new TQToolButton(m_contents);
 	newChild->setIconSet(BarIconSet("1rightarrow"));
 	newChild->setTextLabel(i18n("New &Subitem"), true);
-	vtqlayout->addWidget(newChild);
+	vlayout->addWidget(newChild);
 	m_buttons.insert(BNewChild, newChild);
 	connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow()));
 
 	TQToolButton *delRow = new TQToolButton(m_contents);
 	delRow->setIconSet(BarIconSet("edit_remove"));
 	delRow->setTextLabel(i18n("&Remove Item"), true);
-	vtqlayout->addWidget(delRow);
+	vlayout->addWidget(delRow);
 	m_buttons.insert(BRemRow, delRow);
 	connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow()));
 
 	TQToolButton *rowUp = new TQToolButton(m_contents);
 	rowUp->setIconSet(BarIconSet("1uparrow"));
 	rowUp->setTextLabel(i18n("Move Item &Up"), true);
-	vtqlayout->addWidget(rowUp);
+	vlayout->addWidget(rowUp);
 	m_buttons.insert(BRowUp, rowUp);
 	connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp()));
 
 	TQToolButton *rowDown = new TQToolButton(m_contents);
 	rowDown->setIconSet(BarIconSet("1downarrow"));
 	rowDown->setTextLabel(i18n("Move Item &Down"), true);
-	vtqlayout->addWidget(rowDown);
+	vlayout->addWidget(rowDown);
 	m_buttons.insert(BRowDown, rowDown);
 	connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown()));
-	vtqlayout->addStretch();
+	vlayout->addStretch();
 
 	//// The listview ///////////
 	m_listview = new KListView(m_contents, "editlistview_listview");
@@ -96,7 +96,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_listview->setDropVisualizer(true);
 	m_listview->setAcceptDrops(true);
 	m_listview->setSorting(-1);
-	tqlayout->addWidget(m_listview);
+	layout->addWidget(m_listview);
 	m_listview->setFocus();
 	connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
 	connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index acc72c24..c1056b3b 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -36,7 +36,7 @@
 #include <tqscrollview.h>
 #include <tqtabbar.h>
 #include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kiconloader.h>
 #include <kgenericfactory.h>
@@ -73,7 +73,7 @@ ContainerWidget::~ContainerWidget()
 {
 }
 
-TQSize ContainerWidget::tqsizeHint() const
+TQSize ContainerWidget::sizeHint() const
 {
 	return TQSize(30,30); //default
 }
@@ -125,7 +125,7 @@ KFDTabWidget::~KFDTabWidget()
 }
 
 TQSize
-KFDTabWidget::tqsizeHint() const
+KFDTabWidget::sizeHint() const
 {
 	TQSize s(30,30); // default min size
 	for(int i=0; i < count(); i++)
@@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
 	emit handleDropEvent(e);
 }
 
-/// Various tqlayout widgets /////////////////:
+/// Various layout widgets /////////////////:
 
 HBox::HBox(TQWidget *parent, const char *name)
  : TQFrame(parent, name), m_preview(false)
@@ -218,10 +218,10 @@ VFlow::paintEvent(TQPaintEvent *)
 }
 
 TQSize
-VFlow::tqsizeHint() const
+VFlow::sizeHint() const
 {
-	if(tqlayout())
-		return tqlayout()->tqsizeHint();
+	if(layout())
+		return layout()->sizeHint();
 	else
 		return TQSize(700, 50); // default
 }
@@ -256,7 +256,7 @@ InsertPageCommand::execute()
 	if(classname == "KFDTabWidget")
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
-		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
+		TQString n = i18n("Page %1").arg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
 
@@ -318,7 +318,7 @@ SubForm::SubForm(TQWidget *parent, const char *name)
 : TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 }
 
 void
@@ -455,7 +455,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
 	wSplitter->setName(i18n("Splitter"));
 	wSplitter->setNamePrefix(
 		i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "splitter"));
-	wSplitter->setDescription(i18n("A container that enables user to resize its tqchildren"));
+	wSplitter->setDescription(i18n("A container that enables user to resize its children"));
 	addClass(wSplitter);
 
 	KFormDesigner::WidgetInfo *wHFlow = new KFormDesigner::WidgetInfo(this);
@@ -682,7 +682,7 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
 
 		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) );
-//		if( ((TQWidgetStack*)m_widget)->tqchildren()->count() == 4) // == the stack has only one page
+//		if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page
 		if(stack->childrenListObject().count() == 4) // == the stack has only one page
 			menu->setItemEnabled(id, false);
 
@@ -860,7 +860,7 @@ void ContainerFactory::renameTabPage()
 #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9)
 	       TQLineEdit::Normal,
 #endif
-	       tab->tabLabel(w), &ok, w->tqtopLevelWidget());
+	       tab->tabLabel(w), &ok, w->topLevelWidget());
 	if(ok)
 		tab->changeTab(w, name);
 }
@@ -872,8 +872,8 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos)
 	if(!tab)
 		return;
 
-	KFormDesigner::ObjectTreeItem *item = tab->tqchildren()->take(oldpos);
-	tab->tqchildren()->insert(newpos, item);
+	KFormDesigner::ObjectTreeItem *item = tab->children()->take(oldpos);
+	tab->children()->insert(newpos, item);
 }
 
 void ContainerFactory::addStackPage()
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index b88b437f..6f013e9c 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -126,7 +126,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	protected:
 		bool  m_preview;
@@ -144,7 +144,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 		ContainerWidget(TQWidget *parent, const char *name);
 		virtual ~ContainerWidget();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
 		virtual void dragMoveEvent( TQDragMoveEvent *e );
@@ -170,7 +170,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
 		KFDTabWidget(TQWidget *parent, const char *name);
 		virtual ~KFDTabWidget();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
 		virtual void dragMoveEvent( TQDragMoveEvent *e );
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 24827e13..2607fcca 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -431,13 +431,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 		w = new KProgress(p, n);
 
 	else if(c == "KDateWidget")
-		w = new KDateWidget(TQDate::tqcurrentDate(), p, n);
+		w = new KDateWidget(TQDate::currentDate(), p, n);
 
 	else if(c == "KTimeWidget")
 		w = new KTimeWidget(TQTime::currentTime(), p, n);
 
 	else if(c == "KDateTimeWidget")
-		w = new KDateTimeWidget(TQDateTime::tqcurrentDateTime(), p, n);
+		w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n);
 
 	else if(c == "Line")
 		w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n);
@@ -492,7 +492,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 	if(classname == "KLineEdit")
 	{
 		KLineEdit *lineedit = static_cast<KLineEdit*>(w);
-		createEditor(classname, lineedit->text(), lineedit, container, lineedit->tqgeometry(), lineedit->tqalignment(), true);
+		createEditor(classname, lineedit->text(), lineedit, container, lineedit->geometry(), lineedit->alignment(), true);
 		return true;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)
@@ -505,7 +505,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 			editText();
 		}
 		else
-			createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+			createEditor(classname, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	else if(classname == "KPushButton")
@@ -531,7 +531,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 	else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
 	{
 		TQCheckBox *check = static_cast<TQCheckBox*>(w);
-		//TQRect r(check->tqgeometry());
+		//TQRect r(check->geometry());
 		//r.setX(r.x() + 20);
 		TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w);
 		TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height());
@@ -605,13 +605,13 @@ StdWidgetFactory::changeText(const TQString &text)
 	else
 		changeProperty("text", text, m_container->form());
 
-	/* By-hand method not needed as tqsizeHint() can do that for us
+	/* By-hand method not needed as sizeHint() can do that for us
 	TQFontMetrics fm = w->fontMetrics();
 	TQSize s(fm.width( text ), fm.height());
 	int width;
 	if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text
 	{
-		w->resize(w->tqsizeHint());
+		w->resize(w->sizeHint());
 		WidgetFactory::m_editor->resize(w->size());
 		return;
 	}
@@ -624,7 +624,7 @@ StdWidgetFactory::changeText(const TQString &text)
 		width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width();
 	else
 		return;
-	int width = w->tqsizeHint().width();*/
+	int width = w->sizeHint().width();*/
 
 #if 0 //not needed here, size hint is used on creation in InsertWidgetCommand::execute()
 	if(w->width() < width)
@@ -860,7 +860,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname,
 	}
 	else if(classname == "KexiPictureLabel")
 	{
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
 			return false;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)
@@ -956,7 +956,7 @@ StdWidgetFactory::editText()
 	}
 
 	if(classname == TQLABEL_OBJECT_NAME_STRING)
-		widget()->resize(widget()->tqsizeHint());
+		widget()->resize(widget()->sizeHint());
 }
 
 void
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index b5b20936..52d44966 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -364,10 +364,10 @@ Form::changeName(const TQCString &oldname, const TQCString &newname)
 		return;
 	if(!d->topTree->rename(oldname, newname)) // rename failed
 	{
-		KMessageBox::sorry(widget()->tqtopLevelWidget(),
-			i18n("Renaming widget \"%1\" to \"%2\" failed.").tqarg(TQString(oldname)).tqarg(TQString(newname)));
+		KMessageBox::sorry(widget()->topLevelWidget(),
+			i18n("Renaming widget \"%1\" to \"%2\" failed.").arg(TQString(oldname)).arg(TQString(newname)));
 //moved to WidgetPropertySet::slotChangeProperty()
-//		KMessageBox::sorry(widget()->tqtopLevelWidget(),
+//		KMessageBox::sorry(widget()->topLevelWidget(),
 //		i18n("A widget with this name already exists. "
 //			"Please choose another name or rename existing widget."));
 		kdDebug() << "Form::changeName() : ERROR : A widget named " << newname << " already exists" << endl;
@@ -499,7 +499,7 @@ void collectContainers(ObjectTreeItem* item, TQPtrDict<char>& containers)
 			<< " " << item->container()->objectTree()->name() << endl;
 		containers.insert( item->container(), (const char *)1 );
 	}
-	for (ObjectTreeListIterator it(*item->tqchildren()); it.current(); ++it)
+	for (ObjectTreeListIterator it(*item->children()); it.current(); ++it)
 		collectContainers(it.current(), containers);
 }
 
@@ -528,7 +528,7 @@ Form::autoAssignTabStops()
 	d->tabstops.clear();
 
 	/// We automatically sort widget from the top-left to bottom-right corner
-	//! \todo Handle RTL tqlayout (ie from top-right to bottom-left)
+	//! \todo Handle RTL layout (ie from top-right to bottom-left)
 	foreach_list(WidgetListIterator, it, list) {
 		TQWidget *w = it.current();
 		hlist.append(w);
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index 7df731c6..a8bd6dc0 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -67,7 +67,7 @@ class KFORMEDITOR_EXPORT FormWidget
 		/*! This function inits the buffer used for double-buffering. Called before drawing rect. */
 		virtual void initBuffer() = 0;
 
-		/*! Clears the form, ie pastes the whole buffer to tqrepaint the Form. */
+		/*! Clears the form, ie pastes the whole buffer to repaint the Form. */
 		virtual void clearForm() = 0;
 
 		/*! This function highlights two widgets (to is optional), which are
@@ -109,7 +109,7 @@ class FormPrivate
 
 		PixmapCollection  *pixcollection;
 
-		//! This map is used to store cursor tqshapes before inserting (so we can restore them later)
+		//! This map is used to store cursor shapes before inserting (so we can restore them later)
 		TQMap<TQObject*,TQCursor> cursors;
 
 		//!This string list is used to store the widgets which hasMouseTracking() == true (eg lineedits)
@@ -231,10 +231,10 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 //! @todo make gridSize configurable at global level
 		int gridSize() { return 10; }
 
-		//! \return the default margin for all the tqlayout inside this Form.
+		//! \return the default margin for all the layout inside this Form.
 		int defaultMargin() { return 11;}
 
-		//! \return the default spacing for all the tqlayout inside this Form.
+		//! \return the default spacing for all the layout inside this Form.
 		int defaultSpacing() { return 6;}
 
 		/*! This function is used by ObjectTree to emit childAdded() signal (as it is not a TQObject). */
@@ -285,7 +285,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		    (which are by default in order of creation).*/
 		void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;}
 
-		/*! Tells the Form to reassign the tab stops because the widget tqlayout has changed
+		/*! Tells the Form to reassign the tab stops because the widget layout has changed
 		 (called for example before saving or displaying the tab order dialog).
 		 Automatically sorts widget from the top-left to bottom-right corner.
 		 Widget can be grouped with containers. In paticular, for tab widgets,
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 2759fe98..23c67fb4 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -23,11 +23,11 @@
 #include <tqmetaobject.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcursor.h>
 #include <tqbuffer.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqdatetime.h>
 #include <tqlabel.h>
@@ -66,7 +66,7 @@ void
 CustomWidget::paintEvent(TQPaintEvent *)
 {
 	TQPainter p(this);
-	p.setPen(tqpalette().active().text());
+	p.setPen(palette().active().text());
 	TQRect r(rect());
 	r.setX(r.x()+2);
 	p.drawText(r, TQt::AlignTop, m_className);
@@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = w;
 	bool addSubwidgetFlag = false;
-	int propertyId = w->tqmetaObject()->findProperty(name, true);
+	int propertyId = w->metaObject()->findProperty(name, true);
 	if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget
 		subwidget = subpropIface->subwidget();
-		propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true);
+		propertyId = subpropIface->subwidget()->metaObject()->findProperty(name, true);
 		addSubwidgetFlag = true;
 	}
 	if(propertyId == -1)
@@ -420,7 +420,7 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const
 		return;
 	}
 
-	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true);
+	const TQMetaProperty *meta = subwidget->metaObject()->property(propertyId, true);
 	if (!meta->stored( subwidget )) //not storable
 		return;
 	TQDomElement propertyE = parent.createElement("property");
@@ -621,7 +621,7 @@ FormIO::writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant
 		case TQVariant::Cursor:
 		{
 			type = parent.createElement("cursor");
-			valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape()));
+			valueE = parent.createTextNode(TQString::number(value.toCursor().shape()));
 			type.appendChild(valueE);
 			break;
 		}
@@ -880,8 +880,8 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name)
 	{
 		WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj);
 		TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj;
-		const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true);
-		const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0;
+		const int count = subobject->metaObject()->findProperty(name.latin1(), true);
+		const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0;
 
 		if (meta) {
 			if (meta->isSetType()) {
@@ -964,14 +964,14 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 
 	savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget());
 
-	// Important: save dataSource property FIRST before properties like "tqalignment"
+	// Important: save dataSource property FIRST before properties like "alignment"
 	// - needed when subproperties are defined after subwidget creation, and subwidget is created after setting "dataSource"
 	//   (this is the case for KexiDBAutoField)
 //! @todo more properties like "dataSource" may needed here...
-//	if (-1 != item->widget()->tqmetaObject()->findProperty("dataSource"))
+//	if (-1 != item->widget()->metaObject()->findProperty("dataSource"))
 	//	savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
 
-	// We don't want to save the tqgeometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
+	// We don't want to save the geometry if the widget is inside a layout (so parent.tagName() == "grid" for example)
 	if(item && !item->parent()) {
 		// save form widget size, but not its position
 		savePropertyValue(tclass, domDoc, "geometry",
@@ -992,14 +992,14 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 	for(TQMap<TQString,TQVariant>::ConstIterator it = map->constBegin(); it != endIt; ++it)
 	{
 		const TQCString name( it.key().latin1() );
-		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "tqalignment") {
+		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "alignment") {
 			if(!savedAlignment) // not to save it twice
 			{
-				savePropertyValue(tclass, domDoc, "tqalignment", item->widget()->property("tqalignment"), item->widget());
+				savePropertyValue(tclass, domDoc, "alignment", item->widget()->property("alignment"), item->widget());
 				savedAlignment = true;
 			}
 		}
-		else if(name == "name" || name == "geometry" || name == "tqlayout") {
+		else if(name == "name" || name == "geometry" || name == "layout") {
 			// these have already been saved
 		}
 		else {
@@ -1017,80 +1017,80 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		}
 
 	}
-	// Saving container 's tqlayout if there is one
-	TQDomElement tqlayout;
+	// Saving container 's layout if there is one
+	TQDomElement layout;
 	if(item->container() && item->container()->layoutType() != Container::NoLayout)
 	{
-		if(item->container()->tqlayout()) // there is a tqlayout
+		if(item->container()->layout()) // there is a layout
 		{
-			tqlayout = domDoc.createElement("temp");
-			savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
+			layout = domDoc.createElement("temp");
+			savePropertyValue(layout, domDoc, "name", "unnamed", item->widget());
 			if(item->modifiedProperties()->contains("layoutMargin"))
-				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
+				savePropertyElement(layout, domDoc, "property", "margin", item->container()->layoutMargin());
 			if(item->modifiedProperties()->contains("layoutSpacing"))
-				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
-			tclass.appendChild(tqlayout);
+				savePropertyElement(layout, domDoc, "property", "spacing", item->container()->layoutSpacing());
+			tclass.appendChild(layout);
 		}
 	}
 
 	int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
 	switch(layoutType) {
-		case Container::Grid: // grid tqlayout
+		case Container::Grid: // grid layout
 		{
-			tqlayout.setTagName("grid");
-			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
-				saveWidget(objIt, tqlayout, domDoc, true);
+			layout.setTagName("grid");
+			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
+				saveWidget(objIt, layout, domDoc, true);
 			break;
 		}
 		case Container::HBox: case Container::VBox:
 		{
-			// as we don't save tqgeometry, we need to sort widgets in the right order, not creation order
+			// as we don't save geometry, we need to sort widgets in the right order, not creation order
 			WidgetList *list;
-			if(tqlayout.tagName() == "hbox") {
+			if(layout.tagName() == "hbox") {
 				list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
-				tqlayout.setTagName("hbox");
+				layout.setTagName("hbox");
 			}
 			else {
 				list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget());
-				tqlayout.setTagName("vbox");
+				layout.setTagName("vbox");
 			}
 
-			for(ObjectTreeItem *objTree = item->tqchildren()->first(); objTree; objTree = item->tqchildren()->next())
+			for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next())
 				list->append(objTree->widget());
 			list->sort();
 
 			for(TQWidget *obj = list->first(); obj; obj = list->next()) {
 				ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
 				if(item)
-					saveWidget(titem, tqlayout, domDoc);
+					saveWidget(titem, layout, domDoc);
 			}
 			delete list;
 			break;
 		}
 		case Container::HFlow: case Container::VFlow:
 		{
-			tqlayout.setTagName("grid");
-			KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
+			layout.setTagName("grid");
+			KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
 			if(!flow)  break;
 			WidgetList *list = (WidgetList*)flow->widgetList();
 
 			// save some special properties
-			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
-			savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
+			savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
+			savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) );
 
-			// fill the widget's grid info, ie just simulate grid tqlayout
+			// fill the widget's grid info, ie just simulate grid layout
 			item->container()->createGridLayout(true);
 			for(TQWidget *obj = list->first(); obj; obj = list->next()) {
 				ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
 				if(item)
-					saveWidget(titem, tqlayout, domDoc, true); // save grid info for compatibility with TQtDesigner
+					saveWidget(titem, layout, domDoc, true); // save grid info for compatibility with TQtDesigner
 			}
 			delete list;
 			break;
 		}
 		default:
 		{
-			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
+			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
 				saveWidget(objIt, tclass, domDoc);
 		}
 	}
@@ -1153,7 +1153,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 			else if(tagName == "vbox")
 				classname = "VBox";
 			else if(tagName == "grid") {
-				// first, see if it is flow tqlayout
+				// first, see if it is flow layout
 				for(TQDomNode child = n.firstChild(); !child.isNull(); child = child.nextSibling())  {
 					if((child.toElement().tagName() == "property") 
 						&& (child.toElement().attribute("name") == "customLayout"))
@@ -1232,27 +1232,27 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 	m_currentItem = item;
 	// if we are inside a Grid, we need to insert the widget in the good cell
 	if(container->layoutType() == Container::Grid)  {
-		TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
+		TQGridLayout *layout = (TQGridLayout*)container->layout();
 		if(el.hasAttribute("rowspan")) { // widget spans multiple cells
-			if(tqlayout)
-				tqlayout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
+			if(layout)
+				layout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
 					 el.attribute("column").toInt(),  el.attribute("column").toInt() + el.attribute("colspan").toInt()-1);
 			 item->setGridPos(el.attribute("row").toInt(),  el.attribute("column").toInt(), el.attribute("rowspan").toInt(),
 			   el.attribute("colspan").toInt());
 		}
 		else  {
-			if(tqlayout)
-				tqlayout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
+			if(layout)
+				layout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
 			item->setGridPos(el.attribute("row").toInt(),  el.attribute("column").toInt(), 0, 0);
 		}
 	}
-	else if(container->tqlayout())
-		container->tqlayout()->add(w);
+	else if(container->layout())
+		container->layout()->add(w);
 
 	readChildNodes(item, container, el, w);
 
-	if(item->container() && item->container()->tqlayout())
-		item->container()->tqlayout()->activate();
+	if(item->container() && item->container()->layout())
+		item->container()->layout()->activate();
 
 	// We add the autoSaveProperties in the modifProp list of the ObjectTreeItem, so that they are saved later
 	TQValueList<TQCString> list(container->form()->library()->autoSaveProperties(w->className()));
@@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 		= dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w;
 	for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) {
-		if(subwidget->tqmetaObject()->findProperty(*it, true) != -1)
+		if(subwidget->metaObject()->findProperty(*it, true) != -1)
 			item->addModifiedProperty(*it, subwidget->property(*it));
 	}
 
@@ -1337,7 +1337,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			//if(name == "geometry")
 			//	hasGeometryProp = true;
 			if( ((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
-			      (name == "name")) // we don't care about tqlayout names
+			      (name == "name")) // we don't care about layout names
 				continue;
 
 			if (node.attribute("subwidget")=="true") {
@@ -1355,30 +1355,30 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			if(name == "buddy")
 				m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w);
 			else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
-			  item->container() && item->container()->tqlayout()) {
+			  item->container() && item->container()->layout()) {
 			  // We load the margin of a Layout
 				if(name == "margin")  {
 					int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 					item->container()->setLayoutMargin(margin);
-					item->container()->tqlayout()->setMargin(margin);
+					item->container()->layout()->setMargin(margin);
 				}
 				// We load the spacing of a Layout
 				else if(name == "spacing")  {
 					int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 					item->container()->setLayoutSpacing(spacing);
-					item->container()->tqlayout()->setSpacing(spacing);
+					item->container()->layout()->setSpacing(spacing);
 				}
 				else if((name == "justify")){
 					bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool();
-					KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
+					KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
 					if(flow)
 						flow->setJustified(justify);
 				}
 			}
 			// If the object doesn't have this property, we let the Factory handle it (maybe a special property)
-			else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1)
+			else if(subwidget->metaObject()->findProperty(name.latin1(), true) == -1)
 			{
-				if(w->className() == TQString::tqfromLatin1("CustomWidget"))
+				if(w->className() == TQString::fromLatin1("CustomWidget"))
 					item->storeUnknownProperty(node);
 				else {
 					bool read = container->form()->library()->readSpecialProperty(
@@ -1391,7 +1391,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			{
 				TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) );
 				if(name == "geometry" && dynamic_cast<FormWidget*>(w)) {
-					//fix tqgeometry if needed - this is top level form widget
+					//fix geometry if needed - this is top level form widget
 					TQRect r( val.toRect() );
 					if (r.left()<0) //negative X!
 						r.moveLeft(0);
@@ -1400,8 +1400,8 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 					val = r;
 				}
 				subwidget->setProperty(name.latin1(), val);
-//				int count = w->tqmetaObject()->findProperty(name, true);
-//				const TQMetaProperty *meta = w->tqmetaObject()->property(count, true);
+//				int count = w->metaObject()->findProperty(name, true);
+//				const TQMetaProperty *meta = w->metaObject()->property(count, true);
 //				if(meta && meta->isEnumType()) {
 //					val = w->property(name.latin1()); //update: we want a numeric value of enum
 //				}
@@ -1419,7 +1419,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			loadWidget(container, node, w);
 		}
 		else if(tag == "grid") {
-			// first, see if it is flow tqlayout
+			// first, see if it is flow layout
 			TQString layoutName;
 			for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling())  {
 				if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout"))  {
@@ -1430,37 +1430,37 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 
 			 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;
+				KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
+				layout->setOrientation(Qt::Horizontal);
+				item->container()->m_layout = (TQLayout*)layout;
 			}
 			else if(layoutName == "VFlow") {
 				item->container()->m_layType = Container::VFlow;
-				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
-				tqlayout->setOrientation(Qt::Vertical);
-				item->container()->m_layout = (TQLayout*)tqlayout;
+				KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
+				layout->setOrientation(Qt::Vertical);
+				item->container()->m_layout = (TQLayout*)layout;
 			}
-			else { // grid tqlayout
+			else { // grid layout
 				item->container()->m_layType = Container::Grid;
-				TQGridLayout *tqlayout = new TQGridLayout(item->widget(), 1, 1);
-				item->container()->m_layout = (TQLayout*)tqlayout;
+				TQGridLayout *layout = new TQGridLayout(item->widget(), 1, 1);
+				item->container()->m_layout = (TQLayout*)layout;
 			}
 			readChildNodes(item, container, node, w);
 		}
 		else if(tag == "vbox")  {
 			item->container()->m_layType = Container::VBox;
-			TQVBoxLayout *tqlayout = new TQVBoxLayout(item->widget());
-			item->container()->m_layout = (TQLayout*)tqlayout;
+			TQVBoxLayout *layout = new TQVBoxLayout(item->widget());
+			item->container()->m_layout = (TQLayout*)layout;
 			readChildNodes(item, container, node, w);
 		}
 		else if(tag == "hbox") {
 			item->container()->m_layType = Container::HBox;
-			TQHBoxLayout *tqlayout = new TQHBoxLayout(item->widget());
-			item->container()->m_layout = (TQLayout*)tqlayout;
+			TQHBoxLayout *layout = new TQHBoxLayout(item->widget());
+			item->container()->m_layout = (TQLayout*)layout;
 			readChildNodes(item, container, node, w);
 		}
 		else {// unknown tag, we let the Factory handle it
-			if(w->className() == TQString::tqfromLatin1("CustomWidget"))
+			if(w->className() == TQString::fromLatin1("CustomWidget"))
 				item->storeUnknownProperty(node);
 			else {
 				bool read = container->form()->library()->readSpecialProperty(
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index a2ed0dac..75846dd3 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
 	m_style->setEditable(false);
 
 	KGlobal::config()->setGroup("General");
-	TQString currentStyle = TQString::tqfromLatin1(kapp->tqstyle().name()).lower();
+	TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower();
 	const TQStringList styles = TQStyleFactory::keys();
 	m_style->setItems(styles);
 	m_style->setCurrentItem(0);
@@ -413,7 +413,7 @@ FormManager::resetCreatedConnection()
 		m_active->formWidget()->clearForm();
 	}
 	if (m_active && m_active->widget())
-		m_active->widget()->tqrepaint();
+		m_active->widget()->repaint();
 }
 
 void
@@ -790,7 +790,7 @@ FormManager::createSignalMenu(TQWidget *w)
 	m_sigSlotMenu = new KPopupMenu();
 	m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals"));
 
-	TQStrList list = w->tqmetaObject()->signalNames(true);
+	TQStrList list = w->metaObject()->signalNames(true);
 	TQStrListIterator it(list);
 	for(; it.current() != 0; ++it)
 		m_sigSlotMenu->insertItem(*it);
@@ -813,14 +813,14 @@ FormManager::createSlotMenu(TQWidget *w)
 
 	TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) );
 
-	TQStrList list = w->tqmetaObject()->slotNames(true);
+	TQStrList list = w->metaObject()->slotNames(true);
 	TQStrListIterator it(list);
 	for(; it.current() != 0; ++it)
 	{
 		// we add the slot only if it is compatible with the signal
 		TQString slotArg(*it);
 		slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") );
-		if(!signalArg.tqstartsWith(slotArg, true)) // args not compatible
+		if(!signalArg.startsWith(slotArg, true)) // args not compatible
 			continue;
 
 		m_sigSlotMenu->insertItem(*it);
@@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	const uint widgetsCount = container->form()->selectedWidgets()->count();
 	const bool multiple = widgetsCount > 1;
 	//const bool enableRemove = w != m_active->widget();
-	// We only enabletqlayout creation if more than one widget with the same parent are selected
+	// We only enablelayout creation if more than one widget with the same parent are selected
 	const bool enableLayout = multiple || w == container->widget();
 
 	m_menuWidget = w;
@@ -863,14 +863,14 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	if(!multiple)
 	{
 		if(w == container->form()->widget())
-			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").tqarg(w->name()) );
+			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").arg(w->name()) );
 		else
 			m_popup->insertTitle( SmallIcon(
 				container->form()->library()->iconName(w->className())), TQString(w->name()) + " : " + n );
 	}
 	else
 		m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets")
-		+ TQString(" (%1)").tqarg(widgetsCount));
+		+ TQString(" (%1)").arg(widgetsCount));
 
 	KAction *a;
 #define PLUG_ACTION(_name, forceVisible) \
@@ -937,7 +937,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 
 		// We create the signals menu
 		KPopupMenu *sigMenu = new KPopupMenu();
-		TQStrList list = w->tqmetaObject()->signalNames(true);
+		TQStrList list = w->metaObject()->signalNames(true);
 		TQStrListIterator it(list);
 		for(; it.current() != 0; ++it)
 			sigMenu->insertItem(*it);
@@ -1095,7 +1095,7 @@ void
 FormManager::createLayout(int layoutType)
 {
 	WidgetList *list = m_active->selectedWidgets();
-	// if only one widget is selected (a container), we modify its tqlayout
+	// if only one widget is selected (a container), we modify its layout
 	if (list->isEmpty()) {//sanity check
 		kdWarning() << "FormManager::createLayout(): list is empty!" << endl;
 		return;
@@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType)
 	if(list->count() == 1)
 	{
 		ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
-		if(!item || !item->container() || !m_propSet->contains("tqlayout"))
+		if(!item || !item->container() || !m_propSet->contains("layout"))
 			return;
-		(*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
+		(*m_propSet)["layout"] = Container::layoutTypeToString(layoutType);
 		return;
 	}
 
@@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType)
 		kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl;
 		if(w->parentWidget() != parent)
 		{
-			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
+			KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n"
 		   "All selected widgets must have the same parent."));
 			kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
 			return;
@@ -1143,7 +1143,7 @@ FormManager::breakLayout()
 	else // normal container
 	{
 		if(activeForm()->selectedWidgets()->count() == 1)
-			(*m_propSet)["tqlayout"] = "NoLayout";
+			(*m_propSet)["layout"] = "NoLayout";
 		else
 			container->setLayout(Container::NoLayout);
 	}
@@ -1188,7 +1188,7 @@ FormManager::editTabOrder()
 {
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
-	TQWidget *topLevel = m_active->widget()->tqtopLevelWidget();
+	TQWidget *topLevel = m_active->widget()->topLevelWidget();
 	TabStopDialog dlg(topLevel);
 	//const bool oldAutoTabStops = m_active->autoTabStops();
 	if (dlg.exec(m_active) == TQDialog::Accepted) {
@@ -1222,7 +1222,7 @@ FormManager::editFormPixmapCollection()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->tqtopLevelWidget());
+	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->topLevelWidget());
 	dialog.exec();
 }
 
@@ -1234,7 +1234,7 @@ FormManager::editConnections()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	ConnectionDialog dialog(activeForm()->widget()->tqtopLevelWidget());
+	ConnectionDialog dialog(activeForm()->widget()->topLevelWidget());
 	dialog.exec(activeForm());
 }
 
@@ -1380,9 +1380,9 @@ FormManager::selectAll()
 		return;
 
 	activeForm()->selectFormWidget();
-	uint count = activeForm()->objectTree()->tqchildren()->count();
-	for(ObjectTreeItem *it = activeForm()->objectTree()->tqchildren()->first(); it; 
-		it = activeForm()->objectTree()->tqchildren()->next(), count--)
+	uint count = activeForm()->objectTree()->children()->count();
+	for(ObjectTreeItem *it = activeForm()->objectTree()->children()->first(); it; 
+		it = activeForm()->objectTree()->children()->next(), count--)
 	{
 		activeForm()->setSelectedWidget(it->widget(), /*add*/true, /*raise*/false, /*moreWillBeSelected*/count>1);
 	}
@@ -1493,14 +1493,14 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
 	WidgetList *wlist = form->selectedWidgets();
 	bool fontEnabled = false;
 	for (WidgetListIterator it(*wlist); it.current(); ++it) {
-		if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) {
+		if (-1 != it.current()->metaObject()->findProperty("font", true)) {
 			fontEnabled = true;
 			break;
 		}
 	}
 	enableAction("format_font", fontEnabled);
 
-	// If the widgets selected is a container, we enable tqlayout actions
+	// If the widgets selected is a container, we enable layout actions
 	bool containerSelected = false;
 	if(!multiple)
 	{
@@ -1550,7 +1550,7 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
+	const bool hasChildren = !form->objectTree()->children()->isEmpty();
 
 	// Layout actions
 	enableAction("layout_menu", hasChildren);
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index a43100ff..677a3e7b 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -221,13 +221,13 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		bool isRedoing() const { return m_isRedoing; }
 
 	public slots:
-		/*! Deletes the selected widget in active Form and all of its tqchildren. */
+		/*! Deletes the selected widget in active Form and all of its children. */
 		void deleteWidget();
 
-		/*! Copies the slected widget and all its tqchildren of the active Form using an XML representation. */
+		/*! Copies the slected widget and all its children of the active Form using an XML representation. */
 		void copyWidget();
 
-		/*! Cuts (ie Copies and deletes) the selected widget and all its tqchildren of
+		/*! Cuts (ie Copies and deletes) the selected widget and all its children of
 		 the active Form using an XML representation. */
 		void cutWidget();
 
@@ -258,22 +258,22 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		/*! Creates a dialog to edit the Connection of \ref activeForm(). */
 		void editConnections();
 
-		//! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
+		//! Lay out selected widgets using HBox layout (calls \ref CreateLayoutCommand).
 		void layoutHBox();
-		//! Lay out selected widgets using VBox tqlayout.
+		//! Lay out selected widgets using VBox layout.
 		void layoutVBox();
-		//! Lay out selected widgets using Grid tqlayout.
+		//! Lay out selected widgets using Grid layout.
 		void layoutGrid();
 		//! Lay out selected widgets in an horizontal splitter
 		void  layoutHSplitter();
 		//! Lay out selected widgets in a verticak splitter
 		void  layoutVSplitter();
-		//! Lay out selected widgets using HFlow tqlayout
+		//! Lay out selected widgets using HFlow layout
 		void layoutHFlow();
-		//! Lay out selected widgets using VFlow tqlayout.
+		//! Lay out selected widgets using VFlow layout.
 		void layoutVFlow();
 
-		//! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
+		//! Breaks selected layout(calls \ref BreakLayoutCommand).
 		void breakLayout();
 
 		void alignWidgetsToLeft();
@@ -418,7 +418,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		 Change this if you need to handle, eg. custom UI XML tags, as in Kexi's Form Designer. */
 		virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0);
 #endif
-		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
+		/*! Function called by the "Lay out in..." menu items. It creates a layout from the
 		  currently selected widgets (that must have the same parent).
 		  Calls \ref CreateLayoutCommand. */
 		void createLayout(int layoutType);
diff --git a/kexi/formeditor/kfdpixmapedit.cpp b/kexi/formeditor/kfdpixmapedit.cpp
index db9a726e..64e65f1e 100644
--- a/kexi/formeditor/kfdpixmapedit.cpp
+++ b/kexi/formeditor/kfdpixmapedit.cpp
@@ -48,7 +48,7 @@ KFDPixmapEdit::selectPixmap()
 
 	ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name());
 	TQString name = item ? item->pixmapName(property()->name()) : "";
-	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() );
+	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() );
 	if(dialog.exec() == TQDialog::Accepted) {
 		setValue(dialog.pixmap(), true);
 		item->setPixmapName(property()->name(), dialog.pixmapName());
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index e2ada714..a9b507f7 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -22,7 +22,7 @@
 #include <tqwidget.h>
 #include <tqvariant.h>
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "form.h"
 #include "container.h"
@@ -64,14 +64,14 @@ ObjectTreeItem::rename(const TQString &name)
 void
 ObjectTreeItem::addChild(ObjectTreeItem *c)
 {
-	m_tqchildren.append(c);
+	m_children.append(c);
 	c->setParent(this);
 }
 
 void
 ObjectTreeItem::removeChild(ObjectTreeItem *c)
 {
-	m_tqchildren.remove(c);
+	m_children.remove(c);
 }
 
 void
@@ -141,10 +141,10 @@ ObjectTree::ObjectTree(const TQString &classn, const TQString &name, TQWidget *w
 
 ObjectTree::~ObjectTree()
 {
-//	for(ObjectTreeItem *it = tqchildren()->first(); it; it = tqchildren()->next())
+//	for(ObjectTreeItem *it = children()->first(); it; it = children()->next())
 //		removeItem(it->name());
-	while (tqchildren()->first()) {
-		removeItem(tqchildren()->first());
+	while (children()->first()) {
+		removeItem(children()->first());
 	}
 }
 
@@ -216,7 +216,7 @@ ObjectTree::removeItem(ObjectTreeItem *c)
 	if (m_container && m_container->form())
 		m_container->form()->emitChildRemoved(c);
 
-	for(ObjectTreeItem *it = c->tqchildren()->first(); it; it = c->tqchildren()->next())
+	for(ObjectTreeItem *it = c->children()->first(); it; it = c->children()->next())
 		removeItem(it->name());
 
 	m_treeDict.remove(c->name());
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index b37d7caa..eaa95a0c 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -58,7 +58,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 
 /*! 
  @short An item representing a widget
- Holds the properties of a widget (classname, name, parent, tqchildren ..).
+ Holds the properties of a widget (classname, name, parent, children ..).
  @author Lucijan Busch <lucijan@kde.org>
  */
 class KFORMEDITOR_EXPORT ObjectTreeItem
@@ -72,7 +72,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		TQWidget* widget() const { return m_widget; }
 		EventEater* eventEater() const { return m_eater; }
 		ObjectTreeItem* parent() const { return m_parent; }
-		ObjectTreeList* tqchildren() { return &m_tqchildren; }
+		ObjectTreeList* children() { return &m_children; }
 
 		/*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget.
 		  The TQVariant is the old value (ie first value) of the property whose name is the TQString. */
@@ -121,7 +121,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 	protected:
 		TQString m_className;
 		TQString m_name;
-		ObjectTreeList	m_tqchildren;
+		ObjectTreeList	m_children;
 		TQGuardedPtr<Container> m_container;
 		TQMap<TQString, TQVariant> m_props;
 		TQMap<TQString, TQVariant> *m_subprops;
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index 049df3a5..82cb67bb 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -191,10 +191,10 @@ ObjectTreeView::~ObjectTreeView()
 }
 
 TQSize
-ObjectTreeView::tqsizeHint() const
+ObjectTreeView::sizeHint() const
 {
 	return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+"   "),
-		KListView::tqsizeHint().height());
+		KListView::sizeHint().height());
 }
 
 TQString
@@ -367,7 +367,7 @@ ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent)
 		last = last->nextSibling();
 	treeItem->moveItem(last);
 
-	ObjectTreeList *list = item->tqchildren();
+	ObjectTreeList *list = item->children();
 	for(ObjectTreeItem *it = list->first(); it; it = list->next())
 		loadTree(it, treeItem);
 
diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h
index b625c0ad..2ddf867c 100644
--- a/kexi/formeditor/objecttreeview.h
+++ b/kexi/formeditor/objecttreeview.h
@@ -73,7 +73,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 		ObjectTreeView(TQWidget *parent=0, const char *name=0, bool tabStop = false);
 		virtual ~ObjectTreeView();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		/*! Sets \a form as the current Form in the list. The list will automatically 
 		 be filled with an item for each widget in the Form, and selection will be synced. 
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index 168102b0..9c4a4112 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <ktoolbar.h>
 #include <kfontcombo.h>
@@ -146,10 +146,10 @@ RichTextDialog::buttonToggled(int id)
 			if(!isOn)  break;
 			switch(id)
 			{
-				case TBLeft:  m_edit->tqsetAlignment(TQt::AlignLeft); break;
-				case TBCenter:  m_edit->tqsetAlignment(TQt::AlignCenter); break;
-				case TBRight:  m_edit->tqsetAlignment(TQt::AlignRight); break;
-				case TBJustify:  m_edit->tqsetAlignment(TQt::AlignJustify); break;
+				case TBLeft:  m_edit->setAlignment(TQt::AlignLeft); break;
+				case TBCenter:  m_edit->setAlignment(TQt::AlignCenter); break;
+				case TBRight:  m_edit->setAlignment(TQt::AlignRight); break;
+				case TBJustify:  m_edit->setAlignment(TQt::AlignJustify); break;
 				default: break;
 			}
 		}
@@ -168,7 +168,7 @@ RichTextDialog::cursorPositionChanged(int, int)
 	m_toolbar->setButton(TBUnder, m_edit->underline());
 
 	int id = 0;
-	switch(m_edit->tqalignment())
+	switch(m_edit->alignment())
 	{
 		case TQt::AlignLeft:    id = TBLeft; break;
 		case TQt::AlignCenter:  id = TBCenter; break;
diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h
index 25150873..f5ae41ea 100644
--- a/kexi/formeditor/richtextdialog.h
+++ b/kexi/formeditor/richtextdialog.h
@@ -30,7 +30,7 @@ class KColorCombo;
 namespace KFormDesigner {
 
 //! A simple dialog to edit rich text
-/*! It allows to change font name, style and color, tqalignment. */
+/*! It allows to change font name, style and color, alignment. */
 class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase
 {
 	Q_OBJECT
diff --git a/kexi/formeditor/scripting/formscript.cpp b/kexi/formeditor/scripting/formscript.cpp
index 1123e093..aa32bc02 100644
--- a/kexi/formeditor/scripting/formscript.cpp
+++ b/kexi/formeditor/scripting/formscript.cpp
@@ -71,7 +71,7 @@ FormScript::execute(const TQString &functionName)
 		m_script->callFunction(functionName);
 	}
 	catch(Kross::Api::Exception& e) {
-		kdDebug() << TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) << endl;
+		kdDebug() << TQString("EXCEPTION type='%1' description='%2'").arg(e.type()).arg(e.description()) << endl;
 		return false;
 	}
 	return true;
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index 1ec9a2b4..3e0651b1 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -47,25 +47,25 @@ Spring::setOrientation(Qt::Orientation orient)
 	SizeType type = sizeType();
 	m_orient = orient;
 	setSizeType(type);
-	tqrepaint();
+	repaint();
 }
 
 Spring::SizeType
 Spring::sizeType() const
 {
 	if(m_orient ==Qt::Vertical)
-		return (SizeType)tqsizePolicy().verData();
+		return (SizeType)sizePolicy().verData();
 	else
-		return (SizeType)tqsizePolicy().horData();
+		return (SizeType)sizePolicy().horData();
 }
 
 void
 Spring::setSizeType(SizeType size)
 {
 	if(m_orient ==Qt::Vertical)
-		tqsetSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size);
+		setSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size);
 	else
-		tqsetSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum);
+		setSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum);
 }
 
 void
@@ -144,10 +144,10 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode
 	if(parentNode.tagName() == "widget")
 		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
-	if(!item->widget()->tqsizeHint().isValid())
-		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("size"), item->widget());
+	if(!item->widget()->sizeHint().isValid())
+		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("size"), item->widget());
 	else
-		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("tqsizeHint"), item->widget());
+		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("sizeHint"), item->widget());
 
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "orientation", item->widget()->property("orientation"), item->widget());
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeType", item->widget()->property("sizeType"), item->widget());
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index f28c8e2a..20d81b9e 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
 
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 0cfe0483..79f1b05f 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -276,7 +276,7 @@ void
 KFormDesignerKDevPart::open()
 {
 	m_openingFile = true;
-	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget());
+	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget());
 	if(!url.isEmpty())
 		ReadWritePart::openURL(url);
 	m_openingFile = false;
@@ -321,9 +321,9 @@ KFormDesignerKDevPart::saveAs()
 bool
 KFormDesignerKDevPart::closeForm(Form *form)
 {
-	int res = KMessageBox::warningYesNoCancel( m_workspace->tqtopLevelWidget(),
+	int res = KMessageBox::warningYesNoCancel( m_workspace->topLevelWidget(),
 		i18n( "The form \"%1\" has been modified.\n"
-		"Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ),
+		"Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ),
 		i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() );
 
 	if(res == KMessageBox::Yes)
@@ -397,7 +397,7 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
 	ENABLE_ACTION("format_raise", true);
 	ENABLE_ACTION("format_lower", true);
 
-	// If the widgets selected is a container, we enable tqlayout actions
+	// If the widgets selected is a container, we enable layout actions
 	if(!multiple)
 	{
 		KFormDesigner::ObjectTreeItem *item = form->objectTree()->lookup( form->selectedWidgets()->first()->name() );
@@ -535,13 +535,13 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart()
 
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -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->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index cd51817a..02996580 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -296,7 +296,7 @@ void
 KFormDesignerPart::open()
 {
 	m_openingFile = true;
-	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget());
+	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget());
 	if(!url.isEmpty())
 		ReadWritePart::openURL(url);
 	m_openingFile = false;
@@ -332,7 +332,7 @@ void
 KFormDesignerPart::saveAs()
 {
 	KURL url = KFileDialog::getSaveURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), 
-		m_workspace->tqtopLevelWidget());
+		m_workspace->topLevelWidget());
 	if(url.isEmpty())
 		return;
 	else
@@ -342,9 +342,9 @@ KFormDesignerPart::saveAs()
 bool
 KFormDesignerPart::closeForm(Form *form)
 {
-	int res = KMessageBox::questionYesNoCancel( m_workspace->tqtopLevelWidget(),
+	int res = KMessageBox::questionYesNoCancel( m_workspace->topLevelWidget(),
 		i18n( "The form \"%1\" has been modified.\n"
-		"Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ),
+		"Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ),
 		i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() );
 
 	if(res == KMessageBox::Yes)
@@ -423,7 +423,7 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
 	ENABLE_ACTION("format_raise", true);
 	ENABLE_ACTION("format_lower", true);
 
-	// If the widgets selected is a container, we enable tqlayout actions
+	// If the widgets selected is a container, we enable layout actions
 	bool containerSelected = false;
 	if(!multiple)
 	{
@@ -451,7 +451,7 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
+	const bool hasChildren = !form->objectTree()->children()->isEmpty();
 
 	// Layout actions
 	ENABLE_ACTION("layout_menu", hasChildren);
@@ -558,14 +558,14 @@ KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text)
 
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
-	w->tqrepaint();
+	w->repaint();
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -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->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp
index 6ce4bcae..53a9a15b 100644
--- a/kexi/formeditor/utils.cpp
+++ b/kexi/formeditor/utils.cpp
@@ -88,7 +88,7 @@ void
 KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form)
 {
 	ObjectTreeItem *tree = form->objectTree()->lookup(w->name());
-	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->isEmpty())
+	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->children()->isEmpty())
 		&& !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)
 		) //fix weird behaviour
 		return; // if the user has set a cursor for this widget or this is a container, don't change it
@@ -108,7 +108,7 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass)
 	int tmpw = 0, tmph = 0;
 	TQObjectList *list = w->queryList(inheritClass, 0, false, false);
 	for(TQObject *o = list->first(); o; o = list->next()) {
-		TQRect  r = ((TQWidget*)o)->tqgeometry();
+		TQRect  r = ((TQWidget*)o)->geometry();
 		tmpw = TQMAX(tmpw, r.right());
 		tmph = TQMAX(tmph, r.bottom());
 	}
@@ -119,9 +119,9 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass)
 
 // -----------------
 
-HorWidgetList::HorWidgetList(TQWidget *tqtopLevelWidget)
+HorWidgetList::HorWidgetList(TQWidget *topLevelWidget)
 	: WidgetList()
-	, m_tqtopLevelWidget(tqtopLevelWidget)
+	, m_topLevelWidget(topLevelWidget)
 {
 }
 
@@ -133,14 +133,14 @@ int HorWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 {
 	TQWidget *w1 = TQT_TQWIDGET(item1);
 	TQWidget *w2 = TQT_TQWIDGET(item2);
-	return w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x();
+	return w1->mapTo(m_topLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, TQPoint(0,0)).x();
 }
 
 // -----------------
 
-VerWidgetList::VerWidgetList(TQWidget *tqtopLevelWidget)
+VerWidgetList::VerWidgetList(TQWidget *topLevelWidget)
 	: WidgetList()
-	, m_tqtopLevelWidget(tqtopLevelWidget)
+	, m_topLevelWidget(topLevelWidget)
 {
 }
 
@@ -157,9 +157,9 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 	TQObject *page1 = 0;
 	TabWidget *tw1 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w1, "KFormDesigner::TabWidget", page1);
 	if (tw1) // special case
-		y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
+		y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
 	else
-		y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y();
+		y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y();
 
 	TQObject *page2 = 0;
 	TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2);
@@ -169,16 +169,16 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 	}
 
 	if (tw2) // special case
-		y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
+		y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
 	else
-		y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y();
+		y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y();
 	
 	kdDebug() << w1->name() << ": " << y1 << " " 
 		<< " | " << w2->name() << ": " << y2 << endl;
 
 
-	//kdDebug() << w1->name() << ": " << w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)) << " " << w1->y()
-		//<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_tqtopLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl;
+	//kdDebug() << w1->name() << ": " << w1->mapTo(m_topLevelWidget, TQPoint(0,0)) << " " << w1->y()
+		//<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_topLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl;
 	return y1 - y2;
 }
 
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index 3d078401..d6d56acb 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -71,22 +71,22 @@ typedef TQPtrListIterator<TQWidget> WidgetListIterator;
 class HorWidgetList : public WidgetList
 {
 	public:
-		HorWidgetList(TQWidget *tqtopLevelWidget);
+		HorWidgetList(TQWidget *topLevelWidget);
 		virtual ~HorWidgetList();
 	protected:
 		virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2);
-		TQWidget *m_tqtopLevelWidget;
+		TQWidget *m_topLevelWidget;
 };
 
 //! @short A helper for sorting widgets vertically
 class VerWidgetList : public WidgetList
 {
 	public:
-		VerWidgetList(TQWidget *tqtopLevelWidget);
+		VerWidgetList(TQWidget *topLevelWidget);
 		virtual ~VerWidgetList();
 	protected:
 		virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2);
-		TQWidget *m_tqtopLevelWidget;
+		TQWidget *m_topLevelWidget;
 };
 
 /*! This function is used to remove all the child widgets from a list, and
@@ -94,18 +94,18 @@ class VerWidgetList : public WidgetList
 KFORMEDITOR_EXPORT void removeChildrenFromList(WidgetList &list);
 
 /*! This helper function install an event filter on \a object and all of its
-  tqchildren, directed to \a container.
+  children, directed to \a container.
   This is necessary to filter events for composed widgets. */
 KFORMEDITOR_EXPORT void installRecursiveEventFilter(TQObject *object, TQObject *container);
 
 /*! This helper function removes an event filter installed before
-  on \a object and all of its tqchildren.
+  on \a object and all of its children.
   This is necessary to filter events for composed widgets. */
 KFORMEDITOR_EXPORT void removeRecursiveEventFilter(TQObject *object, TQObject *container);
 
 KFORMEDITOR_EXPORT void setRecursiveCursor(TQWidget *w, Form *form);
 
-/*! \return the size of \a w tqchildren. This can be used eg to get widget's tqsizeHint. */
+/*! \return the size of \a w children. This can be used eg to get widget's sizeHint. */
 KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass=TQWIDGET_OBJECT_NAME_STRING);
 
 }
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 178e2b74..9bec64ba 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -183,14 +183,14 @@ void WidgetFactory::hideClass(const char *classname)
 
 void
 WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
-	TQWidget *w, Container *container, TQRect tqgeometry,
+	TQWidget *w, Container *container, TQRect geometry,
 	int align, bool useFrame, bool multiLine, BackgroundMode background)
 {
 //#ifdef KEXI_KTEXTEDIT
 	if (multiLine) {
 		KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget());
 		textedit->setTextFormat(TQt::PlainText);
-		textedit->tqsetAlignment(align);
+		textedit->setAlignment(align);
 		if (dynamic_cast<TQTextEdit*>(w)) {
 			textedit->setWordWrap(dynamic_cast<TQTextEdit*>(w)->wordWrap());
 			textedit->setWrapPolicy(dynamic_cast<TQTextEdit*>(w)->wrapPolicy());
@@ -198,12 +198,12 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		textedit->setPalette(w->palette());
 		textedit->setFont(w->font());
 		textedit->setResizePolicy(TQScrollView::Manual);
-		textedit->setGeometry(tqgeometry);
+		textedit->setGeometry(geometry);
 		if(background == TQt::NoBackground)
 			textedit->setBackgroundMode(w->backgroundMode());
 		else
 			textedit->setBackgroundMode(background);
-//		textedit->setPaletteBackgroundColor(textedit->tqcolorGroup().color( TQColorGroup::Base ));
+//		textedit->setPaletteBackgroundColor(textedit->colorGroup().color( TQColorGroup::Base ));
 		textedit->setPaletteBackgroundColor(w->paletteBackgroundColor());
 		for(int i =0; i <= textedit->paragraphs(); i++)
 			textedit->setParagraphBackgroundColor(i, w->paletteBackgroundColor());
@@ -229,10 +229,10 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 	}
 	else {
 		KLineEdit *editor = new KLineEdit(text, w->parentWidget());
-		editor->tqsetAlignment(align);
+		editor->setAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
-		editor->setGeometry(tqgeometry);
+		editor->setGeometry(geometry);
 		if(background == TQt::NoBackground)
 			editor->setBackgroundMode(w->backgroundMode());
 		else
@@ -253,7 +253,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 	//copy properties if available
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w;
-	if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true))
+	if (-1!=m_editor->metaObject()->findProperty("margin", true) && -1!=subwidget->metaObject()->findProperty("margin", true))
 		m_editor->setProperty("margin", subwidget->property("margin"));
 //#endif
 //js	m_handles = new ResizeHandleSet(w, container->form(), true);
@@ -314,10 +314,10 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container)
 bool
 WidgetFactory::editList(TQWidget *w, TQStringList &list)
 {
-	KDialogBase dialog(w->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
+	KDialogBase dialog(w->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(w->name()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(w->name()), &dialog, "editlist");
 	dialog.setMainWidget(edit);
 	edit->insertStringList(list);
 //	edit->show();
@@ -345,7 +345,7 @@ WidgetFactory::editRichText(TQWidget *w, TQString &text)
 void
 WidgetFactory::editListView(TQListView *listview)
 {
-	EditListViewDialog dlg(((TQWidget*)listview)->tqtopLevelWidget());
+	EditListViewDialog dlg(((TQWidget*)listview)->topLevelWidget());
 	//dlg.exec(listview);
 }
 
@@ -376,7 +376,7 @@ WidgetFactory::eventFilter(TQObject *obj, TQEvent *ev)
 		if(obj != (TQObject *)w)
 			return false;
 
-		TQWidget *focus = w->tqtopLevelWidget()->tqfocusWidget();
+		TQWidget *focus = w->topLevelWidget()->focusWidget();
 		if(focus && w != focus && !w->child(focus->name(), focus->className()))
 			resetEditor();
 	}
@@ -456,7 +456,7 @@ WidgetFactory::resetEditor()
 	if(m_widget)
 	{
 		disconnect(m_widget, 0, this, 0);
-		m_widget->tqrepaint();
+		m_widget->repaint();
 	}
 
 //js	delete m_handles;
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 9e585625..7c9c5ceb 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -384,10 +384,10 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 
 		/*! This function creates a KLineEdit to input some text and edit a widget's contents.
 		 This can be used in startEditing(). \a text is the text to display by default
-		  in the line edit, \a w is the edited widget, \a tqgeometry is the tqgeometry the new line
+		  in the line edit, \a w is the edited widget, \a geometry is the geometry the new line
 		   edit should have, and \a align is TQt::AlignmentFlags of the new line edit. */
 		void createEditor(const TQCString &classname, const TQString &text,
-			TQWidget *w, Container *container, TQRect tqgeometry,
+			TQWidget *w, Container *container, TQRect geometry,
 			int align, bool useFrame=false, bool multiLine = false,
 			BackgroundMode background = TQt::NoBackground);
 
@@ -403,7 +403,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 into \a list when the user presses "Ok".*/
 		bool editList(TQWidget *w, TQStringList &list);
 
-		/*! This function creates a little editor to modify rich text. It supports tqalignment,
+		/*! This function creates a little editor to modify rich text. It supports alignment,
 		 subscript and superscript and all basic formatting properties.
 		  If the user presses "Ok", the edited text is put in \a text.
 		  If he presses "Cancel", nothing happens. */
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index c9f9bd9b..55f8cde6 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -79,10 +79,10 @@ class WidgetLibraryPrivate
 /*! @todo: reenable */ advancedProperties.insert("palette", (char*)1);
 			advancedProperties.insert("backgroundOrigin", (char*)1);
 			advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless
-			advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things
+			advancedProperties.insert("layout", (char*)1);// too large risk to break things
 			                                              // by providing this in propeditor
-			advancedProperties.insert("tqminimumSize", (char*)1);
-			advancedProperties.insert("tqmaximumSize", (char*)1);
+			advancedProperties.insert("minimumSize", (char*)1);
+			advancedProperties.insert("maximumSize", (char*)1);
 #ifdef KEXI_NO_UNFINISHED
 /*! @todo reenable */
 			advancedProperties.insert("paletteBackgroundPixmap", (char*)1);
@@ -219,8 +219,8 @@ WidgetLibrary::lookupFactories()
 		if (KFormDesigner::version()!=factoryVersion) {
 			kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" 
 				" has version '%2' but required Widget Factory version is '%3'\n"
-				" -- skipping this factory!").tqarg(ptr->library()).tqarg(factoryVersion)
-				.tqarg(KFormDesigner::version()) << endl;
+				" -- skipping this factory!").arg(ptr->library()).arg(factoryVersion)
+				.arg(KFormDesigner::version()) << endl;
 			continue;
 		}
 		d->services.insert(ptr->library().latin1(), new KService::Ptr( ptr ));
@@ -532,7 +532,7 @@ WidgetLibrary::iconName(const TQCString &classname)
 	if(wi)
 		return wi->pixmap();
 
-	return TQString::tqfromLatin1("unknown_widget");
+	return TQString::fromLatin1("unknown_widget");
 }
 
 bool
@@ -739,7 +739,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
 
 	KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup");
-	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(wclass->name()));
+	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name()));
 	popup->insertItem(iconHorizontal, textHorizontal, 1);
 	popup->insertItem(iconVertical, textVertical, 2);
 	popup->insertSeparator();
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index d06a5c2e..b76d326a 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -24,7 +24,7 @@
 #include <tqmetaobject.h>
 #include <tqvariant.h>
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqapplication.h>
 #include <tqeventloop.h>
 
@@ -253,7 +253,7 @@ WidgetPropertySet::addWidget(TQWidget *w)
 		//second widget, update metainfo
 		d->set["this:className"].setValue("special:multiple");
 		d->set["this:classString"].setValue(
-			i18n("Multiple Widgets") + TQString(" (%1)").tqarg(d->widgets.count()) );
+			i18n("Multiple Widgets") + TQString(" (%1)").arg(d->widgets.count()) );
 		d->set["this:iconName"].setValue("multiple_obj");
 		//name doesn't make sense for now
 		d->set["name"].setValue("");
@@ -287,7 +287,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 		return;
 	}
 
-	TQStrList pList = w->tqmetaObject()->propertyNames(true);
+	TQStrList pList = w->metaObject()->propertyNames(true);
 	TQStrListIterator it(pList);
 
 	// add subproperties if available
@@ -309,7 +309,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 		const TQMetaProperty *subMeta = // special case - subproperty
 			subpropIface ? subpropIface->findMetaSubproperty(it.current()) : 0;
 		const TQMetaProperty *meta = subMeta ? subMeta 
-			 : w->tqmetaObject()->property( w->tqmetaObject()->findProperty(*it, true), true);
+			 : w->metaObject()->property( w->metaObject()->findProperty(*it, true), true);
 		if (!meta)
 			continue;
 		const char* propertyName = meta->name();
@@ -328,7 +328,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 			const bool oldValueExists = modifiedPropertiesIt!=modifiedProperties->constEnd();
 
 			if(meta->isEnumType()) {
-				if(qstrcmp(propertyName, "tqalignment") == 0)  {
+				if(qstrcmp(propertyName, "alignment") == 0)  {
 					createAlignProperty(meta, w, subwidget);
 					continue;
 				}
@@ -393,7 +393,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 	/*!  let's forget it for now, until we have new complete events editor
 	if (m_manager->lib()->advancedPropertiesVisible()) {
 		// add the signals property
-		TQStrList strlist = w->tqmetaObject()->signalNames(true);
+		TQStrList strlist = w->metaObject()->signalNames(true);
 		TQStrListIterator strIt(strlist);
 		TQStringList list;
 		for(; strIt.current() != 0; ++strIt)
@@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 			));
 	}*/
 
-	if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property
+	if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property
 		createLayoutProperty(tree);
 }
 
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
+	else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -621,7 +621,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget,
 		else {
 			WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widget);
 			TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widget;
-			if (-1 != subwidget->tqmetaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) {
+			if (-1 != subwidget->metaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) {
 				ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name());
 				if (tree)
 					tree->addModifiedProperty(it.key(), subwidget->property(it.key()));
@@ -678,7 +678,7 @@ WidgetPropertySet::isNameValid(const TQString &name)
 		KMessageBox::sorry(KFormDesigner::FormManager::self()->activeForm()->widget(),
 			i18n("Could not rename widget \"%1\" to \"%2\" because "
 			"\"%3\" is not a valid name (identifier) for a widget.\n")
-			.tqarg(w->name()).tqarg(name).tqarg(name));
+			.arg(w->name()).arg(name).arg(name));
 		d->slotPropertyChangedEnabled = false;
 		d->set["name"].resetValue();
 		d->slotPropertyChangedEnabled = true;
@@ -689,7 +689,7 @@ WidgetPropertySet::isNameValid(const TQString &name)
 		KMessageBox::sorry( KFormDesigner::FormManager::self()->activeForm()->widget(),
 			i18n("Could not rename widget \"%1\" to \"%2\" "
 			"because a widget with the name \"%3\" already exists.\n")
-			.tqarg(w->name()).tqarg(name).tqarg(name));
+			.arg(w->name()).arg(name).arg(name));
 		d->slotPropertyChangedEnabled = false;
 		d->set["name"].resetValue();
 		d->slotPropertyChangedEnabled = true;
@@ -740,7 +740,7 @@ WidgetPropertySet::eventFilter(TQObject *o, TQEvent *ev)
 			if(d->set["geometry"].value() == o->property("geometry")) // to avoid infinite recursion
 				return false;
 
-			d->set["geometry"] = TQT_TQWIDGET(o)->tqgeometry();
+			d->set["geometry"] = TQT_TQWIDGET(o)->geometry();
 		}
 	}
 	else if(d->widgets.count() > 1 && ev->type() == TQEvent::Move) // the widget is being moved, we update the property
@@ -775,8 +775,8 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 
 	TQStringList list;
 	TQString value;
-	const int tqalignment = subwidget->property("tqalignment").toInt();
-	const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(tqalignment) ) );
+	const int alignment = subwidget->property("alignment").toInt();
+	const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(alignment) ) );
 
 	TQStrList *enumKeys = new TQStrList(meta->enumKeys());
 	const TQStringList possibleValues( TQStringList::fromStrList(*enumKeys) );
@@ -786,7 +786,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 	bool isTopLevel = KFormDesigner::FormManager::self()->isTopLevel(widget);
 
 	if(possibleValues.find("AlignHCenter")!=possibleValues.constEnd())  {
-		// Create the horizontal tqalignment property
+		// Create the horizontal alignment property
 		if(keys.find("AlignHCenter")!=keys.constEnd() || keys.find("AlignCenter")!=keys.constEnd())
 			value = "AlignHCenter";
 		else if(keys.find("AlignRight")!=keys.constEnd())
@@ -812,7 +812,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 
 	if(possibleValues.find("AlignTop")!=possibleValues.constEnd())
 	{
-		// Create the ver tqalignment property
+		// Create the ver alignment property
 		if(keys.find("AlignTop")!=keys.constEnd())
 			value = "AlignTop";
 		else if(keys.find("AlignBottom")!=keys.constEnd())
@@ -837,7 +837,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 	) {
 		// Create the wordbreak property
 		KoProperty::Property *p = new KoProperty::Property("wordbreak", 
-			TQVariant(tqalignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") );
+			TQVariant(alignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") );
 		d->set.addProperty(p);
 		updatePropertyValue(tree, "wordbreak");
 		if (!KFormDesigner::FormManager::self()->activeForm()->library()->isPropertyVisible(
@@ -865,9 +865,9 @@ WidgetPropertySet::saveAlignProperty(const TQString &property)
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(
 		(TQWidget*)d->widgets.first() );
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : (TQWidget*)d->widgets.first();
-	int count = subwidget->tqmetaObject()->findProperty("tqalignment", true);
-	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(count, true);
-	subwidget->setProperty("tqalignment", meta->keysToValue(list));
+	int count = subwidget->metaObject()->findProperty("alignment", true);
+	const TQMetaProperty *meta = subwidget->metaObject()->property(count, true);
+	subwidget->setProperty("alignment", meta->keysToValue(list));
 
 	ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(
 		d->widgets.first()->name() );
@@ -877,11 +877,11 @@ WidgetPropertySet::saveAlignProperty(const TQString &property)
 	if(d->isUndoing)
 		return;
 
-	if(d->lastCommand && d->lastCommand->property() == "tqalignment")
+	if(d->lastCommand && d->lastCommand->property() == "alignment")
 		d->lastCommand->setValue(meta->keysToValue(list));
 	else {
 		d->lastCommand = new PropertyCommand(this, d->widgets.first()->name(),
-			subwidget->property("tqalignment"), meta->keysToValue(list), "tqalignment");
+			subwidget->property("alignment"), meta->keysToValue(list), "alignment");
 		KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
 	}
 }
@@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 	if (!container || !KFormDesigner::FormManager::self()->activeForm() ||
 		!KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget())
 		return;
-	// special containers have no 'tqlayout' property, as it should not be changed
+	// special containers have no 'layout' property, as it should not be changed
 	TQCString className = container->widget()->className();
 	if((className == "HBox") || (className == "VBox") || (className == "Grid"))
 		return;
@@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
-	KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value,
+	KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value,
 		i18n("Container's Layout"), i18n("Container's Layout"));
 	p->setVisible( container->form()->library()->advancedPropertiesVisible() );
 	d->set.addProperty(p);
 
-	updatePropertyValue(item, "tqlayout");
+	updatePropertyValue(item, "layout");
 
 	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
@@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 		return;
 	container = item->container();
 
-	if(prop == "tqlayout") {
+	if(prop == "layout") {
 		Container::LayoutType type = Container::stringToLayoutType(value.toString());
 
-		if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing)
+		if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing)
 			d->lastCommand->setValue(value);
 		else if(!d->isUndoing)  {
 			d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(),
-				d->set["tqlayout"].oldValue(), value);
+				d->set["layout"].oldValue(), value);
 			KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
 		}
 
@@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 		return;
 	}
 
-	if(prop == "layoutMargin" && container->tqlayout()) {
+	if(prop == "layoutMargin" && container->layout()) {
 		container->setLayoutMargin(value.toInt());
-		container->tqlayout()->setMargin(value.toInt());
+		container->layout()->setMargin(value.toInt());
 	}
-	else if(prop == "layoutSpacing" && container->tqlayout())  {
+	else if(prop == "layoutSpacing" && container->layout())  {
 		container->setLayoutSpacing(value.toInt());
-		container->tqlayout()->setSpacing(value.toInt());
+		container->layout()->setSpacing(value.toInt());
 	}
 
 	ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name());
@@ -1000,8 +1000,8 @@ WidgetPropertySet::initPropertiesDescription()
 	d->propCaption["enabled"] = i18n("Enabled");
 	d->propCaption["geometry"] = i18n("Geometry");
 	d->propCaption["sizePolicy"] = i18n("Size Policy");
-	d->propCaption["tqminimumSize"] = i18n("Minimum Size");
-	d->propCaption["tqmaximumSize"] = i18n("Maximum Size");
+	d->propCaption["minimumSize"] = i18n("Minimum Size");
+	d->propCaption["maximumSize"] = i18n("Maximum Size");
 	d->propCaption["font"] = i18n("Font");
 	d->propCaption["cursor"] = i18n("Cursor");
 	d->propCaption["paletteForegroundColor"] = i18n("Foreground Color");
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index afb303d1..896d309c 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -157,21 +157,21 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject
 		// Following functions are used to create special types of properties, different
 		// from TQ_PROPERTY
 
-		/*! Creates the properties related to tqalignment (ie hAlign, vAlign and WordBreak) for
+		/*! Creates the properties related to alignment (ie hAlign, vAlign and WordBreak) for
 		 the TQWidget \a widget. \a subwidget is the same as \a widget if the widget itself handles
 		 the property and it's a child widget if the child handles the property. 
 		 For example, the second case is true for KexiDBAutoField.
-		 \a meta  is the TQMetaProperty for "tqalignment" property" of subwidget.  */
+		 \a meta  is the TQMetaProperty for "alignment" property" of subwidget.  */
 		void createAlignProperty(const TQMetaProperty *meta, TQWidget *widget, TQWidget *subwidget);
 
-		/*! Saves the properties related to tqalignment (ie hAlign, vAlign and WordBreak)
-		 and modifies the "tqalignment" property of  the widget.*/
+		/*! Saves the properties related to alignment (ie hAlign, vAlign and WordBreak)
+		 and modifies the "alignment" property of  the widget.*/
 		void saveAlignProperty(const TQString &property);
 
-		/*! Creates the "tqlayout" property, for the Container representing \a item. */
+		/*! Creates the "layout" property, for the Container representing \a item. */
 		void createLayoutProperty(ObjectTreeItem *item);
 
-		/*! Saves the "tqlayout" property and changes the Container 's tqlayout (
+		/*! Saves the "layout" property and changes the Container 's layout (
 		using Container::setLayout() ).*/
 		void saveLayoutProperty(const TQString &property, const TQVariant &value);
 
diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
index aa84f831..362214a1 100644
--- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
+++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
@@ -41,11 +41,11 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget)
 	TQAsciiDict<char> addedSubproperies(1024);
 	if (m_subwidget) {
 		//remember properties in the subwidget that are not present in the parent
-		for( TQMetaObject *tqmetaObject = m_subwidget->tqmetaObject(); tqmetaObject; tqmetaObject = tqmetaObject->tqsuperClass()) {
-			const int numProperties = tqmetaObject->numProperties();
+		for( TQMetaObject *metaObject = m_subwidget->metaObject(); metaObject; metaObject = metaObject->superClass()) {
+			const int numProperties = metaObject->numProperties();
 			for (int i = 0; i < numProperties; i++) {
-				const char *propertyName = tqmetaObject->property( i )->name();
-				if (dynamic_cast<TQObject*>(this)->tqmetaObject()->findProperty( propertyName, true )==-1
+				const char *propertyName = metaObject->property( i )->name();
+				if (dynamic_cast<TQObject*>(this)->metaObject()->findProperty( propertyName, true )==-1
 						&& !addedSubproperies.find( propertyName ) )
 				{
 					m_subproperies.append( propertyName );
@@ -73,10 +73,10 @@ const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(cons
 	if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) {
 		return 0;
 	}
-	const int index = m_subwidget->tqmetaObject()->findProperty( name, true );
+	const int index = m_subwidget->metaObject()->findProperty( name, true );
 	if (index==-1)
 		return 0;
-	return m_subwidget->tqmetaObject()->property( index, true );
+	return m_subwidget->metaObject()->property( index, true );
 }
 
 TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool &ok ) const
diff --git a/kexi/kexidb/alter.cpp b/kexi/kexidb/alter.cpp
index 5386d3d6..f4a1346f 100644
--- a/kexi/kexidb/alter.cpp
+++ b/kexi/kexidb/alter.cpp
@@ -181,7 +181,7 @@ int AlterTableHandler::alteringTypeForProperty(const TQCString& propertyName)
 		if (KexiDB::isExtendedTableFieldProperty(propertyName))
 			return (int)ExtendedSchemaAlteringRequired;
 		KexiDBWarn << TQString("AlterTableHandler::alteringTypeForProperty(): property \"%1\" not found!")
-			.tqarg(propertyName.data()) << endl;
+			.arg(propertyName.data()) << endl;
 	}
 	return res;
 }
@@ -214,9 +214,9 @@ void AlterTableHandler::ChangeFieldPropertyAction::updateAlteringRequirements()
 TQString AlterTableHandler::ChangeFieldPropertyAction::debugString(const DebugOptions& debugOptions)
 {
 	TQString s = TQString("Set \"%1\" property for table field \"%2\" to \"%3\"")
-		.tqarg(m_propertyName).tqarg(fieldName()).tqarg(m_newValue.toString());
+		.arg(m_propertyName).arg(fieldName()).arg(m_newValue.toString());
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(m_fieldUID));
+		s.append(TQString(" (UID=%1)").arg(m_fieldUID));
 	return s;
 }
 
@@ -267,7 +267,7 @@ static void debugActionDict(AlterTableHandler::ActionDict *dict, int fieldUID, b
 	else
 		fieldName = "??";
 	TQString dbg = TQString("Action dict for field \"%1\" (%2, UID=%3):")
-		.tqarg(fieldName).tqarg(dict->count()).tqarg(fieldUID);
+		.arg(fieldName).arg(dict->count()).arg(fieldUID);
 	KexiDBDbg << dbg << endl;
 #ifdef KEXI_DEBUG_GUI
 	if (simulate)
@@ -495,9 +495,9 @@ void AlterTableHandler::RemoveFieldAction::updateAlteringRequirements()
 
 TQString AlterTableHandler::RemoveFieldAction::debugString(const DebugOptions& debugOptions)
 {
-	TQString s = TQString("Remove table field \"%1\"").tqarg(fieldName());
+	TQString s = TQString("Remove table field \"%1\"").arg(fieldName());
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(uid()));
+		s.append(TQString(" (UID=%1)").arg(uid()));
 	return s;
 }
 
@@ -583,11 +583,11 @@ void AlterTableHandler::InsertFieldAction::updateAlteringRequirements()
 TQString AlterTableHandler::InsertFieldAction::debugString(const DebugOptions& debugOptions)
 {
 	TQString s = TQString("Insert table field \"%1\" at position %2")
-		.tqarg(m_field->name()).tqarg(m_index);
+		.arg(m_field->name()).arg(m_index);
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(m_fieldUID));
+		s.append(TQString(" (UID=%1)").arg(m_fieldUID));
 	if (debugOptions.showFieldDebug)
-		s.append(TQString(" (%1)").tqarg(m_field->debugString()));
+		s.append(TQString(" (%1)").arg(m_field->debugString()));
 	return s;
 }
 
@@ -710,9 +710,9 @@ void AlterTableHandler::MoveFieldPositionAction::updateAlteringRequirements()
 TQString AlterTableHandler::MoveFieldPositionAction::debugString(const DebugOptions& debugOptions)
 {
 	TQString s = TQString("Move table field \"%1\" to position %2")
-		.tqarg(fieldName()).tqarg(m_index);
+		.arg(fieldName()).arg(m_index);
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(uid()));
+		s.append(TQString(" (UID=%1)").arg(uid()));
 	return s;
 }
 
@@ -878,7 +878,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 		}
 	}
 	// - Debug
-	TQString dbg = TQString("** Overall altering requirements: %1").tqarg(args.requirements);
+	TQString dbg = TQString("** Overall altering requirements: %1").arg(args.requirements);
 	KexiDBDbg << dbg << endl;
 
 	if (args.onlyComputeRequirements) {
@@ -892,14 +892,14 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 	if (args.simulate)
 		KexiUtils::addAlterTableActionDebug(dbg, 0);
 #endif
-	dbg = TQString("** Ordered, simplified actions (%1, was %2):").tqarg(currentActionsCount).tqarg(allActionsCount);
+	dbg = TQString("** Ordered, simplified actions (%1, was %2):").arg(currentActionsCount).arg(allActionsCount);
 	KexiDBDbg << dbg << endl;
 #ifdef KEXI_DEBUG_GUI
 	if (args.simulate)
 		KexiUtils::addAlterTableActionDebug(dbg, 0);
 #endif
 	for (int i=0; i<allActionsCount; i++) {
-		debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").tqarg(i+1), args.debugString);
+		debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").arg(i+1), args.debugString);
 	}
 
 	if (args.requirements == 0) {//nothing to do
@@ -918,7 +918,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 	if (recreateTable) {
 		TQString tempDestTableName;
 		while (true) {
-			tempDestTableName = TQString("%1_temp%2%3").tqarg(newTable->name()).tqarg(TQString::number(rand(), 16)).tqarg(TQString::number(rand(), 16));
+			tempDestTableName = TQString("%1_temp%2%3").arg(newTable->name()).arg(TQString::number(rand(), 16)).arg(TQString::number(rand(), 16));
 			if (!d->conn->tableSchema(tempDestTableName))
 				break;
 		}
@@ -1007,7 +1007,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 		// -Some source fields can be skipped in case when there are deleted fields.
 		// -Some destination fields can be skipped in case when there 
 		//  are new empty fields without fixed/default value.
-		TQString sql = TQString("INSERT INTO %1 (").tqarg(d->conn->escapeIdentifier(newTable->name()));
+		TQString sql = TQString("INSERT INTO %1 (").arg(d->conn->escapeIdentifier(newTable->name()));
 		//insert list of dest. fields
 		bool first = true;
 		TQString sourceFields;
diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index 4af6cae6..017e75e4 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -254,8 +254,8 @@ bool Connection::connect()
 	d->serverVersion.clear();
 	if (!(d->isConnected = drv_connect(d->serverVersion))) {
 		setError(m_driver->isFileDriver() ?
-			i18n("Could not open \"%1\" project file.").tqarg(TQDir::convertSeparators(d->conn_data->fileName()))
-			: i18n("Could not connect to \"%1\" database server.").tqarg(d->conn_data->serverInfoString()) );
+			i18n("Could not open \"%1\" project file.").arg(TQDir::convertSeparators(d->conn_data->fileName()))
+			: i18n("Could not connect to \"%1\" database server.").arg(d->conn_data->serverInfoString()) );
 	}
 	return d->isConnected;
 }
@@ -363,7 +363,7 @@ bool Connection::drv_databaseExists( const TQString &dbName, bool ignoreErrors )
 
 	if (list.find( dbName )==list.end()) {
 		if (!ignoreErrors)
-			setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").tqarg(dbName));
+			setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").arg(dbName));
 		return false;
 	}
 
@@ -384,19 +384,19 @@ bool Connection::databaseExists( const TQString &dbName, bool ignoreErrors )
 		if (!file.exists() || ( !file.isFile() && !file.isSymLink()) ) {
 			if (!ignoreErrors)
 				setError(ERR_OBJECT_NOT_FOUND, i18n("Database file \"%1\" does not exist.")
-				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		if (!file.isReadable()) {
 			if (!ignoreErrors)
 				setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not readable.")
-				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		if (!file.isWritable()) {
 			if (!ignoreErrors)
 				setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not writable.")
-				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		return true;
@@ -424,7 +424,7 @@ bool Connection::databaseExists( const TQString &dbName, bool ignoreErrors )
 
 #define createDatabase_CLOSE \
 	{ if (!closeDatabase()) { \
-		setError(i18n("Database \"%1\" created but could not be closed after creation.").tqarg(dbName) ); \
+		setError(i18n("Database \"%1\" created but could not be closed after creation.").arg(dbName) ); \
 		return false; \
 	} }
 
@@ -438,12 +438,12 @@ bool Connection::createDatabase( const TQString &dbName )
 		return false;
 
 	if (databaseExists( dbName )) {
-		setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").tqarg(dbName) );
+		setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").arg(dbName) );
 		return false;
 	}
 	if (m_driver->isSystemDatabaseName( dbName )) {
 		setError(ERR_SYSTEM_NAME_RESERVED, 
-			i18n("Cannot create database \"%1\". This name is reserved for system database.").tqarg(dbName) );
+			i18n("Cannot create database \"%1\". This name is reserved for system database.").arg(dbName) );
 		return false;
 	}
 	if (m_driver->isFileDriver()) {
@@ -458,7 +458,7 @@ bool Connection::createDatabase( const TQString &dbName )
 
 	//low-level create
 	if (!drv_createDatabase( dbName )) {
-		setError(i18n("Error creating database \"%1\" on the server.").tqarg(dbName) );
+		setError(i18n("Error creating database \"%1\" on the server.").arg(dbName) );
 		closeDatabase();//sanity
 		return false;
 	}
@@ -472,7 +472,7 @@ bool Connection::createDatabase( const TQString &dbName )
 	if (!tmpdbName.isEmpty() || !m_driver->d->isDBOpenedAfterCreate) {
 		//db need to be opened
 		if (!useDatabase( dbName, false/*not yet kexi compatible!*/ )) {
-			setError(i18n("Database \"%1\" created but could not be opened.").tqarg(dbName) );
+			setError(i18n("Database \"%1\" created but could not be opened.").arg(dbName) );
 			return false;
 		}
 	}
@@ -566,7 +566,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 	if (!drv_useDatabase( my_dbName, cancelled, msgHandler )) {
 		if (cancelled && *cancelled)
 			return false;
-		TQString msg(i18n("Opening database \"%1\" failed.").tqarg( my_dbName ));
+		TQString msg(i18n("Opening database \"%1\" failed.").arg( my_dbName ));
 		if (error())
 			setError( this, msg );
 		else
@@ -589,7 +589,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 		d->databaseVersion.major = num;
 /*		if (true!=querySingleNumber(
 			"select db_value from kexi__db where db_property=" + m_driver->escapeString(TQString("kexidb_major_ver")), num)) {
-			d->errorInvalidDBContents(notfound_str.tqarg("kexidb_major_ver"));
+			d->errorInvalidDBContents(notfound_str.arg("kexidb_major_ver"));
 			return false;
 		}*/
 		num = d->dbProperties->value("kexidb_minor_ver").toInt(&ok);
@@ -598,7 +598,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 		d->databaseVersion.minor = num;
 /*		if (true!=querySingleNumber(
 			"select db_value from kexi__db where db_property=" + m_driver->escapeString(TQString("kexidb_minor_ver")), num)) {
-			d->errorInvalidDBContents(notfound_str.tqarg("kexidb_minor_ver"));
+			d->errorInvalidDBContents(notfound_str.arg("kexidb_minor_ver"));
 			return false;
 		}*/
 
@@ -607,8 +607,8 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 		if (m_driver->versionMajor()!=KexiDB::versionMajor()) {
 			setError(ERR_INCOMPAT_DATABASE_VERSION,
 				i18n("Database version (%1) does not match Kexi application's version (%2)")
-				.tqarg( TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()) )
-				.tqarg( TQString("%1.%2").tqarg(KexiDB::versionMajor()).tqarg(KexiDB::versionMinor()) ) );
+				.arg( TQString("%1.%2").arg(versionMajor()).arg(versionMinor()) )
+				.arg( TQString("%1.%2").arg(KexiDB::versionMajor()).arg(KexiDB::versionMinor()) ) );
 			return false;
 		}
 		if (m_driver->versionMinor()!=KexiDB::versionMinor()) {
@@ -686,7 +686,7 @@ bool Connection::useTemporaryDatabaseIfNeeded(TQString &tmpdbName)
 		if (!ret) {
 			setError(errorNum(), 
 				i18n("Error during starting temporary connection using \"%1\" database name.")
-				.tqarg(tmpdbName) );
+				.arg(tmpdbName) );
 			return false;
 		}
 	}
@@ -725,7 +725,7 @@ bool Connection::dropDatabase( const TQString &dbName )
 	}
 
 	if (m_driver->isSystemDatabaseName( dbToDrop )) {
-		setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").tqarg(dbToDrop) );
+		setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").arg(dbToDrop) );
 		return false;
 	}
 
@@ -765,7 +765,7 @@ TQStringList Connection::objectNames(int objType, bool* ok)
 	if (objType==KexiDB::AnyObjectType)
 		sql = "SELECT o_name FROM kexi__objects";
 	else
-		sql = TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType);
+		sql = TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").arg(objType);
 
 	Cursor *c = executeQuery(sql);
 	if (!c) {
@@ -852,7 +852,7 @@ TQValueList<int> Connection::objectIds(int objType)
 		return list;
 
 	Cursor *c = executeQuery(
-		TQString::tqfromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType));
+		TQString::fromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").arg(objType));
 	if (!c)
 		return list;
 	for (c->moveFirst(); !c->eof(); c->moveNext())
@@ -903,12 +903,12 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem
 
 			if (field->isFPNumericType() && field->precision()>0) {
 				if (field->scale()>0)
-					v += TQString::tqfromLatin1("(%1,%2)").tqarg(field->precision()).tqarg(field->scale());
+					v += TQString::fromLatin1("(%1,%2)").arg(field->precision()).arg(field->scale());
 				else
-					v += TQString::tqfromLatin1("(%1)").tqarg(field->precision());
+					v += TQString::fromLatin1("(%1)").arg(field->precision());
 			}
 			else if (field->type()==Field::Text && field->length()>0)
-				v += TQString::tqfromLatin1("(%1)").tqarg(field->length());
+				v += TQString::fromLatin1("(%1)").arg(field->length());
 
 			if (autoinc)
 				v += (" " +
@@ -925,7 +925,7 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem
 			if (field->defaultValue().isValid()) {
 				TQString valToSQL( m_driver->valueToSQL( field, field->defaultValue() ) );
 				if (!valToSQL.isEmpty()) //for sanity
-					v += TQString::tqfromLatin1(" DEFAULT ") + valToSQL;
+					v += TQString::fromLatin1(" DEFAULT ") + valToSQL;
 			}
 		}
 		sql += v;
@@ -1106,14 +1106,14 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 	for (Field::ListIterator it = querySchema.fieldsIterator(); (f = it.current()); ++it, number++) {
 		if (querySchema.isColumnVisible(number)) {
 			if (!sql.isEmpty())
-				sql += TQString::tqfromLatin1(", ");
+				sql += TQString::fromLatin1(", ");
 
 			if (f->isQueryAsterisk()) {
 				if (!singleTable && static_cast<QueryAsterisk*>(f)->isSingleTableAsterisk()) //single-table *
 					sql += escapeIdentifier(f->table()->name(), options.identifierEscaping) +
-					       TQString::tqfromLatin1(".*");
+					       TQString::fromLatin1(".*");
 				else //all-tables * (or simplified table.* when there's only one table)
-					sql += TQString::tqfromLatin1("*");
+					sql += TQString::fromLatin1("*");
 			}
 			else {
 				if (f->isExpression()) {
@@ -1137,7 +1137,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 				}
 				TQString aliasString = TQString(querySchema.columnAlias(number));
 				if (!aliasString.isEmpty())
-					sql += (TQString::tqfromLatin1(" AS ") + aliasString);
+					sql += (TQString::fromLatin1(" AS ") + aliasString);
 //! @todo add option that allows to omit "AS" keyword
 			}
 			LookupFieldSchema *lookupFieldSchema = (options.addVisibleLookupColumns && f->table())
@@ -1159,16 +1159,16 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 					{
 						//add LEFT OUTER JOIN
 						if (!s_additional_joins.isEmpty())
-							s_additional_joins += TQString::tqfromLatin1(" ");
+							s_additional_joins += TQString::fromLatin1(" ");
 						TQString internalUniqueTableAlias( TQString("__kexidb_") + lookupTable->name() + "_"
 							+ TQString::number(internalUniqueTableAliasNumber++) );
 						s_additional_joins += TQString("LEFT OUTER JOIN %1 AS %2 ON %3.%4=%5.%6")
-							.tqarg(escapeIdentifier(lookupTable->name(), options.identifierEscaping))
-							.tqarg(internalUniqueTableAlias)
-							.tqarg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
-							.tqarg(escapeIdentifier(f->name(), options.identifierEscaping))
-							.tqarg(internalUniqueTableAlias)
-							.tqarg(escapeIdentifier(boundField->name(), options.identifierEscaping));
+							.arg(escapeIdentifier(lookupTable->name(), options.identifierEscaping))
+							.arg(internalUniqueTableAlias)
+							.arg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
+							.arg(escapeIdentifier(f->name(), options.identifierEscaping))
+							.arg(internalUniqueTableAlias)
+							.arg(escapeIdentifier(boundField->name(), options.identifierEscaping));
 
 						//add visibleField to the list of SELECTed fields //if it is not yet present there
 //not needed						if (!querySchema.findTableField( visibleField->table()->name()+"."+visibleField->name() )) {
@@ -1177,13 +1177,13 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 /* not true
 							//table should be added after FROM
 							if (!s_from_additional.isEmpty())
-								s_from_additional += TQString::tqfromLatin1(", ");
+								s_from_additional += TQString::fromLatin1(", ");
 							s_from_additional += escapeIdentifier(visibleField->table()->name(), options.identifierEscaping);
 							*/
 						}
 #endif
 						if (!s_additional_fields.isEmpty())
-							s_additional_fields += TQString::tqfromLatin1(", ");
+							s_additional_fields += TQString::fromLatin1(", ");
 //							s_additional_fields += (internalUniqueTableAlias + "." //escapeIdentifier(visibleField->table()->name(), options.identifierEscaping) + "."
 //									escapeIdentifier(visibleField->name(), options.identifierEscaping));
 //! @todo Add lookup schema option for separator other than ' ' or even option for placeholders like "Name ? ?"
@@ -1216,20 +1216,20 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 					}
 					//add LEFT OUTER JOIN
 					if (!s_additional_joins.isEmpty())
-						s_additional_joins += TQString::tqfromLatin1(" ");
+						s_additional_joins += TQString::fromLatin1(" ");
 					TQString internalUniqueQueryAlias( 
 						kexidb_subquery_prefix + lookupQuery->name() + "_"
 						+ TQString::number(internalUniqueQueryAliasNumber++) );
 					s_additional_joins += TQString("LEFT OUTER JOIN (%1) AS %2 ON %3.%4=%5.%6")
-						.tqarg(selectStatement( *lookupQuery, params, options ))
-						.tqarg(internalUniqueQueryAlias)
-						.tqarg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
-						.tqarg(escapeIdentifier(f->name(), options.identifierEscaping))
-						.tqarg(internalUniqueQueryAlias)
-						.tqarg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping));
+						.arg(selectStatement( *lookupQuery, params, options ))
+						.arg(internalUniqueQueryAlias)
+						.arg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
+						.arg(escapeIdentifier(f->name(), options.identifierEscaping))
+						.arg(internalUniqueQueryAlias)
+						.arg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping));
 
 					if (!s_additional_fields.isEmpty())
-						s_additional_fields += TQString::tqfromLatin1(", ");
+						s_additional_fields += TQString::fromLatin1(", ");
 					const TQValueList<uint> visibleColumns( lookupFieldSchema->visibleColumns() );
 					TQString expression;
 					foreach (TQValueList<uint>::ConstIterator, visibleColumnsIt, visibleColumns) {
@@ -1260,12 +1260,12 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 
 	//add lookup fields
 	if (!s_additional_fields.isEmpty())
-		sql += (TQString::tqfromLatin1(", ") + s_additional_fields);
+		sql += (TQString::fromLatin1(", ") + s_additional_fields);
 
 	if (options.alsoRetrieveROWID) { //append rowid column
 		TQString s;
 		if (!sql.isEmpty())
-			s = TQString::tqfromLatin1(", ");
+			s = TQString::fromLatin1(", ");
 		if (querySchema.masterTable())
 			s += (escapeIdentifier(querySchema.masterTable()->name())+".");
 		s += m_driver->beh->ROW_ID_FIELD_NAME;
@@ -1275,7 +1275,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 	sql.prepend("SELECT ");
 	TableSchema::List* tables = querySchema.tables();
 	if ((tables && !tables->isEmpty()) || !subqueries_for_lookup_data.isEmpty()) {
-		sql += TQString::tqfromLatin1(" FROM ");
+		sql += TQString::fromLatin1(" FROM ");
 		TQString s_from;
 		if (tables) {
 			TableSchema *table;
@@ -1284,15 +1284,15 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 				++it, number++)
 			{
 				if (!s_from.isEmpty())
-					s_from += TQString::tqfromLatin1(", ");
+					s_from += TQString::fromLatin1(", ");
 				s_from += escapeIdentifier(table->name(), options.identifierEscaping);
 				TQString aliasString = TQString(querySchema.tableAlias(number));
 				if (!aliasString.isEmpty())
-					s_from += (TQString::tqfromLatin1(" AS ") + aliasString);
+					s_from += (TQString::fromLatin1(" AS ") + aliasString);
 			}
 	/*unused	if (!s_from_additional.isEmpty()) {//additional tables list needed for lookup fields
 				if (!s_from.isEmpty())
-					s_from += TQString::tqfromLatin1(", ");
+					s_from += TQString::fromLatin1(", ");
 				s_from += s_from_additional;
 			}*/
 		}
@@ -1302,11 +1302,11 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 			subqueries_for_lookup_data.current();	++it, subqueries_for_lookup_data_counter++)
 		{
 			if (!s_from.isEmpty())
-				s_from += TQString::tqfromLatin1(", ");
-			s_from += TQString::tqfromLatin1("(");
+				s_from += TQString::fromLatin1(", ");
+			s_from += TQString::fromLatin1("(");
 			s_from += selectStatement( *it.current(), params, options );
-			s_from += TQString::tqfromLatin1(") AS %1%2")
-				.tqarg(kexidb_subquery_prefix).tqarg(subqueries_for_lookup_data_counter);
+			s_from += TQString::fromLatin1(") AS %1%2")
+				.arg(kexidb_subquery_prefix).arg(subqueries_for_lookup_data_counter);
 		}
 		sql += s_from;
 	}
@@ -1315,7 +1315,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 
 	//JOINS
 	if (!s_additional_joins.isEmpty()) {
-		sql += TQString::tqfromLatin1(" ") + s_additional_joins + TQString::tqfromLatin1(" ");
+		sql += TQString::fromLatin1(" ") + s_additional_joins + TQString::fromLatin1(" ");
 	}
 
 //@todo: we're using WHERE for joins now; use INNER/LEFT/RIGHT JOIN later
@@ -1328,24 +1328,24 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 			wasWhere = true;
 		}
 		else
-			s_where += TQString::tqfromLatin1(" AND ");
+			s_where += TQString::fromLatin1(" AND ");
 		Field::Pair *pair;
 		TQString s_where_sub;
 		for (TQPtrListIterator<Field::Pair> p_it(*rel->fieldPairs()); (pair = p_it.current()); ++p_it) {
 			if (!s_where_sub.isEmpty())
-				s_where_sub += TQString::tqfromLatin1(" AND ");
+				s_where_sub += TQString::fromLatin1(" AND ");
 			s_where_sub += (
 				escapeIdentifier(pair->first->table()->name(), options.identifierEscaping) +
-				TQString::tqfromLatin1(".") +
+				TQString::fromLatin1(".") +
 				escapeIdentifier(pair->first->name(), options.identifierEscaping) +
-				TQString::tqfromLatin1(" = ")  +
+				TQString::fromLatin1(" = ")  +
 				escapeIdentifier(pair->second->table()->name(), options.identifierEscaping) +
-				TQString::tqfromLatin1(".") +
+				TQString::fromLatin1(".") +
 				escapeIdentifier(pair->second->name(), options.identifierEscaping));
 		}
 		if (rel->fieldPairs()->count()>1) {
 			s_where_sub.prepend("(");
-			s_where_sub += TQString::tqfromLatin1(")");
+			s_where_sub += TQString::fromLatin1(")");
 		}
 		s_where += s_where_sub;
 	}
@@ -1362,7 +1362,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 		}
 	}
 	if (!s_where.isEmpty())
-		sql += TQString::tqfromLatin1(" WHERE ") + s_where;
+		sql += TQString::fromLatin1(" WHERE ") + s_where;
 //! \todo (js) add other sql parts
 	//(use wasWhere here)
 	
@@ -1424,8 +1424,8 @@ TQ_ULLONG Connection::lastInsertedAutoIncValue(const TQString& aiFieldName, cons
 	}
 	RowData rdata;
 	if (row_id<=0 || true!=querySingleRecord(
-		TQString::tqfromLatin1("SELECT ") + tableName + TQString::tqfromLatin1(".") + aiFieldName + TQString::tqfromLatin1(" FROM ") + tableName
-		+ TQString::tqfromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::tqfromLatin1("=") + TQString::number(row_id), rdata))
+		TQString::fromLatin1("SELECT ") + tableName + TQString::fromLatin1(".") + aiFieldName + TQString::fromLatin1(" FROM ") + tableName
+		+ TQString::fromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::fromLatin1("=") + TQString::number(row_id), rdata))
 	{
 //		KexiDBDbg << "Connection::lastInsertedAutoIncValue(): row_id<=0 || true!=querySingleRecord()" << endl;
 	 	return (TQ_ULLONG)-1; //ULL;
@@ -1541,7 +1541,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 		if (m_driver->isSystemObjectName( tableName )) {
 			clearError();
 			setError(ERR_SYSTEM_NAME_RESERVED, i18n("System name \"%1\" cannot be used as table name.")
-				.tqarg(tableSchema->name()));
+				.arg(tableSchema->name()));
 			return false;
 		}
 
@@ -1550,7 +1550,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 			clearError();
 			setError(ERR_SYSTEM_NAME_RESERVED,
 				i18n("System name \"%1\" cannot be used as one of fields in \"%2\" table.")
-				.tqarg(sys_field->name()).tqarg(tableName));
+				.arg(sys_field->name()).arg(tableName));
 			return false;
 		}
 	}
@@ -1565,7 +1565,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 			if (existingTable == tableSchema) {
 				clearError();
 				setError(ERR_OBJECT_EXISTS, 
-					i18n("Could not create the same table \"%1\" twice.").tqarg(tableSchema->name()) );
+					i18n("Could not create the same table \"%1\" twice.").arg(tableSchema->name()) );
 				return false;
 			}
 //TODO(js): update any structure (e.g. queries) that depend on this table!
@@ -1579,7 +1579,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 	else {
 		if (this->tableSchema( tableSchema->name() ) != 0) {
 			clearError();
-			setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").tqarg(tableSchema->name()) );
+			setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").arg(tableSchema->name()) );
 			return false;
 		}
 	}
@@ -1707,7 +1707,7 @@ tristate Connection::dropTable( KexiDB::TableSchema* tableSchema, bool alsoRemov
 		|| this->tableSchema(tableSchema->name())!=tableSchema
 		|| this->tableSchema(tableSchema->id())!=tableSchema)
 	{
-		setError(ERR_OBJECT_NOT_FOUND, errmsg.tqarg(tableSchema->name())
+		setError(ERR_OBJECT_NOT_FOUND, errmsg.arg(tableSchema->name())
 			+i18n("Unexpected name or identifier."));
 		return false;
 	}
@@ -1718,7 +1718,7 @@ tristate Connection::dropTable( KexiDB::TableSchema* tableSchema, bool alsoRemov
 
 	//sanity checks:
 	if (m_driver->isSystemObjectName( tableSchema->name() )) {
-		setError(ERR_SYSTEM_NAME_RESERVED, errmsg.tqarg(tableSchema->name()) + d->strItIsASystemObject());
+		setError(ERR_SYSTEM_NAME_RESERVED, errmsg.arg(tableSchema->name()) + d->strItIsASystemObject());
 		return false;
 	}
 
@@ -1757,7 +1757,7 @@ tristate Connection::dropTable( const TQString& table )
 	TableSchema* ts = tableSchema( table );
 	if (!ts) {
 		setError(ERR_OBJECT_NOT_FOUND, i18n("Table \"%1\" does not exist.")
-			.tqarg(table));
+			.arg(table));
 		return false;
 	}
 	return dropTable(ts);
@@ -1772,7 +1772,7 @@ tristate Connection::alterTable( TableSchema& tableSchema, TableSchema& newTable
 
 	if (&tableSchema == &newTableSchema) {
 		setError(ERR_OBJECT_THE_SAME, i18n("Could not alter table \"%1\" using the same table.")
-			.tqarg(tableSchema.name()));
+			.arg(tableSchema.name()));
 		return false;
 	}
 //TODO(js): implement real altering
@@ -1793,18 +1793,18 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 {
 	clearError();
 	if (&tableSchema!=d->tables[tableSchema.id()]) {
-		setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").tqarg(tableSchema.name()));
+		setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").arg(tableSchema.name()));
 		return false;
 	}
 	if (newName.isEmpty() || !KexiUtils::isIdentifier(newName)) {
-		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").tqarg(newName));
+		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").arg(newName));
 		return false;
 	}
 	const TQString oldTableName = tableSchema.name();
 	const TQString newTableName = newName.lower().stripWhiteSpace();
 	if (oldTableName.lower().stripWhiteSpace() == newTableName) {
 		setError(ERR_OBJECT_THE_SAME, i18n("Could rename table \"%1\" using the same name.")
-			.tqarg(newTableName));
+			.arg(newTableName));
 		return false;
 	}
 //TODO: alter table name for server DB backends!
@@ -1816,7 +1816,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 	if (!replace && destTableExists) {
 		setError(ERR_OBJECT_EXISTS,
 			i18n("Could not rename table \"%1\" to \"%2\". Table \"%3\" already exists.")
-			.tqarg(tableSchema.name()).tqarg(newName).tqarg(newName));
+			.arg(tableSchema.name()).arg(newName).arg(newName));
 		return false;
 	}
 
@@ -1838,13 +1838,13 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 		}
 
 		// the new table owns the previous table's id:
-		if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3")
-			.tqarg(origID).tqarg(tableSchema.id()).tqarg((int)TableObjectType)))
+		if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3")
+			.arg(origID).arg(tableSchema.id()).arg((int)TableObjectType)))
 		{
 			return false;
 		}
-		if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2")
-			.tqarg(origID).tqarg(tableSchema.id())))
+		if (!executeSQL(TQString::fromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2")
+			.arg(origID).arg(tableSchema.id())))
 		{
 			return false;
 		}
@@ -1861,8 +1861,8 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 
 	// Update kexi__objects
 	//TODO
-	if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2")
-		.tqarg(m_driver->escapeString(tableSchema.name())).tqarg(tableSchema.id())))
+	if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2")
+		.arg(m_driver->escapeString(tableSchema.name())).arg(tableSchema.id())))
 	{
 		alterTableName_ERR;
 		return false;
@@ -1889,8 +1889,8 @@ bool Connection::drv_alterTableName(TableSchema& tableSchema, const TQString& ne
 	const TQString oldTableName = tableSchema.name();
 	tableSchema.setName(newName);
 
-	if (!executeSQL(TQString::tqfromLatin1("ALTER TABLE %1 RENAME TO %2")
-		.tqarg(escapeIdentifier(oldTableName)).tqarg(escapeIdentifier(newName))))
+	if (!executeSQL(TQString::fromLatin1("ALTER TABLE %1 RENAME TO %2")
+		.arg(escapeIdentifier(oldTableName)).arg(escapeIdentifier(newName))))
 	{
 		tableSchema.setName(oldTableName); //restore old name
 		return false;
@@ -1938,7 +1938,7 @@ bool Connection::dropQuery( const TQString& query )
 	QuerySchema* qs = querySchema( query );
 	if (!qs) {
 		setError(ERR_OBJECT_NOT_FOUND, i18n("Query \"%1\" does not exist.")
-			.tqarg(query));
+			.arg(query));
 		return false;
 	}
 	return dropQuery(qs);
@@ -2014,7 +2014,7 @@ bool Connection::rollbackAutoCommitTransaction(const Transaction& trans)
 
 #define SET_ERR_TRANS_NOT_SUPP \
 	{ setError(ERR_UNSUPPORTED_DRV_FEATURE, \
-	 i18n("Transactions are not supported for \"%1\" driver.").tqarg(m_driver->name() )); }
+	 i18n("Transactions are not supported for \"%1\" driver.").arg(m_driver->name() )); }
 
 #define SET_BEGIN_TR_ERROR \
 	 { if (!error()) \
@@ -2270,7 +2270,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata )
 {
 	//not found: retrieve schema
 /*	KexiDB::Cursor *cursor;
-	if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").tqarg(objId) )))
+	if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").arg(objId) )))
 		return false;
 	if (!cursor->moveFirst()) {
 		deleteCursor(cursor);
@@ -2287,7 +2287,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata )
 	}
 	sdata.m_name = data[2].toString();
 	if (!KexiUtils::isIdentifier( sdata.m_name )) {
-		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").tqarg(sdata.m_name));
+		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").arg(sdata.m_name));
 		return false;
 	}
 	sdata.m_caption = data[3].toString();
@@ -2300,9 +2300,9 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata )
 tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata )
 {
 	RowData data;
-	if (true!=querySingleRecord(TQString::tqfromLatin1(
+	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1")
-		.tqarg(objectID), data))
+		.arg(objectID), data))
 		return cancelled;
 	return setupObjectSchemaData( data, sdata );
 }
@@ -2310,9 +2310,9 @@ tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata )
 tristate Connection::loadObjectSchemaData( int objectType, const TQString& objectName, SchemaData &sdata )
 {
 	RowData data;
-	if (true!=querySingleRecord(TQString::tqfromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc "
+	if (true!=querySingleRecord(TQString::fromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc "
 		"FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2")
-		.tqarg(objectType).tqarg(m_driver->valueToSQL(Field::Text, objectName.lower())), data))
+		.arg(objectType).arg(m_driver->valueToSQL(Field::Text, objectName.lower())), data))
 		return cancelled;
 	return setupObjectSchemaData( data, sdata );
 }
@@ -2324,9 +2324,9 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject )
 		return false;
 	if (newObject) {
 		int existingID;
-		if (true == querySingleNumber(TQString::tqfromLatin1(
+		if (true == querySingleNumber(TQString::fromLatin1(
 			"SELECT o_id FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2")
-			.tqarg(sdata.type()).tqarg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID))
+			.arg(sdata.type()).arg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID))
 		{
 			//we already have stored a schema data with the same name and type:
 			//just update it's properties as it would be existing object
@@ -2366,9 +2366,9 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject )
 	}
 	//existing object:
 	return executeSQL(TQString("UPDATE kexi__objects SET o_type=%2, o_caption=%3, o_desc=%4 WHERE o_id=%1")
-		.tqarg(sdata.id()).tqarg(sdata.type())
-		.tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption()))
-		.tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) );
+		.arg(sdata.id()).arg(sdata.type())
+		.arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption()))
+		.arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) );
 }
 
 tristate Connection::querySingleRecordInternal(RowData &data, const TQString* sql, QuerySchema* query, 
@@ -2407,7 +2407,7 @@ tristate Connection::querySingleRecord(QuerySchema& query, RowData &data, bool a
 bool Connection::checkIfColumnExists(Cursor *cursor, uint column)
 {
 	if (column >= cursor->fieldCount()) {
-		setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").tqarg(column));
+		setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").arg(column));
 		return false;
 	}
 	return true;
@@ -2695,7 +2695,7 @@ bool Connection::loadExtendedTableSchemaData(TableSchema& tableSchema)
 	int errorLine, errorColumn;
 	if (!doc.setContent( extendedTableSchemaString, &errorMsg, &errorLine, &errorColumn ))
 		loadExtendedTableSchemaData_ERR2( i18n("Error in XML data: \"%1\" in line %2, column %3.\nXML data: ")
-			.tqarg(errorMsg).tqarg(errorLine).tqarg(errorColumn) + extendedTableSchemaString.left(1024));
+			.arg(errorMsg).arg(errorLine).arg(errorColumn) + extendedTableSchemaString.left(1024));
 
 //! @todo look at the current format version (KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION)
 	
@@ -2777,7 +2777,7 @@ KexiDB::Field* Connection::setupField( const RowData &data )
 
 	if (!KexiUtils::isIdentifier( data.at(2).toString() )) {
 		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"")
-			.tqarg( data.at(2).toString() ));
+			.arg( data.at(2).toString() ));
 		ok = false;
 		return 0;
 	}
@@ -2807,9 +2807,9 @@ KexiDB::TableSchema* Connection::setupTableSchema( const RowData &data )
 
 	KexiDB::Cursor *cursor;
 	if (!(cursor = executeQuery(
-		TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
+		TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
 			"f_options, f_default, f_order, f_caption, f_help"
-			" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->m_id) )))
+			" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").arg(t->m_id) )))
 	{
 		delete t;
 		return 0;
@@ -2867,9 +2867,9 @@ TableSchema* Connection::tableSchema( const TQString& tableName )
 		return t;
 	//not found: retrieve schema
 	RowData data;
-	if (true!=querySingleRecord(TQString::tqfromLatin1(
+	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2")
-			.tqarg(m_tableName).tqarg(KexiDB::TableObjectType), data))
+			.arg(m_tableName).arg(KexiDB::TableObjectType), data))
 		return 0;
 
 	return setupTableSchema(data);
@@ -2882,9 +2882,9 @@ TableSchema* Connection::tableSchema( int tableId )
 		return t;
 	//not found: retrieve schema
 	RowData data;
-	if (true!=querySingleRecord(TQString::tqfromLatin1(
+	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1")
-		.tqarg(tableId), data))
+		.arg(tableId), data))
 		return 0;
 
 	return setupTableSchema(data);
@@ -2904,7 +2904,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const
 {
 	if (objectID<=0)
 		return false;
-	TQString sql(TQString::tqfromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").tqarg(objectID));
+	TQString sql(TQString::fromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").arg(objectID));
 	TQString sql_sub( KexiDB::sqlWhere(m_driver, KexiDB::Field::Text, "o_sub_id", dataID) );
 
 	bool ok, exists;
@@ -2917,7 +2917,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const
 			+ " WHERE o_id=" + TQString::number(objectID) + " AND " + sql_sub );
 	}
 	return executeSQL(
-		TQString::tqfromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (")
+		TQString::fromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (")
 		+ TQString::number(objectID) +"," + m_driver->valueToSQL( KexiDB::Field::LongText, dataString )
 		+ "," + m_driver->valueToSQL( KexiDB::Field::Text, dataID ) + ")" );
 }
@@ -2943,7 +2943,7 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data )
 	if (!loadDataBlock( objID, sqlText, "sql" )) {
 		setError(ERR_OBJECT_NOT_FOUND, 
 			i18n("Could not find definition for query \"%1\". Removing this query is recommended.")
-			.tqarg(data[2].toString()));
+			.arg(data[2].toString()));
 		return 0;
 	}
 	d->parser()->parse( sqlText );
@@ -2953,8 +2953,8 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data )
 		setError(ERR_SQL_PARSE_ERROR, 
 			i18n("<p>Could not load definition for query \"%1\". "
 			"SQL statement for this query is invalid:<br><tt>%2</tt></p>\n"
-			"<p>You can open this query in Text View and correct it.</p>").tqarg(data[2].toString())
-			.tqarg(d->parser()->statement()));
+			"<p>You can open this query in Text View and correct it.</p>").arg(data[2].toString())
+			.arg(d->parser()->statement()));
 		return 0;
 	}
 	if (!setupObjectSchemaData( data, *query )) {
@@ -2974,9 +2974,9 @@ QuerySchema* Connection::querySchema( const TQString& queryName )
 		return q;
 	//not found: retrieve schema
 	RowData data;
-	if (true!=querySingleRecord(TQString::tqfromLatin1(
+	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2")
-			.tqarg(m_queryName).tqarg(KexiDB::QueryObjectType), data))
+			.arg(m_queryName).arg(KexiDB::QueryObjectType), data))
 		return 0;
 
 	return setupQuerySchema(data);
@@ -2990,8 +2990,8 @@ QuerySchema* Connection::querySchema( int queryId )
 	//not found: retrieve schema
 	clearError();
 	RowData data;
-	if (true!=querySingleRecord(TQString::tqfromLatin1(
-		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").tqarg(queryId), data))
+	if (true!=querySingleRecord(TQString::fromLatin1(
+		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").arg(queryId), data))
 		return 0;
 
 	return setupQuerySchema(data);
@@ -3207,7 +3207,7 @@ bool Connection::updateRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 				TQVariant val = data[ pkeyFieldsOrder[i] ];
 				if (val.isNull() || !val.isValid()) {
 					setError(ERR_UPDATE_NULL_PKEY_FIELD,
-						i18n("Primary key's field \"%1\" cannot be empty.").tqarg(it.current()->name()));
+						i18n("Primary key's field \"%1\" cannot be empty.").arg(it.current()->name()));
 	//js todo: pass the field's name somewhere!
 					return false;
 				}
@@ -3291,7 +3291,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 				KexiDBWarn << "NO ENTIRE MASTER TABLE's PKEY SPECIFIED!" << endl;
 				setError(ERR_INSERT_NO_ENTIRE_MASTER_TABLES_PKEY,
 					i18n("Could not insert row because it does not contain entire master table's primary key.")
-					.tqarg(query.name()));
+					.arg(query.name()));
 				return false;
 			}
 		}
@@ -3351,11 +3351,11 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 			return false;
 		}
 		RowData aif_data;
-		TQString getAutoIncForInsertedValue = TQString::tqfromLatin1("SELECT ")
+		TQString getAutoIncForInsertedValue = TQString::fromLatin1("SELECT ")
 			+ query.autoIncrementSQLFieldsList(m_driver)
-			+ TQString::tqfromLatin1(" FROM ")
+			+ TQString::fromLatin1(" FROM ")
 			+ escapeIdentifier(id_columnInfo->field->table()->name())
-			+ TQString::tqfromLatin1(" WHERE ")
+			+ TQString::fromLatin1(" WHERE ")
 			+ escapeIdentifier(id_columnInfo->field->name()) + "="
 			+ TQString::number(last_id);
 		if (true!=querySingleRecord(getAutoIncForInsertedValue, aif_data)) {
@@ -3395,7 +3395,7 @@ bool Connection::deleteRow(QuerySchema &query, RowData& data, bool useROWID)
 		KexiDBWarn << " -- NO MASTER TABLE!" << endl;
 		setError(ERR_DELETE_NO_MASTER_TABLE,
 			i18n("Could not delete row because there is no master table defined.")
-			.tqarg(query.name()));
+			.arg(query.name()));
 		return false;
 	}
 	IndexSchema *pkey = (mt->primaryKey() && !mt->primaryKey()->fields()->isEmpty()) ? mt->primaryKey() : 0;
@@ -3429,7 +3429,7 @@ bool Connection::deleteRow(QuerySchema &query, RowData& data, bool useROWID)
 			TQVariant val = data[ pkeyFieldsOrder[i] ];
 			if (val.isNull() || !val.isValid()) {
 				setError(ERR_DELETE_NULL_PKEY_FIELD, i18n("Primary key's field \"%1\" cannot be empty.")
-					.tqarg(it.current()->name()));
+					.arg(it.current()->name()));
 //js todo: pass the field's name somewhere!
 				return false;
 			}
diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp
index dc95e30f..75c30cfa 100644
--- a/kexi/kexidb/cursor.cpp
+++ b/kexi/kexidb/cursor.cpp
@@ -57,7 +57,7 @@ Cursor::Cursor(Connection* conn, QuerySchema& query, uint options )
 	, m_options(options)
 {
 #ifdef KEXI_DEBUG_GUI
-	KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").tqarg(query.name())+query.debugString());
+	KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").arg(query.name())+query.debugString());
 #endif
 	init();
 }
diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp
index 1edf5a25..9e384deb 100644
--- a/kexi/kexidb/dbobjectnamevalidator.cpp
+++ b/kexi/kexidb/dbobjectnamevalidator.cpp
@@ -45,7 +45,7 @@ Validator::Result ObjectNameValidator::internalCheck(
 		return Validator::Ok;
 	message = i18n("You cannot use name \"%1\" for your object.\n"
 		"It is reserved for internal Kexi objects. Please choose another name.")
-		.tqarg(v.toString());
+		.arg(v.toString());
 	details = i18n("Names of internal Kexi objects are starting with \"kexi__\".");
 	return Validator::Error;
 }
diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp
index 44b69192..490a7390 100644
--- a/kexi/kexidb/dbproperties.cpp
+++ b/kexi/kexidb/dbproperties.cpp
@@ -38,31 +38,31 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value
 	bool ok;
 	//we need to know whether update or insert
 	bool exists = m_conn->resultExists(
-		TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
-			.tqarg(m_conn->driver()->escapeString(name)), ok);
+		TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
+			.arg(m_conn->driver()->escapeString(name)), ok);
 	if (!ok) {
-		setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
 		return false;
 	}
 
 	if (exists) {
 		if (!m_conn->executeSQL(
-			TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
-			.tqarg(m_conn->driver()->escapeString(value.toString()))
-			.tqarg(m_conn->driver()->escapeString(name))))
+			TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
+			.arg(m_conn->driver()->escapeString(value.toString()))
+			.arg(m_conn->driver()->escapeString(name))))
 		{
-			setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
+			setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
 			return false;
 		}
 		return true;
 	}
 
 	if (!m_conn->executeSQL(
-		TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
-		.tqarg(m_conn->driver()->escapeString(name))
-		.tqarg(m_conn->driver()->escapeString(value.toString()))))
+		TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
+		.arg(m_conn->driver()->escapeString(name))
+		.arg(m_conn->driver()->escapeString(value.toString()))))
 	{
-		setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
 		return false;
 	}
 	return true;
@@ -76,31 +76,31 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt
 	bool ok;
 	//we need to know whether update or insert
 	bool exists = m_conn->resultExists(
-		TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
-			.tqarg(m_conn->driver()->escapeString(name)), ok);
+		TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
+			.arg(m_conn->driver()->escapeString(name)), ok);
 	if (!ok) {
-		setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
 		return false;
 	}
 
 	if (exists) {
 		if (!m_conn->executeSQL(
-			TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
-			.tqarg(m_conn->driver()->escapeString(caption))
-			.tqarg(m_conn->driver()->escapeString(name))))
+			TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
+			.arg(m_conn->driver()->escapeString(caption))
+			.arg(m_conn->driver()->escapeString(name))))
 		{
-			setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
+			setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
 			return false;
 		}
 		return true;
 	}
 
 	if (!m_conn->executeSQL(
-		TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
-		.tqarg(m_conn->driver()->escapeString(name))
-		.tqarg(m_conn->driver()->escapeString(caption))))
+		TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
+		.arg(m_conn->driver()->escapeString(name))
+		.arg(m_conn->driver()->escapeString(caption))))
 	{
-		setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
 		return false;
 	}
 	return true;
@@ -111,9 +111,9 @@ TQVariant DatabaseProperties::value( const TQString& _name )
 	TQString result;
 	TQString name(_name.stripWhiteSpace());
 	if (true!=m_conn->querySingleString(
-		TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
+		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
 		+ m_conn->driver()->escapeString(name), result)) {
-		m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").tqarg(name));
+		m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").arg(name));
 		return TQVariant();
 	}
 	return result;
@@ -126,9 +126,9 @@ TQString DatabaseProperties::caption( const TQString& _name )
 	//captions have ' ' prefix
 	name.prepend(" ");
 	if (true!=m_conn->querySingleString(
-		TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
+		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
 		+ m_conn->driver()->escapeString(name), result)) {
-		setError(m_conn, i18n("Could not read database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not read database property \"%1\".").arg(name));
 		return TQString();
 	}
 	return result;
@@ -138,8 +138,8 @@ TQStringList DatabaseProperties::names()
 {
 	TQStringList result;
 	if (true!=m_conn->queryStringList(
-		TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ")
-		    + m_conn->driver()->escapeString(TQString::tqfromLatin1(" %%")), result, 0 /*0-th*/)) {
+		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ")
+		    + m_conn->driver()->escapeString(TQString::fromLatin1(" %%")), result, 0 /*0-th*/)) {
 		//                                                        ^^ exclude captions
 		setError(m_conn, i18n("Could not read database properties."));
 		return TQStringList();
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index 4db1b400..d760a004 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -106,16 +106,16 @@ bool Driver::isValid()
 	{
 		setError(ERR_INCOMPAT_DRIVER_VERSION,
 		i18n("Incompatible database driver's \"%1\" version: found version %2, expected version %3.")
-		.tqarg(name())
-		.tqarg(TQString("%1.%2").tqarg(version().major).tqarg(version().minor))
-		.tqarg(TQString("%1.%2").tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor)));
+		.arg(name())
+		.arg(TQString("%1.%2").arg(version().major).arg(version().minor))
+		.arg(TQString("%1.%2").arg(KexiDB::version().major).arg(KexiDB::version().minor)));
 		return false;
 	}
 
-	TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").tqarg(name());
+	TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").arg(name());
 	TQString not_init = i18n("Value of \"%1\" is not initialized for the driver.");
 	if (beh->ROW_ID_FIELD_NAME.isEmpty()) {
-		setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.tqarg("DriverBehaviour::ROW_ID_FIELD_NAME"));
+		setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.arg("DriverBehaviour::ROW_ID_FIELD_NAME"));
 		return false;
 	}
 
@@ -135,7 +135,7 @@ TQString Driver::fileDBDriverMimeType() const
 { return d->fileDBDriverMimeType; }
 
 TQString Driver::defaultFileBasedDriverMimeType()
-{ return TQString::tqfromLatin1("application/x-kexiproject-sqlite3"); }
+{ return TQString::fromLatin1("application/x-kexiproject-sqlite3"); }
 
 TQString Driver::defaultFileBasedDriverName()
 {
@@ -282,7 +282,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const
 			return dateTimeToSQL( v.toDateTime() );
 		case Field::BLOB: {
 			if (v.toByteArray().isEmpty())
-				return TQString::tqfromLatin1("NULL");
+				return TQString::fromLatin1("NULL");
 			if (v.type()==TQVariant::String)
 				return escapeBLOB(v.toString().utf8());
 			return escapeBLOB(v.toByteArray());
diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp
index 8c7f096a..462ce608 100644
--- a/kexi/kexidb/driver_p.cpp
+++ b/kexi/kexidb/driver_p.cpp
@@ -85,7 +85,7 @@ void DriverPrivate::initInternalProperties()
 	propertyCaptions["transaction_nested"] = i18n("Nested transactions support");
 
 	properties["kexidb_driver_version"] =
-	  TQString("%1.%2").tqarg(version().major).tqarg(version().minor);
+	  TQString("%1.%2").arg(version().major).arg(version().minor);
 	propertyCaptions["kexidb_driver_version"] =
 	  i18n("KexiDB driver version");
 }
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 0a7ff574..1f348ddf 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -137,12 +137,12 @@ bool DriverManagerInternal::lookupDrivers()
 		if (major_ver != KexiDB::version().major || minor_ver != KexiDB::version().minor) {
 			KexiDBWarn << TQString("DriverManagerInternal::lookupDrivers(): '%1' driver" 
 				" has version '%2' but required KexiDB driver version is '%3.%4'\n"
-				" -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor) << endl;
+				" -- skipping this driver!").arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiDB::version().major).arg(KexiDB::version().minor) << endl;
 			possibleProblems += TQString("\"%1\" database driver has version \"%2\" "
 				"but required driver version is \"%3.%4\"")
-				.tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor);
+				.arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiDB::version().major).arg(KexiDB::version().minor);
 			continue;
 		}
 
@@ -186,7 +186,7 @@ KexiDB::Driver::Info DriverManagerInternal::driverInfo(const TQString &name)
 {
 	KexiDB::Driver::Info i = m_driversInfo[name.lower()];
 	if (!error() && i.name.isEmpty())
-		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").arg(name) );
 	return i;
 }
 
@@ -203,7 +203,7 @@ Driver* DriverManagerInternal::driver(const TQString& name)
 		return drv; //cached
 
 	if (!m_services_lcase.contains(name.lower())) {
-		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").arg(name) );
 		return 0;
 	}
 
@@ -216,7 +216,7 @@ Driver* DriverManagerInternal::driver(const TQString& name)
 
 	if (!drv) {
 		setError(ERR_DRIVERMANAGER, i18n("Could not load database driver \"%1\".")
-				.tqarg(name) );
+				.arg(name) );
 		if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound";
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary";
@@ -360,7 +360,7 @@ KService::Ptr DriverManager::serviceInfo(const TQString &name)
 	if (d_int->m_services_lcase.contains(name.lower())) {
 		return *d_int->m_services_lcase.find(name.lower());
 	} else {
-		setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").arg(name) );
 		return KService::Ptr();
 	}
 }
@@ -425,7 +425,7 @@ TQString DriverManager::possibleProblemsInfoMsg() const
 	for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin();
 		it!=d_int->possibleProblems.constEnd(); ++it)
 	{
-		str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>"));
+		str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>"));
 	}
 	str += "</ul>";
 	return str;
diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
index 18682a4f..44853163 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
@@ -175,7 +175,7 @@ bool MySqlConnection::drv_containsTable( const TQString &tableName )
 {
 	bool success;
 	return resultExists(TQString("show tables like %1")
-		.tqarg(driver()->escapeString(tableName)), success) && success;
+		.arg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool MySqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 01d326af..0f2bcf9b 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -120,12 +120,12 @@ TQString MySqlDriver::escapeString(const TQString& str) const
 	const int old_length = str.length();
 	int i;
 	for ( i = 0; i < old_length; i++ ) { //anything to escape?
-		const unsigned int ch = str[i].tqunicode();
+		const unsigned int ch = str[i].unicode();
 		if (ch == '\\' || ch == '\'' || ch == '"' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\b' || ch == '\0')
 			break;
 	}
 	if (i >= old_length) { //no characters to escape
-		return TQString::tqfromLatin1("'") + str + TQString::tqfromLatin1("'");
+		return TQString::fromLatin1("'") + str + TQString::fromLatin1("'");
 	}
 
 	TQChar *new_string = new TQChar[ old_length * 3 + 1 ]; // a worst case approximation
@@ -133,7 +133,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const
 	int new_length = 0;
 	new_string[new_length++] = '\''; //prepend '
 	for ( i = 0; i < old_length; i++, new_length++ ) {
-		const unsigned int ch = str[i].tqunicode();
+		const unsigned int ch = str[i].unicode();
 		if (ch == '\\') {
 			new_string[new_length++] = '\\';
 			new_string[new_length] = '\\';
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
index c81f04ad..d6262bef 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
@@ -128,7 +128,7 @@ bool pqxxSqlConnection::drv_getDatabasesList( TQStringList &list )
 			// Read value of column 0 into a string N
 			c[0].to(N);
 			// Copy the result into the return list
-			list << TQString::tqfromLatin1 (N.c_str());
+			list << TQString::fromLatin1 (N.c_str());
 		}
 		return true;
 	}
@@ -190,15 +190,15 @@ bool pqxxSqlConnection::drv_useDatabase( const TQString &dbName, bool *cancelled
 	if (data()->port == 0)
 		data()->port = 5432;
 
-	conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(data()->port);
+	conninfo += TQString::fromLatin1(" port='%1'").arg(data()->port);
 
-	conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(dbName);
+	conninfo += TQString::fromLatin1(" dbname='%1'").arg(dbName);
 
 	if (!data()->userName.isNull())
-		conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(data()->userName);
+		conninfo += TQString::fromLatin1(" user='%1'").arg(data()->userName);
 
 	if (!data()->password.isNull())
-		conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(data()->password);
+		conninfo += TQString::fromLatin1(" password='%1'").arg(data()->password);
 
 	try
 	{
@@ -346,7 +346,7 @@ bool pqxxSqlConnection::drv_containsTable( const TQString &tableName )
 {
 	bool success;
 	return resultExists(TQString("select 1 from pg_class where relkind='r' and relname LIKE %1")
-		.tqarg(driver()->escapeString(tableName)), success) && success;
+		.arg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool pqxxSqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
index 637a33f3..8a61978d 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
@@ -79,7 +79,7 @@ inline TQVariant pgsqlCStrToVariant(const pqxx::result::field& r)
 	switch(r.type())
 	{
 		case BOOLOID:
-			return TQString::tqfromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
+			return TQString::fromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
 		case INT2OID:
 		case INT4OID:
 		case INT8OID:
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index 333df590..8967bc5e 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -133,9 +133,9 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const
 //
 TQString pqxxSqlDriver::escapeString( const TQString& str) const
 {
-    return TQString::tqfromLatin1("'")
+    return TQString::fromLatin1("'")
     	+ TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() )
-    	+ TQString::tqfromLatin1("'");
+    	+ TQString::fromLatin1("'");
 }
 
 //==================================================================================
@@ -172,7 +172,7 @@ TQString pqxxSqlDriver::valueToSQL( uint ftype, const TQVariant& v ) const
 		// use SQL compliant TRUE or FALSE as described here
 		// http://www.postgresql.org/docs/8.0/interactive/datatype-boolean.html
 		// 1 or 0 does not work
-		return v.toInt()==0 ? TQString::tqfromLatin1("FALSE") : TQString::tqfromLatin1("TRUE");
+		return v.toInt()==0 ? TQString::fromLatin1("FALSE") : TQString::fromLatin1("TRUE");
 	}
 	return Driver::valueToSQL(ftype, v);
 }
diff --git a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
index 14d2217a..1fb33233 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
@@ -46,7 +46,7 @@ bool SQLiteAdminTools::vacuum(const KexiDB::ConnectionData& data, const TQString
 #else
 	KexiDB::DriverManager manager;
 	KexiDB::Driver *drv = manager.driver(data.driverName);
-	TQString title( i18n("Could not compact database \"%1\".").tqarg(TQDir::convertSeparators(databaseName)) );
+	TQString title( i18n("Could not compact database \"%1\".").arg(TQDir::convertSeparators(databaseName)) );
 	if (!drv) {
 		setError(&manager, title);
 		return false;
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
index 631f3bc6..cf478b94 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -130,7 +130,7 @@ bool SQLiteConnection::drv_containsTable( const TQString &tableName )
 {
 	bool success;
 	return resultExists(TQString("select name from sqlite_master where type='table' and name LIKE %1")
-		.tqarg(driver()->escapeString(tableName)), success) && success;
+		.arg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool SQLiteConnection::drv_getTablesList( TQStringList &list )
@@ -188,7 +188,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
 
 	d->res = sqlite3_open( 
 		//TQFile::encodeName( data()->fileName() ), 
-		data()->fileName().utf8(), /* tqunicode expected since SQLite 3.1 */
+		data()->fileName().utf8(), /* unicode expected since SQLite 3.1 */
 		&d->data,
 		exclusiveFlag,
 		allowReadonly /* If 1 and locking fails, try opening in read-only mode */
@@ -200,7 +200,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
 		if (KMessageBox::Continue != 
 			askQuestion( 
 			i18n("Do you want to open file \"%1\" as read-only?")
-				.tqarg(TQDir::convertSeparators(data()->fileName()))
+				.arg(TQDir::convertSeparators(data()->fileName()))
 			+ "\n\n"
 			+ i18n("The file is probably already open on this or another computer.") + " "
 			+ i18n("Could not gain exclusive access for writing the file."),
@@ -264,7 +264,7 @@ bool SQLiteConnection::drv_dropDatabase( const TQString &dbName )
 	const TQString filename = data()->fileName();
 	if (TQFile(filename).exists() && !TQDir().remove(filename)) {
 		setError(ERR_ACCESS_RIGHTS, i18n("Could not remove file \"%1\".")
-			.tqarg(TQDir::convertSeparators(filename)) + " "
+			.arg(TQDir::convertSeparators(filename)) + " "
 			+ i18n("Check the file's permissions and whether it is already opened and locked by another application."));
 		return false;
 	}
@@ -324,9 +324,9 @@ TQString SQLiteConnection::serverResultName()
 {
 	TQString r = 
 #ifdef SQLITE2
-		TQString::tqfromLatin1( sqlite_error_string(d->res) );
+		TQString::fromLatin1( sqlite_error_string(d->res) );
 #else //SQLITE3
-		TQString(); //tqfromLatin1( d->result_name );
+		TQString(); //fromLatin1( d->result_name );
 #endif
 	return r.isEmpty() ? Connection::serverResultName() : r;
 }
@@ -395,8 +395,8 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri
 //TODO indices, etc.???
 
 	// 3. copy all rows to the new table
-	if (!executeSQL(TQString::tqfromLatin1("INSERT INTO %1 SELECT * FROM %2")
-		.tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName))))
+	if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2")
+		.arg(escapeIdentifier(tableSchema.name())).arg(escapeIdentifier(oldTableName))))
 	{
 		drv_alterTableName_ERR;
 		return false;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
index 5239127c..20d80f9c 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
@@ -476,19 +476,19 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const
 			case Field::Integer:
 				data[i] = TQVariant( TQCString(*col).toInt() );
 			case Field::BigInteger:
-				data[i] = TQVariant( TQString::tqfromLatin1(*col).toLongLong() );
+				data[i] = TQVariant( TQString::fromLatin1(*col).toLongLong() );
 			case Field::Boolean:
-				data[i] = TQVariant( sqliteStringToBool(TQString::tqfromLatin1(*col)), 1 );
+				data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)), 1 );
 				break;
 			case Field::Date:
-				data[i] = TQDate::fromString( TQString::tqfromLatin1(*col), Qt::ISODate );
+				data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate );
 				break;
 			case Field::Time:
 				//TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull()
-				data[i] = KexiUtils::stringToHackedTQTime(TQString::tqfromLatin1(*col));
+				data[i] = KexiUtils::stringToHackedTQTime(TQString::fromLatin1(*col));
 				break;
 			case Field::DateTime: {
-				TQString tmp( TQString::tqfromLatin1(*col) );
+				TQString tmp( TQString::fromLatin1(*col) );
 				tmp[10] = 'T';
 				data[i] = TQDateTime::fromString( tmp, Qt::ISODate );
 				break;
@@ -548,9 +548,9 @@ int SQLiteCursor::serverResult()
 TQString SQLiteCursor::serverResultName()
 {
 #ifdef SQLITE2
-	return TQString::tqfromLatin1( sqlite_error_string(d->res) );
+	return TQString::fromLatin1( sqlite_error_string(d->res) );
 #else //SQLITE3
-	return TQString::tqfromLatin1( d->result_name );
+	return TQString::fromLatin1( d->result_name );
 #endif
 }
 
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index d24d906d..96802596 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -79,7 +79,7 @@ tristate SQLiteVacuum::run()
 	}
 	m_dlg = new KProgressDialog(0, 0, i18n("Compacting database"), 
 		"<qt>"+i18n("Compacting database \"%1\"...")
-		.tqarg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>")
+		.arg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>")
 	);
 	m_dlg->adjustSize();
 	m_dlg->resize(300, m_dlg->height());
@@ -98,7 +98,7 @@ tristate SQLiteVacuum::run()
 		const uint newSize = TQFileInfo(m_filePath).size();
 		const uint decrease = 100-100*newSize/origSize;
 		KMessageBox::information(0, i18n("The database has been compacted. Current size decreased by %1% to %2.")
-			.tqarg(decrease).tqarg(KIO::convertSize(newSize)));
+			.arg(decrease).arg(KIO::convertSize(newSize)));
 	}
 	return m_result;
 }
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index 35ab8d70..d9a33b4c 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -82,7 +82,7 @@ Field::Type BaseExpr::type()
 
 TQString BaseExpr::debugString()
 {
-	return TQString("BaseExpr(%1,type=%1)").tqarg(m_token).tqarg(Driver::defaultSQLTypeName(type()));
+	return TQString("BaseExpr(%1,type=%1)").arg(m_token).arg(Driver::defaultSQLTypeName(type()));
 }
 
 bool BaseExpr::validate(ParseInfo& /*parseInfo*/)
@@ -241,7 +241,7 @@ TQString UnaryExpr::debugString()
 	return "UnaryExpr('" 
 		+ tokenToDebugString() + "', "
 		+ (m_arg ? m_arg->debugString() : TQString("<NONE>")) 
-		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -256,7 +256,7 @@ TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
 		return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NULL";
 	if (m_token==SQL_IS_NOT_NULL)
 		return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NOT NULL";
-	return TQString("{INVALID_OPERATOR#%1} ").tqarg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
+	return TQString("{INVALID_OPERATOR#%1} ").arg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
 }
 
 void UnaryExpr::getQueryParameters(QuerySchemaParameterList& params)
@@ -419,7 +419,7 @@ TQString BinaryExpr::debugString()
 		+ "," + (m_larg ? m_larg->debugString() : TQString("<NONE>")) 
 		+ ",'" + tokenToDebugString() + "',"
 		+ (m_rarg ? m_rarg->debugString() : TQString("<NONE>")) 
-		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString BinaryExpr::tokenToString()
@@ -449,7 +449,7 @@ TQString BinaryExpr::tokenToString()
 	/* not handled here */
 	default:;
 	}
-	return TQString("{INVALID_BINARY_OPERATOR#%1} ").tqarg(m_token);
+	return TQString("{INVALID_BINARY_OPERATOR#%1} ").arg(m_token);
 }
 
 TQString BinaryExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -529,7 +529,7 @@ Field::Type ConstExpr::type()
 TQString ConstExpr::debugString()
 {
 	return TQString("ConstExpr('") + tokenToDebugString() +"'," + toString()
-		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString ConstExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -601,13 +601,13 @@ void QueryParameterExpr::setType(Field::Type type)
 
 TQString QueryParameterExpr::debugString()
 {
-	return TQString("QueryParameterExpr('") + TQString::tqfromLatin1("[%2]").tqarg(value.toString())
-		+ TQString("',type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+	return TQString("QueryParameterExpr('") + TQString::fromLatin1("[%2]").arg(value.toString())
+		+ TQString("',type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString QueryParameterExpr::toString(QuerySchemaParameterValueListIterator* params)
 {
-	return params ? params->getPreviousValueAsString(type()) : TQString::tqfromLatin1("[%2]").tqarg(value.toString());
+	return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").arg(value.toString());
 }
 
 void QueryParameterExpr::getQueryParameters(QuerySchemaParameterList& params)
@@ -656,7 +656,7 @@ VariableExpr* VariableExpr::copy() const
 TQString VariableExpr::debugString()
 {
 	return TQString("VariableExpr(") + name
-		+ TQString(",type=%1)").tqarg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
+		+ TQString(",type=%1)").arg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
 }
 
 TQString VariableExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -719,15 +719,15 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 					parseInfo.errMsg = i18n("Ambiguous field name");
 					parseInfo.errDescr = i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. "
 						"Use \"<tableName>.%4\" notation to specify table name.")
-						.tqarg(firstField->table()->name()).tqarg(f->table()->name())
-						.tqarg(fieldName).tqarg(fieldName);
+						.arg(firstField->table()->name()).arg(f->table()->name())
+						.arg(fieldName).arg(fieldName);
 					return false;
 				}
 			}
 		}
 		if (!firstField) {
 			parseInfo.errMsg = i18n("Field not found");
-			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").tqarg(fieldName);
+			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").arg(fieldName);
 			return false;
 		}
 		//ok
@@ -754,8 +754,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 		if (covered) {
 			parseInfo.errMsg = i18n("Could not access the table directly using its name");
 			parseInfo.errDescr = i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", "
-				"you can write \"%3\"").tqarg(tableName)
-				.tqarg(TQString(tableName+"."+fieldName)).tqarg(TQString(tableAlias+"."+fieldName.latin1()));
+				"you can write \"%3\"").arg(tableName)
+				.arg(TQString(tableName+"."+fieldName)).arg(TQString(tableAlias+"."+fieldName.latin1()));
 			return false;
 		}
 	}
@@ -773,7 +773,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 
 	if (!ts) {
 		parseInfo.errMsg = i18n("Table not found");
-		parseInfo.errDescr = i18n("Unknown table \"%1\"").tqarg(tableName);
+		parseInfo.errDescr = i18n("Unknown table \"%1\"").arg(tableName);
 		return false;
 	}
 
@@ -786,8 +786,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 	//it's a table.*
 	if (fieldName=="*") {
 		if (positionsList->count()>1) {
-			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").tqarg(tableName);
-			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").tqarg(tableName);
+			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").arg(tableName);
+			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").arg(tableName);
 			return false;
 		}
 		tableForQueryAsterisk = ts;
@@ -800,7 +800,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 	if (!realField) {
 		parseInfo.errMsg = i18n("Field not found");
 		parseInfo.errDescr = i18n("Table \"%1\" has no \"%2\" field")
-			.tqarg(tableName).tqarg(fieldName);
+			.arg(tableName).arg(fieldName);
 		return false;
 	}
 
@@ -815,9 +815,9 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 			numberOfTheSameFields++;
 		if (numberOfTheSameFields>1) {
 			parseInfo.errMsg = i18n("Ambiguous \"%1.%2\" expression")
-				.tqarg(tableName).tqarg(fieldName);
+				.arg(tableName).arg(fieldName);
 			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-				.tqarg(tableName).tqarg(fieldName);
+				.arg(tableName).arg(fieldName);
 			return false;
 		}
 	}
@@ -880,7 +880,7 @@ TQString FunctionExpr::debugString()
 	res.append( TQString("FunctionExpr(") + name );
 	if (args)
 		res.append(TQString(",") + args->debugString());
-	res.append(TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())));
+	res.append(TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type())));
 	return res;
 }
 
diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp
index 33e9e929..b12000ac 100644
--- a/kexi/kexidb/field.cpp
+++ b/kexi/kexidb/field.cpp
@@ -179,7 +179,7 @@ TQString Field::typeName(uint type)
 TQString Field::typeString(uint type)
 {
 	m_typeNames.init();
-	return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").tqarg(type);
+	return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").arg(type);
 }
 
 TQString Field::typeGroupName(uint typeGroup)
@@ -191,7 +191,7 @@ TQString Field::typeGroupName(uint typeGroup)
 TQString Field::typeGroupString(uint typeGroup)
 {
 	m_typeGroupNames.init();
-	return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").tqarg(typeGroup);
+	return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").arg(typeGroup);
 }
 
 Field::Type Field::typeForString(const TQString& typeString)
@@ -330,7 +330,7 @@ void
 Field::setType(Type t)
 {
 	if (m_expr) {
-		KexiDBWarn << TQString("Field::setType(%1)").tqarg(t) 
+		KexiDBWarn << TQString("Field::setType(%1)").arg(t) 
 			<< " could not set type because the field has expression assigned!" << endl;
 		return;
 	}
@@ -589,12 +589,12 @@ TQString Field::debugString() const
 	dbg += (conn && conn->driver()) ? conn->driver()->sqlTypeName(type()) : Driver::defaultSQLTypeName(type());
 	if (isFPNumericType() && m_precision>0) {
 		if (scale()>0)
-			dbg += TQString::tqfromLatin1("(%1,%2)").tqarg(m_precision).tqarg(scale());
+			dbg += TQString::fromLatin1("(%1,%2)").arg(m_precision).arg(scale());
 		else 
-			dbg += TQString::tqfromLatin1("(%1)").tqarg(m_precision);
+			dbg += TQString::fromLatin1("(%1)").arg(m_precision);
 	}
 	else if (m_type==Field::Text && m_length>0)
-		dbg += TQString::tqfromLatin1("(%1)").tqarg(m_length);
+		dbg += TQString::fromLatin1("(%1)").arg(m_length);
 	if (m_constraints & Field::AutoInc)
 		dbg += " AUTOINC";
 	if (m_constraints & Field::Unique)
@@ -608,18 +608,18 @@ TQString Field::debugString() const
 	if (m_constraints & Field::NotEmpty)
 		dbg += " NOTEMPTY";
 	if (!m_defaultValue.isNull())
-		dbg += TQString(" DEFAULT=[%1]").tqarg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue);
+		dbg += TQString(" DEFAULT=[%1]").arg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue);
 	if (m_expr)
 		dbg += " EXPRESSION=" + m_expr->debugString();
 	if (m_customProperties && !m_customProperties->isEmpty()) {
-		dbg += TQString(" CUSTOM PROPERTIES (%1): ").tqarg(m_customProperties->count());
+		dbg += TQString(" CUSTOM PROPERTIES (%1): ").arg(m_customProperties->count());
 		bool first = true;
 		foreach (CustomPropertiesMap::ConstIterator, it, *m_customProperties) {
 			if (first)
 				first = false;
 			else
 				dbg += ", ";
-			dbg += TQString("%1 = %2 (%3)").tqarg(TQString(it.key())).tqarg(TQString(it.data().toString())).tqarg(TQString(it.data().typeName()));
+			dbg += TQString("%1 = %2 (%3)").arg(TQString(it.key())).arg(TQString(it.data().toString())).arg(TQString(it.data().typeName()));
 		}
 	}
 	return dbg;
@@ -664,10 +664,10 @@ void Field::setCustomProperty(const TQCString& propertyName, const TQVariant& va
 //-------------------------------------------------------
 #define ADDTYPE(type, i18, str) this->at(Field::type) = i18; \
 	this->at(Field::type+Field::LastType+1) = str; \
-	str2num.insert(TQString::tqfromLatin1(str).lower(), type)
+	str2num.insert(TQString::fromLatin1(str).lower(), type)
 #define ADDGROUP(type, i18, str) this->at(Field::type) = i18; \
 	this->at(Field::type+Field::LastTypeGroup+1) = str; \
-	str2num.insert(TQString::tqfromLatin1(str).lower(), type)
+	str2num.insert(TQString::fromLatin1(str).lower(), type)
 
 Field::FieldTypeNames::FieldTypeNames()
  : TQValueVector<TQString>()
diff --git a/kexi/kexidb/fieldlist.cpp b/kexi/kexidb/fieldlist.cpp
index dea19876..292ba75e 100644
--- a/kexi/kexidb/fieldlist.cpp
+++ b/kexi/kexidb/fieldlist.cpp
@@ -94,7 +94,7 @@ void FieldList::renameField(KexiDB::Field *field, const TQString& newName)
 {
 	if (!field || field != m_fields_by_name[ field->name() ]) {
 		KexiDBFatal << "FieldList::renameField() no field found " 
-			<< (field ? TQString("\"%1\"").tqarg(field->name()) : TQString()) << endl;
+			<< (field ? TQString("\"%1\"").arg(field->name()) : TQString()) << endl;
 		return;
 	}
 	m_fields_by_name.take( field->name() );
@@ -157,7 +157,7 @@ void FieldList::debug()
 }
 
 static TQString subListWarning1(const TQString& fname) {
-	return TQString("FieldList::subList() could not find field \"%1\"").tqarg(fname);
+	return TQString("FieldList::subList() could not find field \"%1\"").arg(fname);
 }
 
 FieldList* FieldList::subList(const TQString& n1, const TQString& n2, 
@@ -212,7 +212,7 @@ FieldList* FieldList::subList(const TQValueList<uint>& list)
 	foreach(TQValueList<uint>::ConstIterator, it, list) {
 		f = field(*it);
 		if (!f) {
-			KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").tqarg(*it) << endl;
+			KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").arg(*it) << endl;
 			delete fl;
 			return 0;
 		}
diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h
index fbf303a9..9db4f5a6 100644
--- a/kexi/kexidb/fieldlist.h
+++ b/kexi/kexidb/fieldlist.h
@@ -143,13 +143,13 @@ class KEXI_DB_EXPORT FieldList
 		 See @ref Connection::selectStatement() for example use.
 		 \a drvEscaping can be used to alter default escaping type.
 		*/
-		TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::tqfromLatin1(","), 
+		TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::fromLatin1(","), 
 			const TQString& tableAlias = TQString(),
 			int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary);
 
 		/*! Like above, but this is convenient static function, so you can pass any \a list here. */
 		static TQString sqlFieldsList(Field::List* list, Driver *driver,
-			const TQString& separator = TQString::tqfromLatin1(","), const TQString& tableAlias = TQString(),
+			const TQString& separator = TQString::fromLatin1(","), const TQString& tableAlias = TQString(),
 			int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary);
 
 		/*! @internal Renames field \a oldName to \a newName. 
diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp
index 62a0665e..05728d00 100644
--- a/kexi/kexidb/lookupfieldschema.cpp
+++ b/kexi/kexidb/lookupfieldschema.cpp
@@ -91,7 +91,7 @@ void LookupFieldSchema::RowSource::setValues(const TQStringList& values)
 TQString LookupFieldSchema::RowSource::debugString() const
 {
 	return TQString("rowSourceType:'%1' rowSourceName:'%2' rowSourceValues:'%3'\n")
-		.tqarg(typeName()).tqarg(name()).tqarg(m_values ? m_values->join("|") : TQString());
+		.arg(typeName()).arg(name()).arg(m_values ? m_values->join("|") : TQString());
 }
 
 void LookupFieldSchema::RowSource::debug() const
@@ -144,11 +144,11 @@ TQString LookupFieldSchema::debugString() const
 		" boundColumn:%2 visibleColumns:%3 maximumListRows:%4 displayWidget:%5\n"
 		" columnHeadersVisible:%6 limitToList:%7\n"
 		" columnWidths:%8 )")
-		.tqarg(m_rowSource.debugString())
-		.tqarg(m_boundColumn).tqarg(visibleColumnsString).tqarg(m_maximumListRows)
-		.tqarg( m_displayWidget==ComboBox ? "ComboBox" : "ListBox")
-		.tqarg(m_columnHeadersVisible).tqarg(m_limitToList)
-		.tqarg(columnWidthsStr);
+		.arg(m_rowSource.debugString())
+		.arg(m_boundColumn).arg(visibleColumnsString).arg(m_maximumListRows)
+		.arg( m_displayWidget==ComboBox ? "ComboBox" : "ListBox")
+		.arg(m_columnHeadersVisible).arg(m_limitToList)
+		.arg(columnWidthsStr);
 }
 
 void LookupFieldSchema::debug() const
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index c2cece0b..38a7d386 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -142,10 +142,10 @@ void yyerror(const char *str)
 
 			if (parser->isReservedKeyword(ctoken.latin1()))
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("\"%1\" is a reserved keyword").tqarg(ctoken)+lexerErr, ctoken, current) );
+					i18n("\"%1\" is a reserved keyword").arg(ctoken)+lexerErr, ctoken, current) );
 			else
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("Syntax Error near \"%1\"").tqarg(ctoken)+lexerErr, ctoken, current) );
+					i18n("Syntax Error near \"%1\"").arg(ctoken)+lexerErr, ctoken, current) );
 		}
 	}
 }
@@ -204,7 +204,7 @@ bool parseData(Parser *p, const char *data)
 			{
 				if(tableList.findRef(item->table()) == -1)
 				{
-					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").tqarg(item->table()->name()), ctoken, current);
+					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").arg(item->table()->name()), ctoken, current);
 					parser->setError(err);
 
 					yyerror("fieldlisterror");
@@ -288,15 +288,15 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 						setError(i18n("Ambiguous field name"), 
 							i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. "
 								"Use \"<tableName>.%4\" notation to specify table name.")
-								.tqarg(firstField->table()->name()).tqarg(f->table()->name())
-								.tqarg(fieldName).tqarg(fieldName));
+								.arg(firstField->table()->name()).arg(f->table()->name())
+								.arg(fieldName).arg(fieldName));
 						return false;
 					}
 				}
 			}
 			if (!firstField) {
 					setError(i18n("Field not found"), 
-						i18n("Table containing \"%1\" field not found").tqarg(fieldName));
+						i18n("Table containing \"%1\" field not found").arg(fieldName));
 					return false;
 			}
 			//ok
@@ -321,8 +321,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 			if (covered) {
 				setError(i18n("Could not access the table directly using its name"), 
 					i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", "
-					"you can write \"%3\"").tqarg(tableName)
-					.tqarg(tableName+"."+fieldName).tqarg(tableAlias+"."+fieldName.latin1()));
+					"you can write \"%3\"").arg(tableName)
+					.arg(tableName+"."+fieldName).arg(tableAlias+"."+fieldName.latin1()));
 				return false;
 			}
 		}
@@ -348,8 +348,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 
 			if (fieldName=="*") {
 				if (positionsList->count()>1) {
-					setError(i18n("Ambiguous \"%1.*\" expression").tqarg(tableName),
-						i18n("More than one \"%1\" table or alias defined").tqarg(tableName));
+					setError(i18n("Ambiguous \"%1.*\" expression").arg(tableName),
+						i18n("More than one \"%1\" table or alias defined").arg(tableName));
 					return false;
 				}
 				parseInfo.querySchema->addAsterisk( new QueryAsterisk(parseInfo.querySchema, ts) );
@@ -368,9 +368,9 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 						if (otherTS->field(fieldName))
 							numberOfTheSameFields++;
 						if (numberOfTheSameFields>1) {
-							setError(i18n("Ambiguous \"%1.%2\" expression").tqarg(tableName).tqarg(fieldName),
+							setError(i18n("Ambiguous \"%1.%2\" expression").arg(tableName).arg(fieldName),
 								i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-								.tqarg(tableName).tqarg(fieldName));
+								.arg(tableName).arg(fieldName));
 							return false;
 						}
 					}
@@ -379,7 +379,7 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 				}
 				else {
 					setError(i18n("Field not found"), i18n("Table \"%1\" has no \"%2\" field")
-						.tqarg(tableName).tqarg(fieldName));
+						.arg(tableName).arg(fieldName));
 					return false;
 				}
 			}
@@ -436,7 +436,7 @@ QuerySchema* buildSelectQuery(
 			TableSchema *s = parser->db()->tableSchema(TQString(tname));
 			if(!s) {
 				setError(//i18n("Field List Error"), 
-					i18n("Table \"%1\" does not exist").tqarg(TQString(tname)));
+					i18n("Table \"%1\" does not exist").arg(TQString(tname)));
 	//			yyerror("fieldlisterror");
 				CLEANUP;
 				return 0;
@@ -511,7 +511,7 @@ QuerySchema* buildSelectQuery(
 				aliasVariable = e->toBinary()->right()->toVariable();
 				if (!aliasVariable) {
 					setError(i18n("Invalid alias definition for column \"%1\"")
-						.tqarg(columnExpr->toString())); //ok?
+						.arg(columnExpr->toString())); //ok?
 					CLEANUP;
 					return 0;
 				}
@@ -542,7 +542,7 @@ QuerySchema* buildSelectQuery(
 				e->toBinary()->m_larg = 0;
 			}
 			else {
-				setError(i18n("Invalid \"%1\" column definition").tqarg(e->toString())); //ok?
+				setError(i18n("Invalid \"%1\" column definition").arg(e->toString())); //ok?
 				CLEANUP;
 				return 0;
 			}
@@ -610,7 +610,7 @@ QuerySchema* buildSelectQuery(
 							(*it).ascending, (*it).columnNumber-1 ))
 						{
 							setError(i18n("Could not define sorting - no column at position %1")
-								.tqarg((*it).columnNumber));
+								.arg((*it).columnNumber));
 							CLEANUP;
 							return 0;
 						}
@@ -619,7 +619,7 @@ QuerySchema* buildSelectQuery(
 						Field * f = querySchema->findTableField((*it).aliasOrName);
 						if (!f) {
 							setError(i18n("Could not define sorting - "
-								"column name or alias \"%1\" does not exist").tqarg((*it).aliasOrName));
+								"column name or alias \"%1\" does not exist").arg((*it).aliasOrName));
 							CLEANUP;
 							return 0;
 						}
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index 091d516b..c7c3aa99 100644
--- a/kexi/kexidb/parser/sqlparser.cpp
+++ b/kexi/kexidb/parser/sqlparser.cpp
@@ -3111,7 +3111,7 @@ YYACCEPT;
 			Field *f = item->table()->field(item->name());
 			if(!f)
 			{
-				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current);
+				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").arg(item->name()).arg(schema->name()), ctoken, current);
 				parser->setError(err);
 				yyerror("fieldlisterror");
 			}	
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index 7775885d..5a8357f2 100644
--- a/kexi/kexidb/parser/sqlparser.y
+++ b/kexi/kexidb/parser/sqlparser.y
@@ -1201,7 +1201,7 @@ IDENTIFIER
 			Field *f = item->table()->field(item->name());
 			if(!f)
 			{
-				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current);
+				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").arg(item->name()).arg(schema->name()), ctoken, current);
 				parser->setError(err);
 				yyerror("fieldlisterror");
 			}	
@@ -1360,7 +1360,7 @@ ColWildCard:
 {
 	$$ = new VariableExpr($1);
 	KexiDBDbg << "  Invalid identifier! " << $1 << endl;
-	setError(i18n("Invalid identifier \"%1\"").tqarg($1));
+	setError(i18n("Invalid identifier \"%1\"").arg($1));
 }*/
 ;
 
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index b77f76a3..47e5d95c 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -53,7 +53,7 @@ TQString QueryColumnInfo::debugString() const
 {
 	return field->name() + 
 		( alias.isEmpty() ? TQString() 
-			: (TQString::tqfromLatin1(" AS ") + TQString(alias)) );
+			: (TQString::fromLatin1(" AS ") + TQString(alias)) );
 }
 
 //=======================================
@@ -402,11 +402,11 @@ TQString OrderByColumn::debugString() const
 	if (m_column) {
 		if (m_pos>-1)
 			return TQString("COLUMN_AT_POSITION_%1(%2, %3)")
-				.tqarg(m_pos+1).tqarg(m_column->debugString()).tqarg(orderString);
+				.arg(m_pos+1).arg(m_column->debugString()).arg(orderString);
 		else
-			return TQString("COLUMN(%1, %2)").tqarg(m_column->debugString()).tqarg(orderString);
+			return TQString("COLUMN(%1, %2)").arg(m_column->debugString()).arg(orderString);
 	}
-	return m_field ? TQString("FIELD(%1, %2)").tqarg(m_field->debugString()).tqarg(orderString)
+	return m_field ? TQString("FIELD(%1, %2)").arg(m_field->debugString()).arg(orderString)
 	 : TQString("NONE");
 }
 
@@ -801,7 +801,7 @@ TQString QuerySchema::debugString()
 	else {
 		dbg1 = "<NONE>\n";
 	}
-	dbg1.prepend( TQString("(%1):\n").tqarg(fieldsExpandedCount) );
+	dbg1.prepend( TQString("(%1):\n").arg(fieldsExpandedCount) );
 	dbg += dbg1;
 
 	//it's safer to delete fieldsExpanded for now 
@@ -816,7 +816,7 @@ TQString QuerySchema::debugString()
 		if (tablePos>=0) {
 			TQCString tAlias = tableAlias(tablePos);
 			if (!tAlias.isEmpty()) {
-				dbg2 += (TQString::tqfromLatin1(" field \"") + FieldList::field(i)->name() 
+				dbg2 += (TQString::fromLatin1(" field \"") + FieldList::field(i)->name() 
 					+ "\" uses alias \"" + TQString(tAlias) + "\" of table \""
 					+ d->tables.at(tablePos)->name() + "\"\n");
 			}
@@ -847,7 +847,7 @@ TQString QuerySchema::debugString()
 		for (int i=0; it.current(); ++it, i++) {
 			TQCString *alias = d->columnAlias(i);
 			if (alias)
-				aliases += (TQString("field #%1: ").tqarg(i) 
+				aliases += (TQString("field #%1: ").arg(i) 
 					+ (it.current()->name().isEmpty() ? "<noname>" : it.current()->name())
 					+ " -> " + (const char*)*alias + "\n");
 		}
@@ -862,7 +862,7 @@ TQString QuerySchema::debugString()
 		for (int i=0; t_it.current(); ++t_it, i++) {
 			TQCString *alias = d->tableAliases[i];
 			if (alias)
-				aliases += (TQString("table #%1: ").tqarg(i) 
+				aliases += (TQString("table #%1: ").arg(i) 
 					+ (t_it.current()->name().isEmpty() ? "<noname>" : t_it.current()->name())
 					+ " -> " + (const char*)*alias + "\n");
 		}
@@ -872,7 +872,7 @@ TQString QuerySchema::debugString()
 	if (!where.isEmpty())
 		dbg += (TQString("\n-WHERE EXPRESSION:\n") + where);
 	if (!orderByColumnList().isEmpty())
-		dbg += (TQString("\n-ORDER BY (%1):\n").tqarg(orderByColumnList().count()) 
+		dbg += (TQString("\n-ORDER BY (%1):\n").arg(orderByColumnList().count()) 
 			+ orderByColumnList().debugString());
 	return dbg;
 }
@@ -1291,8 +1291,8 @@ void QuerySchema::computeFieldsExpanded()
 						// (the expression object will be owned by column info)
 						visibleColumn = new Field();
 						visibleColumn->setName(
-							TQString::tqfromLatin1("[multiple_visible_fields_%1]")
-							.tqarg( ++numberOfColumnsWithMultipleVisibleFields ));
+							TQString::fromLatin1("[multiple_visible_fields_%1]")
+							.arg( ++numberOfColumnsWithMultipleVisibleFields ));
 						visibleColumn->setExpression( 
 							new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/));
 						if (!d->ownedVisibleColumns) {
@@ -1310,7 +1310,7 @@ void QuerySchema::computeFieldsExpanded()
 						if (!table( visibleField->table()->name() )) {
 						}
 						if (!sql.isEmpty())
-							sql += TQString::tqfromLatin1(", ");
+							sql += TQString::fromLatin1(", ");
 						sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "."
 							+ escapeIdentifier(visibleField->name(), drvEscaping));
 					}*/
@@ -1351,8 +1351,8 @@ void QuerySchema::computeFieldsExpanded()
 					// (the expression object will be owned by column info)
 					visibleColumn = new Field();
 					visibleColumn->setName(
-						TQString::tqfromLatin1("[multiple_visible_fields_%1]")
-						.tqarg( ++numberOfColumnsWithMultipleVisibleFields ));
+						TQString::fromLatin1("[multiple_visible_fields_%1]")
+						.arg( ++numberOfColumnsWithMultipleVisibleFields ));
 					visibleColumn->setExpression( 
 						new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/));
 					if (!d->ownedVisibleColumns) {
@@ -1370,7 +1370,7 @@ void QuerySchema::computeFieldsExpanded()
 					if (!table( visibleField->table()->name() )) {
 					}
 					if (!sql.isEmpty())
-						sql += TQString::tqfromLatin1(", ");
+						sql += TQString::fromLatin1(", ");
 					sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "."
 						+ escapeIdentifier(visibleField->name(), drvEscaping));
 				}*/
@@ -1508,9 +1508,9 @@ void QuerySchema::computeFieldsExpanded()
 						ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
 				}
 				else {
-					const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3")
-						.tqarg( ++numberOfColumnsWithMultipleVisibleFields )
-						.tqarg(ci->field->table()->name()).tqarg(ci->field->name()) );
+					const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3")
+						.arg( ++numberOfColumnsWithMultipleVisibleFields )
+						.arg(ci->field->table()->name()).arg(ci->field->name()) );
 					uint *index = lookup_dict[ key ];
 					if (index)
 						ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
@@ -1542,9 +1542,9 @@ void QuerySchema::computeFieldsExpanded()
 					ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
 			}
 			else {
-				const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3")
-					.tqarg( ++numberOfColumnsWithMultipleVisibleFields )
-					.tqarg(ci->field->table()->name()).tqarg(ci->field->name()) );
+				const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3")
+					.arg( ++numberOfColumnsWithMultipleVisibleFields )
+					.arg(ci->field->table()->name()).arg(ci->field->name()) );
 				uint *index = lookup_dict[ key ];
 				if (index)
 					ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
diff --git a/kexi/kexidb/queryschemaparameter.cpp b/kexi/kexidb/queryschemaparameter.cpp
index 4cead962..4418f6e9 100644
--- a/kexi/kexidb/queryschemaparameter.cpp
+++ b/kexi/kexidb/queryschemaparameter.cpp
@@ -36,12 +36,12 @@ QuerySchemaParameter::~QuerySchemaParameter()
 
 TQString QuerySchemaParameter::debugString() const
 {
-	return TQString("msg=\"%1\" type=\"%2\"").tqarg(Field::typeName(type)).tqarg(message);
+	return TQString("msg=\"%1\" type=\"%2\"").arg(Field::typeName(type)).arg(message);
 }
 
 void KexiDB::debug(const QuerySchemaParameterList& list)
 {
-	KexiDBDbg << TQString("Query parameters (%1):").tqarg(list.count()) << endl;
+	KexiDBDbg << TQString("Query parameters (%1):").arg(list.count()) << endl;
 	foreach(QuerySchemaParameterListConstIterator, it, list)
 		KexiDBDbg << " - " << (*it).debugString() << endl;
 }
diff --git a/kexi/kexidb/schemadata.cpp b/kexi/kexidb/schemadata.cpp
index 9b691349..9370a3ac 100644
--- a/kexi/kexidb/schemadata.cpp
+++ b/kexi/kexidb/schemadata.cpp
@@ -51,5 +51,5 @@ TQString SchemaData::schemaDataDebugString() const
 		desc+="...";
 	}
 	return TQString("id=%1 name='%2' caption='%3' desc='%4'")
-		.tqarg(m_id).tqarg(m_name).tqarg(m_caption).tqarg(desc);
+		.arg(m_id).arg(m_name).arg(m_caption).arg(desc);
 }
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 904469bc..570043fe 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -140,7 +140,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 			userAtHost += "@";
 		userAtHost += (d->connData.hostName.isEmpty() ? "localhost" : d->connData.hostName);
 		TQTextStream cout(stdout,IO_WriteOnly);
-		cout << i18n("Enter password for %1: ").tqarg(userAtHost);
+		cout << i18n("Enter password for %1: ").arg(userAtHost);
 //! @todo make use of pty/tty here! (and care about portability)
 		TQTextStream cin(stdin,IO_ReadOnly);
 		cin >> d->connData.password;
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index 9fa9ca01..594773af 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -138,7 +138,7 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details)
 	if (!obj->serverErrorMsg().isEmpty())
 		details += "<p><b><nobr>" +i18n("Message from server:") + "</nobr></b><br>" + obj->serverErrorMsg();
 	if (!obj->recentSQLString().isEmpty())
-		details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").tqarg(obj->recentSQLString());
+		details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").arg(obj->recentSQLString());
 	int serverResult;
 	TQString serverResultName;
 	if (obj->serverResult()!=0) {
@@ -159,9 +159,9 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details)
 
 	if (!details.isEmpty() && !details.startsWith("<qt>")) {
 		if (details.startsWith("<p>"))
-			details = TQString::tqfromLatin1("<qt>")+details;
+			details = TQString::fromLatin1("<qt>")+details;
 		else
-			details = TQString::tqfromLatin1("<qt><p>")+details;
+			details = TQString::fromLatin1("<qt><p>")+details;
 	}
 }
 
@@ -179,7 +179,7 @@ int KexiDB::idForObjectName( Connection &conn, const TQString& objName, int objT
 {
 	RowData data;
 	if (true!=conn.querySingleRecord(TQString("select o_id from kexi__objects where lower(o_name)='%1' and o_type=%2")
-		.tqarg(objName.lower()).tqarg(objType), data))
+		.arg(objName.lower()).arg(objType), data))
 		return 0;
 	bool ok;
 	int id = data[0].toInt(&ok);
@@ -387,7 +387,7 @@ ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent,
 	KexiDB::MessageHandler& msgHandler)
  : KProgressDialog(parent, "testconn_dlg",
 	i18n("Test Connection"), i18n("<qt>Testing connection to <b>%1</b> database server...</qt>")
-	.tqarg(data.serverInfoString(true)), true /*modal*/)
+	.arg(data.serverInfoString(true)), true /*modal*/)
  , m_thread(new ConnectionTestThread(this, data))
  , m_connData(data)
  , m_msgHandler(&msgHandler)
@@ -441,13 +441,13 @@ void ConnectionTestDialog::slotTimeout()
 		else if (notResponding) {
 			KMessageBox::sorry(0, 
 				i18n("<qt>Test connection to <b>%1</b> database server failed. The server is not responding.</qt>")
-					.tqarg(m_connData.serverInfoString(true)),
+					.arg(m_connData.serverInfoString(true)),
 				i18n("Test Connection"));
 		}
 		else {
 			KMessageBox::information(0, 
 				i18n("<qt>Test connection to <b>%1</b> database server established successfully.</qt>")
-					.tqarg(m_connData.serverInfoString(true)),
+					.arg(m_connData.serverInfoString(true)),
 				i18n("Test Connection"));
 		}
 //		slotCancel();
@@ -493,7 +493,7 @@ void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData
 int KexiDB::rowCount(Connection &conn, const TQString& sql)
 {
 	int count = -1; //will be changed only on success of querySingleNumber()
-	TQString selectSql( TQString::tqfromLatin1("SELECT COUNT() FROM (") + sql + ")" );
+	TQString selectSql( TQString::fromLatin1("SELECT COUNT() FROM (") + sql + ")" );
 	conn.querySingleNumber(selectSql, count);
 	return count;
 }
@@ -507,7 +507,7 @@ int KexiDB::rowCount(const KexiDB::TableSchema& tableSchema)
 	}
 	int count = -1; //will be changed only on success of querySingleNumber()
 	tableSchema.connection()->querySingleNumber(
-		TQString::tqfromLatin1("SELECT COUNT(*) FROM ") 
+		TQString::fromLatin1("SELECT COUNT(*) FROM ") 
 		+ tableSchema.connection()->driver()->escapeIdentifier(tableSchema.name()), 
 		count
 	);
@@ -523,7 +523,7 @@ int KexiDB::rowCount(KexiDB::QuerySchema& querySchema)
 	}
 	int count = -1; //will be changed only on success of querySingleNumber()
 	querySchema.connection()->querySingleNumber(
-		TQString::tqfromLatin1("SELECT COUNT(*) FROM (") 
+		TQString::fromLatin1("SELECT COUNT(*) FROM (") 
 		+ querySchema.connection()->selectStatement(querySchema) + ")",
 		count
 	);
@@ -807,7 +807,7 @@ bool KexiDB::setFieldProperty( Field& field, const TQCString& propertyName, cons
 		else {
 			if (!field.table()) {
 				KexiDBWarn << TQString("KexiDB::setFieldProperty() Cannot set \"%1\" property - no table assinged for field!")
-					.tqarg(propertyName.data()) << endl;
+					.arg(propertyName.data()) << endl;
 			}
 			else {
 				LookupFieldSchema *lookup = field.table()->lookupFieldSchema(field);
@@ -965,7 +965,7 @@ TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& p
 	TQDomElement numberEl( doc.createElement("bool") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( 
-		value ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("false") ) );
+		value ? TQString::fromLatin1("true") : TQString::fromLatin1("false") ) );
 	return el;
 }
 
@@ -998,9 +998,9 @@ TQVariant KexiDB::emptyValueForType( KexiDB::Field::Type type )
 		return val;
 	else { //special cases
 		if (type==Field::Date)
-			return TQDate::tqcurrentDate();
+			return TQDate::currentDate();
 		if (type==Field::DateTime)
-			return TQDateTime::tqcurrentDateTime();
+			return TQDateTime::currentDateTime();
 		if (type==Field::Time)
 			return TQTime::currentTime();
 	}
@@ -1047,9 +1047,9 @@ TQVariant KexiDB::notEmptyValueForType( KexiDB::Field::Type type )
 		return val;
 	else { //special cases
 		if (type==Field::Date)
-			return TQDate::tqcurrentDate();
+			return TQDate::currentDate();
 		if (type==Field::DateTime)
-			return TQDateTime::tqcurrentDateTime();
+			return TQDateTime::currentDateTime();
 		if (type==Field::Time)
 			return TQTime::currentTime();
 	}
@@ -1076,11 +1076,11 @@ TQString KexiDB::escapeBLOB(const TQByteArray& array, BLOBEscapingType type)
 		return TQString();
 	}
 	if (type == BLOBEscapeXHex)
-		str = TQString::tqfromLatin1("X'");
+		str = TQString::fromLatin1("X'");
 	else if (type == BLOBEscape0xHex)
-		str = TQString::tqfromLatin1("0x");
+		str = TQString::fromLatin1("0x");
 	else if (type == BLOBEscapeOctal)
-		str = TQString::tqfromLatin1("'");
+		str = TQString::fromLatin1("'");
 	
 	int new_length = str.length(); //after X' or 0x, etc.
 	if (type == BLOBEscapeOctal) {
@@ -1228,7 +1228,7 @@ void KexiDB::getLimitsForType(Field::Type type, int &minValue, int &maxValue)
 
 void KexiDB::debugRowData(const RowData& rowData)
 {
-	KexiDBDbg << TQString("ROW DATA (%1 columns):").tqarg(rowData.count()) << endl;
+	KexiDBDbg << TQString("ROW DATA (%1 columns):").arg(rowData.count()) << endl;
 	foreach(RowData::ConstIterator, it, rowData)
 		KexiDBDbg << "- " << (*it) << endl;
 }
diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h
index ec807d34..334ea20c 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -454,11 +454,11 @@ namespace KexiDB
 			return TQString::fromUtf8(data, length);
 		if (f->isIntegerType()) {
 			if (f->type()==KexiDB::Field::BigInteger)
-				return TQVariant( TQString::tqfromLatin1(data, length).toLongLong() );
-			return TQVariant( TQString::tqfromLatin1(data, length).toInt() );
+				return TQVariant( TQString::fromLatin1(data, length).toLongLong() );
+			return TQVariant( TQString::fromLatin1(data, length).toInt() );
 		}
 		if (f->isFPNumericType())
-			return TQString::tqfromLatin1(data, length).toDouble();
+			return TQString::fromLatin1(data, length).toDouble();
 		if (f->type()==KexiDB::Field::BLOB) {
 			TQByteArray ba;
 			ba.duplicate(data, length);
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index cbee692d..23e2aaeb 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -21,7 +21,7 @@
 #include "utils_p.h"
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <ktabwidget.h>
 #include <klistview.h>
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index da5f7f96..ed1afdcb 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -27,7 +27,7 @@ bool KexiUtils::isIdentifier(const TQString& s)
 {
 	uint i;
 	for (i=0; i<s.length(); i++) {
-		TQChar c = s.tqat(i).lower();
+		TQChar c = s.at(i).lower();
 		if (!((int)c=='_' || (int)c>='a' && (int)c<='z' || i>0 && (int)c>='0' && (int)c<='9'))
 			break;
 	}
@@ -45,10 +45,10 @@ TQString KexiUtils::string2FileName(const TQString &s)
 
 inline TQString char2Identifier(const TQChar& c)
 {
-	if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE)
+	if (c.unicode() >= TRANSLITERATION_TABLE_SIZE)
 		return TQString(TQChar('_'));
-	const char *const s = transliteration_table[c.tqunicode()];
-	return s ? TQString::tqfromLatin1(s) : TQString(TQChar('_'));
+	const char *const s = transliteration_table[c.unicode()];
+	return s ? TQString::fromLatin1(s) : TQString(TQChar('_'));
 }
 
 TQString KexiUtils::string2Identifier(const TQString &s)
@@ -87,8 +87,8 @@ TQString KexiUtils::string2Identifier(const TQString &s)
 
 TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const TQVariant& v)
 {
-	return "<p>"+i18n("Value of \"%1\" column must be an identifier.").tqarg(valueName)
-		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").tqarg(v.toString())+"</p>";
+	return "<p>"+i18n("Value of \"%1\" column must be an identifier.").arg(valueName)
+		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").arg(v.toString())+"</p>";
 }
 
 //--------------------------------------------------------------------------------
diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp
index ca3a42dd..e7cce867 100644
--- a/kexi/kexiutils/longlongvalidator.cpp
+++ b/kexi/kexiutils/longlongvalidator.cpp
@@ -53,7 +53,7 @@ TQValidator::State LongLongValidator::validate( TQString &str, int & ) const
 	if (m_base > 10)
 		newStr = newStr.upper();
 
-	if (newStr == TQString::tqfromLatin1("-")) {// a special case
+	if (newStr == TQString::fromLatin1("-")) {// a special case
 		if ((m_min || m_max) && m_min >= 0)
 			ok = false;
 		else
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index 867ef23d..cf3eea50 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -67,10 +67,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 
 		virtual void polishPopupMenu( TQPopupMenu* p ) { m_style->polishPopupMenu(p); }
 
-		virtual TQRect tqitemRect( TQPainter *p, const TQRect &r,
+		virtual TQRect itemRect( TQPainter *p, const TQRect &r,
 			int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const
 		{
-			return m_style->tqitemRect( p, r, flags, enabled, pixmap, text, len );
+			return m_style->itemRect( p, r, flags, enabled, pixmap, text, len );
 		}
 
 		virtual void drawItem( TQPainter *p, const TQRect &r,
@@ -87,18 +87,18 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			m_style->tqdrawPrimitive( pe, p, r, cg, flags, option );
 		}
 
-		virtual void tqdrawControl( TQ_ControlElement element,
+		virtual void drawControl( TQ_ControlElement element,
 			TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg,
 			SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->tqdrawControl( element, p, widget, r, cg, how, option );
+			m_style->drawControl( element, p, widget, r, cg, how, option );
 		}
 
-		virtual void tqdrawControlMask( TQ_ControlElement element,
+		virtual void drawControlMask( TQ_ControlElement element,
 			TQPainter *p, const TQWidget *widget, const TQRect &r, 
 			const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->tqdrawControlMask( element, p, widget, r, option );
+			m_style->drawControlMask( element, p, widget, r, option );
 		}
 
 		virtual TQRect subRect( SubRect r, const TQWidget *widget ) const
@@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->subRect( r, widget );
 		}
 
-		virtual void tqdrawComplexControl( TQ_ComplexControl control,
+		virtual void drawComplexControl( TQ_ComplexControl control,
 			TQPainter *p, const TQWidget *widget, const TQRect &r,
 			const TQColorGroup &cg, SFlags how = Style_Default,
 #ifdef TQ_TQDOC
@@ -116,14 +116,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 #endif
 			SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			tqdrawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
+			drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
 		}
 
-		virtual void tqdrawComplexControlMask( TQ_ComplexControl control,
+		virtual void drawComplexControlMask( TQ_ComplexControl control,
 			TQPainter *p, const TQWidget *widget, const TQRect &r,
 			const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->tqdrawComplexControlMask( control, p, widget, r, option );
+			m_style->drawComplexControlMask( control, p, widget, r, option );
 		}
 
 		virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
@@ -140,10 +140,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->querySubControl( control, widget, pos, option );
 		}
 
-		virtual int tqpixelMetric( PixelMetric metric,
+		virtual int pixelMetric( PixelMetric metric,
 			const TQWidget *widget = 0 ) const
 		{
-			return m_style->tqpixelMetric( metric, widget );
+			return m_style->pixelMetric( metric, widget );
 		}
 
 		virtual TQSize tqsizeFromContents( ContentsType contents,
@@ -153,11 +153,11 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->tqsizeFromContents( contents, widget, contentsSize, option );
 		}
 
-		virtual int tqstyleHint( TQ_StyleHint stylehint,
+		virtual int styleHint( TQ_StyleHint stylehint,
 			const TQWidget *widget = 0, const TQStyleOption& option = TQStyleOption::Default,
 			TQStyleHintReturn* returnData = 0 ) const
 		{
-			return m_style->tqstyleHint( stylehint, widget, option, returnData );
+			return m_style->styleHint( stylehint, widget, option, returnData );
 		}
 
 		virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
diff --git a/kexi/kexiutils/transliteration_table.h b/kexi/kexiutils/transliteration_table.h
index 0eece11c..5be7dadc 100644
--- a/kexi/kexiutils/transliteration_table.h
+++ b/kexi/kexiutils/transliteration_table.h
@@ -1,4 +1,4 @@
-/* Transliteration table of 65535 tqunicode characters
+/* Transliteration table of 65535 unicode characters
    Do not edit this file, it is generated
    by ./generate_transliteration_table.sh script. */
 
diff --git a/kexi/kexiutils/tristate.h b/kexi/kexiutils/tristate.h
index 0a8df95c..f3864849 100644
--- a/kexi/kexiutils/tristate.h
+++ b/kexi/kexiutils/tristate.h
@@ -165,8 +165,8 @@ public:
 	 */
 	TQString toString() const {
 		if (m_value==False)
-			return TQString::tqfromLatin1("false");
-		return m_value==True ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("cancelled");
+			return TQString::fromLatin1("false");
+		return m_value==True ? TQString::fromLatin1("true") : TQString::fromLatin1("cancelled");
 	}
 
 private:
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 7a1ab0f7..dca4998b 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -226,7 +226,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string)
 	TQCString cstr(string.latin1());
 	TQByteArray array( size );
 	for (uint i=0; i<size; i++) {
-		array[i] = char(string[i].tqunicode()-1);
+		array[i] = char(string[i].unicode()-1);
 	}
 	TQMap<TQString,TQString> map;
 	TQDataStream ds(array, IO_ReadOnly);
@@ -244,17 +244,17 @@ TQString KexiUtils::stringToFileName(const TQString& string)
 void KexiUtils::simpleCrypt(TQString& string)
 {
 	for (uint i=0; i<string.length(); i++)
-		string[i] = TQChar( string[i].tqunicode() + 47 + i );
+		string[i] = TQChar( string[i].unicode() + 47 + i );
 }
 
 void KexiUtils::simpleDecrypt(TQString& string)
 {
 	for (uint i=0; i<string.length(); i++)
-		string[i] = TQChar( string[i].tqunicode() - 47 - i );
+		string[i] = TQChar( string[i].unicode() - 47 - i );
 }
 
 void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, 
-	const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio)
+	const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio)
 {
 	if (pixmap.isNull())
 		return;
@@ -285,21 +285,21 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 			img = img.smoothScale(w, h, TQ_ScaleMin);
 			pos = rect.topLeft(); //0, 0);
 			if (img.width() < w) {
-				int hAlign = TQApplication::horizontalAlignment( tqalignment );
+				int hAlign = TQApplication::horizontalAlignment( alignment );
 				if ( hAlign & TQt::AlignRight )
 					pos.setX(pos.x() + w-img.width());
 				else if ( hAlign & TQt::AlignHCenter )
 					pos.setX(pos.x() + w/2-img.width()/2);
 			}
 			else if (img.height() < h) {
-				if ( tqalignment & TQt::AlignBottom )
+				if ( alignment & TQt::AlignBottom )
 					pos.setY(pos.y() + h-img.height());
-				else if ( tqalignment & TQt::AlignVCenter )
+				else if ( alignment & TQt::AlignVCenter )
 					pos.setY(pos.y() + h/2-img.height()/2);
 			}
 			pixmapBuffer.convertFromImage(img);
 			if (!fast) {
-				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
+				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
 			}
 			else
 				target->drawPixmap(pos, pixmapBuffer);
@@ -307,7 +307,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else {
 			if (!fast) {
 				pixmapBuffer.resize(rect.size()-TQSize(lineWidth, lineWidth));
-				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
+				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
 				p2.drawPixmap(TQRect(rect.x(), rect.y(), w, h), pixmap);
 			}
 			else
@@ -315,7 +315,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		}
 	}
 	else {
-		int hAlign = TQApplication::horizontalAlignment( tqalignment );
+		int hAlign = TQApplication::horizontalAlignment( alignment );
 		if ( hAlign & TQt::AlignRight )
 			pos.setX(pos.x() + w-pixmap.width());
 		else if ( hAlign & TQt::AlignHCenter )
@@ -323,9 +323,9 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else //left, etc.
 			pos.setX(pos.x());
 
-		if ( tqalignment & TQt::AlignBottom )
+		if ( alignment & TQt::AlignBottom )
 			pos.setY(pos.y() + h-pixmap.height());
-		else if ( tqalignment & TQt::AlignVCenter )
+		else if ( alignment & TQt::AlignVCenter )
 			pos.setY(pos.y() + h/2-pixmap.height()/2);
 		else //top, etc. 
 			pos.setY(pos.y());
@@ -339,8 +339,8 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		bitBlt( p.device(), 
 //			pos.x(), 
 //			pos.y(), 
-			(int)p.tqworldMatrix().dx() + rect.x() + lineWidth + pos.x(), 
-			(int)p.tqworldMatrix().dy() + rect.y() + lineWidth + pos.y(), 
+			(int)p.worldMatrix().dx() + rect.x() + lineWidth + pos.x(), 
+			(int)p.worldMatrix().dy() + rect.y() + lineWidth + pos.y(), 
 			&pixmapBuffer);
 	}
 }
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index d7bdbae8..81e4f41e 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -184,7 +184,7 @@ namespace KexiUtils
 	KEXIUTILS_EXPORT TQString stringToFileName(const TQString& string);
 
 	/*! Performs a simple \a string  encryption using rot47-like algorithm. 
-	 Each character's tqunicode value is increased by 47 + i (where i is index of the character). 
+	 Each character's unicode value is increased by 47 + i (where i is index of the character). 
 	 The resulting string still contains redable characters.
 	 Do not use this for data that can be accessed by attackers! */
 	KEXIUTILS_EXPORT void simpleCrypt(TQString& string);
@@ -212,7 +212,7 @@ namespace KexiUtils
 	//! Draws pixmap on painter \a p using predefined parameters.
 	//! Used in KexiDBImageBox and KexiBlobTableEdit.
 	KEXIUTILS_EXPORT void drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
-		const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio);
+		const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio);
 
 	//! @internal
 	KEXIUTILS_EXPORT TQString ptrToStringInternal(void* ptr, uint size);
diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp
index bec7a1ec..919a3b61 100644
--- a/kexi/kexiutils/validator.cpp
+++ b/kexi/kexiutils/validator.cpp
@@ -36,7 +36,7 @@ Validator::Result Validator::check(const TQString &valueName, const TQVariant& v
 {
 	if (v.isNull() || v.type()==TQVariant::String && v.toString().isEmpty()) {
 		if (!m_acceptsEmptyValue) {
-			message = Validator::msgColumnNotEmpty().tqarg(valueName);
+			message = Validator::msgColumnNotEmpty().arg(valueName);
 			return Error;
 		}
 		return Ok;
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 0aa0cd35..8c246ad1 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqguardedptr.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqaccel.h>
 
 //! @internal
@@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent )
  , d( new Private() )
 {
 	m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown);
-	tqlayout()->setMargin( KDialog::marginHint() );
-	tqlayout()->setSpacing( KDialog::spacingHint() );
+	layout()->setMargin( KDialog::marginHint() );
+	layout()->setSpacing( KDialog::spacingHint() );
 	KAction *a = KStdAction::findNext(0, 0, 0);
 	m_btnFind->setText(a->text());
 	m_btnFind->setIconSet(a->iconSet());
@@ -175,7 +175,7 @@ void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName)
 		index = d->lookInColumnNames.findIndex( columnName );
 		if (index == -1) {
 			kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list")
-				.tqarg(columnName) << endl;
+				.arg(columnName) << endl;
 			return;
 		}
 		index = index + 1/*"(All fields)"*/ + 1/*"(Current field)"*/;
@@ -214,13 +214,13 @@ void KexiFindDialog::setObjectNameForCaption(const TQString& name)
 		if (name.isEmpty())
 			setCaption(i18n("Replace"));
 		else
-			setCaption(i18n("Replace in \"%1\"").tqarg(name));
+			setCaption(i18n("Replace in \"%1\"").arg(name));
 	}
 	else {
 		if (name.isEmpty())
 			setCaption(i18n("Find"));
 		else
-			setCaption(i18n("Find in \"%1\"").tqarg(name));
+			setCaption(i18n("Find in \"%1\"").arg(name));
 	}
 }
 
diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui
index 8ffc254d..133570e7 100644
--- a/kexi/main/kexifinddialogbase.ui
+++ b/kexi/main/kexifinddialogbase.ui
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -243,7 +243,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>2</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 5594d577..3071dd38 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -111,7 +111,7 @@
 # define KexiVDebug if (0) kdDebug()
 #endif
 
-//first fix the tqgeometry
+//first fix the geometry
 //#define KEXI_NO_CTXT_HELP 1
 
 #ifndef KEXI_NO_CTXT_HELP
@@ -127,7 +127,7 @@
 //! width changes will be removed in KMDI
 //#define PROPEDITOR_VISIBILITY_CHANGES
 
-//temporary fix to manage tqlayout
+//temporary fix to manage layout
 #include "ksplitter.h"
 #define KDOCKWIDGET_P 1
 
@@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		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 ),
-			d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+		TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
+			d->config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 
@@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		TQToolButton *closeButton = new TQToolButton( tabWidget() );
 		closeButton->setAutoRaise( true );
 		closeButton->setPixmap( TQPixmap( kde2_closebutton ) );
-		closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); 
+		closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); 
 //		closeButton->setIconSet(SmallIconSet("tab_remove"));
 		tabWidget()->setCornerWidget( closeButton, TQt::TopRight );
 		closeButton->hide(); // hide until it's needed to avoid problems in "user mode" 
@@ -465,7 +465,7 @@ void KexiMainWindowImpl::switchToIDEAlMode(bool showMessage)
 		else {
 			KMessageBox::information(this,
 				i18n("User interface mode will be switched to IDEAl at next %1 application startup.")
-				.tqarg(KEXI_APP_NAME));
+				.arg(KEXI_APP_NAME));
 			//delayed
 			d->mdiModeToSwitchAfterRestart = KMdi::IDEAlMode;
 		}
@@ -492,7 +492,7 @@ void KexiMainWindowImpl::switchToChildframeMode(bool showMessage)
 		else {
 			KMessageBox::information(this,
 				i18n("User interface mode will be switched to Childframe at next %1 application startup.")
-				.tqarg(KEXI_APP_NAME));
+				.arg(KEXI_APP_NAME));
 			//delayed
 			d->mdiModeToSwitchAfterRestart = KMdi::ChildframeMode;
 		}
@@ -1281,7 +1281,7 @@ static TQString internalReason(KexiDB::Object *obj)
 	const TQString &s = obj->errorMsg();
 	if (s.isEmpty())
 		return s;
-	return TQString("<br>(%1) ").tqarg(i18n("reason:")+" <i>"+s+"</i>");
+	return TQString("<br>(%1) ").arg(i18n("reason:")+" <i>"+s+"</i>");
 }
 
 tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
@@ -1319,7 +1319,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 		if (incompatibleWithKexi) {
 			if (KMessageBox::Yes == KMessageBox::questionYesNo(this,
 				i18n("<qt>Database project %1 does not appear to have been created using Kexi.<br><br>"
-				"Do you want to import it as a new Kexi project?</qt>").tqarg(projectData.infoString()),
+				"Do you want to import it as a new Kexi project?</qt>").arg(projectData.infoString()),
 				0, KGuiItem(i18n("Import Database", "&Import..."), "database_import"),
 				KStdGuiItem::quit()))
 			{
@@ -1447,9 +1447,9 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 					not_found_msg += (TQString("\"") + info["name"] + "\" - ");
 				if (info["action"]=="new")
 					not_found_msg += i18n("cannot create object - unknown object type \"%1\"")
-						.tqarg(info["type"]);
+						.arg(info["type"]);
 				else
-					not_found_msg += i18n("unknown object type \"%1\"").tqarg(info["type"]);
+					not_found_msg += i18n("unknown object type \"%1\"").arg(info["type"]);
 				not_found_msg += internalReason(&Kexi::partManager())+"<br></li>";
 				continue;
 			}
@@ -1457,7 +1457,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 			if (info["action"]=="new") {
 				if (!newObject( i, openingCancelled) && !openingCancelled) {
 					not_found_msg += "<li>";
-					not_found_msg += (i18n("cannot create object of type \"%1\"").tqarg(info["type"])+
+					not_found_msg += (i18n("cannot create object of type \"%1\"").arg(info["type"])+
 						internalReason(d->prj)+"<br></li>");
 				}
 				else
@@ -1551,7 +1551,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	if (!not_found_msg.isEmpty())
 		showErrorMessage(i18n("You have requested selected objects to be automatically opened "
 			"or processed on startup. Several objects cannot be opened or processed."),
-			TQString("<ul>%1</ul>").tqarg(not_found_msg) );
+			TQString("<ul>%1</ul>").arg(not_found_msg) );
 
 	d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0);
 #if defined(KDOCKWIDGET_P)
@@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions()
 	}
 #endif
 #ifdef TQ_WS_WIN
-	showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32
+	showMaximized();//js: workaround for not yet completed layout settings storage on win32
 #endif
 }
 
@@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor()
 
 	//1		dw->setMinimumWidth(200);
 
-	//	ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true);
+	//	ds->setSeparatorPos(d->propEditor->sizeHint().width(), true);
 
 			//heh, this is for IDEAl only, I suppose?
 	//js		if (m_rightContainer) {
@@ -1864,7 +1864,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p)
 }
 
 //! internal
-void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
+void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized)
 {
 	//js todo: allow to set custom "static" app caption
 
@@ -1877,18 +1877,18 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
 		//current dialog isn't attached! - find top level child
 		if (m_pMdi->topChild()) {
 			view = m_pMdi->topChild()->m_pClient;
-			tqchildrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
+			childrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
 		}
 		else
 			view = 0;
 	}
 
-	if (tqchildrenMaximized && view) {
+	if (childrenMaximized && view) {
 		setCaption( d->curDialog->caption()
-			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) );
+			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) );
 	}
 	else {
-		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - ")))
+		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - ")))
 			+ d->origAppCaption );
 	}
 }
@@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings()
 		}*/
 
 		config->setGroup("MainWindow");
-	    TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
-              config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+	    TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
+              config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 #endif
@@ -3006,10 +3006,10 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	}
 	if (!d->curDialog->supportsViewMode( viewMode )) {
 		showErrorMessage(i18n("Selected view is not supported for \"%1\" object.")
-			.tqarg(d->curDialog->partItem()->name()),
+			.arg(d->curDialog->partItem()->name()),
 		i18n("Selected view (%1) is not supported by this object type (%2).")
-			.tqarg(Kexi::nameForViewMode(viewMode))
-			.tqarg(d->curDialog->part()->instanceCaption()) );
+			.arg(Kexi::nameForViewMode(viewMode))
+			.arg(d->curDialog->part()->instanceCaption()) );
 		d->toggleLastCheckedMode();
 		return false;
 	}
@@ -3019,7 +3019,7 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	tristate res = d->curDialog->switchToViewMode( viewMode );
 	if (!res) {
 		updateCustomPropertyPanelTabs(0, Kexi::NoViewMode); //revert
-		showErrorMessage(i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(viewMode)),
+		showErrorMessage(i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(viewMode)),
 			d->curDialog);
 		d->toggleLastCheckedMode();
 		return false;
@@ -3118,7 +3118,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 			if (allowOverwriting) {
 				int res = KMessageBox::warningYesNoCancel(this,
 					"<p>"+part->i18nMessage("Object \"%1\" already exists.", 0)
-						.tqarg(d->nameDialog->widget()->nameText())
+						.arg(d->nameDialog->widget()->nameText())
 					+"</p><p>"+i18n("Do you want to replace it?")+"</p>", 0,
 					KGuiItem(i18n("&Replace"), "button_yes"),
 					KGuiItem(i18n("&Choose Other Name...")),
@@ -3135,11 +3135,11 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 			else {
 				KMessageBox::information(this,
 					"<p>"+part->i18nMessage("Object \"%1\" already exists.", 0)
-						.tqarg(d->nameDialog->widget()->nameText())
+						.arg(d->nameDialog->widget()->nameText())
 					+"</p><p>"+i18n("Please choose other name.")+"</p>");
 //				" For example: Table \"my_table\" already exists" ,
 //				"%1 \"%2\" already exists.\nPlease choose other name.")
-//				.tqarg(dlg->part()->instanceName()).tqarg(d->nameDialog->widget()->nameText()));
+//				.arg(dlg->part()->instanceName()).arg(d->nameDialog->widget()->nameText()));
 				continue;
 			}
 		}
@@ -3160,7 +3160,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 		//data was saved in the past -just save again
 		res = dlg->storeData(dontAsk);
 		if (!res)
-			showErrorMessage(i18n("Saving \"%1\" object failed.").tqarg(dlg->partItem()->name()),
+			showErrorMessage(i18n("Saving \"%1\" object failed.").arg(dlg->partItem()->name()),
 				d->curDialog);
 		return res;
 	}
@@ -3177,7 +3177,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 	if (~res)
 		return cancelled;
 	if (!res) {
-		showErrorMessage(i18n("Saving new \"%1\" object failed.").tqarg(dlg->partItem()->name()),
+		showErrorMessage(i18n("Saving new \"%1\" object failed.").arg(dlg->partItem()->name()),
 			d->curDialog);
 		return false;
 	}
@@ -3224,11 +3224,11 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar
 		saveChanges.setToolTip(i18n("Save changes"));
 		saveChanges.setWhatsThis(
 			i18n( "Pressing this button will save all recent changes made in \"%1\" object." )
-			.tqarg(dlg->partItem()->name()) );
+			.arg(dlg->partItem()->name()) );
 		KGuiItem discardChanges( KStdGuiItem::discard() );
 		discardChanges.setWhatsThis(
 			i18n( "Pressing this button will discard all recent changes made in \"%1\" object." )
-			.tqarg(dlg->partItem()->name()) );
+			.arg(dlg->partItem()->name()) );
 
 		//dialog's data is dirty:
 		//--adidional message, e.g. table designer will return 
@@ -3243,7 +3243,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar
 
 		const int questionRes = KMessageBox::warningYesNoCancel( this,
 			"<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg)
-			.tqarg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
+			.arg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
 			+ additionalMessage /*may be empty*/,
 			TQString(),
 			saveChanges,
@@ -3380,9 +3380,9 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool
 	KMdiMainFrm::attachWindow(pWnd,true,bAutomaticResize);
 	//for dialogs in normal state: decrease dialog's height if it exceeds area contents
 	if (pWnd->mdiParent()->state() == KMdiChildFrm::Normal
-		&& pWnd->tqgeometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
+		&& pWnd->geometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
 	{
-		TQRect r = pWnd->tqgeometry();
+		TQRect r = pWnd->geometry();
 		r.setBottom( pWnd->mdiParent()->mdiAreaContentsRect().bottom() - 5 );
 		pWnd->setGeometry( r );
 	}
@@ -3444,7 +3444,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		/* Fixes for popup menus behaviour:
 		 For hiding/showing: focus previously (d->focus_before_popup)
 		 focused window, if known, otherwise focus currently focused one.
-		 And: just tqinvalidate actions.
+		 And: just invalidate actions.
 		*/
 		if (e->type()==TQEvent::Hide || e->type()==TQEvent::Show) {
 			KexiVDebug << e->type() << endl;
@@ -3479,10 +3479,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #ifdef KEXI_STATUSBAR_DEBUG
-		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
-		d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
-			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
-			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
+		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
+		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
+			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
+			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
 			);
 #endif
 	}
@@ -3492,10 +3492,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #ifdef KEXI_STATUSBAR_DEBUG
-		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
-		d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
-			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
-			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
+		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
+		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
+			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
+			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
 			);
 #endif
 	}
@@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 //				invalidateSharedActions();
 			}
 			else {
-/*			TQObject* o = tqfocusWidget();
+/*			TQObject* o = focusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
 				o = o->parent();*/
 //js				invalidateSharedActions(focus_w);
@@ -3534,7 +3534,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		return true;
 	}
 
-	//remember currently focued window tqinvalidate act.
+	//remember currently focued window invalidate act.
 	if (e->type()==TQEvent::FocusOut) {
 		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
@@ -3605,7 +3605,7 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening
 	if (!openingAllowed(item, viewMode)) {
 		if (errorMessage)
 			*errorMessage = i18n("opening is not allowed in \"data view/design view/text view\" mode", 
-				"opening is not allowed in \"%1\" mode").tqarg(Kexi::nameForViewMode(viewMode));
+				"opening is not allowed in \"%1\" mode").arg(Kexi::nameForViewMode(viewMode));
 		openingCancelled = true;
 		return 0;
 	}
@@ -3790,7 +3790,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk )
 			"<p>"+i18n("Do you want to permanently delete:\n"
 			"%1\n"
 			"If you click \"Delete\", you will not be able to undo the deletion.")
-				.tqarg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
+				.arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
 			0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no()))
 			return cancelled;
 	}
@@ -3865,7 +3865,7 @@ void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const TQString& _ne
 	const bool res = d->prj->renameObject(this, *item, newName);
 	enableMessages(true);
 	if (!res) {
-		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").tqarg(newName) );
+		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").arg(newName) );
 		success = false;
 		return;
 	}
@@ -3980,7 +3980,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 	if (onStartup && !d->showImportantInfoOnStartup)
 		return;
 
-	TQString key = TQString("showImportantInfo %1").tqarg(KEXI_VERSION_STRING);
+	TQString key = TQString("showImportantInfo %1").arg(KEXI_VERSION_STRING);
 	d->config->setGroup("Startup");
 	bool show = d->config->readBoolEntry(key,true);
 
@@ -4005,7 +4005,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 			ts.setCodec( KGlobal::locale()->codecForEncoding() );
 			TQTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser");
 			if (tb) {
-				tb->setText( TQString("<qt>%1</qt>").tqarg(ts.read()) );
+				tb->setText( TQString("<qt>%1</qt>").arg(ts.read()) );
 			}
 			f.close();
 		}
@@ -4062,7 +4062,7 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData)
 #if 0 //todo reenable; autoopen objects are handled elsewhere
 	KexiDB::TableSchema *sch = d->prj->dbConnection()->tableSchema("kexi__final");
 	TQString err_msg = i18n("Could not start project \"%1\" in Final Mode.")
-		.tqarg(static_cast<KexiDB::SchemaData*>(projectData)->name());
+		.arg(static_cast<KexiDB::SchemaData*>(projectData)->name());
 	if(!sch)
 	{
 		hide();
@@ -4184,7 +4184,7 @@ void KexiMainWindowImpl::slotToolsCompactDatabase()
 		if (!drv || !(drv->features() & KexiDB::Driver::CompactingDatabaseSupported)) {
 			KMessageBox::information(this, "<qt>"+
 				i18n("Compacting database file <nobr>\"%1\"</nobr> is not supported.")
-				.tqarg(TQDir::convertSeparators(cdata.fileName())));
+				.arg(TQDir::convertSeparators(cdata.fileName())));
 			return;
 		}
 		data = new KexiProjectData( cdata, cdata.fileName() );
@@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 	if (dlg) {
 		// accept row changes
-		TQWidget *prevFocusWidget = tqfocusWidget();
+		TQWidget *prevFocusWidget = focusWidget();
 		dlg->setFocus();
 		d->action_data_save_row->activate();
 		if (prevFocusWidget)
@@ -4423,11 +4423,11 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 			saveChanges.setToolTip(i18n("Save changes"));
 			saveChanges.setWhatsThis(
 				i18n( "Pressing this button will save all recent changes made in \"%1\" object." )
-				.tqarg(item->name()) );
+				.arg(item->name()) );
 			KGuiItem doNotSave( KStdGuiItem::no() );
 			doNotSave.setWhatsThis(
 				i18n( "Pressing this button will ignore all unsaved changes made in \"%1\" object." )
-				.tqarg(dlg->partItem()->name()) );
+				.arg(dlg->partItem()->name()) );
 
 			TQString question;
 			if (action == PrintItem)
@@ -4441,7 +4441,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 			const int questionRes = KMessageBox::warningYesNoCancel( this,
 				"<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg)
-				.tqarg(item->name()) + "</p><p>" + question + "</p>",
+				.arg(item->name()) + "</p><p>" + question + "</p>",
 				TQString(), 
 				saveChanges,
 				doNotSave);
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 9dbedae3..141cd475 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -296,7 +296,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual bool acceptsSharedActions(TQObject *w);
 
 		/*! Performs lookup like in KexiSharedActionHost::focusWindow()
-		 but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget().
+		 but starting from \a w instead of a widget returned by TQWidget::focusWidget().
 		 \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */
 		TQWidget* findWindow(TQWidget *w);
 
@@ -346,7 +346,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		void slotPartLoaded(KexiPart::Part* p);
 
-		void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized);
+		void slotCaptionForCurrentMDIChild(bool childrenMaximized);
 		void slotNoMaximizedChildFrmLeft(KMdiChildFrm*);
 		void slotLastChildViewClosed();
 		void slotChildViewIsDetachedNow(TQWidget*);
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index c79b58db..3eeccc94 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -219,8 +219,8 @@ void updatePropEditorDockWidthInfo() {
 
 	void showStartProcessMsg(const TQStringList& args)
 	{
-		wnd->showErrorMessage(i18n("Could not start %1 application.").tqarg(KEXI_APP_NAME),
-			i18n("Command \"%1\" failed.").tqarg(args.join(" ")));
+		wnd->showErrorMessage(i18n("Could not start %1 application.").arg(KEXI_APP_NAME),
+			i18n("Command \"%1\" failed.").arg(args.join(" ")));
 	}
 
 	void hideMenuItem(const TQString& menuName, const TQString& itemText, bool alsoSeparator)
@@ -267,7 +267,7 @@ void updatePropEditorDockWidthInfo() {
 #endif
 			} else {
 				//propEditorToolWindow->show();
-				TQWidget *origFocusWidget = tqApp->tqfocusWidget();
+				TQWidget *origFocusWidget = tqApp->focusWidget();
 				wnd->makeWidgetDockVisible(propEditorTabWidget);
 				if (origFocusWidget)
 					origFocusWidget->setFocus();
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index 45cbc449..f3e1acec 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -53,12 +53,12 @@ void KexiNameDialog::init()
 {
 	TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3);
 	m_icon = new TQLabel( plainPage(), "icon" );
-	m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) );
-	m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
+	m_icon->setAlignment( int( AlignTop | AlignLeft ) );
+	m_icon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
 	m_icon->setFixedWidth(50);
 	lyr->addWidget(m_icon,0,0);
 
-	m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
+	m_widget->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
 	lyr->addWidget(m_widget,0,1);
 	lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2);
 	lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1);
@@ -75,7 +75,7 @@ void KexiNameDialog::updateSize()
 {
 //	resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) )
 	resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) )
-		.expandedTo(tqminimumSizeHint()) );
+		.expandedTo(minimumSizeHint()) );
 //	updateGeometry();
 }
 
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index c6ca8f41..08210ac5 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -20,7 +20,7 @@
 #include "kexinamewidget.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klineedit.h>
 #include <kmessagebox.h>
@@ -66,8 +66,8 @@ void KexiNameWidget::init(
 
 	lbl_message = new TQLabel( this, "message" );
 	setMessageText( message );
-	lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
-	lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
+	lbl_message->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	lbl_message->setAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
 	lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 );
 
 	lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel,
@@ -79,17 +79,17 @@ void KexiNameWidget::init(
 	lyr->addWidget( lbl_name, 2, 0 );
 
 	le_caption = new KLineEdit( nameText, this, "le_caption" );
-	le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
+	le_caption->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
 	lyr->addWidget( le_caption, 1, 1 );
 
 	le_name = new KLineEdit( nameText, this, "le_name" );
-	le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
+	le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
 	Validator *idValidator = new IdentifierValidator(0, "id_val");
 	le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") );
 	lyr->addWidget( le_name, 2, 1 );
 
 	setFocusProxy(le_caption);
-	resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(342, 123).expandedTo(minimumSizeHint()) );
 
 	m_nameWarning = i18n("Please enter the name.");
 	m_captionWarning = i18n("Please enter the caption.");
diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h
index acbeed5c..1ab0ea89 100644
--- a/kexi/main/kexinamewidget.h
+++ b/kexi/main/kexinamewidget.h
@@ -21,7 +21,7 @@
 #define KEXINAMEWIDGET_H
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klineedit.h>
 
 namespace KexiUtils {
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 9beffbf5..1218df23 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -55,7 +55,7 @@ KexiNewStuff::install(const TQString &fileName)
 
 	KTar archive( fileName );
 	if ( !archive.open( IO_ReadOnly ) ) {
-		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").tqarg(fileName) << endl;
+		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").arg(fileName) << endl;
 		return false;
 	}
 	const KArchiveDirectory *archiveDir = archive.directory();
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index e4bfd580..ab6fffab 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -22,7 +22,7 @@
 
 #include "kexistatusbar.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqtimer.h>
@@ -78,7 +78,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part)
 	if (part && part->widget()) {
 		if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) {
 			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( settqStatus( const TQString & ) ) );
+				this, TQT_SLOT( setStatus( const TQString & ) ) );
 
 #  if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
 			changeItem(m_map[ m_activePart ], m_msgID);
@@ -110,7 +110,7 @@ void KexiStatusBar::cursorPositionChanged()
 #endif
 }
 
-void KexiStatusBar::settqStatus(const TQString &str)
+void KexiStatusBar::setStatus(const TQString &str)
 {
 	kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl;
 //	m_status->setText(str);
@@ -125,16 +125,16 @@ void KexiStatusBar::settqStatus(const TQString &str)
 
 void KexiStatusBar::setCursorPosition(int line, int col)
 {
-//	m_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col));
-	changeItem(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col), m_msgID);
+//	m_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
+	changeItem(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col), m_msgID);
 }
 
 /*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
-	if(widget->tqsizeHint().height() + 4 > height())
-		setFixedHeight(widget->tqsizeHint().height() + 4);
+	if(widget->sizeHint().height() + 4 > height())
+		setFixedHeight(widget->sizeHint().height() + 4);
 }*/
 
 void KexiStatusBar::setReadOnlyFlag(bool readOnly)
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index bab1277a..e8c31d41 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -48,7 +48,7 @@ class KexiStatusBar : public KStatusBar
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
 	public slots:
-		virtual void settqStatus(const TQString &str);
+		virtual void setStatus(const TQString &str);
 		virtual void setReadOnlyFlag(bool readOnly);
 
 	protected slots:
@@ -58,7 +58,7 @@ class KexiStatusBar : public KStatusBar
 
 	protected:
 		int m_msgID, m_readOnlyID;
-//		TQLabel *m_status, *m_readOnlytqStatus;
+//		TQLabel *m_status, *m_readOnlyStatus;
 
 #if KexiStatusBar_KTEXTEDITOR_USED
 	KTextEditor::ViewCursorInterface * m_cursorIface;
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 45ab5892..8591167f 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		}
 		painter.setFont(m_mainFont);
 
-		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(),
+		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
 			true, false);
 		m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+"   ");
 		m_mainLineSpacing = painter.fontMetrics().lineSpacing();
@@ -326,9 +326,9 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		TQString pageNumString;
 		if (m_pagesCount>0)
 			pageNumString = i18n("Page (number) of (total)", "Page %1 of %2")
-				.tqarg(pageNumber+1).tqarg(m_pagesCount);
+				.arg(pageNumber+1).arg(m_pagesCount);
 		else
-			pageNumString = i18n("Page %1").tqarg(pageNumber+1);
+			pageNumString = i18n("Page %1").arg(pageNumber+1);
 		painter.drawText((int)m_leftMargin, 
 			(int)m_topMargin + m_pageHeight - m_mainLineSpacing, 
 			m_pageWidth, m_mainLineSpacing,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 476f924a..1df66250 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -38,7 +38,7 @@
 
 #include <tqlabel.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -356,7 +356,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 			m_contents->openDataLink->setText( i18n("Open This Query") );
 			m_origCaptionLabelText = i18n("<h2>Page setup for printing \"%1\" query data</h2>");
 		}
-		m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(m_item->name()) );
+		m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) );
 	}
 	connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), 
 		this, TQT_SLOT(slotTitleTextChanged(const TQString&)));
@@ -442,8 +442,8 @@ void KexiSimplePrintingPageSetup::updatePageLayoutAndUnitInfo()
 	TQString s;
 	if (m_settings.pageLayout.format == PG_CUSTOM) {
 		s += TQString(" (%1 %2 x %3 %4)")
-			.tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit))
-			.tqarg(m_settings.pageLayout.ptHeight).tqarg(KoUnit::unitName(m_unit));
+			.arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit))
+			.arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit));
 	}
 	else
 		s += KoPageFormat::name(m_settings.pageLayout.format);
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 6b169f7e..ff46ee7a 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
             <property name="text">
                 <string>Page title:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignBottom</set>
             </property>
             <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -222,7 +222,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>6</height>
@@ -343,7 +343,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -360,7 +360,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -377,7 +377,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -394,7 +394,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -411,7 +411,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 68c1c673..d17aac45 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -22,7 +22,7 @@
 #include "kexisimpleprintpreviewwindow_p.h"
 #include <kexi_version.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqaccel.h>
 #include <tqtimer.h>
 #include <tqlabel.h>
@@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe )
 		return;
 	TQPixmap pm(size()); //dbl buffered
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+	p.begin(TQT_TQPAINTDEVICE(&pm), this);
 //! @todo only for screen!
 	p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white));
 	if (m_window->currentPage()>=0)
@@ -135,7 +135,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth()
 	viewport()->setUpdatesEnabled(true);
 	resize(size()+TQSize(1,1)); //to update pos.
 	widget->enablePainting = true;
-	widget->tqrepaint();
+	widget->repaint();
 }
 
 void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
@@ -157,7 +157,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
  , m_pageNumber(-1)
  , m_pagesCount(-1)
 {
-	setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME));
+	setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME));
 	setIcon(DesktopIcon("filequickprint"));
 	TQVBoxLayout *lyr = new TQVBoxLayout(this, 6);
 
@@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
 	m_scrollView->setUpdatesEnabled(false);
 	m_view = m_scrollView->widget;
-	m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget(m_scrollView);
 
 	TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar
-	navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget);
 	lyr->addWidget(navToolbarWidget);
 
@@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber)
 	m_pageNumber = pageNumber;
 	m_pagesCount = m_engine.pagesCount();
 
-	m_view->tqrepaint(); //this will automatically paint a new page
+	m_view->repaint(); //this will automatically paint a new page
 
 	m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idPrevious, pageNumber > 0);
 	m_navToolbar->setItemEnabled(m_idFirst, pageNumber > 0);
 	static_cast<TQLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText(
-		i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount()));
+		i18n("Page (number) of (total)", "Page %1 of %2").arg(m_pageNumber+1).arg(m_engine.pagesCount()));
 }
 
 void KexiSimplePrintPreviewWindow::setFullWidth()
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index a9a2a316..c2c84011 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -42,10 +42,10 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqgroupbox.h>
 #include <tqwidgetstack.h>
 #include <tqbuttongroup.h>
@@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
 	TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection"));
 	TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections"));
 	d->stack->addWidget(m_remote);
-	if (m_remote->tqlayout())
-		m_remote->tqlayout()->setMargin(0);
+	if (m_remote->layout())
+		m_remote->layout()->setMargin(0);
 //	connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn()));
 	connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),
 		this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
@@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id)
 			if (m_remote->list->firstChild()) {
 				m_remote->list->setSelected(m_remote->list->firstChild(),true);
 			}
-			m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background());
-			m_remote->descGroupBox->tqlayout()->setMargin(2);
+			m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background());
+			m_remote->descGroupBox->layout()->setMargin(2);
 			m_remote->list->setFocus();
 			slotConnectionSelectionChanged();
 		}
@@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn()
 		m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening,
 			d->stack, "openExistingFileDlg");
 		m_fileDlg->setConfirmOverwrites( d->confirmOverwrites );
-//		static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
+//		static_cast<TQVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg );
 		d->stack->addWidget(m_fileDlg);
 
 		for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
@@ -350,9 +350,9 @@ bool KexiConnSelectorWidget::confirmOverwrites() const
 
 /*static TQString msgUnfinished() { 
 	return i18n("To define or change a connection, use command line options or click on .kexis file. "
-		"You can find example .kexis file at <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8!
+		"You can find example .kexis file at <a href=\"%1\">here</a>.").arg("") //temporary, please do not change for 0.8!
 		+ "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */
-//		.tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
+//		.arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
 //}
 
 void KexiConnSelectorWidget::slotRemoteAddBtnClicked()
@@ -407,7 +407,7 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked()
 		return;
 	if (KMessageBox::Continue!=KMessageBox::warningContinueCancel(0, 
 		i18n("Do you want to remove database connection \"%1\" from the list of available connections?")
-		.tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
+		.arg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
 		KMessageBox::Notify|KMessageBox::Dangerous))
 		return;
 
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui
index 5c7bb64d..c55614e2 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -72,7 +72,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -177,7 +177,7 @@
             <property name="name">
                 <cstring>descGroupBox</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>80</height>
@@ -205,7 +205,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>50</height>
@@ -246,7 +246,7 @@
 &lt;p&gt;You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list.
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
@@ -268,7 +268,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 4ac59bc0..0ee1e4dd 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -22,7 +22,7 @@
 
 #include "KexiDBTitlePageBase.h"
 
-//! @short A helper widget used to displaying a line edit with a label and tqlayout
+//! @short A helper widget used to displaying a line edit with a label and layout
 class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
 {
 	Q_OBJECT
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index 7b711ea3..e8a00ef9 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>111</height>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -76,7 +76,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 79f763ee..122137e1 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -74,7 +74,7 @@
                 <string>Kexi will create a new database project. Select a storage method which will be used to store the new project.
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index b24a66ab..9842cb41 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -46,7 +46,7 @@
 #include <tqobjectlist.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqheader.h>
 
@@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	//page: type selector
 	m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector");
 //	lv_types = new KListView(m_prjtype_sel, "types listview");
-//	m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
+//	m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
 #if KDE_IS_VERSION(3,3,9)
 	m_prjtype_sel->lv_types->setShadeSortColumn(false);
 #endif
@@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*)));
 	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*)));
 
-//	static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types);
-//	static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1);
+//	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types);
+//	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1);
 //	updateGeometry();
 
 	addPage(m_prjtype_sel, i18n("Select Storage Method"));
@@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_conn_sel_widget = new TQWidget(this);
 	TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget);
 	TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget);
-	conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	conn_sel_lyr->addWidget( conn_sel_label );
 	conn_sel_lyr->addSpacing(KDialogBase::spacingHint());
 
@@ -301,7 +301,7 @@ void KexiNewProjectWizard::next()
 				return;
 			}
 			m_project_selector->label->setText(
-				d->server_db_name_dblist_lbl_txt.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
+				d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
 			m_server_db_name->le_caption->setFocus();
 
 		}
@@ -342,7 +342,7 @@ void KexiNewProjectWizard::accept()
 			if (KMessageBox::Continue!=KMessageBox::warningContinueCancel( this, "<qt>"
 				+i18n("<b>A project with database name \"%1\" already exists</b>"
 				"<p>Do you want to delete it and create a new one?")
-				.tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
+				.arg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
 				TQString(), KMessageBox::Notify|KMessageBox::Dangerous ))
 			{
 				m_server_db_name->le_dbname->setFocus();
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index f11d7f58..b74936dd 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -35,7 +35,7 @@
                 <string>&lt;b&gt;Select existing Kexi project file to open:&lt;/b&gt;
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -43,7 +43,7 @@
             <property name="name">
                 <cstring>line</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>8</height>
@@ -60,13 +60,13 @@
             <property name="name">
                 <cstring>spacer</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>6</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>6</height>
@@ -75,7 +75,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -112,7 +112,7 @@
                     <property name="text">
                         <string>Click "Advanced" button if you want to find an existing project on a server rather than a file.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 9353e3a6..05cd5293 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -31,7 +31,7 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 
 #include <assert.h>
@@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch
 	init(prj_set, showProjectNameColumn, showConnectionColumns);
 	
 	m_sel->label->setText( i18n("Select a project on <b>%1</b> database server to open:")
-		.tqarg(cdata->serverInfoString(false)) );
+		.arg(cdata->serverInfoString(false)) );
 }
 
 KexiProjectSelectorDialog::~KexiProjectSelectorDialog()
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index 18c80544..5159d9bb 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -43,7 +43,7 @@
                 <string>&lt;b&gt;There are Kexi projects you have recently opened.&lt;/b&gt; Select one you wish to open:
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -103,7 +103,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index b423d467..f482ed73 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -44,7 +44,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -55,7 +55,7 @@
             <property name="name">
                 <cstring>le_dbname</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>12</height>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index c479a4e0..d405aee3 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -54,7 +54,7 @@
 
 #include <tqcstring.h>
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 namespace Kexi {
 	static KStaticDeleter<KexiStartupHandler> Kexi_startupHandlerDeleter;
@@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 			if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) {
 //				kdDebug() << percent << endl;
 				pd->progressBar()->setProgress(percent);
-				tqApp->tqprocessEvents(100);
+				tqApp->processEvents(100);
 			}
 		}
 	}
@@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 	 + i18n("Please enter the password.") + "</p>";
 /*		msg += cdata.userName.isEmpty() ?
 			"<p>"+i18n("Please enter the password.")
-			: "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/
+			: "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/
 
 	TQString srv = cdata.serverInfoString(false);
 	if (srv.isEmpty() || srv.lower()=="localhost")
 		srv = i18n("local database server");
 
-	msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
+	msg += ("</p><p>"+i18n("Database server: %1").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
 		
 	TQString usr;
 	if (cdata.userName.isEmpty())
@@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 	else
 		usr = cdata.userName;
 	
-	msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>");
+	msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>");
 
 	setPrompt( msg );
 	if (showDetailsButton) {
@@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog()
 void KexiDBPasswordDialog::done(int r)
 {
 	if (r == TQDialog::Accepted) {
-		m_cdata->password = TQString::tqfromLatin1(password());
+		m_cdata->password = TQString::fromLatin1(password());
 	}
 //	if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) {
 /*			} else {
@@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 			KMessageBox::sorry( 0, "<qt>"
 				+i18n("Could not read connection information from connection shortcut "
 				"file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.")
-				.tqarg(TQDir::convertSeparators(connectionShortcut.fileName())));
+				.arg(TQDir::convertSeparators(connectionShortcut.fileName())));
 			return false;
 		}
 	}
@@ -295,7 +295,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) {
 		KMessageBox::sorry( 0, 
 			i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.")
-			.tqarg(fileType));
+			.arg(fileType));
 		return false;
 	}
 
@@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	const bool dropDB = args->isSet("dropdb");
 	const bool openExisting = !createDB && !dropDB;
 	const bool readOnly = args->isSet("readonly");
-	const TQString couldnotMsg = TQString::tqfromLatin1("\n")
+	const TQString couldnotMsg = TQString::fromLatin1("\n")
 		+i18n("Could not start Kexi application this way.");
 
 	if (createDB && dropDB) {
@@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 			if (dropDB && !projectFileExists) {
 				KMessageBox::sorry(0, 
 					i18n("Could not remove project.\nThe file \"%1\" does not exist.")
-					.tqarg(TQDir::convertSeparators(cdata.dbFileName())));
+					.arg(TQDir::convertSeparators(cdata.dbFileName())));
 				return 0;
 			}
 		}
@@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					m_projectData = new KexiProjectData();
 					if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) {
 						KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".")
-							.tqarg(TQDir::convertSeparators(cdata.fileName())));
+							.arg(TQDir::convertSeparators(cdata.fileName())));
 						delete m_projectData;
 						m_projectData = 0;
 						delete d->shortcutFile;
@@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName());
 					if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) {
 						KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".")
-							.tqarg(TQDir::convertSeparators(cdata.fileName())));
+							.arg(TQDir::convertSeparators(cdata.fileName())));
 						delete d->connShortcutFile;
 						d->connShortcutFile = 0;
 						return false;
@@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		if (!alsoOpenDB) {
 			if (ok) {
 				KMessageBox::information( 0, i18n("Project \"%1\" created successfully.")
-					.tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+					.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
 			}
 			return ok;
 		}
@@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/);
 		if (res==true)
 			KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.")
-				.tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+				.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
 		return res!=false;
 	}
 
@@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!(options & SkipMessages))
 			KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 				+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
-				.tqarg(TQDir::convertSeparators(dbFileName))
+				.arg(TQDir::convertSeparators(dbFileName))
 				+i18n("Check the file's permissions and whether it is already opened "
 				"and locked by another application."));
 		return false;
@@ -781,7 +781,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			if (!(options & SkipMessages))
 				KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 					+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
-					.tqarg(TQDir::convertSeparators(dbFileName))
+					.arg(TQDir::convertSeparators(dbFileName))
 					+i18n("Check the file's permissions and whether it is already opened "
 						"and locked by another application."));
 			return false;
@@ -804,7 +804,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
 				parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
 				"Do you want to import the file as a Kexi project?")
-				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
+				.arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()),
 				i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
 			{
 				return cancelled;
@@ -830,8 +830,8 @@ tristate KexiStartupHandler::detectActionForFile(
 			 "The project file \"%1\" is recognized as compatible with \"%2\" database driver, "
 			 "while you have asked for \"%3\" database driver to be used.\n"
 			 "Do you want to use \"%4\" database driver?")
-			 .tqarg(TQDir::convertSeparators(dbFileName))
-			 .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName));
+			 .arg(TQDir::convertSeparators(dbFileName))
+			 .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName));
 		if (KMessageBox::Yes == res)
 			useDetectedDriver = true;
 		else if (KMessageBox::Cancel == res)
@@ -851,7 +851,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		&& KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
 			"Previous version of database file format (\"%1\") is detected in the \"%2\" "
 			"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
-			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
+			.arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) )
 	{
 //		SQLite2ToSQLite3Migration *migr = new 
 		SQLite2ToSQLite3Migration migr( finfo.absFilePath() );
@@ -862,7 +862,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			KMessageBox::sorry(parent, i18n(
 				"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
 				"The file format remains unchanged.")
-				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
+				.arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) );
 			//continue...
 		}
 		if (res==true)
@@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (detectedDriverName.isEmpty()) {
 		TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() );
 		if (!possibleProblemsInfoMsg.isEmpty()) {
-			possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:"));
-			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
+			possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:"));
+			possibleProblemsInfoMsg += TQString::fromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
 			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
-					.tqarg(TQDir::convertSeparators(dbFileName)),
-				TQString::tqfromLatin1("<p>")
+					.arg(TQDir::convertSeparators(dbFileName)),
+				TQString::fromLatin1("<p>")
 				+i18n("Database driver for this file type not found.\nDetected MIME type: %1")
-					.tqarg(mimename)
+					.arg(mimename)
 				+(ptr.data()->comment().isEmpty() 
-					? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment()))
-				+TQString::tqfromLatin1("</p>")
+					? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment()))
+				+TQString::fromLatin1("</p>")
 				+possibleProblemsInfoMsg);
 		return false;
 	}
@@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile(
 KexiProjectData*
 KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
-	cleartqStatus();
+	clearStatus();
 	cancelled = false;
 	if (!cdata)
 		return 0;
@@ -917,13 +917,13 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 		if (prjdlg.projectSet())
 			msgh.showErrorMessage(prjdlg.projectSet(), 
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.tqarg(cdata->serverInfoString(true)));
+				.arg(cdata->serverInfoString(true)));
 		else
 			msgh.showErrorMessage(
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.tqarg(cdata->serverInfoString(true)));
-//		settqStatus(i18n("Could not load list of available projects for database server \"%1\"")
-//		.tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
+				.arg(cdata->serverInfoString(true)));
+//		setStatus(i18n("Could not load list of available projects for database server \"%1\"")
+//		.arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
 		return 0;
 	}
 	if (prjdlg.exec()!=TQDialog::Accepted) {
@@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges()
 
 	if (!ok) {
 		KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.")
-			.tqarg(TQDir::convertSeparators(d->shortcutFile->fileName())));
+			.arg(TQDir::convertSeparators(d->shortcutFile->fileName())));
 	}
 }
 
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index fe1b3cf0..23d8e832 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 /*! Handles startup actions for Kexi application.
 */
 class KEXIMAIN_EXPORT KexiStartupHandler 
-	: public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus
+	: public TQObject, public KexiStartupData, public Kexi::ObjectStatus
 {
 	Q_OBJECT
   TQ_OBJECT
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 7f67bc76..b2ad8cfd 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -25,7 +25,7 @@
 #include "KexiConnSelector.h"
 #include "KexiConnSelectorBase.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates()
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	TQLabel *lbl_blank = new TQLabel( 
 		i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );
-	lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_blank->setMargin(0);
 	tmplyr->addWidget( lbl_blank );
 	tmplyr->addStretch(1);
@@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_templ = new TQLabel( 
 		i18n("Kexi will create a new database project using selected template.\n"
 		"Select template and click \"OK\" button to proceed."), templPageFrame );
-	lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_templ->setMargin(0);
 	tmplyr->addWidget( lbl_templ );
 
@@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_import = new TQLabel( 
 		i18n("Kexi will import the structure and data of an existing database as a new database project.")
 		+clickMsg, templPageFrame );
-	lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_import->setMargin(0);
 	tmplyr->addWidget( lbl_import );
 	tmplyr->addStretch(1);
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 429499f4..d919463d 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -123,8 +123,8 @@ void TemplatesPage::itemClicked(TQIconViewItem *item) {
 		return;
 	}
 	TQString t = TQString("<h2>%1</h2><p>%2</p>")
-		.tqarg(static_cast<TemplateItem*>(item)->name)
-		.tqarg(static_cast<TemplateItem*>(item)->description);
+		.arg(static_cast<TemplateItem*>(item)->name)
+		.arg(static_cast<TemplateItem*>(item)->description);
 #ifndef DB_TEMPLATES
 	t += TQString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>";
 #endif
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index cd54602b..8dd74298 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -23,7 +23,7 @@
 #include <core/kexi.h>
 #include <kexiutils/utils.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
 #include <tqapplication.h>
@@ -42,14 +42,14 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
-	tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
+	setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
 	setMode( mode );
 	
 	TQPoint point( 0, 0 );
 	reparent( parentWidget(), point );
 
-	if (tqlayout())
-		tqlayout()->setMargin(0);
+	if (layout())
+		layout()->setMargin(0);
 	setMinimumHeight(100);
 	setSizeGripEnabled ( false );
 
@@ -300,7 +300,7 @@ bool KexiStartupFileDialog::checkFileName()
 		if (mode() & KFile::ExistingOnly) {
 			if ( !fi.exists() ) {
 				KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" does not exist." )
-					.tqarg( TQDir::convertSeparators(path) ) );
+					.arg( TQDir::convertSeparators(path) ) );
 				return false;
 			}
 			else if (mode() & KFile::File) {
@@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName()
 				}
 				else if (!fi.isReadable()) {
 					KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" is not readable." )
-						.tqarg( TQDir::convertSeparators(path) ) );
+						.arg( TQDir::convertSeparators(path) ) );
 					return false;
 				}
 			}
@@ -329,7 +329,7 @@ bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget
 	if (!fi.exists())
 		return true;
 	const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
-		"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), 
+		"Do you want to overwrite it?").arg( TQDir::convertSeparators(filePath) ), TQString(), 
 			i18n("Overwrite"), KStdGuiItem::no() );
 	if (res == KMessageBox::Yes)
 		return true;
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index c81de131..36b8c527 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -120,27 +120,27 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 /*
     KURL u;
     u.setPath( TQDir::rootDirPath() );
-    TQString text = i18n("Root Directory: %1").tqarg( u.path() );
+    TQString text = i18n("Root Directory: %1").arg( u.path() );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     u.setPath( TQDir::homeDirPath() );
-    text = i18n("Home Directory: %1").tqarg( u.path( +1 ) );
+    text = i18n("Home Directory: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     KURL docPath;
     docPath.setPath( KGlobalSettings::documentPath() );
     if ( u.path(+1) != docPath.path(+1) ) {
-        text = i18n("Documents: %1").tqarg( docPath.path( +1 ) );
+        text = i18n("Documents: %1").arg( docPath.path( +1 ) );
         d->pathCombo->addDefaultURL( u,
                                      KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                      text );
     }
 
     u.setPath( KGlobalSettings::desktopPath() );
-    text = i18n("Desktop: %1").tqarg( u.path( +1 ) );
+    text = i18n("Desktop: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
@@ -185,7 +185,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "up" )->plug( toolbar );
     coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
                                             "For instance, if the current location is file:/home/%1 clicking this "
-                                            "button will take you to file:/home.</qt>").tqarg(getlogin()));
+                                            "button will take you to file:/home.</qt>").arg(getlogin()));
     coll->action( "back" )->plug( toolbar );
     coll->action( "back" )->setWhatsThis(i18n("Click this button to move backwards one step in the browsing history."));
     coll->action( "forward" )->plug( toolbar );
@@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory."));
 
     d->bookmarkHandler = new KFileBookmarkHandler( this );
-    toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
+    toolbar->insertButton(TQString::fromLatin1("bookmark"),
                           (int)HOTLIST_BUTTON, true,
                           i18n("Bookmarks"));
     toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(),
@@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes,
 //(js)    filterWidget->setMimeFilter( mimeTypes, defaultType );
 
 //(js)    TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
-//(js)    types.append( TQString::tqfromLatin1( "inode/directory" ));
+//(js)    types.append( TQString::fromLatin1( "inode/directory" ));
 //(js)    ops->clearFilter();
 //(js)    ops->setMimeFilter( types );
 //(js)    d->hasDefaultFilter = !defaultType.isEmpty();
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index e8139e18..e959ccdc 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -73,7 +73,7 @@ tristate SQLite2ToSQLite3Migration::run()
 
 	m_dlg = new KProgressDialog(0, 0, TQString(), 
 		i18n("Saving \"%1\" project file to a new \"%2\" database format...")
-		.tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3")
+		.arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3")
 	);
 	m_dlg->setModal(true);
 	connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 50d6726d..46479e66 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -22,8 +22,8 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textcodec.h>
 #include <tqcheckbox.h>
 
 #include <kapplication.h>
@@ -53,16 +53,16 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
 		KDialogBase::spacingHint());
 
 	m_encodingComboBox = new KexiCharacterEncodingComboBox(plainPage(), selectedEncoding);
-	m_encodingComboBox->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_encodingComboBox->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget( m_encodingComboBox, 1, 1 );
 	TQLabel* lbl = new TQLabel( 
 		i18n("<h3>Text encoding for Microsoft Access database</h3>\n"
 		"<p>Database file \"%1\" appears to be created by a version of Microsoft Access older than 2000.</p>"
 		"<p>In order to properly import national characters, you may need to choose a proper text encoding "
 		"if the database was created on a computer with a different character set.</p>")
-		.tqarg(TQDir::convertSeparators(databaseFile)), plainPage());
-	lbl->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak );
-	lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+		.arg(TQDir::convertSeparators(databaseFile)), plainPage());
+	lbl->setAlignment( TQt::AlignAuto | TQt::WordBreak );
+	lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	lyr->addMultiCellWidget( lbl, 0, 0, 0, 2 );
 
 	TQLabel* lbl2 = new TQLabel( m_encodingComboBox, i18n("Text encoding:"), plainPage());
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 9c1b4559..cd1c94b3 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -24,7 +24,7 @@
 #include "importoptionsdlg.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
@@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
 		}
 	}
 
-	m_sourceDBEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); //default
+	m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default
 }
 
 //===========================================================
@@ -148,19 +148,19 @@ void ImportWizard::setupIntro()
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint());
 	
 	TQLabel *lblIntro = new TQLabel(m_introPage);
-	lblIntro->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 	TQString msg;
 	if (m_predefinedConnectionData) { //predefined import: server source
 		msg = i18n("<qt>Database Importing wizard is about to import \"%1\" database "
 		"<nobr>(connection %2)</nobr> into a Kexi database.</qt>")
-			.tqarg(m_predefinedDatabaseName).tqarg(m_predefinedConnectionData->serverInfoString());
+			.arg(m_predefinedDatabaseName).arg(m_predefinedConnectionData->serverInfoString());
 	}
 	else if (!m_predefinedDatabaseName.isEmpty()) { //predefined import: file source
 //! @todo this message is currently ok for files only
 		KMimeType::Ptr mimeTypePtr = KMimeType::mimeType(m_predefinedMimeType);
 		msg = i18n("<qt>Database Importing wizard is about to import <nobr>\"%1\"</nobr> file "
 		"of type \"%2\" into a Kexi database.</qt>")
-			.tqarg(TQDir::convertSeparators(m_predefinedDatabaseName)).tqarg(mimeTypePtr->comment());
+			.arg(TQDir::convertSeparators(m_predefinedDatabaseName)).arg(mimeTypePtr->comment());
 	}
 	else {
 		msg = i18n("Database Importing wizard allows you to import an existing database "
@@ -247,7 +247,7 @@ void ImportWizard::setupDstType()
 
 	TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
 	TQLabel *lbl = new TQLabel(i18n("Destination database type:")+" ", m_dstTypePage);
-	lbl->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop);
+	lbl->setAlignment(TQt::AlignAuto|TQt::AlignTop);
 	hbox->addWidget(lbl);
 
 	m_dstPrjTypeSelector = new KexiPrjTypeSelector(m_dstTypePage);
@@ -274,7 +274,7 @@ void ImportWizard::setupDstTitle()
 {
 	m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"), 
 		this, "KexiDBTitlePage");
-	m_dstTitlePage->tqlayout()->setMargin( KDialog::marginHint() );
+	m_dstTitlePage->layout()->setMargin( KDialog::marginHint() );
 	m_dstTitlePage->updateGeometry();
 	m_dstNewDBNameLineEdit = m_dstTitlePage->le_caption;
 	addPage(m_dstTitlePage, i18n("Select Destination Database Project's Caption"));
@@ -339,10 +339,10 @@ void ImportWizard::setupImporting()
 	m_importingPage->hide();
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_importingPage, KDialog::marginHint());
 	m_lblImportingTxt = new TQLabel(m_importingPage);
-	m_lblImportingTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_lblImportingTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	m_lblImportingErrTxt = new TQLabel(m_importingPage);
-	m_lblImportingErrTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_lblImportingErrTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	m_progressBar = new KProgress(100, m_importingPage);
 	m_progressBar->hide();
@@ -374,7 +374,7 @@ void ImportWizard::setupFinish()
 	m_finishPage->hide();
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_finishPage, KDialog::marginHint());
 	m_finishLbl = new TQLabel(m_finishPage);
-	m_finishLbl->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	vbox->addWidget( m_finishLbl );
 	m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"), 
@@ -398,7 +398,7 @@ bool ImportWizard::checkUserInput()
 		finishtxt = finishtxt + "<br>" + i18n("No new database name was entered.");
 	}
 
-	Kexi::ObjecttqStatus result;
+	Kexi::ObjectStatus result;
 	KexiMigrate* sourceDriver = prepareImport(result);
 	if (sourceDriver && sourceDriver->isSourceAndDestinationDataSourceTheSame())
 	{
@@ -551,11 +551,11 @@ void ImportWizard::arriveImportingPage() {
 //! and KexiMigration::Driver classes
 	bool showOptions = false;
 	if (fileBasedSrcSelected()) {
-		Kexi::ObjecttqStatus result;
+		Kexi::ObjectStatus result;
 		KexiMigrate* sourceDriver = prepareImport(result);
 		if (sourceDriver) {
 			showOptions = !result.error() 
-				&& sourceDriver->propertyValue( "source_database_has_nontqunicode_encoding" ).toBool();
+				&& sourceDriver->propertyValue( "source_database_has_nonunicode_encoding" ).toBool();
 			KexiMigration::Data *data = sourceDriver->data();
 			sourceDriver->setData( 0 );
 			delete data;
@@ -572,7 +572,7 @@ void ImportWizard::arriveImportingPage() {
 void ImportWizard::arriveFinishPage() {
 //	backButton()->hide();
 //	cancelButton()->setEnabled(false);
-//	m_finishLbl->setText(	m_successText.tqarg(m_dstNewDBNameLineEdit->text()) );
+//	m_finishLbl->setText(	m_successText.arg(m_dstNewDBNameLineEdit->text()) );
 }
 
 bool ImportWizard::fileBasedSrcSelected() const
@@ -650,7 +650,7 @@ void ImportWizard::accept()
 	KWizard::accept();
 }
 
-KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
+KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 {
 	KexiUtils::WaitCursor wait;
 	
@@ -667,10 +667,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 	);
 	if (!destDriver || manager.error())
 	{
-		result.settqStatus(&manager);
+		result.setStatus(&manager);
 		kdDebug() << "Manager error..." << endl;
 		manager.debugError();
-//		result.settqStatus(&manager);
+//		result.setStatus(&manager);
 	}
 
 	// Set up destination connection data
@@ -702,7 +702,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 		{
 			//TODO This needs a better message
 			//KMessageBox::error(this, 
-			result.settqStatus(i18n("No connection data is available. You did not select a destination filename."),"");
+			result.setStatus(i18n("No connection data is available. You did not select a destination filename."),"");
 			//return false;
 		} */
 	}
@@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 	{
 		sourceDriverName = driverNameForSelectedSource();
 		if (sourceDriverName.isEmpty())
-			result.settqStatus(i18n("No appropriate migration driver found."), 
+			result.setStatus(i18n("No appropriate migration driver found."), 
 				m_migrateManager.possibleProblemsInfoMsg());
 	}
 
@@ -724,7 +724,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 		sourceDriver = m_migrateManager.driver( sourceDriverName );
 		if(!sourceDriver || m_migrateManager.error()) {
 			kdDebug() << "Import migrate driver error..." << endl;
-			result.settqStatus(&m_migrateManager);
+			result.setStatus(&m_migrateManager);
 		}
 	}
 
@@ -793,7 +793,7 @@ tristate ImportWizard::import()
 {
 	m_importExecuted = true;
 
-	Kexi::ObjecttqStatus result;
+	Kexi::ObjectStatus result;
 	KexiMigrate* sourceDriver = prepareImport(result);
 
 	bool acceptingNeeded = false;
@@ -802,7 +802,7 @@ tristate ImportWizard::import()
 	if (sourceDriver && !result.error())
 	{
 		if (!m_sourceDBEncoding.isEmpty()) {
-			sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding", 
+			sourceDriver->setPropertyValue( "source_database_nonunicode_encoding", 
 				TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" 
 			);
 		}
@@ -820,7 +820,7 @@ tristate ImportWizard::import()
 		if (KMessageBox::Yes != KMessageBox::warningYesNo(this,
 			"<qt>"+i18n("Database %1 already exists."
 			"<p>Do you want to replace it with a new one?")
-			.tqarg(sourceDriver->data()->destination->infoString()),
+			.arg(sourceDriver->data()->destination->infoString()),
 			0, KGuiItem(i18n("&Replace")), KGuiItem(i18n("No"))))
 		{
 			return cancelled;
@@ -861,7 +861,7 @@ tristate ImportWizard::import()
 		setTitle(m_finishPage, i18n("Failure"));
 		m_finishLbl->setText(	
 			i18n("<p>Import failed.</p>%1<p>%2</p><p>You can click \"Back\" button and try again.</p>")
-			.tqarg(msg).tqarg(details));
+			.arg(msg).arg(details));
 		return false;
 	}
 //	delete kexi_conn;
@@ -899,9 +899,9 @@ void ImportWizard::next()
 				dbname = m_srcConn->selectedConnectionData() 
 					? m_srcConn->selectedConnectionData()->serverInfoString() : TQString();
 				if (!dbname.isEmpty())
-					dbname = TQString(" \"%1\"").tqarg(dbname);
+					dbname = TQString(" \"%1\"").arg(dbname);
 			KMessageBox::error(this, i18n("Could not import database%1. This type is not supported.")
-				.tqarg(dbname));
+				.arg(dbname));
 			return;
 		}
 	}
@@ -922,7 +922,7 @@ void ImportWizard::next()
 			if (true == res) {
 				m_finishLbl->setText( 
 					i18n("Database has been imported into Kexi database project \"%1\".")
-					.tqarg(m_dstNewDBNameLineEdit->text()) );
+					.arg(m_dstNewDBNameLineEdit->text()) );
 				cancelButton()->setEnabled(false);
 				setBackEnabled(m_finishPage, false);
 				setFinishEnabled(m_finishPage, true);
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index 8d3a82b0..19a1b844 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -47,7 +47,7 @@ class KexiPrjTypeSelector;
 
 namespace Kexi
 {
-	class ObjecttqStatus;
+	class ObjectStatus;
 }
 
 namespace KexiDB
@@ -98,7 +98,7 @@ private:
 	void setupImporting();
 	bool checkUserInput();
 
-	KexiMigrate* prepareImport(Kexi::ObjecttqStatus& result);
+	KexiMigrate* prepareImport(Kexi::ObjectStatus& result);
 
 	/*! Performs import. \return true/false on success/faulure 
 	 or cancelled when user cancelled importing (mainly 
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index b225f6ba..1c3295b6 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -61,20 +61,20 @@ KexiMigrate::~KexiMigrate()
 	delete m_destPrj;
 }
 
-bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result, 
+bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result, 
 	bool& acceptingNeeded)
 {
 	acceptingNeeded = false;
 	if (result)
-		result->cleartqStatus();
+		result->clearStatus();
 
 	KexiDB::DriverManager drvManager;
 	KexiDB::Driver *destDriver = drvManager.driver(
 		m_migrateData->destination->connectionData()->driverName);
 	if (!destDriver) {
-		result->settqStatus(&drvManager,
+		result->setStatus(&drvManager,
 			i18n("Could not create database \"%1\".")
-			.tqarg(m_migrateData->destination->databaseName()));
+			.arg(m_migrateData->destination->databaseName()));
 		return false;
 	}
 
@@ -113,18 +113,18 @@ bool KexiMigrate::isSourceAndDestinationDataSourceTheSame() const
 
 //=============================================================================
 // Perform Import operation
-bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
+bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 {
 	if (result)
-		result->cleartqStatus();
+		result->clearStatus();
 
 	KexiDB::DriverManager drvManager;
 	KexiDB::Driver *destDriver = drvManager.driver(
 		m_migrateData->destination->connectionData()->driverName);
 	if (!destDriver) {
-		result->settqStatus(&drvManager,
+		result->setStatus(&drvManager,
 			i18n("Could not create database \"%1\".")
-			.tqarg(m_migrateData->destination->databaseName()));
+			.arg(m_migrateData->destination->databaseName()));
 		return false;
 	}
 
@@ -135,8 +135,8 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 	if (!drv_connect()) {
 		kdDebug() << "Couldnt connect to database server" << endl;
 		if (result)
-			result->settqStatus(i18n("Could not connect to data source \"%1\".")
-				.tqarg(m_migrateData->source->serverInfoString()), "");
+			result->setStatus(i18n("Could not connect to data source \"%1\".")
+				.arg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -145,9 +145,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 	if (!tableNames(tables)) {
 		kdDebug() << "Couldnt get list of tables" << endl;
 		if (result)
-			result->settqStatus(
+			result->setStatus(
 				i18n("Could not get a list of table names for data source \"%1\".")
-					.tqarg(m_migrateData->source->serverInfoString()), "");
+					.arg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -155,9 +155,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 	if (tables.isEmpty()) {
 		kdDebug() << "There were no tables to import" << endl;
 		if (result)
-			result->settqStatus(
+			result->setStatus(
 				i18n("No tables to import found in data source \"%1\".")
-					.tqarg(m_migrateData->source->serverInfoString()), "");
+					.arg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -165,15 +165,15 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 	tables.sort();
 	m_tableSchemas.clear();
 	if (!destDriver) {
-		result->settqStatus(&drvManager);
+		result->setStatus(&drvManager);
 		return false;
 	}
 	const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end();
 	TQStringList kexiDBTables;
 	if (kexi__objects_exists) {
 		tristate res = drv_queryStringListFromSQL(
-			TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
-		.tqarg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1);
+			TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
+		.arg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1);
 		if (res == true) {
 			// prepend KexiDB-compatible tables to 'tables' list, so we'll copy KexiDB-compatible tables first,
 			// to make sure existing IDs will not be in conflict with IDs newly generated for non-KexiDB tables
@@ -199,9 +199,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 		if (!drv_readTableSchema(*it, *tableSchema)) {
 			delete tableSchema;
 			if (result)
-				result->settqStatus(
+				result->setStatus(
 					i18n("Could not import project from data source \"%1\". Error reading table \"%2\".")
-					.tqarg(m_migrateData->source->serverInfoString()).tqarg(tableName), "");
+					.arg(m_migrateData->source->serverInfoString()).arg(tableName), "");
 			return false;
 		}
 		//yeah, got a table
@@ -228,9 +228,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 		if (trans.isNull()) {
 			ok = false;
 			if (result)
-				result->settqStatus(destConn,
+				result->setStatus(destConn,
 					i18n("Could not create database \"%1\".")
-					.tqarg(m_migrateData->destination->databaseName()));
+					.arg(m_migrateData->destination->databaseName()));
 			//later destConn->dropDatabase(m_migrateData->destination->databaseName());
 			//don't delete prj, otherwise eror message will be deleted		delete prj;
 			//later return m_destPrj;
@@ -250,7 +250,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 			bool firstRecord = true;
 			if (true == drv_fetchRecordFromSQL(
 					TQString("SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects "
-					"WHERE o_name='%1' AND o_type=%1").tqarg(*it).tqarg((int)KexiDB::TableObjectType), 
+					"WHERE o_name='%1' AND o_type=%1").arg(*it).arg((int)KexiDB::TableObjectType), 
 					data, firstRecord)
 				&& destConn->setupObjectSchemaData( data, *t ))
 			{
@@ -258,9 +258,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 				//load schema for every field and add it
 				firstRecord = true;
 				TQString sql(
-					TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
+					TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
 						"f_options, f_default, f_order, f_caption, f_help"
-						" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->id()) );
+						" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").arg(t->id()) );
 				while (ok) {
 					tristate res = drv_fetchRecordFromSQL(sql, data, firstRecord);
 					if (res != true) {
@@ -299,9 +299,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 				kdDebug() << "Failed to create a table " << ts->name() << endl;
 				destConn->debugError();
 				if (result)
-					result->settqStatus(destConn,
+					result->setStatus(destConn,
 						i18n("Could not create database \"%1\".")
-						.tqarg(m_migrateData->destination->databaseName()));
+						.arg(m_migrateData->destination->databaseName()));
 				m_tableSchemas.remove(ts);
 				break;
 			}
@@ -329,9 +329,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 		if (m_destPrj->error()) {
 			ok = false;
 			if (result)
-				result->settqStatus(m_destPrj,
+				result->setStatus(m_destPrj,
 					i18n("Could not import project from data source \"%1\".")
-					.tqarg(m_migrateData->source->serverInfoString()));
+					.arg(m_migrateData->source->serverInfoString()));
 		}
 	}
 
@@ -380,8 +380,8 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 			if (!ok) {
 				kdDebug() << "Failed to copy table " << tname << endl;
 				if (result)
-					result->settqStatus(destConn,
-						i18n("Could not copy table \"%1\" to destination database.").tqarg(tname));
+					result->setStatus(destConn,
+						i18n("Could not copy table \"%1\" to destination database.").arg(tname));
 				break;
 			}
 		}//for
@@ -404,9 +404,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 
 	// Finally: error handling
 	if (result && result->error())
-		result->settqStatus(destConn,
+		result->setStatus(destConn,
 			i18n("Could not import data from data source \"%1\".")
-				.tqarg(m_migrateData->source->serverInfoString()));
+				.arg(m_migrateData->source->serverInfoString()));
 	if (destConn) {
 		destConn->debugError();
 		destConn->rollbackTransaction(trans);
@@ -420,10 +420,10 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 }
 //=============================================================================
 
-bool KexiMigrate::performExport(Kexi::ObjecttqStatus* result)
+bool KexiMigrate::performExport(Kexi::ObjectStatus* result)
 {
 	if (result)
-		result->cleartqStatus();
+		result->clearStatus();
 
 	//! @todo performExport
 
@@ -512,7 +512,7 @@ KexiDB::Field::Type KexiMigrate::userType(const TQString& fname)
 	res = dlg->getItem( i18n("Field Type"),
 	                    i18n("The data type for %1 could not be determined. "
 				 "Please select one of the following data "
-				 "types").tqarg(fname),
+				 "types").arg(fname),
                       types, 0, false);
 
 //! @todo use TQMap<TQCString, KexiDB::Field::Type> here!
@@ -575,9 +575,9 @@ bool KexiMigrate::isValid()
 	{
 		setError(ERR_INCOMPAT_DRIVER_VERSION,
 		i18n("Incompatible migration driver's \"%1\" version: found version %2, expected version %3.")
-		.tqarg(name())
-		.tqarg(TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()))
-		.tqarg(TQString("%1.%2").tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor())));
+		.arg(name())
+		.arg(TQString("%1.%2").arg(versionMajor()).arg(versionMinor()))
+		.arg(TQString("%1.%2").arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor())));
 		return false;
 	}
 	return true;
@@ -588,8 +588,8 @@ bool KexiMigrate::drv_queryMaxNumber(const TQString& tableName,
 {
 	TQString string;
 	tristate r = drv_querySingleStringFromSQL(
-		TQString::tqfromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName))
-		.tqarg(drv_escapeIdentifier(tableName)), 0, string);
+		TQString::fromLatin1("SELECT MAX(%1) FROM %2").arg(drv_escapeIdentifier(columnName))
+		.arg(drv_escapeIdentifier(tableName)), 0, string);
 	if (r == false)
 		return false;
 	if (~r) {
diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h
index ee22ded8..cd2949f9 100644
--- a/kexi/migration/keximigrate.h
+++ b/kexi/migration/keximigrate.h
@@ -34,7 +34,7 @@
 class KexiProject;
 namespace Kexi
 {
-	class ObjecttqStatus;
+	class ObjectStatus;
 }
 
 /*! KexiMigration implementation version. 
@@ -99,7 +99,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
 		 \a acceptingNeeded is set to true if destination database exists. 
 		 In this case you should ask about accepting database overwriting. 
 		 Used in ImportWizard::import(). */
-		bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result,
+		bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result,
 			bool& acceptingNeeded);
 
 		/*! Checks if the source- and the destination databases are identical.
@@ -107,10 +107,10 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
 		bool isSourceAndDestinationDataSourceTheSame() const;
 
 		//! Perform an import operation
-		bool performImport(Kexi::ObjecttqStatus* result = 0);
+		bool performImport(Kexi::ObjectStatus* result = 0);
 
 		//! Perform an export operation
-		bool performExport(Kexi::ObjecttqStatus* result = 0);
+		bool performExport(Kexi::ObjectStatus* result = 0);
 
 		//! Returns true if the migration driver supports progress updates.
 		inline bool progressSupported() { return drv_progressSupported(); }
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 2c0ce6cd..945f084c 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -131,19 +131,19 @@ bool MigrateManagerInternal::lookupDrivers()
 			<< srv_name.lower() << "' driver's version -- skipping it!" << endl;
 			possibleProblems += TQString("\"%1\" migration driver has unrecognized version; "
 				"required driver version is \"%2.%3\"")
-				.tqarg(srv_name.lower())
-				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor());
+				.arg(srv_name.lower())
+				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor());
 			continue;
 		}
 		if (major_ver != KexiMigration::versionMajor() || minor_ver != KexiMigration::versionMinor()) {
 			KexiDBWarn << TQString("MigrateManagerInternal::lookupDrivers(): '%1' driver" 
 				" has version '%2' but required migration driver version is '%3.%4'\n"
-				" -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()) << endl;
+				" -- skipping this driver!").arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()) << endl;
 			possibleProblems += TQString("\"%1\" migration driver has version \"%2\" "
 				"but required driver version is \"%3.%4\"")
-				.tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor());
+				.arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor());
 			continue;
 		}
 //</COPIED>
@@ -188,7 +188,7 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name)
 		return drv; //cached
 
 	if (!m_services_lcase.contains(name.lower())) {
-		setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").arg(name) );
 		return 0;
 	}
 
@@ -201,7 +201,7 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name)
 
 	if (!drv) {
 		setError(ERR_DRIVERMANAGER, i18n("Could not load import/export database driver \"%1\".")
-				.tqarg(name) );
+				.arg(name) );
 		if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound";
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary";
@@ -314,7 +314,7 @@ TQString MigrateManager::driverForMimeType(const TQString &mimeType)
 	
 	KService::Ptr ptr = d_int->m_services_by_mimetype[mimeType.lower()];
 	if (!ptr) {
-		kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").tqarg(mimeType) << endl;
+		kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").arg(mimeType) << endl;
 		return TQString();
 	}
 
@@ -325,7 +325,7 @@ KexiMigrate* MigrateManager::driver(const TQString& name)
 {
 	KexiMigrate *drv = d_int->driver(name);
 	if (d_int->error()) {
-		kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").tqarg(name).tqarg(d_int->errorMsg()) << endl;
+		kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").arg(name).arg(d_int->errorMsg()) << endl;
 		setError(d_int);
 	}
 	return drv;
@@ -363,7 +363,7 @@ TQString MigrateManager::possibleProblemsInfoMsg() const
 	for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin();
 		it!=d_int->possibleProblems.constEnd(); ++it)
 	{
-		str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>"));
+		str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>"));
 	}
 	str += "</ul>";
 	return str;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 1b125d8d..78671241 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -396,7 +396,7 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table,
 	TQString mysqlType;
 	KexiDB::Field::Type kexiType;
 	TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + 
-	                "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'";
+	                "` LIKE '" + TQString::fromLatin1(fld->name) + "'";
 
 	if(d->executeSQL(query)) {
 		MYSQL_RES *res = mysql_store_result(d->mysql);
@@ -444,7 +444,7 @@ TQStringList MySQLMigrate::examineEnumField(const TQString& table,
 		const MYSQL_FIELD* fld) {
 	TQString vals;
 	TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + 
-			"` LIKE '" + TQString::tqfromLatin1(fld->name) + "'";
+			"` LIKE '" + TQString::fromLatin1(fld->name) + "'";
 
 	if(d->executeSQL(query)) {
 		MYSQL_RES *res = mysql_store_result(d->mysql);
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index d6c655f9..904e0c92 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -135,7 +135,7 @@ bool PqxxMigrate::drv_tableNames(TQStringList& tableNames)
         for (pqxx::result::const_iterator c = m_res->begin(); c != m_res->end(); ++c)
         {
             // Copy the result into the return list
-            tableNames << TQString::tqfromLatin1 (c[0].c_str());
+            tableNames << TQString::fromLatin1 (c[0].c_str());
         }
         return true;
     }
@@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect()
     if (m_migrateData->source->port == 0)
         m_migrateData->source->port = 5432;
 
-    conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(m_migrateData->source->port);
+    conninfo += TQString::fromLatin1(" port='%1'").arg(m_migrateData->source->port);
 
-    conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName);
+    conninfo += TQString::fromLatin1(" dbname='%1'").arg(m_migrateData->sourceName);
 
     if (!m_migrateData->source->userName.isNull())
-        conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(m_migrateData->source->userName);
+        conninfo += TQString::fromLatin1(" user='%1'").arg(m_migrateData->source->userName);
 
     if (!m_migrateData->source->password.isNull())
-        conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(m_migrateData->source->password);
+        conninfo += TQString::fromLatin1(" password='%1'").arg(m_migrateData->source->password);
 
     try
     {
@@ -377,7 +377,7 @@ bool PqxxMigrate::primaryKey(pqxx::oid table_uid, int col) const
 
     try
     {
-        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").tqarg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").arg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_pkey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -480,7 +480,7 @@ tristate PqxxMigrate::drv_queryStringListFromSQL(
 				mysql_free_result(res);
 				return false;
 			}
-			string = TQString::tqfromLatin1(row[columnNumber], lengths[columnNumber]);
+			string = TQString::fromLatin1(row[columnNumber], lengths[columnNumber]);
 			mysql_free_result(res);
 		} else {
 			kdDebug() << "PqxxMigrate::drv_querySingleStringFromSQL(): null result" << endl;
@@ -569,7 +569,7 @@ bool PqxxMigrate::uniqueKey(pqxx::oid table_uid, int col) const
 
     try
     {
-        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").tqarg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").arg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_ukey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -647,7 +647,7 @@ bool PqxxMigrate::notEmpty(pqxx::oid /*table_uid*/, int /*col*/) const
             // Read value of column 0 into a string N
             c[0].to(N);
             // Copy the result into the return list
-            list << TQString::tqfromLatin1 (N.c_str());
+            list << TQString::fromLatin1 (N.c_str());
 	    KexiDBDrvDbg << N.c_str() << endl;
         }
         return true;
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 61585840..bec4de7d 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -352,12 +352,12 @@ public:
 			msg = TQString();
 		// hardcoded, but it's not that bad
 		else if (actionType=="macro")
-			msg = i18n("&Select macro to be executed after clicking \"%1\" button:").tqarg(actionWidgetName);
+			msg = i18n("&Select macro to be executed after clicking \"%1\" button:").arg(actionWidgetName);
 		else if (actionType=="script")
-			msg = i18n("&Select script to be executed after clicking \"%1\" button:").tqarg(actionWidgetName);
+			msg = i18n("&Select script to be executed after clicking \"%1\" button:").arg(actionWidgetName);
 		//default: table/query/form/report...
 		else
-			msg = i18n("&Select object to be opened after clicking \"%1\" button:").tqarg(actionWidgetName);
+			msg = i18n("&Select object to be opened after clicking \"%1\" button:").arg(actionWidgetName);
 		selectActionToBeExecutedLbl->setText(msg);
 	}
 
@@ -405,7 +405,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	setButtonOK( KGuiItem(i18n("Assign action", "&Assign"), "button_ok", i18n("Assign action")) );
 
 	TQWidget *mainWidget = new TQWidget( this );
-	mainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	mainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	setMainWidget(mainWidget);
 
 /*    lbl 1
@@ -428,24 +428,24 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 
 	// 1st column: action types
 	d->actionCategoriesListView = new ActionCategoriesListView(mainWidget);
-	d->actionCategoriesListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+	d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
 	d->glyr->addWidget(d->actionCategoriesListView, 1, 0);
 	connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
 		this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*)));
 
 	TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget);
 	lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
-	lbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-	lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+	lbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 	d->glyr->addWidget(lbl, 0, 0, TQt::AlignTop|TQt::AlignLeft);
 	
 	// widget stack for 2nd and 3rd column
 	d->secondAnd3rdColumnStack = new TQWidgetStack(mainWidget);
-	d->secondAnd3rdColumnStack->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	d->secondAnd3rdColumnStack->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	d->glyr->addMultiCellWidget(d->secondAnd3rdColumnStack, 0, 1, 1, 1);//, TQt::AlignTop|TQt::AlignLeft);
 
 	d->secondAnd3rdColumnMainWidget = new TQWidget(d->secondAnd3rdColumnStack);
-	d->secondAnd3rdColumnMainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	d->secondAnd3rdColumnMainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	d->secondAnd3rdColumnGrLyr = new TQGridLayout(d->secondAnd3rdColumnMainWidget, 2, 2, 0, KDialog::spacingHint());
 	d->secondAnd3rdColumnGrLyr->setRowStretch(1, 2);
 	d->secondAnd3rdColumnStack->addWidget(d->secondAnd3rdColumnMainWidget);
@@ -457,8 +457,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 		this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
 
 	d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget);
-	d->selectActionToBeExecutedLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
-	d->selectActionToBeExecutedLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+	d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->selectActionToBeExecutedLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 	d->selectActionToBeExecutedLbl->setMinimumHeight(d->selectActionToBeExecutedLbl->fontMetrics().height()*2);
 	d->secondAnd3rdColumnGrLyr->addWidget(d->selectActionToBeExecutedLbl, 0, 0, TQt::AlignTop|TQt::AlignLeft);
 
@@ -469,7 +469,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionToExecuteListView = new ActionToExecuteListView(d->secondAnd3rdColumnMainWidget);
 	d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting
-	d->actionToExecuteListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+	d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
 	connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)),
 		this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*)));
 	connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
@@ -479,8 +479,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, 
 		i18n("Action to execute:"), d->secondAnd3rdColumnMainWidget);
 	d->actionToExecuteLbl->installEventFilter(this); //to be able to disable painting
-	d->actionToExecuteLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
-	d->actionToExecuteLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+	d->actionToExecuteLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->actionToExecuteLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 	d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, TQt::AlignTop|TQt::AlignLeft);
 
 	// temporary show all sections to avoid resizing the dialog in the future
@@ -538,7 +538,7 @@ void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*)
 void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*)
 {
 	d->setActionToExecuteSectionVisible(false);
-	updateOKButtontqStatus();
+	updateOKButtonStatus();
 }
 
 void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem*)
@@ -549,7 +549,7 @@ void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem
 void KexiActionSelectionDialog::slotCurrentFormActionItemSelected(TQListViewItem*)
 {
 	d->setActionToExecuteSectionVisible(false);
-	updateOKButtontqStatus();
+	updateOKButtonStatus();
 }
 
 void KexiActionSelectionDialog::slotItemForOpeningOrExecutingSelected(KexiPart::Item* item)
@@ -568,7 +568,7 @@ void KexiActionSelectionDialog::slotActionToExecuteItemExecuted(TQListViewItem*
 
 void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*)
 {
-	updateOKButtontqStatus();
+	updateOKButtonStatus();
 }
 
 void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
@@ -581,15 +581,15 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label
 		if (simpleItem->data == "kaction") {
 			if (!d->kactionPageWidget) {
-				//create lbl+list view with a vtqlayout
+				//create lbl+list view with a vlayout
 				d->kactionPageWidget = new TQWidget();
-				d->kactionPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+				d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint());
 				d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin);
 				d->kactionListView->init();
-				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.tqarg(d->actionWidgetName),
+				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName),
 					d->kactionPageWidget);
-				lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->kactionListView);
@@ -605,16 +605,16 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 		}
 		else if (simpleItem->data == "currentForm") {
 			if (!d->currentFormActionsPageWidget) {
-				//create lbl+list view with a vtqlayout
+				//create lbl+list view with a vlayout
 				d->currentFormActionsPageWidget = new TQWidget();
-				d->currentFormActionsPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+				d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint());
 				d->currentFormActionsListView = new CurrentFormActionsListView(
 					d->currentFormActionsPageWidget, d->mainWin);
 				d->currentFormActionsListView->init();
 				TQLabel *lbl = new TQLabel(d->currentFormActionsListView, 
-					selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), d->currentFormActionsPageWidget);
-				lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+					selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->currentFormActionsPageWidget);
+				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->currentFormActionsListView);
@@ -635,7 +635,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			d->setActionToExecuteSectionVisible(false);
 		}
 		d->actionCategoriesListView->update();
-		updateOKButtontqStatus();
+		updateOKButtonStatus();
 		return;
 	}
 	// other case
@@ -656,7 +656,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			d->raiseWidget( d->secondAnd3rdColumnMainWidget );
 	}
 	d->actionCategoriesListView->update();
-	updateOKButtontqStatus();
+	updateOKButtonStatus();
 }
 
 KexiMainWindow* KexiActionSelectionDialog::mainWin() const
@@ -696,7 +696,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const
 			KexiPart::Info* partInfo = partItem ? Kexi::partManager().infoForMimeType( partItem->mimeType() ) : 0;
 			if (partInfo) {
 				// opening or executing: table:name, query:name, form:name, macro:name, script:name, etc.
-				data.string = TQString("%1:%2").tqarg(partInfo->objectName()).tqarg(partItem->name());
+				data.string = TQString("%1:%2").arg(partInfo->objectName()).arg(partItem->name());
 				data.option = actionToExecute->data;
 				return data;
 			}
@@ -705,7 +705,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const
 	return data; // No Action
 }
 
-void KexiActionSelectionDialog::updateOKButtontqStatus()
+void KexiActionSelectionDialog::updateOKButtonStatus()
 {
 	TQPushButton *btn = actionButton(Ok);
 	ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>(
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h
index a2c4066d..983ea759 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog.h
@@ -63,7 +63,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase
 		void slotItemForOpeningOrExecutingSelected(KexiPart::Item* item);
 
 	protected:
-		void updateOKButtontqStatus();
+		void updateOKButtonStatus();
 
 		class KexiActionSelectionDialogPrivate;
 		KexiActionSelectionDialogPrivate* d;
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index e89ba9cb..1a6df899 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -113,7 +113,7 @@ void KexiFormDataProvider::fillDataItems(KexiTableItem& row, bool cursorAtNewRow
 		kexipluginsdbg << "fill data of '" << itemIface->dataSource() <<  "' at idx=" << it.data() 
 			<< " data=" << value << (indexForVisibleLookupValue!=-1 
 				? TQString(" SPECIAL: indexForVisibleLookupValue=%1 visibleValue=%2")
-					.tqarg(indexForVisibleLookupValue).tqarg(visibleLookupValue.toString())
+					.arg(indexForVisibleLookupValue).arg(visibleLookupValue.toString())
 				: TQString())
 			<< endl;
 		const bool displayDefaultValue = cursorAtNewRow && (value.isNull() && visibleLookupValue.isNull())
@@ -228,7 +228,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 //		newIndices[i]=-1;
 		KexiFormDataItemInterface *item = m_dataItems.at( *it );
 		if (item)
-			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
+			item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") );
 		m_dataItems.remove(*it);
 		kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl;
 //		i++;
@@ -253,7 +253,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 		else {
 			kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl;
 			m_dataItems.remove(it.key());
-			it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
+			it.key()->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") );
 		}
 	}
 #endif
@@ -275,7 +275,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 	for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current();) {
 		KexiFormDataItemInterface * item = it.current();
 		if (invalidSources[ item->dataSource().lower() ]) {
-			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
+			item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") );
 			m_dataItems.remove(item);
 			continue;
 		}
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index e9ff4177..018feb8b 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -20,7 +20,7 @@
 #include "kexidatasourcepage.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqheader.h>
 
@@ -65,9 +65,9 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	TQVBoxLayout *contentsVlyr = new TQVBoxLayout(contents);
 
 	m_noDataSourceAvailableLabel = new TQLabel(m_noDataSourceAvailableSingleText, contents);
-	m_noDataSourceAvailableLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	m_noDataSourceAvailableLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 	m_noDataSourceAvailableLabel->setMargin(2);
-	m_noDataSourceAvailableLabel->tqsetAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft);
+	m_noDataSourceAvailableLabel->setAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft);
 	contentsVlyr->addWidget(m_noDataSourceAvailableLabel);
 
 	//-Widget's Data Source
@@ -78,10 +78,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 #else
 	m_widgetDSLabel = new TQLabel(i18n("Table Field or Query Field", "Widget's data source:"), contents);
 #endif
-	m_widgetDSLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_widgetDSLabel->setMargin(2);
 	m_widgetDSLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	m_widgetDSLabel->tqsetAlignment(AlignLeft|AlignBottom);
+	m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom);
 	hlyr->addWidget(m_widgetDSLabel);
 
 	m_clearWidgetDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearWidgetDSButton");
@@ -104,10 +104,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	//- Form's Data Source
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents);
-	m_dataSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_dataSourceLabel->setMargin(2);
 	m_dataSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	m_dataSourceLabel->tqsetAlignment(AlignLeft|AlignBottom);
+	m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom);
 	hlyr->addWidget(m_dataSourceLabel);
 
 	m_gotoButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoButton");
@@ -160,14 +160,14 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_mousePointerLabel->setFixedWidth( m_mousePointerLabel->pixmap() ? m_mousePointerLabel->pixmap()->width() : 0);
 	m_availableFieldsDescriptionLabel = new TQLabel(
 		i18n("Select fields from the list below and drag them onto a form or click the \"Insert\" button"), contents);
-	m_availableFieldsDescriptionLabel->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak );
+	m_availableFieldsDescriptionLabel->setAlignment( TQt::AlignAuto | TQt::WordBreak );
 	hlyr->addWidget(m_availableFieldsDescriptionLabel);
 
 	//Available Fields
 	contentsVlyr->addSpacing(4);
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents);
-	m_availableFieldsLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_availableFieldsLabel->setMargin(2);
 	m_availableFieldsLabel->setMinimumHeight(IconSize(KIcon::Small));
 	hlyr->addWidget(m_availableFieldsLabel);
@@ -183,7 +183,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 
 	m_fieldListView = new KexiFieldListView(contents, "fieldListView",
 		KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection );
-	m_fieldListView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
+	m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
 	m_availableFieldsLabel->setBuddy(m_fieldListView);
 	contentsVlyr->addWidget(m_fieldListView, 1);
 	connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged()));
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 3f47a6ec..d87b31c5 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -398,9 +398,9 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 /*	else if(c == "KexiDBTimeEdit")
 		w = new KexiDBTimeEdit(TQTime::currentTime(), p, n);
 	else if(c == "KexiDBDateEdit")
-		w = new KexiDBDateEdit(TQDate::tqcurrentDate(), p, n);
+		w = new KexiDBDateEdit(TQDate::currentDate(), p, n);
 	else if(c == "KexiDBDateTimeEdit")
-		w = new KexiDBDateTimeEdit(TQDateTime::tqcurrentDateTime(), p, n);*/
+		w = new KexiDBDateTimeEdit(TQDateTime::currentDateTime(), p, n);*/
 //	else if(c == "KexiDBIntSpinBox")
 //		w = new KexiDBIntSpinBox(p, n);
 //	else if(c == "KexiDBDoubleSpinBox")
@@ -462,7 +462,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 //! just inherited StdWidgetFactory::clearWidgetContent() should be called
 		KLineEdit *lineedit = static_cast<KLineEdit*>(w);
 		createEditor(classname, lineedit->text(), lineedit, container,
-			lineedit->tqgeometry(), lineedit->tqalignment(), true);
+			lineedit->geometry(), lineedit->alignment(), true);
 		return true;
 	}
 	if(classname == "KexiDBTextEdit")
@@ -471,7 +471,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 //! just inherited StdWidgetFactory::clearWidgetContent() should be called
 		KTextEdit *textedit = static_cast<KTextEdit*>(w);
 		createEditor(classname, textedit->text(), textedit, container,
-			textedit->tqgeometry(), textedit->tqalignment(), true, true);
+			textedit->geometry(), textedit->alignment(), true, true);
 		//copy a few properties
 		KTextEdit *ed = dynamic_cast<KTextEdit *>( editor(w) );
 		ed->setWrapPolicy(textedit->wrapPolicy());
@@ -497,13 +497,13 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 			}
 
 			if ( classname == "KexiDBLabel" )
-				w->resize(w->tqsizeHint());
+				w->resize(w->sizeHint());
 		}
 		else
 		{
 			createEditor(classname, label->text(), label, container,
-				label->tqgeometry(), label->tqalignment(), 
-				false, label->tqalignment() & TQt::WordBreak /*multiline*/);
+				label->geometry(), label->alignment(), 
+				false, label->alignment() & TQt::WordBreak /*multiline*/);
 		}
 		return true;
 	}
@@ -529,12 +529,12 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 		if(static_cast<KexiDBAutoField*>(w)->hasAutoCaption())
 			return false; // caption is auto, abort editing
 		TQLabel *label = static_cast<KexiDBAutoField*>(w)->label();
-		createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+		createEditor(classname, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	else if (classname == "KexiDBCheckBox") {
 		KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w);
-		TQRect r( cb->tqgeometry() );
+		TQRect r( cb->geometry() );
 		r.setLeft( r.left() + 2 + cb->tqstyle().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() );
 		createEditor(classname, cb->text(), cb, container, r, TQt::AlignAuto);
 		return true;
@@ -679,7 +679,7 @@ KexiDBFactory::changeText(const TQString &text)
 		changeProperty("caption", text, form);
 		return true;
 	}
-	//! \todo check field's tqgeometry
+	//! \todo check field's geometry
 	return false;
 }
 
@@ -690,7 +690,7 @@ KexiDBFactory::resizeEditor(TQWidget *editor, TQWidget *w, const TQCString &clas
 	//TQPoint p = widget->pos();
 
 	if(classname == "KexiDBAutoField")
-		editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->tqgeometry() );
+		editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->geometry() );
 }
 
 void
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
index 3c20510e..e8da5ad5 100644
--- a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
+++ b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
@@ -43,7 +43,7 @@ void KexiDBTextWidgetInterface::setColumnInfo(KexiDB::QueryColumnInfo* cinfo, TQ
 	}
 }
 
-void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int tqalignment, bool hasFocus )
+void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int alignment, bool hasFocus )
 {
 	KexiFormDataItemInterface *dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(w);
 	KexiDB::QueryColumnInfo *columnInfo = dataItemIface ? dataItemIface->columnInfo() : 0;
@@ -53,11 +53,11 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt
 			if (w->hasFocus()) {
 				p->setPen(
 					KexiUtils::blendedColors(
-						m_autonumberDisplayParameters->textColor, w->tqpalette().active().base(), 1, 3));
+						m_autonumberDisplayParameters->textColor, w->palette().active().base(), 1, 3));
 			}
 			KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p,
 				2 + margin + w->margin(), margin, w->width() - margin*2 -2-2, 
-				w->height() - margin*2 -2, tqalignment, hasFocus);
+				w->height() - margin*2 -2, alignment, hasFocus);
 		}
 	}
 }
@@ -66,6 +66,6 @@ void KexiDBTextWidgetInterface::event( TQEvent * e, TQWidget *w, bool textIsEmpt
 {
 	if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {
 		if (m_autonumberDisplayParameters && textIsEmpty)
-			w->tqrepaint();
+			w->repaint();
 	}
 }
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.h b/kexi/plugins/forms/kexidbtextwidgetinterface.h
index 6e0299c0..17382e31 100644
--- a/kexi/plugins/forms/kexidbtextwidgetinterface.h
+++ b/kexi/plugins/forms/kexidbtextwidgetinterface.h
@@ -40,7 +40,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextWidgetInterface
 		void setColumnInfo(KexiDB::QueryColumnInfo* cinfo, TQWidget *w);
 
 		//! Called from paintEvent( TQPaintEvent *pe ) method of the data aware widget.
-		void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int tqalignment, bool hasFocus );
+		void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int alignment, bool hasFocus );
 
 		//! Called from event( TQEvent * e ) method of the data aware widget.
 		void event( TQEvent * e, TQWidget *w, bool textIsEmpty );
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index 4e066bd6..55e999db 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -56,7 +56,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 		return 0;
 	KexiPart::Info *info = 0;
 	if (_actionType!="kaction" && _actionType!="currentForm") {
-		info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(_actionType) );
+		info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(_actionType) );
 		if (!info)
 			return 0;
 	}
@@ -85,7 +85,7 @@ void KexiFormEventAction::activate()
 	if (!project)
 		return;
 	KexiPart::Part* part = Kexi::partManager().partForMimeType( 
-		TQString("kexi/%1").tqarg(m_actionName) );
+		TQString("kexi/%1").arg(m_actionName) );
 	if (!part)
 		return;
 	KexiPart::Item* item = project->item( part->info(), m_objectName );
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 9674f4fe..8c0c66e7 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -112,7 +112,7 @@ void KexiFormManager::setFormDataSource(const TQCString& mime, const TQCString&
 		propValues.insert("dataSource", name);
 		propValues.insert("dataSourceMimeType", mime);
 		KFormDesigner::CommandGroup *group 
-			= new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").tqarg(name.data()), propertySet());
+			= new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").arg(name.data()), propertySet());
 		propertySet()->createPropertyCommandsInDesignMode(formWidget, propValues, group, true /*addToActiveForm*/);
 	}
 
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 9c4e3173..9d8017d8 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -277,7 +277,7 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc)
 		TQDomElement lNameProperty = domDoc.createElement("property");
 		lNameProperty.setAttribute("name", "name");
 		TQDomElement lType = domDoc.createElement("cstring");
-		TQDomText lClassN = domDoc.createTextNode(TQString("l%1").tqarg(list->field(i)->name()));
+		TQDomText lClassN = domDoc.createTextNode(TQString("l%1").arg(list->field(i)->name()));
 		lType.appendChild(lClassN);
 		lNameProperty.appendChild(lType);
 		lclass.appendChild(lNameProperty);
@@ -510,7 +510,7 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
 
 void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 {
-	TQStrList signalNames(widget->tqmetaObject()->signalNames());
+	TQStrList signalNames(widget->metaObject()->signalNames());
 	if (!signalNames.isEmpty()) {
 		const char *handleDragMoveEventSignal = "handleDragMoveEvent(TQDragMoveEvent*)";
 		const char *handleDropEventSignal = "handleDropEvent(TQDropEvent*)";
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index df5191ed..b4b58f70 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -150,9 +150,9 @@ void KexiFormScrollView::moveToFirstRecordRequested()
 	selectFirstRow();
 }
 
-void KexiFormScrollView::clearColumnsInternal(bool tqrepaint)
+void KexiFormScrollView::clearColumnsInternal(bool repaint)
 {
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 	//! @todo
 }
 
@@ -349,7 +349,7 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item)
 }
 
 /*void KexiFormScrollView::slotAboutToDeleteRow(KexiTableItem& item, 
-	KexiDB::ResultInfo* result, bool tqrepaint)
+	KexiDB::ResultInfo* result, bool repaint)
 {
 	//! @todo
 }*/
@@ -359,18 +359,18 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item)
 	//! @todo
 }*/
 
-void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool tqrepaint)
+void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool repaint)
 {
 	Q_UNUSED( item );
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 	//! @todo
 }
 
-void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
+void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool repaint)
 {
 	Q_UNUSED( item );
 	Q_UNUSED( row );
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 	//! @todo
 }
 
@@ -551,7 +551,7 @@ void KexiFormScrollView::refreshContentsSize()
 
 void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName)
 {
-	TQWidget *w = tqfocusWidget();
+	TQWidget *w = focusWidget();
 	KexiFormDataItemInterface *item = 0;
 	while (w) {
 		item = dynamic_cast<KexiFormDataItemInterface*>(w);
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index d8326a57..7d2b9867 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -162,17 +162,17 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 		virtual void slotRowRepaintRequested(KexiTableItem& item);
 
 		//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
-		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
-		{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
+		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
+		{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
 
-		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 		virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
+		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & );
 
@@ -193,7 +193,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 
 	protected:
 		//! Implementation for KexiDataAwareObjectInterface
-		virtual void clearColumnsInternal(bool tqrepaint);
+		virtual void clearColumnsInternal(bool repaint);
 
 		//! Implementation for KexiDataAwareObjectInterface
 		virtual void addHeaderColumn(const TQString& caption, const TQString& description, 
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 01ec080f..c6d689f7 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -90,7 +90,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 
 	if (viewMode()==Kexi::DataViewMode) {
 		m_scrollView->recordNavigator()->setRecordHandler( m_scrollView );
-		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->tqpalette().active().background());
+		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background());
 //moved to formmanager		connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
 	}
 	else
@@ -345,12 +345,12 @@ void KexiFormView::updateValuesForSubproperties()
 				kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget="
 					<< it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl;
 
-				const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true);
-				const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0;
+				const int count = subwidget->metaObject()->findProperty(subpropIt.key().latin1(), true);
+				const TQMetaProperty *meta = count!=-1 ? subwidget->metaObject()->property(count, true) : 0;
 				if (meta) {
 					// Special case: the property value of type enum (set) but is saved as a string list,
 					// not as int, so we need to translate it to int. It's been created as such
-					// by FormIO::readPropertyValue(). Example: "tqalignment" property.
+					// by FormIO::readPropertyValue(). Example: "alignment" property.
 					if (meta->isSetType() && subpropIt.data().type()==TQVariant::StringList) {
 						TQStrList keys;
 						const TQStringList list( subpropIt.data().toStringList() );
@@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties()
 static void setUnsavedBLOBIdsForDataViewMode( 
 	TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName)
 {
-	if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) {
+	if (-1 != widget->metaObject()->findProperty("pixmapId")) {
 		const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ];
 		if (blobID > 0)
 			widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID);
@@ -525,9 +525,9 @@ KexiFormView::afterSwitchFrom(int mode)
 
 		//set focus on 1st focusable widget which has valid dataSource property set
 		if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
-//			TQWidget *www = tqfocusWidget();
-			//if (Kexi::hasParent(this, tqApp->tqfocusWidget())) {
-				KexiUtils::unsetFocusWithReason(tqApp->tqfocusWidget(), TQFocusEvent::Tab);
+//			TQWidget *www = focusWidget();
+			//if (Kexi::hasParent(this, tqApp->focusWidget())) {
+				KexiUtils::unsetFocusWithReason(tqApp->focusWidget(), TQFocusEvent::Tab);
 			//}
 
 			TQPtrListIterator<TQWidget> it(*m_dbform->orderedFocusWidgets());
@@ -860,7 +860,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
 	setAvailable("formpart_format_raise", true);
 	setAvailable("formpart_format_lower", true);
 
-	// If the widgets selected is a container, we enable tqlayout actions
+	// If the widgets selected is a container, we enable layout actions
 	if(!multiple)
 	{
 		KFormDesigner::ObjectTreeItem *item = f->objectTree()->lookup( f->selectedWidgets()->first()->name() );
@@ -999,14 +999,14 @@ void
 KexiFormView::setFocusInternal()
 {
 	if (viewMode() == Kexi::DataViewMode) {
-		if (m_dbform->tqfocusWidget()) {
+		if (m_dbform->focusWidget()) {
 			//better-looking focus
 			if (m_setFocusInternalOnce) {
 				KexiUtils::setFocusWithReason(m_setFocusInternalOnce, TQFocusEvent::Other);//Tab);
 				m_setFocusInternalOnce = 0;
 			}
 			else {
-				//ok? SET_FOCUS_USING_REASON(m_dbform->tqfocusWidget(), TQFocusEvent::Other);//Tab);
+				//ok? SET_FOCUS_USING_REASON(m_dbform->focusWidget(), TQFocusEvent::Other);//Tab);
 			}
 			return;
 		}
@@ -1115,7 +1115,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 //		KFormDesigner::WidgetList* prevSelection = form()->selectedWidgets();
 	KFormDesigner::WidgetList widgetsToSelect;
 	KFormDesigner::CommandGroup *group = new KFormDesigner::CommandGroup(
-		fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").tqarg(fields.count()),
+		fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").arg(fields.count()),
 		KFormDesigner::FormManager::self()->propertySet()
 	);
 	
@@ -1173,8 +1173,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 //		newWidget->setDataSource(column->aliasOrName());
 //		newWidget->setFieldTypeInternal((int)column->field->type());
 //		newWidget->setFieldCaptionInternal(column->captionOrAliasOrName());
-		//resize again because autofield's type changed what can lead to changed tqsizeHint() 
-//		newWidget->resize(newWidget->tqsizeHint());
+		//resize again because autofield's type changed what can lead to changed sizeHint() 
+//		newWidget->resize(newWidget->sizeHint());
 		KFormDesigner::WidgetList list;
 		list.append(newWidget);
 		KFormDesigner::AdjustSizeCommand *adjustCommand 
@@ -1191,10 +1191,10 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	}
 	if (widgetsToSelect.last()) {
 		//resize form if needed
-		TQRect oldFormRect( m_dbform->tqgeometry() );
+		TQRect oldFormRect( m_dbform->geometry() );
 		TQRect newFormRect( oldFormRect );
-		newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->tqgeometry().right()+1));
-		newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->tqgeometry().bottom()+1));
+		newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->geometry().right()+1));
+		newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->geometry().bottom()+1));
 		if (newFormRect != oldFormRect) {
 			//1. resize by hand
 			m_dbform->setGeometry( newFormRect );
@@ -1205,8 +1205,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 			group->addCommand(resizeFormCommand, true/*will be executed on CommandGroup::execute()*/);
 		}
 
-		//remember tqgeometry of the last inserted widget
-		m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->tqgeometry();
+		//remember geometry of the last inserted widget
+		m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->geometry();
 	}
 
 	//eventually, add entire command group to active form
@@ -1217,11 +1217,11 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	//enable proper REDO usage
 	group->resetAllowExecuteFlags();
 
-	m_scrollView->tqrepaint();
-	m_scrollView->viewport()->tqrepaint();
+	m_scrollView->repaint();
+	m_scrollView->viewport()->repaint();
 	m_scrollView->repaintContents();
 	m_scrollView->updateContents();
-	m_scrollView->clipper()->tqrepaint();
+	m_scrollView->clipper()->repaint();
 	m_scrollView->refreshContentsSize();
 
 	//select all inserted widgets, if multiple
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index 8bc1cb79..f269abf7 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -218,7 +218,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		TQGuardedPtr<TQWidget> m_setFocusInternalOnce;
 
 	
-		/*! Stores tqgeometry of widget recently inserted using insertAutoFields() method.
+		/*! Stores geometry of widget recently inserted using insertAutoFields() method.
 		 having this information, we'r eable to compute position for a newly 
 		 inserted widget in insertAutoFields() is such position has not been specified.
 		 (the position is specified when a widget is inserted with mouse drag & dropping
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 7ebc522f..be17c159 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -22,7 +22,7 @@
 #include "kexidbautofield.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqmetaobject.h>
 #include <tqapplication.h>
@@ -57,7 +57,7 @@ class KexiDBAutoField::Private
 		                       //!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto
 		WidgetType  widgetType_property; //!< provides widget type or Auto
 		LabelPosition  lblPosition;
-		TQBoxLayout  *tqlayout;
+		TQBoxLayout  *layout;
 		TQLabel  *label;
 		TQString  caption;
 		KexiDB::Field::Type fieldTypeInternal;
@@ -104,7 +104,7 @@ void
 KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
 {
 	d->fieldTypeInternal = KexiDB::Field::InvalidType;
-	d->tqlayout = 0;
+	d->layout = 0;
 	m_subwidget = 0;
 	d->label = new TQLabel(text, this);
 	d->label->installEventFilter( this );
@@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
 	d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType()
 	setLabelPosition(pos);
 	setWidgetType(type);
-	d->baseColor = tqpalette().active().base();
-	d->textColor = tqpalette().active().text();
+	d->baseColor = palette().active().base();
+	d->textColor = palette().active().text();
 }
 
 void
@@ -222,30 +222,30 @@ void
 KexiDBAutoField::setLabelPosition(LabelPosition position)
 {
 	d->lblPosition = position;
-	if(d->tqlayout) {
-		TQBoxLayout *lyr = d->tqlayout;
-		d->tqlayout = 0;
+	if(d->layout) {
+		TQBoxLayout *lyr = d->layout;
+		d->layout = 0;
 		delete lyr;
 	}
 
 	if(m_subwidget)
 		m_subwidget->show();
-	//! \todo support right-to-left tqlayout where positions are inverted
+	//! \todo support right-to-left layout where positions are inverted
 	if (position==Top || position==Left) {
-		int align = d->label->tqalignment();
+		int align = d->label->alignment();
 		if(position == Top) {
-			d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
+			d->layout = (TQBoxLayout*) new TQVBoxLayout(this);
 			align |= AlignVertical_Mask;
 			align ^= AlignVertical_Mask;
 			align |= AlignTop;
 		}
 		else {
-			d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+			d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
 			align |= AlignVertical_Mask;
 			align ^= AlignVertical_Mask;
 			align |= AlignVCenter;
 		}
-		d->label->tqsetAlignment(align);
+		d->label->setAlignment(align);
 		if(d->widgetType == Boolean 
 			|| (d->widgetType == Auto && fieldTypeInternal() == KexiDB::Field::InvalidType && !d->designMode))
 		{
@@ -254,36 +254,36 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
 		else {
 			d->label->show();
 		}
-		d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
+		d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
 		if(position == Left && d->widgetType != Boolean)
-			d->tqlayout->addSpacing(KexiDBAutoField_SPACING);
-		d->tqlayout->addWidget(m_subwidget, 1);
+			d->layout->addSpacing(KexiDBAutoField_SPACING);
+		d->layout->addWidget(m_subwidget, 1);
 		KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
 		if (subwidgetInterface) {
 			if (subwidgetInterface->appendStretchRequired(this))
-				d->tqlayout->addStretch(0);
+				d->layout->addStretch(0);
 			if (subwidgetInterface->subwidgetStretchRequired(this)) {
-				TQSizePolicy sizePolicy( m_subwidget->tqsizePolicy() );
+				TQSizePolicy sizePolicy( m_subwidget->sizePolicy() );
 				if(position == Left) {
 					sizePolicy.setHorData( TQSizePolicy::Minimum );
-					d->label->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+					d->label->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 				}
 				else {
 					sizePolicy.setVerData( TQSizePolicy::Minimum );
-					d->label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+					d->label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 				}
-				m_subwidget->tqsetSizePolicy(sizePolicy);
+				m_subwidget->setSizePolicy(sizePolicy);
 			}
 		}
 //		if(m_subwidget)
-	//		m_subwidget->tqsetSizePolicy(...);
+	//		m_subwidget->setSizePolicy(...);
 	}
 	else {
-		d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+		d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
 		d->label->hide();
-		d->tqlayout->addWidget(m_subwidget);
+		d->layout->addWidget(m_subwidget);
 	}
-	//a hack to force tqlayout to be refreshed (any better idea for this?)
+	//a hack to force layout to be refreshed (any better idea for this?)
 	resize(size()+TQSize(1,0));
 	resize(size()-TQSize(1,0));
 	if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) {
@@ -570,7 +570,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 	bool unbound = false;
 	if (d->autoCaption && (d->widgetType==Auto || dataSource().isEmpty())) {
 		if (d->designMode)
-			realText = TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)");
+			realText = TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)");
 		else
 			realText = TQString();
 		unbound = true;
@@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 				realText = text[0].upper() + text.mid(1);
 				if (d->widgetType!=Boolean) {
 //! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-//! @todo support right-to-left tqlayout where position of ":" is inverted
+//! @todo support right-to-left layout where position of ":" is inverted
 					realText += ": ";
 				}
 			}
@@ -594,9 +594,9 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 	}
 
 	if (unbound)
-		d->label->tqsetAlignment( TQt::AlignCenter | TQt::WordBreak );
+		d->label->setAlignment( TQt::AlignCenter | TQt::WordBreak );
 	else
-		d->label->tqsetAlignment( TQt::AlignCenter );
+		d->label->setAlignment( TQt::AlignCenter );
 //	TQWidget* widgetToAlterForegroundColor;
 	if(d->widgetType == Boolean) {
 		static_cast<TQCheckBox*>((TQWidget*)m_subwidget)->setText(realText);
@@ -650,15 +650,15 @@ KexiDBAutoField::setDataSource( const TQString &ds ) {
 }
 
 TQSize
-KexiDBAutoField::tqsizeHint() const
+KexiDBAutoField::sizeHint() const
 {
 	if (d->lblPosition == NoLabel)
-		return m_subwidget ? m_subwidget->tqsizeHint() : TQWidget::tqsizeHint();
+		return m_subwidget ? m_subwidget->sizeHint() : TQWidget::sizeHint();
 
 	TQSize s1(0,0);
 	if (m_subwidget)
-		s1 = m_subwidget->tqsizeHint();
-	TQSize s2(d->label->tqsizeHint());
+		s1 = m_subwidget->sizeHint();
+	TQSize s2(d->label->sizeHint());
 	if (d->lblPosition == Top)
 		return TQSize(TQMAX(s1.width(), s2.width()), s1.height()+KexiDBAutoField_SPACING+s2.height());
 
@@ -682,10 +682,10 @@ KexiDBAutoField::updateInformationAboutUnboundField()
 	if ( (d->autoCaption && (dataSource().isEmpty() || dataSourceMimeType().isEmpty()))
 		|| (!d->autoCaption && d->caption.isEmpty()) )
 	{
-		d->label->setText( TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") );
+		d->label->setText( TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") );
 	}
 //	else
-//		d->label->setText( TQString::tqfromLatin1(name())+" "+i18n(" (unbound)") );
+//		d->label->setText( TQString::fromLatin1(name())+" "+i18n(" (unbound)") );
 }
 
 /*void
@@ -701,7 +701,7 @@ KexiDBAutoField::paintEvent( TQPaintEvent* pe )
 		p.setClipRect(pe->rect());
 		p.setFont(d->label->font());
 		p.drawText(rect(), TQt::AlignLeft | TQt::WordBreak, 
-			TQString::tqfromLatin1(name())+" "+i18n(" (unbound)"));
+			TQString::fromLatin1(name())+" "+i18n(" (unbound)"));
 	}
 }*/
 
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h
index 653e4067..809c1186 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.h
+++ b/kexi/plugins/forms/widgets/kexidbautofield.h
@@ -132,7 +132,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField :
 		/*! @internal */
 		TQString fieldCaptionInternal() const;
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 		virtual void setFocusPolicy ( TQ_FocusPolicy policy );
 
 		//! Reimplemented to return internal editor's color.
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 81c66ba6..2a25b905 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -59,10 +59,10 @@ class KexiDBComboBox::Private
 
 	KexiComboBoxPopup *popup;
 	KComboBox *paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle (because styles use <static_cast>)
-	TQSize tqsizeHint; //!< A cache for KexiDBComboBox::tqsizeHint(), 
+	TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), 
 	                //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange()
 	KexiDB::QueryColumnInfo* visibleColumnInfo;
-	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false)
+	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its children (if isEditable is false)
 	bool isEditable : 1; //!< true is the combo box is editable
 	bool buttonPressed : 1;
 	bool mouseOver : 1;
@@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const
 void KexiDBComboBox::paintEvent( TQPaintEvent * )
 {
 	TQPainter p( this );
-	TQColorGroup cg( tqpalette().active() );
+	TQColorGroup cg( palette().active() );
 //	if ( hasFocus() )
 //		cg.setColor(TQColorGroup::Base, cg.highlight());
 //	else
@@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 		return;
 	}
 
-//! @todo support reverse tqlayout
+//! @todo support reverse layout
 //bool reverse = TQApplication::reverseLayout();
-	tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
+	tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
 		flags, (uint)TQStyle::SC_All, 
 		(d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )
 	);
@@ -159,7 +159,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 		if ( hasFocus() ) {
 			if (0==qstrcmp(tqstyle().name(), "windows")) //a hack
 				p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
-			TQRect r( TQStyle::tqvisualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
+			TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
 			r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
 			tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, 
 				r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
@@ -170,7 +170,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 
 TQRect KexiDBComboBox::editorGeometry() const
 {
-	TQRect r( TQStyle::tqvisualRect(
+	TQRect r( TQStyle::visualRect(
 		tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
 		TQStyle::SC_ComboBoxEditField), d->paintedCombo ) );
 	
@@ -211,20 +211,20 @@ void KexiDBComboBox::createEditor()
 void KexiDBComboBox::setLabelPosition(LabelPosition position)
 {
 	if(m_subwidget) {
-		if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true))
+		if (-1 != m_subwidget->metaObject()->findProperty("frameShape", true))
 			m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame));
 		m_subwidget->setGeometry( editorGeometry() );
 	}
 //		KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
 		// update size policy
 //		if (subwidgetInterface && subwidgetInterface->subwidgetStretchRequired(this)) {
-			TQSizePolicy sizePolicy( this->tqsizePolicy() );
+			TQSizePolicy sizePolicy( this->sizePolicy() );
 			if(position == Left)
 				sizePolicy.setHorData( TQSizePolicy::Minimum );
 			else
 				sizePolicy.setVerData( TQSizePolicy::Minimum );
-			//m_subwidget->tqsetSizePolicy(sizePolicy);
-			tqsetSizePolicy(sizePolicy);
+			//m_subwidget->setSizePolicy(sizePolicy);
+			setSizePolicy(sizePolicy);
 		//}
 //	}
 }
@@ -233,7 +233,7 @@ TQRect KexiDBComboBox::buttonGeometry() const
 {
 	TQRect arrowRect( 
 		tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
-	arrowRect = TQStyle::tqvisualRect(arrowRect, d->paintedCombo);
+	arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo);
 	arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style
 	return arrowRect;
 }
@@ -259,7 +259,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e)
 	    if ( arrowRect.contains( e->pos() ) ) {
 		d->arrowPressed = TRUE;
 		d->arrowDown    = TRUE;
-		tqrepaint( FALSE );
+		repaint( FALSE );
 	    }
 	} else {*/
 		showPopup();
@@ -490,29 +490,29 @@ int KexiDBComboBox::popupWidthHint() const
 
 void KexiDBComboBox::fontChange( const TQFont & oldFont )
 {
-	d->tqsizeHint = TQSize(); //force rebuild the cache
+	d->sizeHint = TQSize(); //force rebuild the cache
 	KexiDBAutoField::fontChange(oldFont);
 }
 
 void KexiDBComboBox::styleChange( TQStyle& oldStyle )
 {
 	KexiDBAutoField::styleChange( oldStyle );
-	d->tqsizeHint = TQSize(); //force rebuild the cache
+	d->sizeHint = TQSize(); //force rebuild the cache
 	if (m_subwidget)
 		m_subwidget->setGeometry( editorGeometry() );
 }
 
-TQSize KexiDBComboBox::tqsizeHint() const
+TQSize KexiDBComboBox::sizeHint() const
 {
-	if ( isVisible() && d->tqsizeHint.isValid() )
-		return d->tqsizeHint;
+	if ( isVisible() && d->sizeHint.isValid() )
+		return d->sizeHint;
 
 	const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
 	const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
-	d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+	d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
 		TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
 
-	return d->tqsizeHint;
+	return d->sizeHint;
 }
 
 void KexiDBComboBox::editRequested()
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index 4e780aa3..60ed78d1 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -68,7 +68,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		//! Reimpemented because to avoid taking value from the internal editor (index is taken from the popup instead)
 		virtual bool valueChanged();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		//! Reimplemented after KexiDBAutoField: jsut sets \a cinfo without initializing a subwidget.
 		//! Initialization is performed by \ref setVisibleColumnInfo().
@@ -111,7 +111,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		//! \return internal editor's tqgeometry
+		//! \return internal editor's geometry
 		TQRect editorGeometry() const;
 
 		//! Creates editor. Reimplemented, because if the combo box is not editable, 
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 8394ef58..339ba722 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "kexidbdateedit.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <kpopupmenu.h>
 #include <kdatepicker.h>
@@ -37,7 +37,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 
 	m_edit = new TQDateEdit(date, this);
 	m_edit->setAutoAdvance(true);
-	m_edit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+	m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) );
 	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) );
 
@@ -54,7 +54,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 
 	m_datePickerPopupMenu = new KPopupMenu(0, "date_popup");
 	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
-	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0);
+	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
@@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 	m_datePickerPopupMenu->insertItem(m_datePicker);
 	btn->setPopup(m_datePickerPopupMenu);
 
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-	tqlayout->addWidget(m_edit, 1);
-	tqlayout->addWidget(btn, 0);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	layout->addWidget(m_edit, 1);
+	layout->addWidget(btn, 0);
 
 	setFocusProxy(m_edit);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index ea9dede7..6f479c69 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -21,7 +21,7 @@
 #include "kexidbdatetimeedit.h"
 
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kpopupmenu.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
@@ -36,7 +36,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 
 	m_dateEdit = new TQDateEdit(datetime.date(), this);
 	m_dateEdit->setAutoAdvance(true);
-	m_dateEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+	m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 //	m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") );
 	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged()));
 	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged()));
@@ -48,7 +48,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 
 	m_timeEdit = new TQTimeEdit(datetime.time(), this);;
 	m_timeEdit->setAutoAdvance(true);
-	m_timeEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+	m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged()));
 	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged()));
 
@@ -61,7 +61,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 
 	m_datePickerPopupMenu = new KPopupMenu(0, "date_popup");
 	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
-	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0);
+	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
@@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_datePickerPopupMenu->insertItem(m_datePicker);
 	btn->setPopup(m_datePickerPopupMenu);
 
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-	tqlayout->addWidget(m_dateEdit, 0);
-	tqlayout->addWidget(btn, 0);
-	tqlayout->addWidget(m_timeEdit, 0);
-	//tqlayout->addStretch(1);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	layout->addWidget(m_dateEdit, 0);
+	layout->addWidget(btn, 0);
+	layout->addWidget(m_timeEdit, 0);
+	//layout->addStretch(1);
 
 	setFocusProxy(m_dateEdit);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 88ddf93f..17242953 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -125,13 +125,13 @@ KexiDBForm::~KexiDBForm()
 
 KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->dataAwareObject; }
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		TQT_TQWIDGET(obj)->tqrepaint();
+		TQT_TQWIDGET(obj)->repaint();
 	}
 	delete list;
 }
@@ -148,7 +148,7 @@ void
 KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type)
 {
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -192,7 +192,7 @@ void
 KexiDBForm::clearForm()
 {
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -216,7 +216,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -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->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -268,7 +268,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 }
 
 TQSize
-KexiDBForm::tqsizeHint() const
+KexiDBForm::sizeHint() const
 {
 	//todo: find better size (user configured?)
 	return TQSize(400,300);
@@ -304,7 +304,7 @@ TQPtrList<TQWidget>* KexiDBForm::orderedDataAwareWidgets() const
 void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 {
 	TQWidget *fromWidget = 0;
-	//TQWidget *tqtopLevelWidget = form->widget()->tqtopLevelWidget();
+	//TQWidget *topLevelWidget = form->widget()->topLevelWidget();
 //js	form->updateTabStopsOrder(); //certain widgets can have now updated focusPolicy properties, fix this
 	uint numberOfDataAwareWidgets = 0;
 //	if (d->orderedFocusWidgets.isEmpty()) {
@@ -313,18 +313,18 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 			if (it.current()->widget()->focusPolicy() & TQ_TabFocus) {
 				//this widget has tab focus:
 				it.current()->widget()->installEventFilter(this);
-				//also filter events for data-aware tqchildren of this widget (i.e. KexiDBAutoField's editors)
-				TQObjectList *tqchildren = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
-				for (TQObjectListIt tqchildrenIt(*tqchildren); tqchildrenIt.current(); ++tqchildrenIt) {
-	//				if (dynamic_cast<KexiFormDataItemInterface*>(tqchildrenIt.current())) {
+				//also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors)
+				TQObjectList *children = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
+				for (TQObjectListIt childrenIt(*children); childrenIt.current(); ++childrenIt) {
+	//				if (dynamic_cast<KexiFormDataItemInterface*>(childrenIt.current())) {
 						kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" 
-							<< tqchildrenIt.current()->className() << " " << tqchildrenIt.current()->name()  
+							<< childrenIt.current()->className() << " " << childrenIt.current()->name()  
 							<< "' child to filtered widgets" << endl;
-						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(tqchildrenIt.current()));
-						tqchildrenIt.current()->installEventFilter(this);
+						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current()));
+						childrenIt.current()->installEventFilter(this);
 		//			}
 				}
-				delete tqchildren;
+				delete children;
 				if (fromWidget) {
 					kexipluginsdbg << "KexiDBForm::updateTabStopsOrder() tab order: " << fromWidget->name() 
 						<< " -> " << it.current()->widget()->name() << endl;
@@ -361,7 +361,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 			}
 			fromWidget = it.current();
 		}
-//		SET_FOCUS_USING_REASON(tqfocusWidget(), TQFocusEvent::Tab);
+//		SET_FOCUS_USING_REASON(focusWidget(), TQFocusEvent::Tab);
 	}*/
 }
 
@@ -399,7 +399,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab;
 			bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab)
 				|| (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab);
-			TQObject *o = watched; //tqfocusWidget();
+			TQObject *o = watched; //focusWidget();
 			TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling)
 
 			if (!tab && !backtab) {
diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h
index fc0d25c2..29798947 100644
--- a/kexi/plugins/forms/widgets/kexidbform.h
+++ b/kexi/plugins/forms/widgets/kexidbform.h
@@ -69,7 +69,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm :
 		virtual void clearForm();
 		virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/);
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		bool autoTabStops() const;
 
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 4165c000..23f079ae 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -23,7 +23,7 @@
 #include <tqapplication.h>
 #include <tqpixmap.h>
 #include <tqstyle.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtooltip.h>
 #include <tqimage.h>
 #include <tqbuffer.h>
@@ -67,7 +67,7 @@ static TQPixmap* KexiDBImageBox_pmSmall = 0;
 KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name )
 	: KexiFrame( parent, name, TQt::WNoAutoErase )
 	, KexiFormDataItemInterface()
-	, m_tqalignment(TQt::AlignAuto|TQt::AlignTop)
+	, m_alignment(TQt::AlignAuto|TQt::AlignTop)
 	, m_designMode(designMode)
 	, m_readOnly(false)
 	, m_scaledContents(false)
@@ -80,7 +80,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n
 	, m_insideSetPalette(false)
 {
 	installEventFilter(this);
-	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
 
 	//setup popup menu
 	m_popupMenu = new KexiImageContextMenu(this);
@@ -176,7 +176,7 @@ void KexiDBImageBox::setValueInternal( const TQVariant& add, bool removeOld, boo
 		m_valueMimeType = TQString();
 		m_pixmap = TQPixmap();
 	}
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBImageBox::setInvalidState( const TQString& displayText )
@@ -242,7 +242,7 @@ void KexiDBImageBox::setPixmapId(uint id)
 	if (m_insideSetData) //avoid recursion
 		return;
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*unstored*/false ));
-	tqrepaint();
+	repaint();
 }
 
 uint KexiDBImageBox::storedPixmapId() const
@@ -257,7 +257,7 @@ uint KexiDBImageBox::storedPixmapId() const
 void KexiDBImageBox::setStoredPixmapId(uint id)
 {
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*stored*/true ));
-	tqrepaint();
+	repaint();
 }
 
 bool KexiDBImageBox::hasScaledContents() const
@@ -276,14 +276,14 @@ void KexiDBImageBox::setScaledContents(bool set)
 {
 //todo	m_pixmapLabel->setScaledContents(set);
 	m_scaledContents = set;
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBImageBox::setKeepAspectRatio(bool set)
 {
 	m_keepAspectRatio = set;
 	if (m_scaledContents)
-		tqrepaint();
+		repaint();
 }
 
 TQWidget* KexiDBImageBox::widget()
@@ -331,7 +331,7 @@ void KexiDBImageBox::handleInsertFromFileAction(const KURL& url)
 		if (!h)
 			return;
 		setData(h);
-		tqrepaint();
+		repaint();
 	}
 	else {
 		//db-aware
@@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction()
 
 void KexiDBImageBox::handleCopyAction()
 {
-	tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
+	tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
 }
 
 void KexiDBImageBox::handlePasteAction()
 {
 	if (isReadOnly() || (!m_designMode && !hasFocus()))
 		return;
-	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
 //	if (!pm.isNull())
 //		setValueInternal(pm, true);
 	if (dataSource().isEmpty()) {
@@ -429,7 +429,7 @@ void KexiDBImageBox::handlePasteAction()
 		}
 	}
 	
-	tqrepaint();
+	repaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();
 		signalValueChanged();
@@ -455,7 +455,7 @@ void KexiDBImageBox::clear()
 	//! @todo emit signal for setting "dirty" flag within the design
 
 //	m_pixmap = TQPixmap(); //will be loaded on demand
-	tqrepaint();
+	repaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();//valueChanged(data());
 		signalValueChanged();
@@ -522,17 +522,17 @@ void KexiDBImageBox::slotToggled(bool on)
 	TQRect screen = tqApp->desktop()->availableGeometry( m_chooser );
 	TQPoint p;
 	if ( TQApplication::reverseLayout() ) {
-		if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() )
+		if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() )
 			p = m_chooser->mapToGlobal( m_chooser->rect().bottomRight() );
 		else
-			p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) );
-		p.rx() -= m_popupMenu->tqsizeHint().width();
+			p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->sizeHint().height() ) );
+		p.rx() -= m_popupMenu->sizeHint().width();
 	}
 	else {
-		if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() )
+		if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() )
 			p = m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() );
 		else
-			p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) );
+			p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->sizeHint().height() ) );
 	}
 	if (!m_popupMenu->isVisible() && on) {
 		m_popupMenu->exec( p, -1 );
@@ -573,7 +573,7 @@ void KexiDBImageBox::updateActionStrings()
 				 (see doc/dev/settings.txt) */
 				beautifiedImageBoxName = beautifiedImageBoxName[0].upper() + beautifiedImageBoxName.mid(1);
 			}
-			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").tqarg(beautifiedImageBoxName));
+			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").arg(beautifiedImageBoxName));
 		}
 	}
 }
@@ -610,11 +610,11 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	}
 	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() );
 	}
 }
 
-TQSize KexiDBImageBox::tqsizeHint() const
+TQSize KexiDBImageBox::sizeHint() const
 {
 	if (pixmap().isNull())
 		return TQSize(80, 80);
@@ -640,7 +640,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (m_designMode && pixmap().isNull()) {
 		TQPixmap pm(size()-TQSize(m, m));
 		TQPainter p2;
-		p2.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+		p2.begin(TQT_TQPAINTDEVICE(&pm), this);
 		p2.fillRect(0,0,width(),height(), bg);
 
 		updatePixmap();
@@ -665,7 +665,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 		p2.setPen( KexiUtils::contrastColor( bg ) );
 		p2.drawText(pm.rect(), TQt::AlignCenter,
 			dataSource().isEmpty() 
-				? TQString::tqfromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image")
+				? TQString::fromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image")
 				: dataSource());
 		p2.end();
 		bitBlt(this, m, m, &pm);
@@ -678,7 +678,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 		//clearing needed here because we may need to draw a pixmap with transparency
 		p.fillRect(0,0,width(),height(), bg);
 
-		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_tqalignment, 
+		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_alignment, 
 			m_scaledContents, m_keepAspectRatio );
 	}
 	KexiFrame::drawFrame( &p );
@@ -687,7 +687,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) {
 		tqstyle().tqdrawPrimitive(
 			TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this), 
-			tqpalette().active() );
+			palette().active() );
 	}
 }
 
@@ -697,7 +697,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (oldPalette.active().background()!=palette().active().background()) {
 		delete KexiDBImageBox_pm;
 		KexiDBImageBox_pm = 0;
-		tqrepaint();
+		repaint();
 	}
 }*/
 
@@ -715,11 +715,11 @@ void KexiDBImageBox::updatePixmap()
 	}
 }
 
-void KexiDBImageBox::tqsetAlignment(int tqalignment)
+void KexiDBImageBox::setAlignment(int alignment)
 {
-	m_tqalignment = tqalignment;
+	m_alignment = alignment;
 	if (!m_scaledContents || m_keepAspectRatio)
-		tqrepaint();
+		repaint();
 }
 
 void KexiDBImageBox::setData(const KexiBLOBBuffer::Handle& handle)
@@ -737,7 +737,7 @@ void KexiDBImageBox::resizeEvent( TQResizeEvent * e )
 {
 	KexiFrame::resizeEvent(e);
 	if (m_chooser) {
-		TQSize s( m_chooser->tqsizeHint() );
+		TQSize s( m_chooser->sizeHint() );
 		TQSize margin( realLineWidth(), realLineWidth() );
 		s.setHeight( height() - 2*margin.height() );
 		s = s.boundedTo( size()-2*margin );
@@ -839,7 +839,7 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e )
 {
 	if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_chooser)) { //we're watching chooser as well because it's a focus proxy even if invisible
 		if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut || e->type()==TQEvent::MouseButtonPress) {
-			update(); //to tqrepaint focus rect
+			update(); //to repaint focus rect
 		}
 	}
 	// hide popup menu as soon as it loses focus
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index 32b4e9b1..860ee4c6 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -48,7 +48,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 	TQ_PROPERTY( uint storedPixmapId READ storedPixmapId WRITE setStoredPixmapId DESIGNABLE false STORED true )
 	TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents )
 	TQ_PROPERTY( bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio )
-	TQ_PROPERTY( int tqalignment READ tqalignment WRITE tqsetAlignment )
+	TQ_PROPERTY( int alignment READ alignment WRITE setAlignment )
 //	TQ_PROPERTY( TQString originalFileName READ originalFileName WRITE setOriginalFileName DESIGNABLE false )
 //	TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
 	TQ_PROPERTY( bool dropDownButtonVisible READ dropDownButtonVisible WRITE setDropDownButtonVisible )
@@ -95,11 +95,11 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 //		bool designMode() const { return m_designMode; }
 
-		int tqalignment() const { return m_tqalignment; }
+		int alignment() const { return m_alignment; }
 
 		bool keepAspectRatio() const { return m_keepAspectRatio; }
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		KexiImageContextMenu *contextMenu() const;
 
@@ -158,7 +158,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 		void setScaledContents(bool set);
 
-		void tqsetAlignment(int tqalignment);
+		void setAlignment(int alignment);
 
 		void setKeepAspectRatio(bool set);
 
@@ -258,7 +258,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 //moved		KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction,
 //			*m_deleteAction, *m_propertiesAction;
 //		TQTimer m_clickTimer;
-		int m_tqalignment;
+		int m_alignment;
 		TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal()
 		bool m_designMode : 1;
 		bool m_readOnly : 1;
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 2d09429e..93f35027 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -63,10 +63,10 @@ KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent )
 	: TQLabel( parent )
 	, m_parentLabel(parent)
 {
-	int a = tqalignment() | TQt::WordBreak;
+	int a = alignment() | TQt::WordBreak;
 	a &= (0xffffff ^ TQt::AlignVertical_Mask);
 	a |= TQt::AlignTop;
-	tqsetAlignment( a );
+	setAlignment( a );
 	updateFrame();
 }
 
@@ -132,7 +132,7 @@ TQImage KexiDBInternalLabel::makeShadow( const TQImage& textImage,
 	double realOpacity = SHADOW_OPACITY + TQMIN(50.0/double(256.0-tqGray(bgColor.rgb())), 50.0);
 	//int _h, _s, _v;
 	//.getHsv( &_h, &_s, &_v );
-	if (tqcolorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white
+	if (colorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white
 		realOpacity += 50.0;
 	result.fill( (int)realOpacity );
 	result.setAlphaBuffer( true );
@@ -177,7 +177,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() {
 	/*!
 	* Backup the default color used to draw text.
 	*/
-	const TQColor textColor = tqcolorGroup().foreground();
+	const TQColor textColor = colorGroup().foreground();
 
 	/*!
 	* Temporary storage for the generated shadow
@@ -232,7 +232,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() {
 		TQMIN( m_shadowRect.y() + ( m_shadowRect.height() * 3 / 2 ), shadowImage.height() ) ) );
 
 	shadowImage = makeShadow( shadowImage,
-		tqGray( tqcolorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black,
+		tqGray( colorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black,
 		m_shadowRect );
 	if (shadowImage.isNull())
 		return KPixmap();
@@ -424,9 +424,9 @@ void KexiDBLabel::init()
 	m_hasFocusableWidget = false;
 	d->internalLabel = new KexiDBInternalLabel( this );
 	d->internalLabel->hide();
-	d->frameColor = tqpalette().active().foreground();
+	d->frameColor = palette().active().foreground();
 
-	tqsetAlignment( d->internalLabel->tqalignment() );
+	setAlignment( d->internalLabel->alignment() );
 }
 
 void KexiDBLabel::updatePixmapLater() {
@@ -453,7 +453,7 @@ void KexiDBLabel::updatePixmap() {
 	d->internalLabel->setText( text() );
 	d->internalLabel->setFixedSize( size() );
 	d->internalLabel->setPalette( palette() );
-	d->internalLabel->tqsetAlignment( tqalignment() );
+	d->internalLabel->setAlignment( alignment() );
 //	d->shadowPixmap = KPixmap(); //parallel repaints won't hurt us cause incomplete pixmap
 	KPixmap shadowPixmap = d->internalLabel->getShadowPixmap();
 	if (shadowPixmap.isNull())
@@ -461,7 +461,7 @@ void KexiDBLabel::updatePixmap() {
 	d->shadowPixmap = shadowPixmap;
 	d->shadowPosition = d->internalLabel->m_shadowRect.topLeft();
 	d->pixmapDirty = false;
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBLabel::paintEvent( TQPaintEvent* e )
@@ -491,7 +491,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e )
 			p.drawPixmap( d->internalLabel->m_shadowRect.topLeft(), d->shadowPixmap, clipRect );
 		}
 	}
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), false );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), false );
 	TQLabel::paintEvent( e );
 }
 
@@ -577,7 +577,7 @@ void KexiDBLabel::setShadowEnabled( bool state ) {
 	d->pixmapDirty = true;
 	if (state)
 		d->internalLabel->updateFrame();
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBLabel::resizeEvent( TQResizeEvent* e ) {
@@ -636,7 +636,7 @@ void KexiDBLabel::setText( const TQString& text ) {
 	TQLabel::setText( text );
 	//This is necessary for KexiFormDataItemInterface
 	valueChanged();
-	tqrepaint();
+	repaint();
 }
 
 bool KexiDBLabel::shadowEnabled() const
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 5bb74e22..815adca9 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -331,14 +331,14 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo)
 /*todo
 void KexiDBLineEdit::paint( TQPainter *p )
 {
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }*/
 
 void KexiDBLineEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KLineEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }
 
 bool KexiDBLineEdit::event( TQEvent * e )
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 9c24df4a..8b4149a9 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -33,7 +33,7 @@ KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent,
 : TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 }
 /*
 void
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index c4cbe4d0..b6ab6b03 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -145,7 +145,7 @@ void KexiDBTextEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KTextEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }
 
 TQPopupMenu * KexiDBTextEdit::createPopupMenu(const TQPoint & pos)
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index b136fa0d..3afa0e47 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -21,7 +21,7 @@
 #include "kexidbtimeedit.h"
 
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 
 #include <kpopupmenu.h>
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index 09266ae4..b64d6edf 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
 	, d( new Private() )
 {
 	//defaults
-	d->frameColor = tqpalette().active().foreground();
+	d->frameColor = palette().active().foreground();
 //! @todo obtain these defaults from current template's style...
 	setLineWidth(2);
 	setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised);
diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index 2f6ca562..ce51766c 100644
--- a/kexi/plugins/forms/widgets/kexiframe.h
+++ b/kexi/plugins/forms/widgets/kexiframe.h
@@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame
 			GroupBoxPanel = TQFrame::GroupBoxPanel //!< rectangular group-box-like panel depending on the GUI style
 		};
 		Shape frameShape() const;
-		void setFrameShape( KexiFrame::Shape tqshape );
+		void setFrameShape( KexiFrame::Shape shape );
 		Shadow frameShadow() const;
 		void setFrameShadow( KexiFrame::Shadow shadow );
 #endif
diff --git a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
index 331909ee..22a71001 100644
--- a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
+++ b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
@@ -26,7 +26,7 @@ void ClassName::drawFrame( TQPainter *p )
 		if ( frameShadow() == Plain )
 			qDrawPlainRect( p, frameRect(), d->frameColor, lineWidth() );
 		else
-			qDrawShadeRect( p, frameRect(), tqcolorGroup(), frameShadow() == TQFrame::Sunken, 
+			qDrawShadeRect( p, frameRect(), colorGroup(), frameShadow() == TQFrame::Sunken, 
 				lineWidth(), midLineWidth() );
 	}
 	else {
@@ -69,9 +69,9 @@ ClassName::Shape ClassName::frameShape() const
 	return d->frameShape;
 }
 
-void ClassName::setFrameShape( ClassName::Shape tqshape )
+void ClassName::setFrameShape( ClassName::Shape shape )
 {
-	d->frameShape = tqshape;
+	d->frameShape = shape;
 	update();
 }
 
@@ -98,7 +98,7 @@ void TQFrame::drawFrame( TQPainter *p )
     p->setPen( black ); // ####
     p->drawRect( r ); //### a bit too simple
 #else
-    const TQColorGroup & g = tqcolorGroup();
+    const TQColorGroup & g = colorGroup();
 
 #ifndef TQT_NO_STYLE
     TQStyleOption opt(lineWidth(),midLineWidth());
@@ -162,24 +162,24 @@ void TQFrame::drawFrame( TQPainter *p )
     case PopupPanel:
 #ifndef TQT_NO_STYLE
     {
-	int vextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this),
-	    hextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this);
+	int vextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this),
+	    hextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this);
 	if(vextra > 0 || hextra > 0) {
 	    TQRect fr = frameRect();
 	    int   fw = frameWidth();
 	    if(vextra > 0) {
-		style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
+		style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
 				    TQRect(fr.x() + fw, fr.y() + fw, fr.width() - (fw*2), vextra),
 				    g, flags, opt);
-		style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
+		style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
 				    TQRect(fr.x() + fw, fr.bottom() - fw - vextra, fr.width() - (fw*2), vextra),
 				    g, flags, opt);
 	    }
 	    if(hextra > 0) {
-		style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
+		style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
 				    TQRect(fr.x() + fw, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra),
 				    g, flags, opt);
-		style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
+		style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
 				    TQRect(fr.right() - fw - hextra, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra),
 				    g, flags, opt);
 	    }
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index f3347676..bbd678cc 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
 	}
 
 	if (copyToClipboard)
-		kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+		kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
 
 	delete [] isText;
 	delete [] isDateTime;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 6e985901..bd5ad814 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -137,12 +137,12 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		m_exportOptionsPage);
 	connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked()));
 	exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0);
-	m_showOptionsButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
 	// -<options section>
 	m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage,
 		"m_exportOptionsSection");
-	m_exportOptionsSection->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1);
 	TQWidget *exportOptionsSectionWidget
 		= new TQWidget(m_exportOptionsSection, "exportOptionsSectionWidget");
@@ -170,7 +170,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 
 	// - character encoding
 	m_characterEncodingCombo = new KexiCharacterEncodingComboBox( exportOptionsSectionWidget );
-	m_characterEncodingCombo->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_characterEncodingCombo->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsSectionLyr->addWidget( m_characterEncodingCombo, 2, 1 );
 	TQLabel *characterEncodingLabel = new TQLabel(m_characterEncodingCombo, i18n("Text encoding:"),
 		exportOptionsSectionWidget);
@@ -222,8 +222,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	updateGeometry();
 
 	// -keep widths equal on page #2:
-	int width = TQMAX( m_infoLblFrom->leftLabel()->tqsizeHint().width(),
-		m_infoLblTo->leftLabel()->tqsizeHint().width());
+	int width = TQMAX( m_infoLblFrom->leftLabel()->sizeHint().width(),
+		m_infoLblTo->leftLabel()->sizeHint().width());
 	m_infoLblFrom->leftLabel()->setFixedWidth(width);
 	m_infoLblTo->leftLabel()->setFixedWidth(width);
 }
@@ -255,9 +255,9 @@ void KexiCSVExportWizard::showPage ( TQWidget * page )
 		int columns = KexiDB::fieldCount(*m_tableOrQuery);
 		text += "\n";
 		if (m_rowCount>0)
-			text += i18n("(rows: %1, columns: %2)").tqarg(m_rowCount).tqarg(columns);
+			text += i18n("(rows: %1, columns: %2)").arg(m_rowCount).arg(columns);
 		else
-			text += i18n("(columns: %1)").tqarg(columns);
+			text += i18n("(columns: %1)").arg(columns);
 		m_infoLblFrom->setLabelText(text);
 		TQFontMetrics fm(m_infoLblFrom->fileNameLabel()->font());
 		m_infoLblFrom->fileNameLabel()->setFixedHeight( fm.height() * 2 + fm.lineSpacing() );
@@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked()
 	}
 }
 
-void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout )
+void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout )
 {
-	TQWizard::layOutButtonRow( tqlayout );
+	TQWizard::layOutButtonRow( layout );
 
-	//find the last subtqlayout
+	//find the last sublayout
 	TQLayout *l = 0;
-	for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit)
-		l = lit.current()->tqlayout();
+	for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit)
+		l = lit.current()->layout();
 	if (dynamic_cast<TQBoxLayout*>(l)) {
 		if (!m_defaultsBtn) {
 			m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
@@ -376,7 +376,7 @@ void KexiCSVExportWizard::slotDefaultsButtonClicked()
 
 static TQString convertKey(const char *key, KexiCSVExport::Mode mode)
 {
-	TQString _key(TQString::tqfromLatin1(key));
+	TQString _key(TQString::fromLatin1(key));
 	if (mode == KexiCSVExport::Clipboard) {
 		_key.replace("Exporting", "Copying");
 		_key.replace("Export", "Copy");
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 27213159..7ef7020d 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard
 
 	protected:
 		//! reimplemented to add "Defaults" button on the left hand
-		virtual void layOutButtonRow( TQHBoxLayout * tqlayout );
+		virtual void layOutButtonRow( TQHBoxLayout * layout );
 
 		//! \return default delimiter depending on mode.
 		TQString defaultDelimiter() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 18398d39..54890c0b 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -27,17 +27,17 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmime.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfiledialog.h>
 #include <tqpainter.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtimer.h>
 #include <tqfontmetrics.h>
 #include <tqtooltip.h>
@@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	setIcon(DesktopIcon(_IMPORT_ICON));
 	setSizeGripEnabled( TRUE );
 
-//	m_encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+//	m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 //	m_stripWhiteSpaceInTextValuesChecked = true;
 	m_file = 0;
 	m_inputStream = 0;
@@ -216,7 +216,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addMultiCellWidget( m_delimiterWidget, 1, 2, 0, 0 );
 
 	TQLabel *delimiterLabel = new TQLabel(m_delimiterWidget, i18n("Delimiter:"), page);
-	delimiterLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	delimiterLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addMultiCellWidget( delimiterLabel, 0, 0, 0, 0 );
 
 	// Format: number, text, currency,
@@ -230,7 +230,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addMultiCellWidget( m_formatCombo, 1, 1, 1, 1 );
 
 	m_formatLabel = new TQLabel(m_formatCombo, "", page);
-	m_formatLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	m_formatLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( m_formatLabel, 0, 1 );
 
 	m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" );
@@ -241,20 +241,20 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addWidget( m_comboQuote, 1, 2 );
 
 	TextLabel2 = new TQLabel( m_comboQuote, i18n( "Text quote:" ), page, "TextLabel2" );
-	TextLabel2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
-	TextLabel2->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	TextLabel2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
+	TextLabel2->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( TextLabel2, 0, 2 );
 
 	m_startAtLineSpinBox = new KIntSpinBox( page, "m_startAtLineSpinBox" );
 	m_startAtLineSpinBox->setMinValue(1);
-	m_startAtLineSpinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	m_startAtLineSpinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 	m_startAtLineSpinBox->setMinimumWidth(TQFontMetrics(m_startAtLineSpinBox->font()).width("8888888"));
 	glyr->addWidget( m_startAtLineSpinBox, 1, 3 );
 
 	m_startAtLineLabel = new TQLabel( m_startAtLineSpinBox, "", 
 		page, "TextLabel3" );
-	m_startAtLineLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
-	m_startAtLineLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	m_startAtLineLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
+	m_startAtLineLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( m_startAtLineLabel, 0, 3 );
 
 	TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
@@ -271,7 +271,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	m_table = new KexiCSVImportDialogTable( plainPage(), "m_table" );
 	lyr->addWidget( m_table );
 
-	m_table->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) );
+	m_table->setSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) );
 	m_table->setNumRows( 0 );
 	m_table->setNumCols( 0 );
 
@@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 if ( m_mode == Clipboard )
   {
 	setCaption( i18n( "Inserting From Clipboard" ) );
-	TQMimeSource * mime = TQApplication::tqclipboard()->data();
+	TQMimeSource * mime = TQApplication::clipboard()->data();
 	if ( !mime )
 	{
 	  KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -294,7 +294,7 @@ if ( m_mode == Clipboard )
 	  m_cancelled = true;
 	  return;
 	}
-	m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
+	m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {*/
@@ -336,11 +336,11 @@ if ( m_mode == Clipboard )
 	}
 	else if (m_mode == Clipboard) {
 		TQCString subtype("plain");
-		m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard);
+		m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard);
 /* debug
-		for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++)
+		for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++)
 			kdDebug() << i << ": " 
-				<< TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
+				<< TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
 */
 	}
 	else {
@@ -352,7 +352,7 @@ if ( m_mode == Clipboard )
 	if (m_mode == File) {
 		m_loadingProgressDlg = new KProgressDialog(
 			this, "m_loadingProgressDlg", i18n("Loading CSV Data"), i18n("Loading CSV Data from \"%1\"...")
-			.tqarg(TQDir::convertSeparators(m_fname)), true);
+			.arg(TQDir::convertSeparators(m_fname)), true);
 		m_loadingProgressDlg->progressBar()->setTotalSteps( m_maximumRowsForPreview+1 );
 		m_loadingProgressDlg->show();
 	}
@@ -440,7 +440,7 @@ bool KexiCSVImportDialog::openData()
 		delete m_file;
 		m_file = 0;
 		KMessageBox::sorry( this, i18n("Cannot open input file <nobr>\"%1\"</nobr>.")
-			.tqarg(TQDir::convertSeparators(m_fname)) );
+			.arg(TQDir::convertSeparators(m_fname)) );
 		actionButton( Ok )->setEnabled( false );
 		m_cancelled = true;
 		if (parentWidget())
@@ -458,7 +458,7 @@ bool KexiCSVImportDialog::cancelled() const
 void KexiCSVImportDialog::fillTable()
 {
 	KexiUtils::WaitCursor wc(true);
-	tqrepaint();
+	repaint();
 	m_blockUserEvents = true;
 	TQPushButton *pb = actionButton(KDialogBase::Cancel);
 	if (pb)
@@ -530,16 +530,16 @@ void KexiCSVImportDialog::fillTable()
 		m_startAtLineSpinBox->setMaxValue(count);
 		m_startAtLineSpinBox->setValue(m_startline+1);
 	}
-	m_startAtLineLabel->setText(i18n( "Start at line%1:").tqarg(
-			m_allRowsLoadedInPreview ? TQString(" (1-%1)").tqarg(count)
+	m_startAtLineLabel->setText(i18n( "Start at line%1:").arg(
+			m_allRowsLoadedInPreview ? TQString(" (1-%1)").arg(count)
 			: TQString() //we do not know what's real count
 	));
 	updateRowCountInfo();
 
 	m_blockUserEvents = false;
-	tqrepaint();
-	m_table->verticalScrollBar()->tqrepaint();//avoid missing tqrepaint
-	m_table->horizontalScrollBar()->tqrepaint();//avoid missing tqrepaint
+	repaint();
+	m_table->verticalScrollBar()->repaint();//avoid missing repaint
+	m_table->horizontalScrollBar()->repaint();//avoid missing repaint
 }
 
 TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextStream& inputStream)
@@ -548,7 +548,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 
 	// try to detect delimiter
 	// \t has priority, then ; then ,
-	const TQIODevice::Offset origOffset = inputStream.tqdevice()->at();
+	const TQIODevice::Offset origOffset = inputStream.device()->at();
 	TQChar c, prevChar=0;
 	int detectedDelimiter = 0;
 	bool insideQuote = false;
@@ -601,7 +601,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 		prevChar = c;
 	}
 
-	inputStream.tqdevice()->at(origOffset); //restore orig. offset
+	inputStream.device()->at(origOffset); //restore orig. offset
 
 	//now, try to find a delimiter character that exists the same number of times in all the checked lines
 	//this detection method has priority over others
@@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 		if (x == '\r') {
 			continue; // eat '\r', to handle RFC-compliant files
 		}
-		if (offset==0 && x.tqunicode()==0xfeff) {
+		if (offset==0 && x.unicode()==0xfeff) {
 			// Ignore BOM, the "Byte Order Mark" 
-			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf)
+			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf)
 			// Probably fixed in TQt4.
 			continue;
 		}
@@ -882,7 +882,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 			m_1stRowForFieldNames->setChecked(true); //this will reload table
 			//slot1stRowForFieldNamesChanged(1);
 			m_blockUserEvents = false;
-			tqrepaint();
+			repaint();
 			return false;
 		}
 
@@ -926,7 +926,7 @@ void KexiCSVImportDialog::updateColumnText(int col)
 	if (col<(int)m_columnNames.count() && (m_1stRowForFieldNames->isChecked() || m_changedColumnNames[col]))
 		colName = m_columnNames[ col ];
 	if (colName.isEmpty()) {
-		colName = i18n("Column %1").tqarg(col+1); //will be changed to a valid identifier on import
+		colName = i18n("Column %1").arg(col+1); //will be changed to a valid identifier on import
 		m_changedColumnNames[ col ] = false;
 	}
 	int detectedType = m_detectedTypes[col];
@@ -937,7 +937,7 @@ void KexiCSVImportDialog::updateColumnText(int col)
 		detectedType=_TEXT_TYPE;
 	}
 	m_table->horizontalHeader()->setLabel(col, 
-		i18n("Column %1").tqarg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
+		i18n("Column %1").arg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
 	m_table->setText(0, col, colName);
 	m_table->horizontalHeader()->adjustHeaderSize();
 
@@ -1108,8 +1108,8 @@ void KexiCSVImportDialog::setText(int row, int col, const TQString& text, bool i
 			TQCString t(text.latin1());
 			const int textLen = t.length();
 			for (int i=0; i<textLen; i++) {
-				if (t.tqat(i)==',') {
-					t.tqat(i) = '.';
+				if (t.at(i)==',') {
+					t.at(i) = '.';
 					break;
 				}
 			}
@@ -1295,7 +1295,7 @@ void KexiCSVImportDialog::currentCellChanged(int, int col)
 		type=_NUMBER_TYPE; //we're simplifying that for now
 
 	m_formatCombo->setCurrentItem( type );
-	m_formatLabel->setText( m_formatComboText.tqarg(col+1) );
+	m_formatLabel->setText( m_formatComboText.arg(col+1) );
 	m_primaryKeyField->setEnabled( _NUMBER_TYPE == m_detectedTypes[col]);
 	m_primaryKeyField->blockSignals(true); //block to disable executing slotPrimaryKeyFieldToggled()
 	 m_primaryKeyField->setChecked( m_primaryKeyColumn == col );
@@ -1522,7 +1522,7 @@ void KexiCSVImportDialog::accept()
 		}
 		m_importingProgressDlg->setLabel(
 			i18n("Importing CSV Data from <nobr>\"%1\"</nobr> into \"%2\" table...")
-			.tqarg(TQDir::convertSeparators(m_fname)).tqarg(m_destinationTableSchema->name()) );
+			.arg(TQDir::convertSeparators(m_fname)).arg(m_destinationTableSchema->name()) );
 		m_importingProgressDlg->progressBar()->setTotalSteps( TQFileInfo(*m_file).size() );
 		m_importingProgressDlg->show();
 	}
@@ -1569,7 +1569,7 @@ void KexiCSVImportDialog::accept()
 
 	TQDialog::accept();
 	KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".")
-		.tqarg(m_destinationTableSchema->name()));
+		.arg(m_destinationTableSchema->name()));
 	parentWidget()->raise();
 	m_conn = 0;
 }
@@ -1651,12 +1651,12 @@ void KexiCSVImportDialog::updateRowCountInfo()
 	m_infoLbl->setFileName( m_fname );
 	if (m_allRowsLoadedInPreview) {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: %1)").tqarg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: %1)").arg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::remove( m_infoLbl );
 	}
 	else {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: more than %1)").tqarg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: more than %1)").arg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::add( m_infoLbl->commentLabel(), i18n("Not all rows are visible on this preview") );
 	}
 }
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index ed1a5b30..bf64aad5 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -21,8 +21,8 @@
 #include <widget/kexicharencodingcombobox.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textcodec.h>
 #include <tqcheckbox.h>
 
 #include <kapplication.h>
@@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions()
 	kapp->config()->setGroup("ImportExport");
 	encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
 	if (encoding.isEmpty()) {
-		encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 		defaultEncodingExplicitySet = false;
 	}
 	else
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index 48d907b9..53ba28c3 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <klineedit.h>
@@ -57,7 +57,7 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget
 	setFocusProxy(m_combo);
 
 	m_delimiterEdit = new KLineEdit( this, "m_delimiterEdit" );
-//  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+//  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
 	m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
 	m_delimiterEdit->setMaxLength(1);
 	lyr->addWidget( m_delimiterEdit );
@@ -162,19 +162,19 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent
 	vbox->addLayout(hbox);
 	m_leftLabel = new TQLabel(labelText, this);
 	m_leftLabel->setMinimumWidth(130);
-	m_leftLabel->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
-	m_leftLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_leftLabel->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	m_leftLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addWidget(m_leftLabel);
 	m_iconLbl = new TQLabel(this);
-	m_iconLbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
-	m_iconLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft);
+	m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft);
 	m_fnameLbl = new KActiveLabel(this);
 	m_fnameLbl->setFocusPolicy(TQ_NoFocus);
 	m_fnameLbl->setTextFormat(TQt::PlainText);
-	m_fnameLbl->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0));
+	m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0));
 	m_fnameLbl->setLineWidth(1);
 	m_fnameLbl->setFrameStyle(TQFrame::Box);
-	m_fnameLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_fnameLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addSpacing(5);
 	hbox->addWidget(m_iconLbl);
 	hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
@@ -182,10 +182,10 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent
 	m_commentLbl = new KActiveLabel(this);
 	m_commentLbl->setFocusPolicy(TQ_NoFocus);
 	m_commentLbl->setTextFormat(TQt::PlainText);
-	m_commentLbl->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+	m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 	m_commentLbl->setLineWidth(1);
 	m_commentLbl->setFrameStyle(TQFrame::Box);
-	m_commentLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_commentLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addWidget(m_commentLbl, 0, TQt::AlignVCenter | TQt::AlignRight | TQt::WordBreak);
 
 	m_separator = new TQFrame(this);
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 3c420c7a..76f76d31 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget
 		 setFileName() can be used to display filename and setCommentAfterFileName() to display 
 		 additional comment.
 
-		 The widget's tqlayout can look like this:
+		 The widget's layout can look like this:
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index d2eb1df1..19922122 100644
--- a/kexi/plugins/macros/kexiactions/datatableaction.cpp
+++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp
@@ -148,10 +148,10 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 	TQString identifier;
 	if(! partitem.isEmpty()) {
 		TQStringList parts = TQStringList::split(".", partitem);
-		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(parts[0]) );
+		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(parts[0]) );
 		KexiPart::Item* item = part ? mainWin()->project()->item(part->info(), parts[1]) : 0;
 		if(! item)
-			throw KoMacro::Exception(i18n("No such item \"%1\"").tqarg(partitem));
+			throw KoMacro::Exception(i18n("No such item \"%1\"").arg(partitem));
 		identifier = TQString::number(item->identifier());
 	}
 
@@ -178,7 +178,7 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 		delete dlg;
 	}
 	else {
-		throw KoMacro::Exception(i18n("No such method \"%1\"").tqarg(method));
+		throw KoMacro::Exception(i18n("No such method \"%1\"").arg(method));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index ccad645c..564b03c8 100644
--- a/kexi/plugins/macros/kexiactions/executeaction.cpp
+++ b/kexi/plugins/macros/kexiactions/executeaction.cpp
@@ -77,17 +77,17 @@ void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context)
 		return;
 	}
 
-	const TQString mimetype = TQString("kexi/%1").tqarg( context->variable("object")->variant().toString() );
+	const TQString mimetype = TQString("kexi/%1").arg( context->variable("object")->variant().toString() );
 	const TQString name = context->variable("name")->variant().toString();
 
 	KexiPart::Part* part = Kexi::partManager().partForMimeType(mimetype);
 	if(! part) {
-		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").tqarg(mimetype));
+		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").arg(mimetype));
 	}
 
 	KexiPart::Item* item = mainWin()->project()->item(part->info(), name);
 	if(! item) {
-		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").tqarg(name).tqarg(mimetype));
+		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").arg(name).arg(mimetype));
 	}
 
 	part->execute(item);
diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp
index bc573d10..815b8723 100644
--- a/kexi/plugins/macros/kexiactions/navigateaction.cpp
+++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp
@@ -111,13 +111,13 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
 
 	KexiViewBase* view = dialog->selectedView();
 	if(! view) {
-		throw KoMacro::Exception(i18n("No view selected for \"%1\".").tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("No view selected for \"%1\".").arg(dialog->caption()));
 	}
 
 	KexiDataAwareView* dbview = dynamic_cast<KexiDataAwareView*>( view );
 	KexiDataAwareObjectInterface* dbobj = dbview ? dbview->dataAwareObject() : 0;
 	if(! dbview) {
-		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").arg(dialog->caption()));
 	}
 
 	const TQString record = context->variable("record")->variant().toString();
@@ -151,7 +151,7 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
 		void sortAscending();
 		void sortDescending();
 		*/
-		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").tqarg(record).tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").arg(record).arg(dialog->caption()));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index 419e2b00..1a0aabf8 100644
--- a/kexi/plugins/macros/kexiactions/objectnamevariable.h
+++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h
@@ -49,7 +49,7 @@ namespace KexiMacro {
 					return;
 
 				TQStringList namelist;
-				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(objectname) );
+				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(objectname) );
 				if(info) {
 					KexiPart::ItemDict* items = actionimpl->mainWin()->project()->items(info);
 					if(items)
@@ -65,7 +65,7 @@ namespace KexiMacro {
 
 				this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name );
 
-				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl;
+				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" children="<<namelist<<endl;
 			}
 
 			virtual ~ObjectNameVariable() {}
diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h
index 83a7a471..c27f024b 100644
--- a/kexi/plugins/macros/kexiactions/objectvariable.h
+++ b/kexi/plugins/macros/kexiactions/objectvariable.h
@@ -72,8 +72,8 @@ namespace KexiMacro {
 
 				if(! objectname.isNull())
 					this->setVariant( objectname );
-				else if(this->tqchildren().count() > 0)
-					this->setVariant( this->tqchildren()[0]->variant() );
+				else if(this->children().count() > 0)
+					this->setVariant( this->children()[0]->variant() );
 				else
 					this->setVariant( TQString() );
 
diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp
index 9cd2e664..d7c4e7aa 100644
--- a/kexi/plugins/macros/kexiactions/openaction.cpp
+++ b/kexi/plugins/macros/kexiactions/openaction.cpp
@@ -53,7 +53,7 @@ namespace KexiMacro {
 				: KexiVariable<ACTIONIMPL>(actionimpl, VIEW, i18n("View"))
 			{
 				TQStringList namelist;
-				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(objectname) );
+				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(objectname) );
 				if(part) {
 					int viewmodes = part->supportedViewModes();
 					if(viewmodes & Kexi::DataViewMode)
@@ -63,7 +63,7 @@ namespace KexiMacro {
 					if(viewmodes & Kexi::TextViewMode)
 						namelist << TEXTVIEW;
 					for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
-						this->tqchildren().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
+						this->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
 				}
 				const TQString n =
 					namelist.contains(viewname)
@@ -124,9 +124,9 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
 
 	const TQString objectname = context->variable(OBJECT)->variant().toString();
 	const TQString name = context->variable(NAME)->variant().toString();
-	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").tqarg(objectname).latin1(), name );
+	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").arg(objectname).latin1(), name );
 	if(! item) {
-		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").tqarg(objectname).tqarg(name));
+		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").arg(objectname).arg(name));
 	}
 
 	// Determinate the viewmode.
@@ -139,14 +139,14 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
 	else if(view == TEXTVIEW)
 		viewmode = Kexi::TextViewMode;
 	else {
-		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").tqarg(view).tqarg(objectname).tqarg(name));
+		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").arg(view).arg(objectname).arg(name));
 	}
 
 	// Try to open the object now.
 	bool openingCancelled;
 	if(! mainWin()->openObject(item, viewmode, openingCancelled)) {
 		if(! openingCancelled) {
-			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").tqarg(objectname).tqarg(name));
+			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").arg(objectname).arg(name));
 		}
 	}
 }
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index b7e89e9a..5406e8ca 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
 	) );
 
 	// Create the tableview.
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
 	d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/);
-	tqlayout->addWidget(d->datatable);
+	layout->addWidget(d->datatable);
 	d->tableview = d->datatable->tableView();
 	d->tableview->setSpreadSheetMode();
 	d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area
@@ -461,10 +461,10 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
 
 		kdDebug() << "KexiMacroDesignView::propertyChanged() set existing property=" << *it << endl;
 		KoProperty::Property& p = set.property((*it).latin1());
-		KoMacro::Variable::List tqchildren = variable->tqchildren();
-		if(tqchildren.count() > 0) {
+		KoMacro::Variable::List children = variable->children();
+		if(children.count() > 0) {
 			TQStringList keys, names;
-			KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end());
+			KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end());
 			for(; childit != childend; ++childit) {
 				const TQString s = (*childit)->variant().toString();
 				keys << s;
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h
index 3529ea0c..520d1799 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.h
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h
@@ -91,7 +91,7 @@ class KexiMacroDesignView : public KexiMacroView
 		/**
 		* Called if a row got inserted.
 		*/
-		void rowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void rowInserted(KexiTableItem* item, uint row, bool repaint);
 
 		/**
 		* Called if a property in the \a KoProperty got changed.
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index f6422be9..25ec569f 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -53,14 +53,14 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont
 	KoMacro::Exception* exception = context->exception();
 
 	iconlbl->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32));
-	errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").tqarg( context->macro()->name() ).tqarg( exception->errorMessage() ));
+	errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() ));
 
 	int i = 1;
 	KoMacro::MacroItem::List items = context->macro()->items();
 	for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++)
 	{
 		KListViewItem* listviewitem = new KListViewItem(errorlist);
-		listviewitem->setText(0,TQString("%1").tqarg(i++));
+		listviewitem->setText(0,TQString("%1").arg(i++));
 		listviewitem->setText(1,i18n("Action"));
 		KSharedPtr<KoMacro::MacroItem> macroitem = *mit;
 
@@ -107,7 +107,7 @@ void KexiMacroError::designbtnClicked()
 	const TQString name = macro->name();
 	KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name);
 	if(! item) {
-		kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").tqarg(name) << endl;
+		kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").arg(name) << endl;
 		return;
 	}
 
@@ -115,7 +115,7 @@ void KexiMacroError::designbtnClicked()
 	bool openingCancelled;
 	if(! d->mainwin->openObject(item, Kexi::DesignViewMode, openingCancelled)) {
 		if(! openingCancelled) {
-			kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").tqarg(name) << endl;
+			kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").arg(name) << endl;
 			return;
 		}
 	}
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index d44b8aee..05d7ba72 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -53,7 +53,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>48</width>
                                     <height>48</height>
@@ -65,7 +65,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -87,7 +87,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignVCenter</set>
                             </property>
                         </widget>
@@ -154,7 +154,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index e67794be..73827383 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -17,7 +17,7 @@
 
 #include "keximacroproperty.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpainter.h>
@@ -86,7 +86,7 @@ void KexiMacroProperty::init()
 	}
 
 	//TESTCASE!!!!!!!!!!!!!!!!!!!!!!
-	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").tqarg(variable->name()).latin1() );
+	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() );
 
 	Q_ASSERT(! d->name.isNull());
 	m_property->setName( d->name.latin1() );
@@ -349,9 +349,9 @@ class EditListBoxItem : public ListBoxItem
 			Q_ASSERT( m_widget != 0 );
 			//m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0));
 			m_widget->reparent(listBox(), 0, TQPoint(1,1));
-			//tqlayout->addWidget(m_widget, 1);
+			//layout->addWidget(m_widget, 1);
 			m_widget->setMinimumHeight(5);
-			m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+			m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 		}
 
 	private:
@@ -389,45 +389,45 @@ class ListBox : public TQListBox
 			Q_ASSERT( m_edititem->widget() != 0 );
 
 			const TQString name = m_macroproperty->name();
-			KoMacro::Variable::List tqchildren;
+			KoMacro::Variable::List children;
 			{
-				KoMacro::Variable::List actiontqchildren;
+				KoMacro::Variable::List actionchildren;
 
 				KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
 				//kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl;
 				if(itemvar.data())
-					actiontqchildren = itemvar->tqchildren();
+					actionchildren = itemvar->children();
 
 				KSharedPtr<KoMacro::Action> action = m_edititem->action();
 				KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>();
 				//kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl;
 				if(actionvar.data())
-					actiontqchildren += actionvar->tqchildren();
+					actionchildren += actionvar->children();
 
-				KoMacro::Variable::List::ConstIterator it(actiontqchildren.constBegin()), end(actiontqchildren.constEnd());
+				KoMacro::Variable::List::ConstIterator it(actionchildren.constBegin()), end(actionchildren.constEnd());
 				for(; it != end; ++it) {
 					if(name == (*it)->name()) {
-						KoMacro::Variable::List list = (*it)->tqchildren();
+						KoMacro::Variable::List list = (*it)->children();
 						KoMacro::Variable::List::ConstIterator listit(list.constBegin()), listend(list.constEnd());
 						for(; listit != listend; ++listit)
-							tqchildren.append( *listit );
+							children.append( *listit );
 					}
 				}
 
-				if(tqchildren.count() <= 0)
-					tqchildren = actiontqchildren;
+				if(children.count() <= 0)
+					children = actionchildren;
 			}
 
 			/*
-			kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<tqchildren.count()<<endl;
-			KoMacro::Variable::List::ConstIterator listit(tqchildren.constBegin()), listend(tqchildren.constEnd());
+			kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<children.count()<<endl;
+			KoMacro::Variable::List::ConstIterator listit(children.constBegin()), listend(children.constEnd());
 			for(; listit != listend; ++listit) {
-				kdDebug()<<"    child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->tqchildren().count()<<endl;
+				kdDebug()<<"    child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->children().count()<<endl;
 			}
 			*/
 
-			if(tqchildren.count() > 0) {
-				KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end());
+			if(children.count() > 0) {
+				KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end());
 				for(; childit != childend; ++childit) {
 					const TQString n = (*childit)->name();
 					//if(! n.startsWith("@")) continue;
@@ -507,7 +507,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
 {
 	kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl;
 
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0);
+	TQHBoxLayout* layout = new TQHBoxLayout(this, 0, 0);
 
 	d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() );
 	if(! d->macroproperty) {
@@ -516,11 +516,11 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
 	}
 
 	d->combobox = new KComboBox(this);
-	tqlayout->addWidget(d->combobox);
+	layout->addWidget(d->combobox);
 	d->listbox = new ListBox(d->combobox, d->macroproperty);
 	d->combobox->setEditable(true);
 	d->combobox->setListBox(d->listbox);
-	d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	d->combobox->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	d->combobox->setMinimumHeight(5);
 	d->combobox->setInsertionPolicy(TQComboBox::NoInsertion);
 	d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index e35ee5b2..540dcc39 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent,
 	: KexiMacroView(mainwin, parent, macro, "KexiMacroTextView")
 	, d( new Private() )
 {
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
 	d->editor = new KTextEdit(this);
 	d->editor->setTextFormat(TQt::PlainText);
 	d->editor->setWordWrap(TQTextEdit::NoWrap);
-	tqlayout->addWidget(d->editor);
+	layout->addWidget(d->editor);
 
 	connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged()));
 }
@@ -72,7 +72,7 @@ bool KexiMacroTextView::loadData()
 		return false;
 	}
 
-	kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").tqarg(data) << endl;
+	kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").arg(data) << endl;
 	//d->editor->blockSignals(true);
 	d->editor->setText(data);
 	//d->editor->blockSignals(false);
@@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData()
 
 tristate KexiMacroTextView::storeData(bool /*dontAsk*/)
 {
-	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl;
+	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()).arg(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 e9f9cd33..19e789f0 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -115,7 +115,7 @@ bool KexiMacroView::loadData()
 		return false;
 	}
 
-	kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").tqarg(domdoc.toString()) << endl;
+	kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").arg(domdoc.toString()) << endl;
 	TQDomElement macroelem = domdoc.namedItem("macro").toElement();
 	if(macroelem.isNull()) {
 		kexipluginsdbg << "KexiMacroView::loadData() Macro domelement is null" << endl;
@@ -154,8 +154,8 @@ 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(parentDialog()->partItem()->name()).tqarg(parentDialog()->id());
-	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl;
+	const TQString name = TQString("%1 [%2]").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id());
+	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").arg(name).arg(xml) << endl;
 	return storeDataBlock(xml);
 }
 
diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp
index 45c03d12..fc729b57 100644
--- a/kexi/plugins/macros/lib/action.cpp
+++ b/kexi/plugins/macros/lib/action.cpp
@@ -81,7 +81,7 @@ Action::Action(const TQString& name, const TQString& text)
 
 Action::~Action()
 {
-	//kdDebug() << TQString("Action::~Action() name=\"%1\"").tqarg(name()) << endl;
+	//kdDebug() << TQString("Action::~Action() name=\"%1\"").arg(name()) << endl;
 
 	// destroy the private d-pointer instance.
 	delete d;
@@ -89,7 +89,7 @@ Action::~Action()
 
 const TQString Action::toString() const
 {
-	return TQString("Action:%1").tqarg(name());
+	return TQString("Action:%1").arg(name());
 }
 
 const TQString Action::name() const
diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp
index 7c0b6ee8..c0eea250 100644
--- a/kexi/plugins/macros/lib/context.cpp
+++ b/kexi/plugins/macros/lib/context.cpp
@@ -44,7 +44,7 @@ namespace KoMacro {
 			KSharedPtr<Macro> macro;
 
 			/**
-			* List of @a Action instances that are tqchildren of the
+			* List of @a Action instances that are children of the
 			* macro.
 			*/
 			TQValueList<KSharedPtr<MacroItem > > items;
@@ -70,7 +70,7 @@ namespace KoMacro {
 			/// Constructor.
 			explicit Private(KSharedPtr<Macro> m)
 				: macro(m) // remember the macro
-				, items(m->items()) // set d-pointer tqchildren to macro tqchildren
+				, items(m->items()) // set d-pointer children to macro children
 				, exception(0) // no exception yet.
 			{
 			}
@@ -119,7 +119,7 @@ KSharedPtr<Variable> Context::variable(const TQString& name) const
 		}
 	}
 	//none found throw exception
-	throw Exception(TQString("Variable name='%1' does not exist.").tqarg(name));
+	throw Exception(TQString("Variable name='%1' does not exist.").arg(name));
 }
 
 //return a map of our (d-pointer) variables
@@ -132,7 +132,7 @@ Variable::Map Context::variables() const
 void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable)
 {
 	//debuging infos
-	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").tqarg(name).tqarg(variable->toString()) << endl;
+	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").arg(name).arg(variable->toString()) << endl;
 	//Use TQMap?s replace to set/replace the variable named name
 	d->variables.replace(name, variable);
 }
@@ -198,14 +198,14 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it)
 			d->exception = new Exception(e);
 			//add new tracemessages
 			//the macro name
-			d->exception->addTraceMessage( TQString("macro=%1").tqarg(d->macro->name()) );
+			d->exception->addTraceMessage( TQString("macro=%1").arg(d->macro->name()) );
 			//the action name
-			d->exception->addTraceMessage( TQString("action=%1").tqarg(action->name()) );
+			d->exception->addTraceMessage( TQString("action=%1").arg(action->name()) );
 			//and all variables wich belong to the action/macro
 			TQStringList variables = action->variableNames();
 			for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) {
 				KSharedPtr<Variable> v = d->macroitem->variable(*vit, true);
-				d->exception->addTraceMessage( TQString("%1=%2").tqarg(*vit).tqarg(v->toString()) );
+				d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) );
 			}
 			return; // abort execution
 		}
diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index 2bb1bef3..a7986167 100644
--- a/kexi/plugins/macros/lib/context.h
+++ b/kexi/plugins/macros/lib/context.h
@@ -35,7 +35,7 @@ namespace KoMacro {
 
 	/**
 	* The context of an execution. If a @a Macro got executed it creates
-	* an instance of this class and passes it around all it's tqchildren
+	* an instance of this class and passes it around all it's children
 	* as local execution context.
 	*/
 	class KOMACRO_EXPORT Context
diff --git a/kexi/plugins/macros/lib/exception.cpp b/kexi/plugins/macros/lib/exception.cpp
index 91cfa03c..b435f2f2 100644
--- a/kexi/plugins/macros/lib/exception.cpp
+++ b/kexi/plugins/macros/lib/exception.cpp
@@ -56,7 +56,7 @@ Exception::Exception(const TQString& errormessage)
 	: d( new Private(errormessage) ) // create the private d-pointer instance.
 {
 	//debuging infos
-	kdDebug() << TQString("Exception errormessage=\"%1\"").tqarg(errormessage) << endl;
+	kdDebug() << TQString("Exception errormessage=\"%1\"").arg(errormessage) << endl;
 }
 
 //copy constructor
diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp
index 6bcdc21d..808c4043 100644
--- a/kexi/plugins/macros/lib/macro.cpp
+++ b/kexi/plugins/macros/lib/macro.cpp
@@ -84,7 +84,7 @@ void Macro::setName(const TQString& name)
 //get an "extended" name
 const TQString Macro::toString() const
 {
-	return TQString("Macro:%1").tqarg(name());
+	return TQString("Macro:%1").arg(name());
 }
 
 //get (d-pointer) itemlist
diff --git a/kexi/plugins/macros/lib/macro.h b/kexi/plugins/macros/lib/macro.h
index 86e0122a..5e5decf8 100644
--- a/kexi/plugins/macros/lib/macro.h
+++ b/kexi/plugins/macros/lib/macro.h
@@ -85,7 +85,7 @@ namespace KoMacro {
 
 			/**
 			* @return a list of @a MacroItem instances which
-			* are tqchildren of this @a Macro .
+			* are children of this @a Macro .
 			*/
 			TQValueList< KSharedPtr<MacroItem> >& items() const;
 
diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp
index 16b93803..05bd22c3 100644
--- a/kexi/plugins/macros/lib/metamethod.cpp
+++ b/kexi/plugins/macros/lib/metamethod.cpp
@@ -92,12 +92,12 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje
 	int startpos = d->signature.find("(");
 	int endpos = d->signature.findRev(")");
 	if(startpos < 0 || startpos > endpos) {
-		throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("Invalid signature \"%1\"").arg(d->signature));
 	}
 
 	d->signaturetag = d->signature.left(startpos).stripWhiteSpace();
 	if(d->signaturetag.isEmpty()) {
-		throw Exception(TQString("Invalid tagname in signature \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("Invalid tagname in signature \"%1\"").arg(d->signature));
 	}
 
 	d->signaturearguments = d->signature.mid(startpos + 1, endpos - startpos - 1).stripWhiteSpace();
@@ -108,7 +108,7 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje
 		if(starttemplatepos >= 0 && (commapos < 0 || starttemplatepos < commapos)) {
 			int endtemplatepos = d->signaturearguments.find(">", starttemplatepos);
 			if(endtemplatepos <= 0) {
-				throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(d->signature));
+				throw Exception(TQString("No closing template-definiton in signature \"%1\"").arg(d->signature));
 			}
 			commapos = d->signaturearguments.find(",", endtemplatepos);
 		}
@@ -170,7 +170,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
 	uint argsize = d->arguments.size();
 
 	if(arguments.size() <= argsize) {
-		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").arg(d->signature));
 	}
 
 	// The first item in the TQUObject-array is for the returnvalue
@@ -188,7 +188,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
 		}
 	
 		if(metaargument->type() != variable->type()) {
-			throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").tqarg(d->signature).tqarg(metaargument->type()).tqarg(variable->type()));
+			throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").arg(d->signature).arg(metaargument->type()).arg(variable->type()));
 		}
 
 		switch(metaargument->type()) {
@@ -287,7 +287,7 @@ KSharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
 		return new Variable(v);
 	}
 
-	throw Exception(TQString("Invalid parameter '%1'").tqarg(desc));
+	throw Exception(TQString("Invalid parameter '%1'").arg(desc));
 }
 
 Variable::List MetaMethod::toVariableList(TQUObject* uo)
diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp
index e9e56b44..ee865c82 100644
--- a/kexi/plugins/macros/lib/metaobject.cpp
+++ b/kexi/plugins/macros/lib/metaobject.cpp
@@ -77,31 +77,31 @@ TQObject* const MetaObject::object() const
 /*
 TQStrList MetaObject::signalNames() const
 {
-	return object()->tqmetaObject()->signalNames();
+	return object()->metaObject()->signalNames();
 }
 
 TQStrList MetaObject::slotNames() const
 {
-	return object()->tqmetaObject()->slotNames();
+	return object()->metaObject()->slotNames();
 }
 */
 
 int MetaObject::indexOfSignal(const char* signal) const
 {
-	TQMetaObject* metaobject = object()->tqmetaObject();
+	TQMetaObject* metaobject = object()->metaObject();
 	int signalid = metaobject->findSignal(signal, false);
 	if(signalid < 0) {
-		throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal));
+		throw Exception(TQString("Invalid signal \"%1\"").arg(signal));
 	}
 	return signalid;
 }
 
 int MetaObject::indexOfSlot(const char* slot) const
 {
-	TQMetaObject* metaobject = object()->tqmetaObject();
+	TQMetaObject* metaobject = object()->metaObject();
 	int slotid = metaobject->findSlot(slot, false);
 	if(slotid < 0) {
-		throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot));
+		throw Exception(TQString("Invalid slot \"%1\"").arg(slot));
 	}
 	return slotid;
 }
@@ -110,7 +110,7 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
 {
 	TQObject* obj = object();
 	MetaMethod::Type type = MetaMethod::Slot;
-	TQMetaObject* metaobject = obj->tqmetaObject();
+	TQMetaObject* metaobject = obj->metaObject();
 
 	const TQMetaData* metadata = metaobject->slot(index, true);
 	if(! metadata) {
@@ -119,13 +119,13 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
 
 		metadata = metaobject->signal(index, true);
 		if(! metadata) {
-			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").tqarg(index).tqarg(obj->name()));
+			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").arg(index).arg(obj->name()));
 		}
 		type = MetaMethod::Signal;
 	}
 
 	if(metadata->access != TQMetaData::Public) {
-		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").tqarg(metadata->name).tqarg(obj->name()));
+		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").arg(metadata->name).arg(obj->name()));
 	}
 
 	return new MetaMethod(metadata->name, type, this);
diff --git a/kexi/plugins/macros/lib/variable.cpp b/kexi/plugins/macros/lib/variable.cpp
index f64613b0..3661ef9a 100644
--- a/kexi/plugins/macros/lib/variable.cpp
+++ b/kexi/plugins/macros/lib/variable.cpp
@@ -58,10 +58,10 @@ namespace KoMacro {
 			const TQObject* object;
 
 			/**
-			* Optional list of tqchildren this @a Variable has.
+			* Optional list of children this @a Variable has.
 			*/
 			// TODO Dow we use this or is it for the future??
-			Variable::List tqchildren;
+			Variable::List children;
 
 			/**
 			* Defines if the variable is enabled or disabled.
@@ -199,7 +199,7 @@ const TQString Variable::toString() const
 			return variant().toString();
 		} break;
 		case KoMacro::MetaParameter::TypeObject: {
-			return TQString("[%1]").tqarg( object()->name() );
+			return TQString("[%1]").arg( object()->name() );
 		} break;
 		default: {
 			throw Exception("Type is undefined.");
@@ -213,24 +213,24 @@ int Variable::toInt() const
 	return variant().toInt();
 }
 
-Variable::List Variable::tqchildren() const
+Variable::List Variable::children() const
 {
-	return d->tqchildren;
+	return d->children;
 }
 
 void Variable::appendChild(KSharedPtr<Variable> variable)
 {
-	d->tqchildren.append(variable);
+	d->children.append(variable);
 }
 
 void Variable::clearChildren()
 {
-	d->tqchildren.clear();
+	d->children.clear();
 }
 
-void Variable::setChildren(const Variable::List& tqchildren)
+void Variable::setChildren(const Variable::List& children)
 {
-	d->tqchildren = tqchildren;
+	d->children = children;
 }
 
 /*
diff --git a/kexi/plugins/macros/lib/variable.h b/kexi/plugins/macros/lib/variable.h
index 108a6005..14adf09c 100644
--- a/kexi/plugins/macros/lib/variable.h
+++ b/kexi/plugins/macros/lib/variable.h
@@ -173,29 +173,29 @@ namespace KoMacro {
 
 			/**
 			* @return the optional list of @a Variable instances
-			* that are tqchildren of this @a Variable .
+			* that are children of this @a Variable .
 			*
 			* @note that the list is returned call-by-reference. The
 			* list is accessed as getter/setter (read/write). So,
 			* don't set this method to const!
 			*/
-			List tqchildren() const;
+			List children() const;
 
 			/**
-			* Append a @a Variable to the list of tqchildren this
+			* Append a @a Variable to the list of children this
 			* @a Variable has.
 			*/
 			void appendChild(KSharedPtr<Variable> variable);
 
 			/**
-			* Clear the list of tqchildren this @a Variable has.
+			* Clear the list of children this @a Variable has.
 			*/
 			void clearChildren();
 
 			/**
-			* Set the tqchildren this @a Variable has.
+			* Set the children this @a Variable has.
 			*/
-			void setChildren(const List& tqchildren);
+			void setChildren(const List& children);
 
 #if 0
 			/**
diff --git a/kexi/plugins/macros/lib/xmlhandler.cpp b/kexi/plugins/macros/lib/xmlhandler.cpp
index 4894c619..5b53d51b 100644
--- a/kexi/plugins/macros/lib/xmlhandler.cpp
+++ b/kexi/plugins/macros/lib/xmlhandler.cpp
@@ -75,7 +75,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 	// We expect a <macro> element. Do we really need to be such strict or
 	// would it be more wise to trust the application in that case?
 	if(element.tagName() != "macro") {
-		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").tqarg(element.tagName()) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").arg(element.tagName()) << endl;
 		return false;
 	}
 	
@@ -83,7 +83,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 	// If there is more than one version, parsing should update old macro-data, so that it
 	// could write out in the newer version in toXML().
 	if( element.attribute("xmlversion") != "1"){
-		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").tqarg(element.attribute("xmlversion")) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").arg(element.attribute("xmlversion")) << endl;
 		return false;
 	}
 
@@ -115,7 +115,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 			// Set the comment
 			item->setComment( itemelem.attribute("comment") );
 
-			// Iterate through the tqchildren this item has and try
+			// Iterate through the children this item has and try
 			// to fill the list of variables our new MacroItem has.
 			for(TQDomNode childnode = itemnode.firstChild(); ! childnode.isNull(); childnode = childnode.nextSibling()) {
 				// The tagname should be "variable"
@@ -156,12 +156,12 @@ TQDomElement XMLHandler::toXML()
 	// redundancy at this point.
 	//macroelem.setAttribute("name",d->macro->name());
 
-	// The list of MacroItem-tqchildren a Macro provides.
+	// The list of MacroItem-children a Macro provides.
 	TQValueList<KSharedPtr<MacroItem > > items = d->macro->items();
 
 	// Create an iterator...
 	TQValueList<KSharedPtr<MacroItem > >::ConstIterator it(items.constBegin()), end(items.constEnd());
-	// ...and iterate over the list of tqchildren the Macro provides.
+	// ...and iterate over the list of children the Macro provides.
 	for(;it != end; ++it) {
 		// We are iterating over MacroItem instances.
 		KSharedPtr<MacroItem> item = *it;
diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp
index 1086a340..bdc2e6ad 100644
--- a/kexi/plugins/macros/tests/commontests.cpp
+++ b/kexi/plugins/macros/tests/commontests.cpp
@@ -424,7 +424,7 @@ void CommonTests::testFunction()
 	domdocument.setContent(TQString(
 		"<function name=\"" + name + "\" text=\"" + text + "\" comment=\"" + comment + "\" receiver=\"" + receiver + "\" slot=\"myslot(const TQString &amp; , int)\">"
 			"<argument>" + argument1 + "</argument>"
-			"<argument>" + TQString("%1").tqarg(argument2) + "</argument>"
+			"<argument>" + TQString("%1").arg(argument2) + "</argument>"
 		"</function>"
 	));
 
@@ -677,7 +677,7 @@ void CommonTests::testMacro()
 //	KOMACROTEST_ASSERT( actionptr->comment(), TQString("") );
 /*
 	//fetch the second one
-	KSharedPtr<KoMacro::Action> myfuncptr = tqchildren[1];
+	KSharedPtr<KoMacro::Action> myfuncptr = children[1];
 	//cast it to function
 	
                                                                                     KoMacro::Function* myfunc = dynamic_cast<KoMacro::Function*>( myfuncptr.data() );
@@ -712,8 +712,8 @@ void CommonTests::testMacro()
 	//KOMACROTEST_XASSERT((int) yanActionptr2.data(), 0);
 	//KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0);
 	
-	//create a list of the tqchildren from yanMacro
-	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->tqchildren();
+	//create a list of the children from yanMacro
+	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->children();
 	//check that there are two
 	//KOMACROTEST_ASSERT(yanChildren.count(), uint(2));
 /*
@@ -722,9 +722,9 @@ void CommonTests::testMacro()
 		const int oldsize = yanChildren.count();
 		//add a new child to the macro
 		yanMacro->addChild(yanActionptr2);
-		//get the tqchildren
-		yanChildren = yanMacro->tqchildren();
-		//get count of tqchildren
+		//get the children
+		yanChildren = yanMacro->children();
+		//get count of children
 		const int size = yanChildren.count();
 		//check count has changed
 		KOMACROTEST_XASSERT(size, oldsize);
@@ -735,9 +735,9 @@ void CommonTests::testMacro()
 		const int oldsize = yanChildren.count();
 		//add a new child to the macro		
 		yanMacro->addChild(yanActionptr3);
-		//get the tqchildren
-		yanChildren = yanMacro->tqchildren();
-		//get count of tqchildren
+		//get the children
+		yanChildren = yanMacro->children();
+		//get count of children
 		const int size = yanChildren.count();
 		//check count has changed
 		KOMACROTEST_XASSERT(size, oldsize);
@@ -859,12 +859,12 @@ void CommonTests::testVariables()
 		//check that it is not null
 	KOMACROTEST_XASSERT((int) macro, 0);
 		
-	//create a list of its tqchildren
-	TQValueList< KSharedPtr<KoMacro::Action> > tqchildren = macro->tqchildren();
-	//Check that there are two tqchildren. The first child is always the returnvalue.
-	KOMACROTEST_ASSERT( tqchildren.count(), uint(2) );
-	//fetch the tqchildren
-	KSharedPtr<KoMacro::Action> func1ptr = tqchildren[1];
+	//create a list of its children
+	TQValueList< KSharedPtr<KoMacro::Action> > children = macro->children();
+	//Check that there are two children. The first child is always the returnvalue.
+	KOMACROTEST_ASSERT( children.count(), uint(2) );
+	//fetch the children
+	KSharedPtr<KoMacro::Action> func1ptr = children[1];
 
 	//create new context
 	KSharedPtr<KoMacro::Context> context = new KoMacro::Context(macroptr);
diff --git a/kexi/plugins/macros/tests/komacrotestbase.h b/kexi/plugins/macros/tests/komacrotestbase.h
index e301730d..ee746991 100644
--- a/kexi/plugins/macros/tests/komacrotestbase.h
+++ b/kexi/plugins/macros/tests/komacrotestbase.h
@@ -27,7 +27,7 @@
 */
 #define KOMACROTEST_ASSERT(actual, expected) \
 	{ \
-		std::cout << TQString("Testing: %1 == %2").tqarg(#actual).tqarg(#expected).latin1() << std::endl; \
+		std::cout << TQString("Testing: %1 == %2").arg(#actual).arg(#expected).latin1() << std::endl; \
 		check( __FILE__, __LINE__, #actual, actual, expected, false ); \
 		if(actual != expected) \
 		{ \
@@ -44,7 +44,7 @@
 */
 #define KOMACROTEST_XASSERT(actual, notexpected) \
 	{ \
-		std::cout << TQString("Testing: %1 != %2").tqarg(#actual).tqarg(#notexpected).latin1() << std::endl; \
+		std::cout << TQString("Testing: %1 != %2").arg(#actual).arg(#notexpected).latin1() << std::endl; \
 		check( __FILE__, __LINE__, #actual, actual, notexpected, true ); \
 		if(actual == notexpected) \
 		{ \
diff --git a/kexi/plugins/macros/tests/testobject.cpp b/kexi/plugins/macros/tests/testobject.cpp
index e0db481e..2634d71a 100644
--- a/kexi/plugins/macros/tests/testobject.cpp
+++ b/kexi/plugins/macros/tests/testobject.cpp
@@ -94,7 +94,7 @@ int TestObject::myslot(const TQString&, int i)
 //TQString is returnvalue
 TQString TestObject::myslot(const TQString& s)
 {
-	TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").tqarg(s);
+	TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").arg(s);
 	//be loud
 	kdDebug() << t << endl;
 	//add some extra Debuginfos to TestResults
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp
index 29c53831..90454d35 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp
@@ -332,7 +332,7 @@ void XMLHandlerTests::testMaxNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX);
+				    "</macro>").arg(INT_MAX).arg(DBL_MAX);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -362,7 +362,7 @@ void XMLHandlerTests::testMaxNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1);
+				    "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -392,7 +392,7 @@ void XMLHandlerTests::testMinNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN);
+				    "</macro>").arg(INT_MIN).arg(DBL_MIN);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -422,7 +422,7 @@ void XMLHandlerTests::testMinNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1);
+				    "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -452,7 +452,7 @@ void XMLHandlerTests::testBigNumber()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %1 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(DBL_MAX+1);
+				    "</macro>").arg(DBL_MAX+1);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
index ac176f89..f32416c0 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
@@ -586,7 +586,7 @@ void XMLHandlerTests2::testMaxNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX);
+				    "</macro>").arg(INT_MAX).arg(DBL_MAX);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
@@ -674,7 +674,7 @@ void XMLHandlerTests2::testMaxNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1);
+				    "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
@@ -762,7 +762,7 @@ void XMLHandlerTests2::testMinNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN);
+				    "</macro>").arg(INT_MIN).arg(DBL_MIN);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
@@ -850,7 +850,7 @@ void XMLHandlerTests2::testMinNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1);
+				    "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index a1f28a79..01a3ee3c 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -50,7 +50,7 @@
                             <property name="text">
                                 <string>kexi_</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -82,7 +82,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -105,7 +105,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index e7526413..26b7d0f2 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -53,7 +53,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index e215ab90..6425d97c 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -20,7 +20,7 @@
 
 #include "kexiquerydesignerguieditor.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqdom.h>
 #include <tqregexp.h>
@@ -193,8 +193,8 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
 	addChildView(d->relations);
 	addChildView(d->dataTable);
 	setViewWidget(d->dataTable, true);
-	d->relations->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
-	d->head->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
+	d->relations->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
+	d->head->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
 	updateGeometry();
 	d->spl->setSizes(TQValueList<int>()<< 800<<400);
 }
@@ -388,7 +388,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 			d->dataTable->dataAwareObject()->setCursorPosition(i,0);
 			if (errMsg)
 				*errMsg = i18n("Select column for table \"%1\"")
-					.tqarg(it.current()->at(COLUMN_ID_TABLE).toString());
+					.arg(it.current()->at(COLUMN_ID_TABLE).toString());
 			return false;
 		}
 
@@ -410,7 +410,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 					true/*allowRelationalOperator*/);
 				if (!criteriaExpr) {//for sanity
 					if (errMsg)
-						*errMsg = i18n("Invalid criteria \"%1\"").tqarg(criteriaStr);
+						*errMsg = i18n("Invalid criteria \"%1\"").arg(criteriaStr);
 					delete whereExpr;
 					return false;
 				}
@@ -431,7 +431,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 						false/*!allowRelationalOperator*/);
 					if (!columnExpr) {
 						if (errMsg)
-							*errMsg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
+							*errMsg = i18n("Invalid expression \"%1\"").arg(fieldName);
 						return false;
 					}
 					temp->query()->addExpression(columnExpr, fieldVisible);
@@ -624,7 +624,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 		if (!m_dialog->neverSaved()) {
 			if (!loadLayout()) {
 				//err msg
-				parentDialog()->settqStatus(conn,
+				parentDialog()->setStatus(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."));
@@ -639,7 +639,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 				KexiDB::ResultInfo result;
 				showFieldsForQuery( q, result );
 				if (!result.success) {
-					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->setStatus(&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) {
-					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
 					return false;
 				}
 			}
@@ -901,7 +901,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 			columnAlias = query->columnAlias(row_num);
 			if (field->isExpression()) {
 //				if (columnAlias.isEmpty()) {
-//					columnAlias = i18n("expression", "expr%1").tqarg(row_num); //TODO
+//					columnAlias = i18n("expression", "expr%1").arg(row_num); //TODO
 //				}
 //				if (columnAlias.isEmpty())
 //TODO: ok? perhaps do not allow to omit aliases?
@@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 //		return false;
 //	}
 	if (xml.isEmpty()) {
-		//in a case when query tqlayout was not saved, build tqlayout by hand
+		//in a case when query layout was not saved, build layout by hand
 		// -- dynamic cast because of a need for handling invalid queries
 		//    (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
 		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
@@ -1083,7 +1083,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 			KexiDB::ResultInfo result;
 			showRelationsForQuery( q, result );
 			if (!result.success) {
-				parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+				parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
 				return false;
 			}
 		}
@@ -1177,10 +1177,10 @@ bool KexiQueryDesignerGuiEditor::storeLayout()
 	return true;
 }
 
-TQSize KexiQueryDesignerGuiEditor::tqsizeHint() const
+TQSize KexiQueryDesignerGuiEditor::sizeHint() const
 {
-	TQSize s1 = d->relations->tqsizeHint();
-	TQSize s2 = d->head->tqsizeHint();
+	TQSize s1 = d->relations->sizeHint();
+	TQSize s2 = d->head->sizeHint();
 	return TQSize(TQMAX(s1.width(),s2.width()), s1.height()+s2.height());
 }
 
@@ -1239,7 +1239,7 @@ void KexiQueryDesignerGuiEditor::slotNewItemAppendedForAfterDeletingInSpreadShee
 		item->at(COLUMN_ID_VISIBLE) = TQVariant(false, 0); //the same init as in initTableRows()
 }
 
-void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*tqrepaint*/)
+void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*repaint*/)
 {
 	if (d->droppedNewItem && d->droppedNewItem==item) {
 		createPropertySet( row, d->droppedNewTable, d->droppedNewField, true );
@@ -1449,7 +1449,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 						result->allowToDiscardChanges = true;
 						result->column = colnum;
 						result->msg = i18n("Entered column alias \"%1\" is not a valid identifier.")
-							.tqarg(alias.data());
+							.arg(alias.data());
 						result->desc = i18n("Identifiers should start with a letter or '_' character");
 						return;
 					}
@@ -1468,7 +1468,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 					result->success = false;
 					result->allowToDiscardChanges = true;
 					result->column = colnum;
-					result->msg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
+					result->msg = i18n("Invalid expression \"%1\"").arg(fieldName);
 					return;
 				}
 			}
@@ -1590,7 +1590,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 			result->allowToDiscardChanges = true;
 			result->column = colnum;
 			result->msg = i18n("Could not set sorting for multiple columns (%1)")
-				.tqarg(table=="*" ? table : (table+".*"));
+				.arg(table=="*" ? table : (table+".*"));
 		}
 	}
 	else if (colnum==COLUMN_ID_CRITERIA) {
@@ -1612,7 +1612,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 			result->column = colnum;
 			if (propertySet())
 				result->msg = i18n("Could not set criteria for \"%1\"")
-					.tqarg(table=="*" ? table : field);
+					.arg(table=="*" ? table : field);
 			else
 				result->msg = i18n("Could not set criteria for empty row");
 			//moved to result->allowToDiscardChanges handler //d->dataTable->dataAwareObject()->cancelEditor(); //prevents further editing of this cell
@@ -1638,7 +1638,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 			result->success = false;
 			result->allowToDiscardChanges = true;
 			result->column = colnum;
-			result->msg = i18n("Invalid criteria \"%1\"").tqarg(newValue.toString());
+			result->msg = i18n("Invalid criteria \"%1\"").arg(newValue.toString());
 		}
 	}
 }
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index c97c140d..f85125c6 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -69,7 +69,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 
 		KexiRelationWidget *relationView() const;
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	public slots:
 		virtual void setFocus();
@@ -129,15 +129,15 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 		void slotBeforeCellChanged(KexiTableItem *item, int colnum,
 			TQVariant& newValue, KexiDB::ResultInfo* result);
 
-		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
 		void slotTablePositionChanged(KexiRelationViewTableContainer*);
 		void slotAboutConnectionRemove(KexiRelationViewConnection*);
 		void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
 
-		/*! Loads tqlayout of relation GUI diagram. */
+		/*! Loads layout of relation GUI diagram. */
 		bool loadLayout();
 
-		/*! Stores tqlayout of relation GUI diagram. */
+		/*! Stores layout of relation GUI diagram. */
 		bool storeLayout();
 
 		void showTablesForQuery(KexiDB::QuerySchema *query);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 37fab0e6..022b47a0 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqtimer.h>
@@ -73,7 +73,7 @@ class KexiQueryDesignerSQLView::Private
 		}
 		KexiQueryDesignerSQLEditor *editor;
 		KexiQueryDesignerSQLHistory *history;
-		TQLabel *pixmaptqStatus, *lbltqStatus;
+		TQLabel *pixmapStatus, *lblStatus;
 		TQHBox *status_hbox;
 		TQVBox *history_section;
 		KexiSectionHeader *head, *historyHead;
@@ -120,18 +120,18 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	d->status_hbox->installEventFilter(this);
 	d->splitter->setResizeMode(d->history_section, TQSplitter::KeepSize);
 	d->status_hbox->setSpacing(0);
-	d->pixmaptqStatus = new TQLabel(d->status_hbox);
-	d->pixmaptqStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
-	d->pixmaptqStatus->tqsetAlignment(AlignHCenter | AlignTop);
-	d->pixmaptqStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->pixmaptqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
-
-	d->lbltqStatus = new TQLabel(d->status_hbox);
-	d->lbltqStatus->tqsetAlignment(AlignLeft | AlignTop | WordBreak);
-	d->lbltqStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->lbltqStatus->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-	d->lbltqStatus->resize(d->lbltqStatus->width(),d->statusPixmapOk.width()*3);
-	d->lbltqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+	d->pixmapStatus = new TQLabel(d->status_hbox);
+	d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
+	d->pixmapStatus->setAlignment(AlignHCenter | AlignTop);
+	d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4);
+	d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
+
+	d->lblStatus = new TQLabel(d->status_hbox);
+	d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak);
+	d->lblStatus->setMargin(d->statusPixmapOk.width()/4);
+	d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+	d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3);
+	d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
 
 	TQHBoxLayout *b = new TQHBoxLayout(this);
 	b->addWidget(d->splitter);
@@ -171,36 +171,36 @@ KexiQueryDesignerSQLEditor *KexiQueryDesignerSQLView::editor() const
 
 void KexiQueryDesignerSQLView::setStatusOk()
 {
-	d->pixmaptqStatus->setPixmap(d->statusPixmapOk);
+	d->pixmapStatus->setPixmap(d->statusPixmapOk);
 	setStatusText("<h2>"+i18n("The query is correct")+"</h2>");
 	d->history->addEvent(d->editor->text().stripWhiteSpace(), true, TQString());
 }
 
 void KexiQueryDesignerSQLView::setStatusError(const TQString& msg)
 {
-	d->pixmaptqStatus->setPixmap(d->statusPixmapErr);
+	d->pixmapStatus->setPixmap(d->statusPixmapErr);
 	setStatusText("<h2>"+i18n("The query is incorrect")+"</h2><p>"+msg+"</p>");
 	d->history->addEvent(d->editor->text().stripWhiteSpace(), false, msg);
 }
 
 void KexiQueryDesignerSQLView::setStatusEmpty()
 {
-	d->pixmaptqStatus->setPixmap(d->statusPixmapInfo);
+	d->pixmapStatus->setPixmap(d->statusPixmapInfo);
 	setStatusText(i18n("Please enter your query and execute \"Check query\" function to verify it."));
 }
 
 void KexiQueryDesignerSQLView::setStatusText(const TQString& text)
 {
 	if (!d->action_toggle_history->isChecked()) {
-		TQSimpleRichText rt(text, d->lbltqStatus->font());
-		rt.setWidth(d->lbltqStatus->width());
+		TQSimpleRichText rt(text, d->lblStatus->font());
+		rt.setWidth(d->lblStatus->width());
 		TQValueList<int> sz = d->splitter->sizes();
-		const int newHeight = rt.height()+d->lbltqStatus->margin()*2;
+		const int newHeight = rt.height()+d->lblStatus->margin()*2;
 		if (sz[1]<newHeight) {
 			sz[1] = newHeight;
 			d->splitter->setSizes(sz);
 		}
-		d->lbltqStatus->setText(text);
+		d->lblStatus->setText(text);
 	}
 }
 
@@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca
 {
 	Q_UNUSED( cancel );
 
-	//here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor
+	//here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor
 	bool queryOK = slotCheckQuery();
 	bool ok = true;
 	KexiDB::SchemaData* query = 0;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 7cc62620..16bfffce 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqpainter.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqregexp.h>
 
 #include <kpopupmenu.h>
@@ -57,14 +57,14 @@ KexiQueryDesignerSQLHistory::drawContents(TQPainter *p, int cx, int cy, int cw,
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
 //		it->drawItem(p, visibleWidth());
-		if(clipping.intersects(it->tqgeometry(y, visibleWidth(), fontMetrics())))
+		if(clipping.intersects(it->geometry(y, visibleWidth(), fontMetrics())))
 		{
 			p->saveWorldMatrix();
 			p->translate(0, y);
-			it->drawItem(p, visibleWidth(), tqcolorGroup());
+			it->drawItem(p, visibleWidth(), colorGroup());
 			p->restoreWorldMatrix();
 		}
-		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 }
 
@@ -79,27 +79,27 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e)
 		if(it.current()->isSelected())
 		{
 			//clear
-			it.current()->setSelected(false, tqcolorGroup());
-			updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()));
+			it.current()->setSelected(false, colorGroup());
+			updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics()));
 		}
 
-		if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
+		if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
 		{
 			popupHistory = it.current();
 			pos = y;
 		}
-		y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	//now do update
 	if (popupHistory) {
 			if (m_selected && m_selected != popupHistory) {
-				m_selected->setSelected(false, tqcolorGroup());
-				updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+				m_selected->setSelected(false, colorGroup());
+				updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
 			}
 			m_selected = popupHistory;
-			m_selected->setSelected(true, tqcolorGroup());
-			updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+			m_selected->setSelected(true, colorGroup());
+			updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
 			if(e->button() == Qt::RightButton) {
 				m_popup->exec(e->globalPos());
 			}
@@ -121,7 +121,7 @@ KexiQueryDesignerSQLHistory::addEvent(const TQString& q, bool s, const TQString
 	if (he) {
 		if (he->statement()==q) {
 			he->updateTime(TQTime::currentTime());
-			tqrepaint();
+			repaint();
 			return;
 		}
 	}
@@ -137,25 +137,25 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 	int y = 0;
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
-		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	resizeContents(visibleWidth() - 1, y);
 	if (m_selected) {
-		m_selected->setSelected(false, tqcolorGroup());
+		m_selected->setSelected(false, colorGroup());
 	}
 	m_selected = e;
-	m_selected->setSelected(true, tqcolorGroup());
+	m_selected->setSelected(true, colorGroup());
 	ensureVisible(0,y+5);
 	updateContents();
 /*	ensureVisible(0, 0);
 	if (m_selected) {
-		m_selected->setSelected(false, tqcolorGroup());
+		m_selected->setSelected(false, colorGroup());
 	}
 	m_selected = e;
-	m_selected->setSelected(true, tqcolorGroup());
+	m_selected->setSelected(true, colorGroup());
 //	updateContents();
-	updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/
+	updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/
 }
 
 /*void
@@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard()
 	if(!m_selected)
 		return;
 
-	TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
+	TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
 }
 
 void
@@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	}
 	else
 	{
-		text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(statement);
+		text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(statement);
 	}
 
 	TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b");
@@ -334,9 +334,9 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	text = text.replace(keywords, "<b>\\1</b>");
 
 	if(!m_error.isEmpty())
-//		text += ("<br>"+i18n("Error: %1").tqarg(m_error));
-//		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
-		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
+//		text += ("<br>"+i18n("Error: %1").arg(m_error));
+//		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>";
+		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>";
 
 	kdDebug() << "HistoryEntry::highlight() text:" << text << endl;
 //	m_formated = new TQSimpleRichText(text, TQFont("courier", 8));
@@ -352,7 +352,7 @@ HistoryEntry::setSelected(bool selected, const TQColorGroup &cg)
 }
 
 TQRect
-HistoryEntry::tqgeometry(int y, int width, TQFontMetrics f)
+HistoryEntry::geometry(int y, int width, TQFontMetrics f)
 {
 	Q_UNUSED( f );
 
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index a6d55285..6c828c39 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -36,7 +36,7 @@ class HistoryEntry
 		HistoryEntry(bool success, const TQTime &time, const TQString &statement, /*int y,*/ const TQString &error = TQString());
 		~HistoryEntry();
 
-		TQRect	tqgeometry(int y, int width, TQFontMetrics f);
+		TQRect	geometry(int y, int width, TQFontMetrics f);
 		void	drawItem(TQPainter *p, int width, const TQColorGroup &cg);
 
 		void	setSelected(bool selected, const TQColorGroup &cg);
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index c57224ea..1b3c16d7 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) {
-		parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), 
+		parentDialog()->setStatus(parentDialog()->mainWin()->project()->dbConnection(), 
 			i18n("Query executing failed."));
 		//todo: also provide server result and sql statement
 		return false;
diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp
index 6c5fae1d..0e42ef80 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.cpp
+++ b/kexi/plugins/relations/kexirelationmaindlg.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kexidb/connection.h>
 
@@ -61,7 +61,7 @@ KexiRelationMainDlg::~KexiRelationMainDlg()
 {
 }
 
-TQSize KexiRelationMainDlg::tqsizeHint() const
+TQSize KexiRelationMainDlg::sizeHint() const
 {	
 	return TQSize(600,300);
 }
diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h
index a2f8ca57..69f43242 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.h
+++ b/kexi/plugins/relations/kexirelationmaindlg.h
@@ -34,7 +34,7 @@ class KexiRelationMainDlg : public KexiViewBase
 		KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		~KexiRelationMainDlg();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		virtual TQWidget* mainWidget();
 
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index f45b30bf..7cf7dae9 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -139,7 +139,7 @@ KexiReportFactory::startEditing(const TQCString &c, TQWidget *w, KFormDesigner::
 			editText();
 		}
 		else
-			createEditor(c, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+			createEditor(c, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	return false;
@@ -153,7 +153,7 @@ KexiReportFactory::isPropertyVisibleInternal(const TQCString &classname, TQWidge
 			return false;
 	}
 	else if(classname == "PicLabel") {
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
 			return false;
 	}
 
@@ -180,7 +180,7 @@ KexiReportFactory::changeText(const TQString &text)
 	TQWidget *w = WidgetFactory::m_widget;
 	changeProperty("text", text, m_container);
 
-	int width = w->tqsizeHint().width();
+	int width = w->sizeHint().width();
 
 	if(w->width() < width)
 		w->resize(width, w->height() );
@@ -212,7 +212,7 @@ KexiReportFactory::editText()
 	}
 
 	if(classname == "Label")
-		m_widget->resize(m_widget->tqsizeHint());
+		m_widget->resize(m_widget->sizeHint());
 }
 
 bool
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index 89423b03..cacf40b7 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -40,13 +40,13 @@ KexiReportForm::~KexiReportForm()
 	kexipluginsdbg << "KexiReportForm::~KexiReportForm(): close" << endl;
 }
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -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->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -178,7 +178,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 }
 
 TQSize
-KexiReportForm::tqsizeHint() const
+KexiReportForm::sizeHint() const
 {
 	//todo: find better size (user configured?)
 	return TQSize(400,300);
diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h
index 8813a2c3..7898ec98 100644
--- a/kexi/plugins/reports/kexireportform.h
+++ b/kexi/plugins/reports/kexireportform.h
@@ -47,7 +47,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig
 		virtual void clearForm();
 		virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/);
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	private:
 		/*TQString m_ds;
diff --git a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
index f64a089f..9d577ec1 100644
--- a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
@@ -102,7 +102,7 @@ const TQString KexiDBConnection::getClassName() const {
     if(! m_connection)
         throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection is NULL.")) );
     //if(m_connection->error())
-    //    throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").tqarg(m_connection->errorMsg())) );
+    //    throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").arg(m_connection->errorMsg())) );
     return m_connection;
 }
 
@@ -140,9 +140,9 @@ KexiDBCursor* KexiDBConnection::executeQueryString(const TQString& sqlquery) {
     // or e.g. a DROP TABLE operation. So, let's check for such dangerous operations right now.
     ::KexiDB::Parser parser( connection() );
     if(! parser.parse(sqlquery))
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").tqarg(parser.error().type()).tqarg(parser.error().error())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").arg(parser.error().type()).arg(parser.error().error())) );
     if( parser.query() == 0 || parser.operation() != ::KexiDB::Parser::OP_Select )
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").tqarg(parser.operationString()) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").arg(parser.operationString()) ) );
     ::KexiDB::Cursor* cursor = connection()->executeQuery(sqlquery);
     return cursor ? new KexiDBCursor(cursor) : 0;
 }
diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
index c2475276..00b5a21d 100644
--- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
@@ -66,7 +66,7 @@ const TQString KexiDBDriverManager::getClassName() const {
 KexiDB::DriverManager& KexiDBDriverManager::driverManager()
 {
     if(m_drivermanager.error())
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").tqarg(m_drivermanager.errorMsg())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").arg(m_drivermanager.errorMsg())) );
     return m_drivermanager;
 }
 
@@ -77,7 +77,7 @@ const TQStringList KexiDBDriverManager::driverNames() {
 KexiDBDriver* KexiDBDriverManager::driver(const TQString& drivername) {
     TQGuardedPtr< ::KexiDB::Driver > driver = driverManager().driver(drivername); // caching is done by the DriverManager
     if(! driver) return 0;
-    if(driver->error()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Driver error for drivername '%1': %2").tqarg(drivername).tqarg(driver->errorMsg())) );
+    if(driver->error()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Driver error for drivername '%1': %2").arg(drivername).arg(driver->errorMsg())) );
     return new KexiDBDriver(driver);
 }
 
@@ -139,7 +139,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt
             data->password = config.readEntry("encryptedPassword");
             uint len = data->password.length();
             for (uint i=0; i<len; i++)
-                data->password[i] = TQChar( data->password[i].tqunicode() - 47 - i );
+                data->password[i] = TQChar( data->password[i].unicode() - 47 - i );
         }
         if(data->password.isEmpty())
             data->password = config.readEntry("password");
diff --git a/kexi/plugins/scripting/kexidb/kexidbschema.cpp b/kexi/plugins/scripting/kexidb/kexidbschema.cpp
index 2ac40342..c45eedfc 100644
--- a/kexi/plugins/scripting/kexidb/kexidbschema.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbschema.cpp
@@ -179,11 +179,11 @@ bool KexiDBQuerySchema::setWhereExpression(const TQString& whereexpression) {
 
             ::KexiDB::Field* field = static_cast< ::KexiDB::QuerySchema* >(m_schema)->field(key);
             if(! field)
-                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: Field \"%1\" does not exists in tableschema \"%2\".").tqarg(key).tqarg(m_schema->name())) );
+                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: Field \"%1\" does not exists in tableschema \"%2\".").arg(key).arg(m_schema->name())) );
 
             TQVariant v(value);
             if(! v.cast(field->variantType()))
-                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: The for Field \"%1\" defined value is of type \"%2\" rather then the expected type \"%3\"").tqarg(key).tqarg(v.typeName()).tqarg(field->variantType())) );
+                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: The for Field \"%1\" defined value is of type \"%2\" rather then the expected type \"%3\"").arg(key).arg(v.typeName()).arg(field->variantType())) );
 
             static_cast< ::KexiDB::QuerySchema* >(m_schema)->addToWhereExpression(field,v);
         }
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 421bc31f..e9de3f46 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -28,12 +28,12 @@
 #include <kross/main/scriptaction.h>
 #include <kross/api/interpreter.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplitter.h>
 #include <tqtimer.h>
 #include <tqdatetime.h>
 #include <tqdom.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
 
@@ -73,8 +73,8 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa
 
     TQSplitter* splitter = new TQSplitter(this);
     splitter->setOrientation(Qt::Vertical);
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-    tqlayout->addWidget(splitter);
+    TQHBoxLayout* layout = new TQHBoxLayout(this);
+    layout->addWidget(splitter);
 
     d->editor = new KexiScriptEditor(mainWin, splitter, "ScriptEditor");
     splitter->setFocusProxy(d->editor);
@@ -191,7 +191,7 @@ void KexiScriptDesignView::slotPropertyChanged(KoProperty::Set& /*set*/, KoPrope
 
     if(property.name() == "language") {
         TQString language = property.value().toString();
-        kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").tqarg(language) << endl;
+        kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").arg(language) << endl;
         d->scriptaction->setInterpreterName( language );
         // We assume Kross and the HighlightingInterface are using same
         // names for the support languages...
@@ -201,7 +201,7 @@ void KexiScriptDesignView::slotPropertyChanged(KoProperty::Set& /*set*/, KoPrope
     else {
         bool ok = d->scriptaction->setOption( property.name(), property.value() );
         if(! ok) {
-            kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").tqarg(TQString(property.name())) << endl;
+            kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").arg(TQString(property.name())) << endl;
             return;
         }
     }
@@ -214,12 +214,12 @@ void KexiScriptDesignView::execute()
     d->statusbrowser->clear();
     TQTime time;
     time.start();
-    d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").tqarg(d->scriptaction->name()) );
+    d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").arg(d->scriptaction->name()) );
 
     d->scriptaction->activate();
     if( d->scriptaction->hadException() ) {
         TQString errormessage = d->scriptaction->getException()->getError();
-        d->statusbrowser->append(TQString("<b>%2</b><br>").tqarg(TQStyleSheet::escape(errormessage)) );
+        d->statusbrowser->append(TQString("<b>%2</b><br>").arg(TQStyleSheet::escape(errormessage)) );
 
         TQString tracedetails = d->scriptaction->getException()->getTrace();
         d->statusbrowser->append( TQStyleSheet::escape(tracedetails) );
@@ -229,7 +229,7 @@ void KexiScriptDesignView::execute()
             d->editor->setLineNo(lineno);
     }
     else {
-        d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").tqarg(time.elapsed()) );
+        d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").arg(time.elapsed()) );
     }
 }
 
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index 8aec288b..08820522 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -76,7 +76,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction)
             "support in Kexi. The scripting API may change in details\n"
             "in the next Kexi version.\n"
             "For more information and documentation see\n%1"
-        ).tqarg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n";
+        ).arg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n";
     }
     KexiEditor::setText(code);
     // We assume Kross and the HighlightingInterface are using same
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index cb66734d..84fbe4ec 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -95,7 +95,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender)
 		bool exec = (dontask == "yes");
 		if( !exec && dontask != "no" ) {
 			exec = KMessageBox::warningContinueCancel(0,
-				i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").tqarg(scriptaction->text()),
+				i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").arg(scriptaction->text()),
 				i18n("Execute Script?"), KGuiItem(i18n("Execute"), "exec"),
 				dontAskAgainName, KMessageBox::Notify | KMessageBox::Dangerous
 			) == KMessageBox::Continue;
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 6f75bdea..f244ae39 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -93,10 +93,10 @@ def runGuiApp(copycenter, name):
 			qt.QDialog.__init__(self, parent, "ProgressDialog", 1)
 			self.parent = parent
 			self.setCaption(caption)
-			tqlayout = qt.QVBoxLayout(self)
+			layout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setMargin(2)
-			tqlayout.addWidget(box)
+			layout.addWidget(box)
 			self.listview = qt.QListView(box)
 			self.listview.setAllColumnsShowFocus(True)
 			self.listview.header().setStretchEnabled(True,0)
@@ -216,7 +216,7 @@ def runGuiApp(copycenter, name):
 			print "CopyJobWidget.writeOptions"
 			writer.write("<%s plugin=\"%s\">\n" % (plugininst.plugintype, pluginname))
 			for optionname in plugininst.options:
-				value = self.escape( tqunicode(plugininst.options[optionname]).encode("utf-8") )
+				value = self.escape( unicode(plugininst.options[optionname]).encode("utf-8") )
 				writer.write("\t<%s value=\"%s\" />\n" % (optionname,value))
 			writer.write("</%s>\n" % plugininst.plugintype)
 
@@ -309,31 +309,31 @@ def runGuiApp(copycenter, name):
 			self.starttime = None
 			qt.QDialog.__init__(self, dialog, "ProgressDialog", 1)
 			self.setCaption("Copying...")
-			tqlayout = qt.QVBoxLayout(self)
+			layout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setSpacing(6)
 			box.setMargin(6)
-			tqlayout.addWidget(box)
+			layout.addWidget(box)
 			self.textbrowser = qt.QTextBrowser(box)
 			self.textbrowser.setWordWrap(qt.QTextEdit.WidgetWidth)
 			self.textbrowser.setTextFormat(qt.Qt.RichText)
 			statusbox = qt.QFrame(box)
-			tqlayout = qt.QGridLayout(statusbox,4,2,0,2)
-			tqlayout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
+			layout = qt.QGridLayout(statusbox,4,2,0,2)
+			layout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
 			self.donecounter = 0
 			self.donelabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.donelabel,0,1)
-			tqlayout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
+			layout.addWidget(self.donelabel,0,1)
+			layout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
 			self.successcounter = 0
 			self.successlabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.successlabel,1,1)
-			tqlayout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
+			layout.addWidget(self.successlabel,1,1)
+			layout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
 			self.failedcounter = 0
 			self.failedlabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.failedlabel,2,1)
-			tqlayout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
+			layout.addWidget(self.failedlabel,2,1)
+			layout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
 			self.elapsedlabel = qt.QLabel("-",statusbox)
-			tqlayout.addWidget(self.elapsedlabel,3,1)
+			layout.addWidget(self.elapsedlabel,3,1)
 			btnbox = qt.QHBox(box)
 			btnbox.setSpacing(6)
 			self.donebtn = qt.QPushButton(btnbox)
@@ -530,11 +530,11 @@ def runGuiApp(copycenter, name):
 			self.ListViewDialog = ListViewDialog
 			qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 			self.setCaption("Copy Center")
-			tqlayout = qt.QVBoxLayout(self)
+			layout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setMargin(6)
 			box.setSpacing(6)
-			tqlayout.addWidget(box)
+			layout.addWidget(box)
 			self.tab = qt.QTabWidget(box)
 			self.tab.setMargin(6)
 			box.setStretchFactor(self.tab,1)
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index 678cf40b..985d757d 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -84,7 +84,7 @@ class CopyCenterPlugin:
 				return None
 			record = []
 			for fieldname in self.fieldlist:
-				record.append( tqunicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
+				record.append( unicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
 			#print "read record: %s" % record
 			return record
 
@@ -145,8 +145,8 @@ class CopyCenterPlugin:
 				cursorrecord.setValue(self.fieldlist[i], v)
 			rowcount = self.cursor.insert()
 			if rowcount < 1:
-				drv = tqunicode(self.cursor.lastError().driverText()).encode("latin-1")
-				db = tqunicode(self.cursor.lastError().databaseText()).encode("latin-1")
+				drv = unicode(self.cursor.lastError().driverText()).encode("latin-1")
+				db = unicode(self.cursor.lastError().databaseText()).encode("latin-1")
 				print "failed: %s %s" % (drv,db)
 				self.copierer.writeFailed(record)
 			else:
diff --git a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py
index d0d1f0cc..cace0340 100644
--- a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py
+++ b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py
@@ -131,7 +131,7 @@ class HtmlExporter:
 			if items == None: break
 			output.write("<tr>")
 			for item in items:
-				u = tqunicode(str(self.htmlescape(item)),"latin-1")
+				u = unicode(str(self.htmlescape(item)),"latin-1")
 				output.write("<td>%s</td>" % u.encode("utf-8"))
 			output.write("</tr>\n")
 		output.write("</table>\n")
diff --git a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
index 6ca94f9a..200b3dee 100755
--- a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
+++ b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
@@ -124,9 +124,9 @@ class SaxInput:
 				was parsed. """
 
 				if self.field != None:
-					# the xml-data is tqunicode and we need to encode it
+					# the xml-data is unicode and we need to encode it
 					# to latin-1 cause KexiDB deals only with latin-1.
-					u = tqunicode(chars[offset:offset+length])
+					u = unicode(chars[offset:offset+length])
 					self.field.append(u.encode("latin-1"))
 
 		# start the job
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 443f26d4..d47f0226 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -20,7 +20,7 @@
 #include "kexilookupcolumnpage.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqheader.h>
 
@@ -142,10 +142,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 
 	TQHBoxLayout *hlyr = new TQHBoxLayout(contentsVlyr);
 	d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents);
-	d->rowSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->rowSourceLabel->setMargin(2);
 	d->rowSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	d->rowSourceLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom);
+	d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->rowSourceLabel);
 
 	d->gotoRowSourceButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoRowSourceButton");
@@ -170,10 +170,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	//- Bound Column
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents);
-	d->boundColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->boundColumnLabel->setMargin(2);
 	d->boundColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	d->boundColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom);
+	d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->boundColumnLabel);
 
 	d->clearBoundColumnButton = new KexiSmallToolButton(contents, TQString(),
@@ -192,10 +192,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	//- Visible Column
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents);
-	d->visibleColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->visibleColumnLabel->setMargin(2);
 	d->visibleColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	d->visibleColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom);
+	d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->visibleColumnLabel);
 
 	d->clearVisibleColumnButton = new KexiSmallToolButton(contents, TQString(),
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index 298363c4..a019eac2 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -18,7 +18,7 @@
 */
 #include <tqdom.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 #include <tqmetaobject.h>
@@ -72,8 +72,8 @@ ChangeFieldPropertyCommand::~ChangeFieldPropertyCommand()
 TQString ChangeFieldPropertyCommand::name() const
 {
 	return i18n("Change \"%1\" property for table field from \"%2\" to \"%3\"")
-		.tqarg(m_alterTableAction.propertyName()).tqarg(m_oldValue.toString())
-		.tqarg(m_alterTableAction.newValue().toString());
+		.arg(m_alterTableAction.propertyName()).arg(m_oldValue.toString())
+		.arg(m_alterTableAction.newValue().toString());
 }
 
 TQString ChangeFieldPropertyCommand::debugString()
@@ -81,15 +81,15 @@ TQString ChangeFieldPropertyCommand::debugString()
 	TQString s( name() );
 	if (m_oldListData || m_listData)
 		s += TQString("\nAnd list data from [%1]\n  to [%2]")
-			.tqarg( m_oldListData ? 
+			.arg( m_oldListData ? 
 				TQString("%1 -> %2")
-				.tqarg(m_oldListData->keysAsStringList().join(",")).tqarg(m_oldListData->names.join(","))
+				.arg(m_oldListData->keysAsStringList().join(",")).arg(m_oldListData->names.join(","))
 				: TQString("<NONE>"))
-			.tqarg( m_listData ?
+			.arg( m_listData ?
 				TQString("%1 -> %2")
-				.tqarg(m_listData->keysAsStringList().join(",")).tqarg(m_listData->names.join(","))
+				.arg(m_listData->keysAsStringList().join(",")).arg(m_listData->names.join(","))
 				: TQString("<NONE>"));
-	return s + TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
+	return s + TQString(" (UID=%1)").arg(m_alterTableAction.uid());
 }
 
 void ChangeFieldPropertyCommand::execute()
@@ -136,9 +136,9 @@ RemoveFieldCommand::~RemoveFieldCommand()
 TQString RemoveFieldCommand::name() const
 {
 	if (m_set)
-		return i18n("Remove table field \"%1\"").tqarg(m_alterTableAction.fieldName());
+		return i18n("Remove table field \"%1\"").arg(m_alterTableAction.fieldName());
 
-	return TQString("Remove empty row at position %1").tqarg(m_fieldIndex);
+	return TQString("Remove empty row at position %1").arg(m_fieldIndex);
 }
 
 void RemoveFieldCommand::execute()
@@ -161,7 +161,7 @@ TQString RemoveFieldCommand::debugString()
 
 	return name() + "\nAT ROW " + TQString::number(m_fieldIndex)
 		+ ", FIELD: " + (*m_set)["caption"].value().toString()
-		+ TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
+		+ TQString(" (UID=%1)").arg(m_alterTableAction.uid());
 }
 
 KexiDB::AlterTableHandler::ActionBase* RemoveFieldCommand::createAction()
@@ -192,7 +192,7 @@ InsertFieldCommand::~InsertFieldCommand()
 
 TQString InsertFieldCommand::name() const
 {
-	return i18n("Insert table field \"%1\"").tqarg(m_set["caption"].value().toString());
+	return i18n("Insert table field \"%1\"").arg(m_set["caption"].value().toString());
 }
 
 void InsertFieldCommand::execute()
@@ -229,9 +229,9 @@ ChangePropertyVisibilityCommand::~ChangePropertyVisibilityCommand()
 TQString ChangePropertyVisibilityCommand::name() const
 {
 	return TQString("[internal] Change \"%1\" visibility from \"%2\" to \"%3\"")
-		.tqarg(m_alterTableAction.propertyName())
-		.tqarg(m_oldVisibility ? "true" : "false")
-		.tqarg(m_alterTableAction.newValue().toBool() ? "true" : "false");
+		.arg(m_alterTableAction.propertyName())
+		.arg(m_oldVisibility ? "true" : "false")
+		.arg(m_alterTableAction.newValue().toBool() ? "true" : "false");
 }
 
 void ChangePropertyVisibilityCommand::execute()
@@ -265,7 +265,7 @@ InsertEmptyRowCommand::~InsertEmptyRowCommand()
 
 TQString InsertEmptyRowCommand::name() const
 {
-	return TQString("Insert empty row at position %1").tqarg(m_row);
+	return TQString("Insert empty row at position %1").arg(m_row);
 }
 
 void InsertEmptyRowCommand::execute()
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 84ea686c..0563cde3 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -22,7 +22,7 @@
 #include "kexilookupcolumnpage.h"
 #include "kexitabledesignercommands.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 
@@ -168,7 +168,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 	connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
 
-	setMinimumSize(d->view->tqminimumSizeHint().width(), d->view->tqminimumSizeHint().height());
+	setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height());
 	d->view->setFocus();
 
 	d->sets = new KexiDataAwarePropertySet( this, d->view );
@@ -495,11 +495,11 @@ void KexiTableDesignerView::slotTogglePrimaryKey()
 /*	CommandGroup *setPrimaryKeyCommand;
 	if (isSet) {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Set primary key for field \"%1\"")
-			.tqarg(set["name"].value().toString()) );
+			.arg(set["name"].value().toString()) );
 	}
 	else {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Unset primary key for field \"%1\"")
-			.tqarg(set["name"].value().toString()) );
+			.arg(set["name"].value().toString()) );
 	}
 	switchPrimaryKey(set, isSet, false, setPrimaryKeyCommand);*/
 	//addHistoryCommand( setPrimaryKeyCommand, false /* !execute */ );
@@ -687,8 +687,8 @@ void KexiTableDesignerView::slotBeforeCellChanged(
 				//remember this action containing 2 subactions
 				CommandGroup *changeCaptionAndNameCommand = new CommandGroup(
 					i18n("Change \"%1\" field's name to \"%2\" and caption from \"%3\" to \"%4\"")
-						.tqarg(oldName).tqarg(propertySetForItem->property("name").value().toString())
-						.tqarg(oldCaption).tqarg(newValue.toString() ));
+						.arg(oldName).arg(propertySetForItem->property("name").value().toString())
+						.arg(oldCaption).arg(newValue.toString() ));
 				changeCaptionAndNameCommand->addCommand( changeCaptionCommand );
 //					new ChangeFieldPropertyCommand( this, *propertySetForItem,
 	//						"caption", oldCaption, newValue)
@@ -759,7 +759,7 @@ void KexiTableDesignerView::slotBeforeCellChanged(
 		// *** this action contains subactions ***
 		CommandGroup *changeDataTypeCommand = new CommandGroup(
 			i18n("Change data type for field \"%1\" to \"%2\"")
-				.tqarg(set["name"].value().toString()).tqarg( KexiDB::Field::typeName( fieldType ) ) );
+				.arg(set["name"].value().toString()).arg( KexiDB::Field::typeName( fieldType ) ) );
 
 //kexipluginsdbg << "++++++++++" << slist << nlist << endl;
 
@@ -968,13 +968,13 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 				//switchPrimaryKey(set, true);
 				// this will be toplevel command 
 				setAutonumberCommand = new CommandGroup(
-					i18n("Assign autonumber for field \"%1\"").tqarg(set["name"].value().toString()) );
+					i18n("Assign autonumber for field \"%1\"").arg(set["name"].value().toString()) );
 				toplevelCommand = setAutonumberCommand;
 				d->setPropertyValueIfNeeded( set, "autoIncrement", TQVariant(true,1), setAutonumberCommand );
 			}
 			else {
 				setAutonumberCommand = new CommandGroup(
-					i18n("Remove autonumber from field \"%1\"").tqarg(set["name"].value().toString()) );
+					i18n("Remove autonumber from field \"%1\"").arg(set["name"].value().toString()) );
 				//d->slotPropertyChanged_enabled = false;
 //					set["autoIncrement"].setValue( TQVariant(false,1), false/*don't save old*/);
 //					d->slotPropertyChanged_enabled = true;
@@ -995,7 +995,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 		setPrimaryKey = false;
 		// this will be toplevel command 
 		CommandGroup *unsetIndexedOrUniquOrNotNullCommand = new CommandGroup(
-			i18n("Set \"%1\" property for field \"%2\"").tqarg(property.caption()).tqarg(set["name"].value().toString()) );
+			i18n("Set \"%1\" property for field \"%2\"").arg(property.caption()).arg(set["name"].value().toString()) );
 		toplevelCommand = unsetIndexedOrUniquOrNotNullCommand;
 		d->setPropertyValueIfNeeded( set, pname, TQVariant(false,1), unsetIndexedOrUniquOrNotNullCommand );
 		if (pname=="notNull") {
@@ -1040,8 +1040,8 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 //		kdDebug() << set["type"].value() << endl;
 //		if (KexiDB::Field::typeGroup( set["type"].value().toInt() ) == (int)KexiDB::Field::TextGroup) {
 		CommandGroup* changeFieldTypeCommand = new CommandGroup(
-			i18n("Change type for field \"%1\" to \"%2\"").tqarg(set["name"].value().toString())
-			.tqarg(typeName) );
+			i18n("Change type for field \"%1\" to \"%2\"").arg(set["name"].value().toString())
+			.arg(typeName) );
 		d->setPropertyValueIfNeeded( set, "subType", property.value(), property.oldValue(),
 			changeFieldTypeCommand );
 
@@ -1085,7 +1085,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 			//this action contains subactions
 			CommandGroup *setPrimaryKeyCommand = new CommandGroup(
 				i18n("Set primary key for field \"%1\"")
-					.tqarg(set["name"].value().toString()) );
+					.arg(set["name"].value().toString()) );
 			if (toplevelCommand)
 				toplevelCommand->addCommand( setPrimaryKeyCommand );
 			else
@@ -1111,7 +1111,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 			//remember this action containing 2 subactions
 			CommandGroup *setPrimaryKeyCommand = new CommandGroup(
 				i18n("Unset primary key for field \"%1\"")
-					.tqarg(set["name"].value().toString()) );
+					.arg(set["name"].value().toString()) );
 			if (toplevelCommand)
 				toplevelCommand->addCommand( setPrimaryKeyCommand );
 			else
@@ -1147,10 +1147,10 @@ void KexiTableDesignerView::slotRowInserted()
 }
 
 void KexiTableDesignerView::slotAboutToDeleteRow(
-	KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
+	KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
 {
 	Q_UNUSED(result)
-	Q_UNUSED(tqrepaint)
+	Q_UNUSED(repaint)
 	if (item[COLUMN_ID_ICON].toString()=="key")
 		d->primaryKeyExists = false;
 
@@ -1213,7 +1213,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 				"for creating relations between database tables. "
 				"Do you want to add primary key automatically now?</p>"
 				"<p>If you want to add a primary key by hand, press \"Cancel\" "
-				"to cancel saving table design.</p>").tqarg(schema.name()),
+				"to cancel saving table design.</p>").arg(schema.name()),
 				TQString(), KGuiItem(i18n("&Add Primary Key"), "key"), KStdGuiItem::no(),
 					"autogeneratePrimaryKeysOnTableDesignSaving");
 			if (questionRes==KMessageBox::Cancel) {
@@ -1229,9 +1229,9 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 					KoProperty::Set *set = d->sets->at(i);
 					if (set) {
 						if ((*set)["name"].value().toString()
-							== pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex))
+							== pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex))
 						|| (*set)["caption"].value().toString()
-							== pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex)))
+							== pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex)))
 						{
 							//try next id index
 							i = 0;
@@ -1241,8 +1241,8 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 					}
 					i++;
 				}
-				pkFieldName = pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
-				pkFieldCaption = pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldName = pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldCaption = pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex));
 				//ok, add PK with such unique name
 				d->view->insertEmptyRow(0);
 				d->view->setCursorPosition(0, COLUMN_ID_CAPTION);
@@ -1273,7 +1273,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 				if (beSilent) {
 					kexipluginswarn << 
 						TQString("KexiTableDesignerView::buildSchema(): no field caption entered at row %1...")
-						.tqarg(i+1) << endl;
+						.arg(i+1) << endl;
 				}
 				else {
 					d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
@@ -1304,7 +1304,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 		if (beSilent) {
 			kexipluginswarn << 
 				TQString("KexiTableDesignerView::buildSchema(): duplicated field name '%1'")
-				.tqarg((*b)["name"].value().toString()) << endl;
+				.arg((*b)["name"].value().toString()) << endl;
 		}
 		else {
 			d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
@@ -1313,7 +1313,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 			KMessageBox::sorry(this,
 				i18n("You have added \"%1\" field name twice.\nField names cannot be repeated. "
 				"Correct name of the field.")
-				.tqarg((*b)["name"].value().toString()) );
+				.arg((*b)["name"].value().toString()) );
 		}
 		res = cancelled;
 	}
@@ -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)
-			parentDialog()->settqStatus(conn, "");
+			parentDialog()->setStatus(conn, "");
 	}
 
 	if (res == true) {
@@ -1457,7 +1457,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 			this, *conn, *tempData()->table,
 			i18n("You are about to change the design of table \"%1\" "
 			"but following objects using this table are opened:")
-			.tqarg(tempData()->table->name()));
+			.arg(tempData()->table->name()));
 	}
 
 	if (res == true) {
@@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 
 			res = conn->alterTable(*tempData()->table, *newTable);
 			if (res != true)
-				parentDialog()->settqStatus(conn, "");
+				parentDialog()->setStatus(conn, "");
 		}
 		else {
 			KexiDB::AlterTableHandler::ExecutionArguments args;
@@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 				<< res.toString() << endl;
 			if (true != res) {
 				alterTableHandler->debugError();
-				parentDialog()->settqStatus(alterTableHandler, "");
+				parentDialog()->setStatus(alterTableHandler, "");
 			}
 		}
 	}
@@ -1659,7 +1659,7 @@ void KexiTableDesignerView::slotAboutToShowContextMenu()
 		if (captionOrName.isEmpty())
 			captionOrName = set["name"].value().toString();
 //! @todo show "field" icon
-		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").tqarg(captionOrName) );
+		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").arg(captionOrName) );
 	}
 	else {
 		d->contextMenuTitle->setTitle( i18n("Empty table row", "Empty Row") );
diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h
index 13ce495d..5b9d0215 100644
--- a/kexi/plugins/tables/kexitabledesignerview.h
+++ b/kexi/plugins/tables/kexitabledesignerview.h
@@ -146,10 +146,10 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 
 		//! Called before row inserting in tableview.
 		void slotRowInserted();
-//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool tqrepaint);
+//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool repaint);
 
 		//! Called before row deleting in tableview.
-		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
+		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
 
 		/*! Called after any property has been changed in the current property set,
 		 to perform some actions (like updating other dependent properties) */
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index c546327b..30bdb557 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -20,7 +20,7 @@
 #include "kexitabledesignerview_p.h"
 #include "kexitabledesignerview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 4efd237a..55c8be5d 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -137,7 +137,7 @@ bool KexiTablePart::remove(KexiMainWindow *win, KexiPart::Item &item)
 		tristate res = KexiTablePart::askForClosingObjectsUsingTableSchema(
 			win, *conn, *sch, 
 			i18n("You are about to remove table \"%1\" but following objects using this table are opened:")
-			.tqarg(sch->name()));
+			.arg(sch->name()));
 		return true == conn->dropTable( sch );
 	}
 	//last chance: just remove item
@@ -182,7 +182,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K
 	TQString openedObjectsStr = "<ul>";
 	for (TQPtrListIterator<KexiDB::Connection::TableSchemaChangeListenerInterface> it(*listeners);
 		it.current(); ++it)	{
-			openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString);
+			openedObjectsStr += TQString("<li>%1</li>").arg(it.current()->listenerInfoString);
 	}
 	openedObjectsStr += "</ul>";
 	int r = KMessageBox::questionYesNo(parent, 
diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi
index 8c13ad39..5a1b4ebd 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 6155eb63..765457af 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -25,7 +25,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 
@@ -56,7 +56,7 @@ KexiProject* prj = 0;
 void showError(const TQString& msg)
 {
 	TQString msg_(msg);
-	msg_.prepend(TQString("Error at line %1: ").tqarg(testLineNumber));
+	msg_.prepend(TQString("Error at line %1: ").arg(testLineNumber));
 	kdDebug() << msg_ << endl;
 }
 
@@ -119,7 +119,7 @@ tristate readLineFromTestFile(const TQString& expectedCommandName = TQString())
 	}
 	if (!expectedCommandName.isEmpty() && testFileLine[0]!=expectedCommandName) {
 		showError( TQString("Invalid command '%1', expected '%2'")
-			.tqarg(testFileLine[0]).tqarg(expectedCommandName));
+			.arg(testFileLine[0]).arg(expectedCommandName));
 		return false;
 	}
 	if (quoted) {
@@ -136,9 +136,9 @@ bool checkItemsNumber(int expectedNumberOfItems, int optionalNumberOfItems = -1)
 		ok = ok || optionalNumberOfItems==(int)testFileLine.count();
 	if (!ok) {
 		TQString msg = TQString("Invalid number of args (%1) for command '%2', expected: %3")
-			.tqarg(testFileLine.count()).tqarg(testFileLine[0]).tqarg(expectedNumberOfItems);
+			.arg(testFileLine.count()).arg(testFileLine[0]).arg(expectedNumberOfItems);
 		if (optionalNumberOfItems>0)
-			msg.append( TQString(" or %1").tqarg(optionalNumberOfItems) );
+			msg.append( TQString(" or %1").arg(optionalNumberOfItems) );
 		showError( msg );
 		return false;
 	}
@@ -167,7 +167,7 @@ TQVariant::Type typeNameToTQVariantType(const TQCString& name_)
 	if (name=="longlong")
 		return TQVariant::LongLong;
 //todo more types
-	showError(TQString("Invalid type '%1'").tqarg(name_));
+	showError(TQString("Invalid type '%1'").arg(name_));
 	return TQVariant::Invalid;
 }
 
@@ -202,7 +202,7 @@ static int getNumber(const TQString& argument, bool& ok)
 	else {
 		result = argument.toInt(&ok);
 		if (!ok) {
-			showError(TQString("Invalid value '%1'").tqarg(argument));
+			showError(TQString("Invalid value '%1'").arg(argument));
 			return -1;
 		}
 	}
@@ -248,7 +248,7 @@ bool AlterTableTester::changeFieldProperty(KexiTableDesignerInterface* designerI
 	else {
 		if (!castStringToTQVariant(propertyValueString, propertyType, newValue)) {
 			showError( TQString("Could not set property '%1' value '%2' of type '%3'")
-				.tqarg(propertyName).tqarg(propertyValueString).tqarg(propertyType) );
+				.arg(propertyName).arg(propertyValueString).arg(propertyType) );
 			return false;
 		}
 	}
@@ -283,7 +283,7 @@ bool AlterTableTester::getSchemaDump(KexiDialogBase* dlg, TQString& schemaDebugS
 	schemaDebugString = designerIface->debugStringForCurrentTableSchema(result);
 	if (true!=result) {
 		showError( TQString("Loading modified schema failed. Result: %1")
-			.tqarg(~result ? "cancelled" : "false") );
+			.arg(~result ? "cancelled" : "false") );
 		return false;
 	}
 	schemaDebugString.remove(TQRegExp(",$")); //no need to have "," at the end of lines
@@ -296,9 +296,9 @@ bool AlterTableTester::showSchema(KexiDialogBase* dlg, bool copyToClipboard)
 	if (!getSchemaDump(dlg, schemaDebugString))
 		return false;
 	if (copyToClipboard)
-		TQApplication::tqclipboard()->setText( schemaDebugString );
+		TQApplication::clipboard()->setText( schemaDebugString );
 	else
-		kdDebug() << TQString("Schema for '%1' table:\n").tqarg(dlg->partItem()->name())
+		kdDebug() << TQString("Schema for '%1' table:\n").arg(dlg->partItem()->name())
 			+ schemaDebugString + "\nendSchema" << endl;
 	return true;
 }
@@ -354,8 +354,8 @@ bool AlterTableTester::checkSchema(KexiDialogBase* dlg)
 	if (!getSchemaDump(dlg, schemaDebugString))
 		return false;
 	bool result = checkInternal(dlg, schemaDebugString, "endSchema", true /*skipColonsAndStripWhiteSpace*/);
-	kdDebug() << TQString("Schema check for table '%1': %2").tqarg(dlg->partItem()->name())
-		.tqarg(result ? "OK" : "Failed") << endl;
+	kdDebug() << TQString("Schema check for table '%1': %2").arg(dlg->partItem()->name())
+		.arg(result ? "OK" : "Failed") << endl;
 	return result;
 }
 
@@ -367,7 +367,7 @@ bool AlterTableTester::getActionsDump(KexiDialogBase* dlg, TQString& actionsDebu
 		return false;
 	tristate result = designerIface->simulateAlterTableExecution(&actionsDebugString);
 	if (true!=result) {
-		showError( TQString("Computing simplified actions for table '%1'  failed.").tqarg(dlg->partItem()->name()) );
+		showError( TQString("Computing simplified actions for table '%1'  failed.").arg(dlg->partItem()->name()) );
 		return false;
 	}
 	return true;
@@ -379,9 +379,9 @@ bool AlterTableTester::showActions(KexiDialogBase* dlg, bool copyToClipboard)
 	if (!getActionsDump(dlg, actionsDebugString))
 		return false;
 	if (copyToClipboard)
-		TQApplication::tqclipboard()->setText( actionsDebugString );
+		TQApplication::clipboard()->setText( actionsDebugString );
 	else
-		kdDebug() << TQString("Simplified actions for altering table '%1':\n").tqarg(dlg->partItem()->name())
+		kdDebug() << TQString("Simplified actions for altering table '%1':\n").arg(dlg->partItem()->name())
 			+ actionsDebugString+"\n" << endl;
 	return true;
 }
@@ -392,8 +392,8 @@ bool AlterTableTester::checkActions(KexiDialogBase* dlg)
 	if (!getActionsDump(dlg, actionsDebugString))
 		return false;
 	bool result = checkInternal(dlg, actionsDebugString, "endActions", true /*skipColonsAndStripWhiteSpace*/);
-		kdDebug() << TQString("Actions check for table '%1': %2").tqarg(dlg->partItem()->name())
-		.tqarg(result ? "OK" : "Failed") << endl;
+		kdDebug() << TQString("Actions check for table '%1': %2").arg(dlg->partItem()->name())
+		.arg(result ? "OK" : "Failed") << endl;
 	return result;
 }
 
@@ -405,7 +405,7 @@ bool AlterTableTester::saveTableDesign(KexiDialogBase* dlg)
 		return false;
 	tristate result = designerIface->executeRealAlterTable();
 	if (true!=result) {
-		showError( TQString("Saving design of table '%1' failed.").tqarg(dlg->partItem()->name()) );
+		showError( TQString("Saving design of table '%1' failed.").arg(dlg->partItem()->name()) );
 		return false;
 	}
 	return true;
@@ -439,9 +439,9 @@ bool AlterTableTester::showTableData(KexiDialogBase* dlg, bool copyToClipboard)
 	if (!getTableDataDump(dlg, dataString))
 		return false;
 	if (copyToClipboard)
-		TQApplication::tqclipboard()->setText( dataString );
+		TQApplication::clipboard()->setText( dataString );
 	else
-		kdDebug() << TQString("Contents of table '%1':\n").tqarg(dlg->partItem()->name())+dataString+"\n" << endl;
+		kdDebug() << TQString("Contents of table '%1':\n").arg(dlg->partItem()->name())+dataString+"\n" << endl;
 	return true;
 }
 
@@ -451,8 +451,8 @@ bool AlterTableTester::checkTableData(KexiDialogBase* dlg)
 	if (!getTableDataDump(dlg, dataString))
 		return false;
 	bool result = checkInternal(dlg, dataString, "endTableData", false /*!skipColonsAndStripWhiteSpace*/);
-		kdDebug() << TQString("Table '%1' contents: %2").tqarg(dlg->partItem()->name())
-			.tqarg(result ? "OK" : "Failed") << endl;
+		kdDebug() << TQString("Table '%1' contents: %2").arg(dlg->partItem()->name())
+			.arg(result ? "OK" : "Failed") << endl;
 	return result;
 }
 
@@ -462,8 +462,8 @@ bool AlterTableTester::closeWindow(KexiDialogBase* dlg)
 		return true;
 	TQString name = dlg->partItem()->name();
 	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;
+	kdDebug() << TQString("Closing window for table '%1': %2").arg(name)
+		.arg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl;
 	return result == true;
 }
 
@@ -492,13 +492,13 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 	TQString tableName(testFileLine[1]);
 	KexiPart::Item *item = prj->itemForMimeType("kexi/table", tableName);
 	if (!item) {
-		showError(TQString("No such table '%1'").tqarg(tableName));
+		showError(TQString("No such table '%1'").arg(tableName));
 		return false;
 	}
 	bool openingCancelled;
 	KexiDialogBase* dlg = win->openObject(item, Kexi::DesignViewMode, openingCancelled);
 	if (!dlg) {
-		showError(TQString("Could not open table '%1'").tqarg(item->name()));
+		showError(TQString("Could not open table '%1'").arg(item->name()));
 		return false;
 	}
 	KexiTableDesignerInterface* designerIface 
@@ -570,7 +570,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 				bool ok;
 				variableI = command.mid(2).toInt(&ok);
 				if (!ok) {
-					showError(TQString("Invalid variable initialization '%1'").tqarg(command));
+					showError(TQString("Invalid variable initialization '%1'").arg(command));
 					return false;
 				}
 				continue;
@@ -622,7 +622,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 		if (command=="stop") {
 			if (!checkItemsNumber(1))
 				return false;
-			kdDebug() << TQString("Test STOPPED at line %1.").tqarg(testLineNumber) << endl;
+			kdDebug() << TQString("Test STOPPED at line %1.").arg(testLineNumber) << endl;
 			break;
 		}
 		else if (command=="closeWindow") {
@@ -640,7 +640,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 			break;
 		}
 		else {
-			showError( TQString("No such command '%1'").tqarg(command) );
+			showError( TQString("No such command '%1'").arg(command) );
 			return false;
 		}
 	}
@@ -674,7 +674,7 @@ int main(int argc, char *argv[])
 	testFilename = argv[argc-1];
 	testFile.setName(testFilename);
 	if (!testFile.open(IO_ReadOnly)) {
-		kdWarning() << TQString("Opening test file %1 failed.").tqarg(testFilename) << endl;
+		kdWarning() << TQString("Opening test file %1 failed.").arg(testFilename) << endl;
 		return quit(1);
 	}
 	//load db name
@@ -704,10 +704,10 @@ int main(int argc, char *argv[])
 	res = tester.run(closeAppRequested);
 	if (true != res) {
 		if (false == res)
-			kdWarning() << TQString("Running test for file '%1' failed.").tqarg(testFilename) << endl;
+			kdWarning() << TQString("Running test for file '%1' failed.").arg(testFilename) << endl;
 		return quit(res==false ? 1 : 0);
 	}
-	kdDebug() << TQString("Tests from file '%1': OK").tqarg(testFilename) << endl;
+	kdDebug() << TQString("Tests from file '%1': OK").arg(testFilename) << endl;
 	result = (closeOnFinish || closeAppRequested) ? 0 : tqApp->exec();
 	quit(result);
 	return result;
diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
index 0f2248e6..bf5fcd32 100644
--- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui
+++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
@@ -180,7 +180,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -222,7 +222,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -231,7 +231,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="8" colspan="1">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -279,7 +279,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
diff --git a/kexi/tests/newapi/dr_prop_test.h b/kexi/tests/newapi/dr_prop_test.h
index d7bfd5b3..2cbee8b2 100644
--- a/kexi/tests/newapi/dr_prop_test.h
+++ b/kexi/tests/newapi/dr_prop_test.h
@@ -23,7 +23,7 @@
 int drPropTest()
 {
 	TQValueList<TQCString> names = driver->propertyNames();
-	kdDebug() << TQString("%1 properties found:").tqarg(names.count()) << endl;
+	kdDebug() << TQString("%1 properties found:").arg(names.count()) << endl;
 	for (TQValueList<TQCString>::ConstIterator it = names.constBegin(); it!=names.constEnd(); ++it) {
 		kdDebug() << " - " << (*it) << ":" 
 			<< " caption=\"" << driver->propertyCaption(*it) << "\""
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index d02dbc9b..9eaff2ab 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -137,7 +137,7 @@ int main(int argc, char** argv)
 	}
 	test_name = args->getOption("test");
 	if (!tests.contains(test_name)) {
-		kdDebug() << TQString("No such test \"%1\". Use --help.").tqarg(test_name.data()) << endl;
+		kdDebug() << TQString("No such test \"%1\". Use --help.").arg(test_name.data()) << endl;
 		RETURN(1);
 	}
 	
@@ -152,7 +152,7 @@ int main(int argc, char** argv)
 		db_name_required = false;
 	}
 	if ((int)args->count()<minargs) {
-		kdDebug() << TQString("Not enough args (%1 required). Use --help.").tqarg(minargs) << endl;
+		kdDebug() << TQString("Not enough args (%1 required). Use --help.").arg(minargs) << endl;
 		RETURN(1);
 	}
 	
diff --git a/kexi/tests/newapi/parser_test.h b/kexi/tests/newapi/parser_test.h
index 90c25d7c..d02017ec 100644
--- a/kexi/tests/newapi/parser_test.h
+++ b/kexi/tests/newapi/parser_test.h
@@ -42,8 +42,8 @@ int parserTest(const char *st, const TQStringList& params)
 	}
 	else {
 		KexiDB::ParserError	err = parser.error();
-		kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").tqarg(err.error())
-			.tqarg(err.type()).tqarg(err.at()) << endl;
+		kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").arg(err.error())
+			.arg(err.type()).arg(err.at()) << endl;
 		r = 1;
 	}
 	delete q;
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index 1ada79b1..c497903e 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -22,7 +22,7 @@
  *   OTHER DEALINGS IN THE SOFTWARE.                                       *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 4c279382..af893ddf 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -435,7 +435,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ
 		pm->changeTitle(m_partPopupTitle_id, *bit->pixmap(0), title_text);
 /*		KexiPart::Part* part = Kexi::partManager().part(bit->info());
 		if (part)
-			m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceName() ));
+			m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceName() ));
 		else
 			m_newObjectAction->setText(i18n("&Create Object..."));
 		m_newObjectAction->setIconSet( SmallIconSet(bit->info()->itemIcon()) );*/
@@ -523,14 +523,14 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i)
 		m_prevSelectedPart = part;
 		if (part) {
 			if (m_newObjectAction) {
-				m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceCaption() ));
+				m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceCaption() ));
 				m_newObjectAction->setIcon( part->info()->createItemIcon() );
 				if (m_features & Toolbar) {
 					m_newObjectToolButton->setIconSet( part->info()->createItemIcon() );
 					TQToolTip::add(m_newObjectToolButton, 
-						i18n("Create object: %1").tqarg( part->instanceCaption().lower() ));
+						i18n("Create object: %1").arg( part->instanceCaption().lower() ));
 					TQWhatsThis::add(m_newObjectToolButton, 
-						i18n("Creates a new object: %1").tqarg( part->instanceCaption().lower() ));
+						i18n("Creates a new object: %1").arg( part->instanceCaption().lower() ));
 				}
 			}
 		} else {
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index ff277e7d..28c4521a 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -19,7 +19,7 @@
 
 #include "kexicharencodingcombobox.h"
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
  : KComboBox( parent, "KexiCharacterEncodingComboBox" )
  , m_defaultEncodingAdded(false)
 {
-	TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding()));
+	TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding()));
 	TQString defaultEncodingDescriptiveName;
 
 	TQString _selectedEncoding = selectedEncoding;
 	if (_selectedEncoding.isEmpty())
-		_selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		_selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 
 	TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames());
 	TQStringList::ConstIterator it = descEncodings.constBegin();
@@ -66,7 +66,7 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
 	if (!defaultEncodingDescriptiveName.isEmpty()) {
 		m_defaultEncodingAdded = true;
 		TQString desc = i18n("Text encoding: Default", "Default: %1")
-			.tqarg(defaultEncodingDescriptiveName);
+			.arg(defaultEncodingDescriptiveName);
 		insertItem( desc, 0 );
 		if (_selectedEncoding==defaultEncoding) {
 			setCurrentItem(0);
@@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox()
 TQString KexiCharacterEncodingComboBox::selectedEncoding() const
 {
 	if (defaultEncodingSelected()) {
-		return TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		return TQString::fromLatin1(KGlobal::locale()->encoding());
 	}
 	else {
 		return KGlobal::charsets()->encodingForName( currentText() );
diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index 20e85b04..2cdd0bfc 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -50,7 +50,7 @@ void KexiImagePropertyEdit::selectPixmap()
 
 	ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name());
 	TQString name = item ? item->pixmapName(property()->name()) : "";
-	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() );
+	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() );
 	if(dialog.exec() == TQDialog::Accepted) {
 		setValue(dialog.pixmap(), true);
 		item->setPixmapName(property()->name(), dialog.pixmapName());
@@ -101,7 +101,7 @@ void KexiIdentifierPropertyEdit::setValue(const TQVariant &value, bool emitChang
 	TQString identifier( KexiUtils::string2Identifier(string) );
 	if (identifier!=string)
 		kdDebug() << TQString("KexiIdentifierPropertyEdit::setValue(): "
-			"String \"%1\" converted to identifier \"%2\".").tqarg(string).tqarg(identifier) << endl;
+			"String \"%1\" converted to identifier \"%2\".").arg(string).arg(identifier) << endl;
 	StringEdit::setValue( identifier, emitChange );
 }
 
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 113f8be4..f73b059e 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -23,7 +23,7 @@
 #include <utils/kexisharedactionclient.h>
 #include <core/keximainwindow.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kpopupmenu.h>
 
@@ -59,9 +59,9 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 	TQVBoxLayout *box = new TQVBoxLayout(this);
 	box->addWidget(m_internalView);
 
-	setMinimumSize(m_internalView->tqminimumSizeHint().width(), 
-		m_internalView->tqminimumSizeHint().height());
-	resize( preferredSizeHint( m_internalView->tqsizeHint() ) );
+	setMinimumSize(m_internalView->minimumSizeHint().width(), 
+		m_internalView->minimumSizeHint().height());
+	resize( preferredSizeHint( m_internalView->sizeHint() ) );
 	setFocusProxy(m_internalView);
 	
 	if (!noDataAware) {
@@ -165,14 +165,14 @@ TQWidget* KexiDataAwareView::mainWidget()
 	return m_internalView;
 }
 
-TQSize KexiDataAwareView::tqminimumSizeHint() const
+TQSize KexiDataAwareView::minimumSizeHint() const
 {
-	return m_internalView ? m_internalView->tqminimumSizeHint() : TQSize(0,0);//KexiViewBase::tqminimumSizeHint();
+	return m_internalView ? m_internalView->minimumSizeHint() : TQSize(0,0);//KexiViewBase::minimumSizeHint();
 }
 
-TQSize KexiDataAwareView::tqsizeHint() const
+TQSize KexiDataAwareView::sizeHint() const
 {
-	return m_internalView ? m_internalView->tqsizeHint() : TQSize(0,0);//KexiViewBase::tqsizeHint();
+	return m_internalView ? m_internalView->sizeHint() : TQSize(0,0);//KexiViewBase::sizeHint();
 }
 
 void KexiDataAwareView::updateActions(bool activated)
@@ -241,7 +241,7 @@ void KexiDataAwareView::slotCellSelected(int /*col*/, int row)
 
 void KexiDataAwareView::deleteAllRows()
 {
-	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*tqrepaint*/);
+	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*repaint*/);
 }
 
 void KexiDataAwareView::deleteCurrentRow()
diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h
index 5cc76e97..8a787bd7 100644
--- a/kexi/widget/kexidataawareview.h
+++ b/kexi/widget/kexidataawareview.h
@@ -49,9 +49,9 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
 
 		TQWidget* mainWidget();
 
-		virtual TQSize tqminimumSizeHint() const;
+		virtual TQSize minimumSizeHint() const;
 		
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 		
 		KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; }
 
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index 09680b14..db75e010 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -20,7 +20,7 @@
 */
 
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <kiconloader.h>
@@ -42,10 +42,10 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent,
 	KexiTableView *view;
 	if (dbAware)
 		view = new KexiDataTableView(this, 
-			TQString("%1_datatableview").tqarg(name ? name : "KexiDataTableView").latin1());
+			TQString("%1_datatableview").arg(name ? name : "KexiDataTableView").latin1());
 	else
 		view = new KexiTableView(0, this, 
-			TQString("%1_tableview").tqarg(name ? name : "KexiTableView").latin1());
+			TQString("%1_tableview").arg(name ? name : "KexiTableView").latin1());
 
 	KexiDataAwareView::init( view, view, view );
 }
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index 78b67c8d..00918d5b 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -39,7 +39,7 @@
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -95,7 +95,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 	hbox->addWidget( d->btnSaveChanges );
 	hbox->addSpacing( KDialogBase::spacingHint() );
 	TQWidget::setTabOrder(titleEdit, d->btnSaveChanges);
-	d->btnSaveChanges->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	d->btnSaveChanges->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
 	d->btnTestConnection = new KPushButton(KGuiItem(i18n("&Test Connection"), "", 
 		i18n("Test database connection"), 
@@ -103,7 +103,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 		frmBottom, "testConnection");
 	hbox->addWidget( d->btnTestConnection );
 	TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection);
-	d->btnTestConnection->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
 	connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) );
 	connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) );
@@ -225,7 +225,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch
  : KTabWidget( parent, name )
 {
 	mainWidget = new KexiDBConnectionWidget( this, "mainWidget" );
-	mainWidget->tqlayout()->setMargin(KDialog::marginHint());
+	mainWidget->layout()->setMargin(KDialog::marginHint());
 	addTab( mainWidget, i18n("Parameters") );
 
 //	TQVBox *page2 = new TQVBox(this);
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index 6dd4fbf8..d121f1b7 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -39,7 +39,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>331</height>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -111,7 +111,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>90</width>
                             <height>20</height>
@@ -337,7 +337,7 @@
                     <property name="text">
                         <string>&amp;Title (optional):</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -356,7 +356,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32</width>
                             <height>32767</height>
@@ -395,7 +395,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -411,7 +411,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index f1f161de..46d2dfac 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -62,7 +62,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>129</width>
                             <height>20</height>
@@ -125,7 +125,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index 88b72596..d8cead89 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
@@ -37,7 +37,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
 	KexiDSPixmap *pic = new KexiDSPixmap(this);
 
 	TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this);
-	lText->tqsetAlignment(AlignTop | AlignLeft | WordBreak);
+	lText->setAlignment(AlignTop | AlignLeft | WordBreak);
 	TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this);
 	connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool)));
 	useWizard->setChecked(true);
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 07627f32..6d3848ce 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -23,7 +23,7 @@
 
 #include <keximainwindow.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 	: KexiViewBase(mainWin, parent, name)
 	, d(new KexiEditorPrivate())
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
 	d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
 	//adjust font
@@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 #else
 	TQFrame *fr = new TQFrame(this);
 	fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel);
-	tqlayout->addWidget(fr);
-	tqlayout = new TQVBoxLayout(fr);
-	tqlayout->setMargin( 2 );
+	layout->addWidget(fr);
+	layout = new TQVBoxLayout(fr);
+	layout->setMargin( 2 );
 
 	d->doc =  KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr));
 	if (!d->doc)
@@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 	KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view));
 	d->view->installEventFilter(this);
 
-	tqlayout->addWidget(d->view);
+	layout->addWidget(d->view);
 	setViewWidget(d->view, true/*focus*/);
 	d->view->show();
 }
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 31795049..cc1845ab 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -20,7 +20,7 @@
 #include "kexifieldcombobox.h"
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -182,7 +182,7 @@ void KexiFieldComboBox::setFieldOrExpression(int index)
 	index++; //skip 1st empty item
 	if (index>=count()) {
 		kexiwarn << TQString("KexiFieldComboBox::setFieldOrExpression(int index): index %1 "
-			"out of range (0..%2)").tqarg(index).tqarg(count()-1) << endl;
+			"out of range (0..%2)").arg(index).arg(count()-1) << endl;
 		index = -1;
 	}
 	if (index<=0) {
@@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e )
 {
 	KComboBox::focusOutEvent( e );
 	// accept changes if the focus is moved
-	if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) //(a check needed because drop-down listbox also causes a focusout)
+	if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout)
 		slotReturnPressed(currentText());
 }
 
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 532ec057..406bcb8a 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -20,7 +20,7 @@
 #include "kexifieldlistview.h"
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -117,7 +117,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema)
 }
 
 #if 0
-TQSize KexiFieldListView::tqsizeHint()
+TQSize KexiFieldListView::sizeHint()
 {
 	TQFontMetrics fm(font());
 
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index 50d94dba..53682436 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -60,7 +60,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
 		TQStringList selectedFieldNames() const;
 
 //		void setReadOnly(bool);
-//		virtual TQSize tqsizeHint();
+//		virtual TQSize sizeHint();
 
 	signals:
 		/*! Emitted when a field is double clicked */
diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp
index e41681ab..89225823 100644
--- a/kexi/widget/kexifilterdlg.cpp
+++ b/kexi/widget/kexifilterdlg.cpp
@@ -19,7 +19,7 @@
 
 #include <tqlistview.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
 
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index 059bf080..c6ff117a 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -88,7 +88,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
@@ -110,7 +110,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 02b050b8..e3576a17 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
@@ -40,7 +40,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
 	hlyr->addWidget(m_objectIconLabel);
 	m_objectNameLabel = new TQLabel(this);
 	m_objectNameLabel->setMargin(2);
-	m_objectNameLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	m_objectNameLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	hlyr->addWidget(m_objectNameLabel);
 }
 
@@ -76,7 +76,7 @@ void KexiObjectInfoLabel::updateName()
 	if (txt.isEmpty())
 		txt = m_objectName;
 	else if (!m_objectName.isEmpty())
-		txt += TQString(" \"%1\"").tqarg(m_objectName);
+		txt += TQString(" \"%1\"").arg(m_objectName);
 	m_objectNameLabel->setText(txt);
 }
 
@@ -125,7 +125,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
 	vlyr->addWidget(d->objectIcon);
 	d->objectClassName = new TQLabel(this);
 	d->objectClassName->setMargin(2);
-	d->objectClassName->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	d->objectClassName->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	vlyr->addWidget(d->objectClassName);*/
 
 	d->editor = new KoProperty::Editor(this, true /*AutoSync*/, "propeditor");
@@ -146,14 +146,14 @@ KexiPropertyEditorView::~KexiPropertyEditorView()
 	delete d;
 }
 
-TQSize KexiPropertyEditorView::tqsizeHint() const
+TQSize KexiPropertyEditorView::sizeHint() const
 {
-	return TQSize(200,200);//m_editor->tqsizeHint();
+	return TQSize(200,200);//m_editor->sizeHint();
 }
 
-TQSize KexiPropertyEditorView::tqminimumSizeHint() const
+TQSize KexiPropertyEditorView::minimumSizeHint() const
 {
-	return TQSize(200,200);//m_editor->tqsizeHint();
+	return TQSize(200,200);//m_editor->sizeHint();
 }
 
 /*void KexiPropertyEditorView::setGeometry ( const TQRect &r )
diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h
index 66cc0ac7..008e6759 100644
--- a/kexi/widget/kexipropertyeditorview.h
+++ b/kexi/widget/kexipropertyeditorview.h
@@ -99,8 +99,8 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget
 			KexiObjectInfoLabel *infoLabel, KoProperty::Set* set, 
 			const TQString& textToDisplayForNullSet = TQString());
 
-		virtual TQSize tqsizeHint() const;
-		virtual TQSize tqminimumSizeHint() const;
+		virtual TQSize sizeHint() const;
+		virtual TQSize minimumSizeHint() const;
 		KoProperty::Editor *editor() const;
 
 //	public slots:
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index db9dbb14..ba4c8f9e 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -52,8 +52,8 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
  , m_scrollViewNavPanel(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
-	TQColor fc = tqpalette().active().foreground(),
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	TQColor fc = palette().active().foreground(),
 		bc = viewport()->paletteBackgroundColor();
 	m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2);
 //	m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3, 
@@ -80,7 +80,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 //! @todo allow to hide navigator
 		updateScrollBars();
 		m_scrollViewNavPanel = new KexiRecordNavigator(this, leftMargin(), "nav");
-		m_scrollViewNavPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+		m_scrollViewNavPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 	}
 }
 
@@ -173,11 +173,11 @@ KexiScrollView::refreshContentsSize()
 			change = true;
 		}
 		if (change) {
-	tqrepaint();
-	viewport()->tqrepaint();
+	repaint();
+	viewport()->repaint();
 	repaintContents();
 	updateContents(0, 0, 2000,2000);
-	clipper()->tqrepaint();
+	clipper()->repaint();
 
 			resizeContents(w, h);
 		}
@@ -257,8 +257,8 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev)
 		for(TQObject *o = list->first(); o; o = list->next())
 		{
 			TQWidget *w = (TQWidget*)o;
-			tmpx = TQMAX(tmpx, (w->tqgeometry().right() + 10));
-			tmpy = TQMAX(tmpy, (w->tqgeometry().bottom() + 10));
+			tmpx = TQMAX(tmpx, (w->geometry().right() + 10));
+			tmpy = TQMAX(tmpy, (w->geometry().bottom() + 10));
 		}
 		delete list;
 
@@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in
 		//draw right and bottom borders
 		const int wx = childX(m_widget);
 		const int wy = childY(m_widget);
-		p->setPen(tqpalette().active().foreground());
+		p->setPen(palette().active().foreground());
 		p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height());
 		p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height());
 //kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl;
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 7e6989f3..0c1b9f76 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -22,7 +22,7 @@
 #include <kexiutils/utils.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqtooltip.h>
 
@@ -65,7 +65,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o,
 	d->lyr->setAutoAdd(true);
 	d->lbl_b = new TQHBox(this);
 	d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b);
-	d->lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	d->lbl->setFocusPolicy(TQ_StrongFocus);
 	d->lbl->installEventFilter(this);
 	installEventFilter(this);
@@ -83,7 +83,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
 	KPushButton *btn = new KPushButton(d->lbl_b);
 	btn->setFlat(true);
 	btn->setFocusPolicy(TQ_NoFocus);
-	btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	if (receiver && member) {
 		connect(btn, TQT_SIGNAL(clicked()), receiver, member);
 	}
@@ -113,19 +113,19 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e )
 
 void KexiSectionHeader::slotFocus(bool in)
 {
-	in = in || tqfocusWidget()==this;
+	in = in || focusWidget()==this;
 	d->lbl->setPaletteBackgroundColor( 
-		in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) );
+		in ? palette().active().color(TQColorGroup::Highlight) : palette().active().color(TQColorGroup::Background) );
 	d->lbl->setPaletteForegroundColor( 
-		in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) );
+		in ? palette().active().color(TQColorGroup::HighlightedText) : palette().active().color(TQColorGroup::Foreground) );
 }
 
-TQSize KexiSectionHeader::tqsizeHint() const
+TQSize KexiSectionHeader::sizeHint() const
 {
 	if (!d->lyr->view)
-		return TQWidget::tqsizeHint();
-	TQSize s = d->lyr->view->tqsizeHint();
-	return TQSize(s.width(), d->lbl->tqsizeHint().height() + s.height());
+		return TQWidget::sizeHint();
+	TQSize s = d->lyr->view->sizeHint();
+	return TQSize(s.width(), d->lbl->sizeHint().height() + s.height());
 }
 
 /*void KexiSectionHeader::setFocus()
diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h
index 9ed31a35..a8d08a45 100644
--- a/kexi/widget/kexisectionheader.h
+++ b/kexi/widget/kexisectionheader.h
@@ -41,7 +41,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	public slots:
 		void slotFocus(bool in);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 81bab0c6..a2ccf318 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -70,8 +70,8 @@ void KexiSmallToolButton::updateAction()
 
 void KexiSmallToolButton::init()
 {
-	setPaletteBackgroundColor(tqpalette().active().background());
-	tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	setPaletteBackgroundColor(palette().active().background());
+	setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	TQFont f(KGlobalSettings::toolBarFont());
 	f.setPixelSize(Kexi::smallFont().pixelSize());
 	setFont(f);
@@ -125,7 +125,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
 		if (isEnabled())
 			arrowFlags |= TQStyle::Style_Enabled;
 		tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
-			TQRect(width()-7, height()-7, 5, 5), tqcolorGroup(),
+			TQRect(width()-7, height()-7, 5, 5), colorGroup(),
 			arrowFlags, TQStyleOption() );
 	}
 }
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 0aeddca4..eade3cdd 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstringlist.h>
 #include <tqtoolbutton.h>
@@ -159,7 +159,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	// Name input
 	TQLabel *name = new TQLabel(i18n("&Name:"), frame);
 	l->addWidget(name, 0, 0);
-	name->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter);
+	name->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	m_nameInput = new KLineEdit("kexi", frame);
 	l->addWidget(m_nameInput, 0, 1);
 	name->setBuddy(m_nameInput);
@@ -167,7 +167,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	// Choose size
 	TQLabel *size = new TQLabel(i18n("&Size:"), frame);
 	l->addWidget(size, 1, 0);
-	size->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter);
+	size->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 
 	KComboBox *combo = new KComboBox(frame);
 	l->addWidget(combo, 1, 1);
@@ -232,7 +232,7 @@ TQString LoadIconDialog::iconName()
 /// Pixmap Collection Editor Dialog
 PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent)
 : KDialogBase(parent, "pixcollection_dialog", true,
-	i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false)
+	i18n("Edit Pixmap Collection: %1").arg(collection->collectionName()), Close, Close, false)
 {
 	m_collection = collection;
 	TQFrame *frame = makeMainWidget();
@@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	setInitialSize(TQSize(400, 200), true);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3);
+	TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3);
 	TQToolButton *newItemPath = new TQToolButton(frame);
 	newItemPath->setIconSet(BarIconSet("fileopen"));
 	newItemPath->setTextLabel(i18n("&Add File"), true);
-	vtqlayout->addWidget(newItemPath);
+	vlayout->addWidget(newItemPath);
 	m_buttons.insert(BNewItemPath, newItemPath);
 	connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath()));
 
 	TQToolButton *newItemName = new TQToolButton(frame);
 	newItemName->setIconSet(BarIconSet("icons"));
 	newItemName->setTextLabel(i18n("&Add an Icon"), true);
-	vtqlayout->addWidget(newItemName);
+	vlayout->addWidget(newItemName);
 	m_buttons.insert(BNewItemName, newItemName);
 	connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName()));
 
 	TQToolButton *delItem = new TQToolButton(frame);
 	delItem->setIconSet(BarIconSet("edit_remove"));
 	delItem->setTextLabel(i18n("&Remove Selected Item"), true);
-	vtqlayout->addWidget(delItem);
+	vlayout->addWidget(delItem);
 	m_buttons.insert(BDelItem, delItem);
 	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
-	vtqlayout->addStretch();
+	vlayout->addStretch();
 
 	// Setup the iconView
 	m_iconView = new KIconView(frame, "pixcollection_iconView");
@@ -312,7 +312,7 @@ PixmapCollectionEditor::removeItem()
 
 	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>");
+		.arg(item->text()).arg(m_collection->collectionName()) + "</qt>");
 	if(confirm == KMessageBox::No)
 		return;
 
@@ -373,7 +373,7 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 
 //// A Dialog to choose a pixmap from the PixmapCollection
 PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent)
-: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
+: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").arg(collection->collectionName()),
    User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection...")))
 {
 	m_collection = collection;
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 18c19ef9..e3537aa5 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqevent.h>
@@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 
 //	connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
 
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 	setFocusPolicy(TQ_WheelFocus);
 	setResizePolicy(Manual);
 /*MOVED TO KexiRelationDialog
@@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	invalidateActions();
 #endif
 
-	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
+	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
 }
 
 KexiRelationView::~KexiRelationView()
@@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	
 	addChild(c, 100,100);
 	if (rect.isValid()) {//predefined size
-		TQSize finalSize = c->size().expandedTo( c->tqsizeHint() );
+		TQSize finalSize = c->size().expandedTo( c->sizeHint() );
 		TQRect r = rect;
 		r.setSize( finalSize + TQSize(0,10) );
 		moveChild( c, rect.left(), rect.top() );
 		//we're doing this instead of setGeometry(rect)
 		//because the geomenty might be saved on other system with bigger fonts :)
-		c->resize(c->tqsizeHint());
+		c->resize(c->sizeHint());
 //		c->setGeometry(r);
 //TODO
 
@@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	updateGeometry();
 	if (!rect.isValid()) {
 		c->updateGeometry();
-		c->resize(c->tqsizeHint());
+		c->resize(c->sizeHint());
 	}
 	int x, y;
 
@@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus()
 	emit tableViewGotFocus();
 }
 
-TQSize KexiRelationView::tqsizeHint() const
+TQSize KexiRelationView::sizeHint() const
 {
-	return TQSize(TQScrollView::tqsizeHint());//.width(), 600);
+	return TQSize(TQScrollView::sizeHint());//.width(), 600);
 }
 
 void KexiRelationView::clear()
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 6bc31b31..33d988b9 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -78,7 +78,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 		TablesDict* tables() { return &m_tables; }
 
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget tqgeometry will be initialized.
+		 If \a rect is valid, table widget geometry will be initialized.
 		 \return added table container or 0 on failure.
 		 */
 		KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, 
@@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; }
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		const ConnectionList* connections() const { return &m_connectionViews; }
 
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index c0635c1b..fe3b5a53 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection()
 void
 KexiRelationViewConnection::drawConnection(TQPainter *p)
 {
-	p->setPen(m_parent->tqpalette().active().foreground());
+	p->setPen(m_parent->palette().active().foreground());
 	int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX();
 	int sy = m_masterTable->globalY(m_masterField);
 	int rx = m_detailsTable->x() + m_parent->contentsX();
@@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, rx - 4, ry - 3);
 		pa.setPoint(1, rx - 4, ry + 3);
 		pa.setPoint(2, rx - 1, ry);
-		p->tqdrawPolygon(pa, true);
+		p->drawPolygon(pa, true);
 		
 		//master side
 		p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1);
@@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, lx + 3, ry - 3);
 		pa.setPoint(1, lx + 3, ry + 3);
 		pa.setPoint(2, lx, ry);
-		p->tqdrawPolygon(pa, true);
+		p->drawPolygon(pa, true);
 		
 //		p->drawLine(lx, ry, lx + 8, ry);
 //		p->drawPoint(lx + 1, ry - 1);
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 55440da4..5de32b91 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this);
 
 	m_tableHeader->unsetFocus();
-	m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+	m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 	lyr->addWidget(m_tableHeader);
 	connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved()));
 	connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag()));
 
 	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
-	m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+	m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	
-	m_tableView->setMaximumSize( m_tableView->tqsizeHint() );
+	m_tableView->setMaximumSize( m_tableView->sizeHint() );
 	
-//	m_tableView->resize( m_tableView->tqsizeHint() );
+//	m_tableView->resize( m_tableView->sizeHint() );
 	lyr->addWidget(m_tableView, 0);
 	connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved()));
 	connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
@@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field)
 }
 
 #if 0//js
-TQSize KexiRelationViewTableContainer::tqsizeHint()
+TQSize KexiRelationViewTableContainer::sizeHint()
 {
 #ifdef TQ_WS_WIN
-	TQSize s = m_tableView->tqsizeHint()
+	TQSize s = m_tableView->sizeHint()
 		+ TQSize(  2 * 5 , m_tableHeader->height() + 2 * 5 );
 #else
-	TQSize s = m_tableView->tqsizeHint();
+	TQSize s = m_tableView->sizeHint();
 	s.setWidth(s.width() + 4);
 	s.setHeight(m_tableHeader->height() + s.height());
 #endif
@@ -140,7 +140,7 @@ void KexiRelationViewTableContainer::setFocus()
 	m_tableView->setPalette(p);*/
 
 	raise();
-	tqrepaint();
+	repaint();
 	emit gotFocus();
 }
 
@@ -166,7 +166,7 @@ void KexiRelationViewTableContainer::unsetFocus()
 	m_tableView->setPalette(p);*/
 	
 	clearFocus();
-	tqrepaint();
+	repaint();
 }
 
 
@@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable()
 {
 }
 
-TQSize KexiRelationViewTable::tqsizeHint() const
+TQSize KexiRelationViewTable::sizeHint() const
 {
 	TQFontMetrics fm(fontMetrics());
 
@@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item)
 	TQListViewItem *i = findItem(item, 0);
 	if (!i)
 		return -1;
-	int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2);
+	int y = itemRect(i).y() + (itemRect(i).height() / 2);
 	if (contentsY() > itemPos(i))
 		y = 0;
 	else if (y == 0)
@@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
 	if (painter) {
-		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(),
+		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
 			TQStyle::Style_FocusAtBorder);
 	}
-	return tqitemRect(item);
+	return itemRect(item);
 }
 
 #include "kexirelationviewtable.moc"
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 5c622dad..6578cdd5 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
 //		KexiDB::TableSchema *table() const { return m_table; };
 		int globalY(const TQString &item);
 //		void setReadOnly(bool);
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	signals:
 		void tableScrolling();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 4b952163..0ff65f38 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -21,7 +21,7 @@
 
 #include "kexirelationwidget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
@@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion);
 	hlyr->addWidget(lbl);
 	hlyr->addWidget(m_tableCombo);
-	m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
+	m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
 	fillTablesCombo();
 
 	m_btnAdd = new KPushButton(i18n("&Add"), this);
@@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable()
 		Kexi::DesignViewMode, openingCancelled);
 }
 
-TQSize KexiRelationWidget::tqsizeHint() const
+TQSize KexiRelationWidget::sizeHint() const
 {
-	return m_relationView->tqsizeHint();
+	return m_relationView->sizeHint();
 }
 
 void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table)
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 39ac549a..6899a434 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 
 //		void openTable(KexiDB::TableSchema* table, bool designMode);
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		/*! Used to add newly created object information to the combo box. */
 		void objectCreated(const TQCString &mime, const TQCString& name);
@@ -76,7 +76,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 	
 	public slots:
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget rtqgeometry will be initialized.
+		 If \a rect is valid, table widget rgeometry will be initialized.
 		 */
 		void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect());
 
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 7ad76c34..2700477a 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -25,8 +25,8 @@
 #include <tqdatastream.h>
 #include <tqfile.h>
 #include <tqpopupmenu.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 #include <tqstatusbar.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqbuffer.h>
 
 #include <kdebug.h>
@@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data)
 	TQPixmap pixmap;
 	if (!pixmap.loadFromData(data))
 		return;
-	tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
+	tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
 }
 
 void KexiBlobTableEdit::handlePasteAction()
 {
 	if (isReadOnly())
 		return;
-	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
 	TQByteArray ba;
 	TQBuffer buffer( ba );
 	buffer.open( IO_WriteOnly );
@@ -559,7 +559,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	s = TQMIN( h-3, s );
 	s = TQMIN( w-3, s );//avoid too large box
 	TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-	p->setPen(TQPen(tqcolorGroup().text(), 1));
+	p->setPen(TQPen(colorGroup().text(), 1));
 	p->drawRect(r);
 	if (val.asBool()) {
 		p->drawLine(r.x(), r.y(), r.right(), r.bottom());
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index 8f199b5d..950d19b7 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -105,7 +105,7 @@ void KexiBoolTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria
 		s = TQMIN( h-3, s );
 		s = TQMIN( w-3, s );//avoid too large box
 		TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-//already set ouotside:		p->setPen(TQPen(tqcolorGroup().text(), 1));
+//already set ouotside:		p->setPen(TQPen(colorGroup().text(), 1));
 		p->drawRect(r);
 		if (val.isNull()) { // && !field()->isNotNull()) {
 			p->drawText( r, TQt::AlignCenter, "?" );
@@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
 	if (actionName=="edit_paste") {
 		emit editRequested();
 		bool ok;
-		const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
+		const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
 		if (ok) {
 			m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1);
 		}
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 89ba63cf..be2f81be 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 #include <tqwindowsstyle.h>
 #include <tqpainter.h>
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 6a2feec8..5e74a20e 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
 
 /*! @internal
@@ -56,8 +56,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 			a.rowHighlightingEnabled = true;
 			a.rowMouseOverHighlightingEnabled = true;
 			a.persistentSelections = false;
-			a.rowMouseOverHighlightingColor = tqcolorGroup().highlight();
-			a.rowMouseOverHighlightingTextColor = tqcolorGroup().highlightedText();
+			a.rowMouseOverHighlightingColor = colorGroup().highlight();
+			a.rowMouseOverHighlightingTextColor = colorGroup().highlightedText();
 			a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor;
 			a.gridEnabled = false;
 			setAppearance(a);
@@ -68,7 +68,7 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 			setContextMenuEnabled( false );
 			setScrollbarToolTipsEnabled( false );
 			installEventFilter(this);
-			setBottomMarginInternal( - horizontalScrollBar()->tqsizeHint().height() );
+			setBottomMarginInternal( - horizontalScrollBar()->sizeHint().height() );
 		}
 		virtual void setData( KexiTableViewData *data, bool owner = true )
 			{ KexiTableView::setData( data, owner ); }
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 3ae97974..24c4c38f 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -18,12 +18,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 #include <tqwindowsstyle.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include "kexicomboboxtableedit.h"
 #include <widget/utils/kexicomboboxdropdownbutton.h>
@@ -80,11 +80,11 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 //	m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 //	m_lineedit->setLineWidth( 1 );
 //	if (f.isNumericType()) {
-//		m_lineedit->tqsetAlignment(AlignRight);
+//		m_lineedit->setAlignment(AlignRight);
 //	}
 //	setView( m_lineedit );
 
-//	tqlayout->addWidget(m_view);
+//	layout->addWidget(m_view);
 //	m_combo->setEditable( true );
 //	m_combo->clear();
 //	m_combo->insertStringList(f.enumHints());
@@ -350,8 +350,8 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e )
 	if (!column()->isReadOnly() && e->type()==TQEvent::MouseButtonPress && m_scrollView) {
 		TQPoint gp = TQT_TQMOUSEEVENT(e)->globalPos() 
 			+ TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button));
-		TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), 
-			d->button->mapToGlobal(d->button->tqgeometry().bottomRight()));
+		TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()), 
+			d->button->mapToGlobal(d->button->geometry().bottomRight()));
 		if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
 			m_mouseBtnPressedWhenPopupVisible = true;
 		}
@@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName)
 			m_lineedit->clear();
 		}
 //! @todo does not work with BLOBs!
-		setValueInInternalEditor( tqApp->tqclipboard()->text() );
+		setValueInInternalEditor( tqApp->clipboard()->text() );
 	}
 	else
 		KexiInputTableEdit::handleAction(actionName);
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 79613d9d..ce0b7695 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -84,7 +84,7 @@ KexiDataAwareObjectInterface::KexiDataAwareObjectInterface()
 	m_scrollBarTip->setPalette(TQToolTip::palette());
 	m_scrollBarTip->setMargin(2);
 	m_scrollBarTip->setIndent(0);
-	m_scrollBarTip->tqsetAlignment(TQt::AlignCenter);
+	m_scrollBarTip->setAlignment(TQt::AlignCenter);
 	m_scrollBarTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 	m_scrollBarTip->setLineWidth(1);
 
@@ -539,8 +539,8 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo
 
 	if ( forceSet || m_curRow != newrow || m_curCol != newcol )
 	{
-		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").tqarg(m_curCol)
-			.tqarg(m_curRow).tqarg(newcol).tqarg(newrow) << endl;
+		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").arg(m_curCol)
+			.arg(m_curRow).arg(newcol).arg(newrow) << endl;
 		
 		// cursor moved: get rid of editor
 		if (m_editor) {
@@ -645,7 +645,7 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo
 			}
 			else {
 				kdDebug(44021) << TQString("NOW item at %1 (%2) is current")
-					.tqarg(m_curRow).tqarg((ulong)itemAt(m_curRow)) << endl;
+					.arg(m_curRow).arg((ulong)itemAt(m_curRow)) << endl;
 	//NOT EFFECTIVE!!!!!!!!!!!
 				//set item iterator
 				if (!newRowInserted && isInsertingEnabled() && m_currentItem == m_insertItem && m_curRow == (rows()-1)) {
@@ -838,7 +838,7 @@ bool KexiDataAwareObjectInterface::cancelRowEdit()
 //			viewport()->width(), d->rowHeight*3 + (m_navPanel ? m_navPanel->height() : 0)*3 );
 //		updateContents(); //js: above did not work well so we do that dirty
 		updateWidgetContents();
-//TODO: still doesn't tqrepaint properly!!
+//TODO: still doesn't repaint properly!!
 //		TQSize s(tableSize());
 //		resizeContents(s.width(), s.height());
 		updateWidgetContentsSize();
@@ -940,7 +940,7 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (!m_errorMessagePopup) {
 //					m_errorMessagePopup->close();
 					m_errorMessagePopup = new KexiArrowTip(
-						i18n("Error: %1").tqarg(m_editor->columnInfo()->field->typeName())+"?", 
+						i18n("Error: %1").arg(m_editor->columnInfo()->field->typeName())+"?", 
 						dynamic_cast<TQWidget*>(this));
 					m_errorMessagePopup->move( 
 						par->mapToGlobal(edit->pos()) + TQPoint(6, edit->height() + 0) );
@@ -954,8 +954,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 			if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) {
 				kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NULL NOT ALLOWED!" << endl;
 				res = Validator::Error;
-//				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//				msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+				msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 					+ "\n\n" + Kexi::msgYouCanImproveData();
 				desc = i18n("The column's constraint is declared as NOT NULL.");
 				editCurrentCellAgain = true;
@@ -976,8 +976,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (m_editor->field()->isNotEmpty() && !autoIncColumnCanBeOmitted) {
 					kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): EMPTY NOT ALLOWED!" << endl;
 					res = Validator::Error;
-//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 						+ "\n\n" + Kexi::msgYouCanImproveData();
 					desc = i18n("The column's constraint is declared as NOT EMPTY.");
 					editCurrentCellAgain = true;
@@ -994,8 +994,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) {
 					kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NEITHER NULL NOR EMPTY VALUE CAN BE SET!" << endl;
 					res = Validator::Error;
-//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 						+ "\n\n" + Kexi::msgYouCanImproveData();
 					desc = i18n("The column's constraint is declared as NOT EMPTY and NOT NULL.");
 					editCurrentCellAgain = true;
@@ -1251,7 +1251,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 		m_curRow++;
 	}
 
-	m_data->insertRow(*newItem, row, true /*tqrepaint*/);
+	m_data->insertRow(*newItem, row, true /*repaint*/);
 
 	if (changeCurrentRow) {
 		//update iter...
@@ -1281,15 +1281,15 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 	*/
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool repaint)
 {
 	int row = m_data->findRef(item);
-	slotRowInserted( item, row, tqrepaint );
+	slotRowInserted( item, row, repaint );
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool tqrepaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool repaint)
 {
-	if (tqrepaint && (int)row<rows()) {
+	if (repaint && (int)row<rows()) {
 		updateWidgetContentsSize();
 
 /* updateAllVisibleRowsBelow() used instead
@@ -1317,7 +1317,7 @@ void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uin
 	}
 }
 
-tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
+tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
 {
 	if (!hasData())
 		return true;
@@ -1331,7 +1331,7 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 			tableName.append("\"");
 		}
 		if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast<TQWidget*>(this),
-				i18n("Do you want to clear the contents of table %1?").tqarg(tableName),
+				i18n("Do you want to clear the contents of table %1?").arg(tableName),
 				0, KGuiItem(i18n("&Clear Contents")) ))
 			return cancelled;
 	}
@@ -1339,10 +1339,10 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 	cancelRowEdit();
 //	acceptRowEdit();
 //	m_verticalHeader->clear();
-	const bool repaintLater = tqrepaint && m_spreadSheetMode;
+	const bool repaintLater = repaint && m_spreadSheetMode;
 	const int oldRows = rows();
 
-	bool res = m_data->deleteAllRows(tqrepaint && !repaintLater);
+	bool res = m_data->deleteAllRows(repaint && !repaintLater);
 
 	if (res) {
 		if (m_spreadSheetMode) {
@@ -1359,21 +1359,21 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 //	m_verticalHeader->setCurrentRow(-1);
 
 //	d->pUpdateTimer->start(1,true);
-//	if (tqrepaint)
-//		viewport()->tqrepaint();
+//	if (repaint)
+//		viewport()->repaint();
 	return res;
 }
 
-void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
+void KexiDataAwareObjectInterface::clearColumns(bool repaint)
 {
 	cancelRowEdit();
 	m_data->clearInternal();
 
-	clearColumnsInternal(tqrepaint);
+	clearColumnsInternal(repaint);
 	updateIndicesForVisibleValues();
 
-	if (tqrepaint)
-//		viewport()->tqrepaint();
+	if (repaint)
+//		viewport()->repaint();
 //OK?
 		updateWidgetContents();
 
@@ -1393,7 +1393,7 @@ void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
 
 	m_verticalHeader->setCurrentRow(-1);
 
-	viewport()->tqrepaint();
+	viewport()->repaint();
 
 //	d->pColumnTypes.resize(0);
 //	d->pColumnModes.resize(0);
@@ -1490,9 +1490,9 @@ void KexiDataAwareObjectInterface::setEmptyRowInsertingEnabled(bool set)
 }
 
 void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item, 
-	KexiDB::ResultInfo* /*result*/, bool tqrepaint)
+	KexiDB::ResultInfo* /*result*/, bool repaint)
 {
-	if (tqrepaint) {
+	if (repaint) {
 		m_rowWillBeDeleted = m_data->findRef(&item);
 	}
 }
@@ -1534,7 +1534,7 @@ bool KexiDataAwareObjectInterface::deleteItem(KexiTableItem *item)/*, bool moveC
 	const bool lastRowDeleted = m_spreadSheetMode && m_data->last() == item; //we need to know this so we
 	                                                                         //can return to the last row 
 	                                                                         //after reinserting it
-	if (!m_data->deleteRow(*item, true /*tqrepaint*/)) {
+	if (!m_data->deleteRow(*item, true /*repaint*/)) {
 		/*const int button =*/ 
 		showErrorMessageForResult( m_data->result() );
 //		if (KMessageBox::No == button) {
@@ -1950,7 +1950,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 		if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char
 			firstCharacter = -1;
 		}
-		else if (where.tqstartsWith(stringValue, caseSensitive)) {
+		else if (where.startsWith(stringValue, caseSensitive)) {
 			if (wholeWordsOnly) {
 				// If where.length() < stringValue.length(), true will be returned too - fine.
 				return !where.at( stringValue.length() ).isLetterOrNumber();
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 389c1c74..0fed82b6 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -267,14 +267,14 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		 Does not clear columns information.
 		 Does not destroy KexiTableViewData object (if present) but only clears its contents.
 		 Displays confirmation dialog if \a ask is true (the default is false).
-		 Repaints widget if \a tqrepaint is true (the default). 
+		 Repaints widget if \a repaint is true (the default). 
 		 For empty tables, true is returned immediately.
 		 If isDeleteEnabled() is false, false is returned.
 		 For spreadsheet mode all current rows are just replaced by empty rows.
 		 \return true on success, false on failure, and cancelled if user cancelled deletion 
 		 (only possible if \a ask is true).
 		 */
-		tristate deleteAllRows(bool ask = false, bool tqrepaint = true);
+		tristate deleteAllRows(bool ask = false, bool repaint = true);
 
 		/*! \return maximum number of rows that can be displayed per one "page" 
 		 for current view's size. */
@@ -537,12 +537,12 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void initDataContents();
 
 		/*! Clears columns information and thus all internal table data 
-		 and its visible representation. Repaints widget if \a tqrepaint is true. */
-		virtual void clearColumns(bool tqrepaint = true);
+		 and its visible representation. Repaints widget if \a repaint is true. */
+		virtual void clearColumns(bool repaint = true);
 
 		/*! Called by clearColumns() to clear internals of the object.
 		 For example, KexiTableView removes contents of it's horizontal header. */
-		virtual void clearColumnsInternal(bool tqrepaint) = 0;
+		virtual void clearColumnsInternal(bool repaint) = 0;
 
 		/*! @internal for implementation
 		 This should append another section within horizontal header or any sort of caption
@@ -654,16 +654,16 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 
 		//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
 		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, 
-			bool tqrepaint);
+			bool repaint);
 
-		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 		virtual void slotRowDeleted();
 
-		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
+		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & ) {}
 
@@ -675,7 +675,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void selectCellInternal() {}
 
 		/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-		 to tqrepaint tow \a row and all visible below. 
+		 to repaint tow \a row and all visible below. 
 		 Implemented if there is more than one row displayed, i.e. currently for KexiTableView. */
 		virtual void updateAllVisibleRowsBelow(int row) { Q_UNUSED( row ); }
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 257cf0aa..3b9fe3af 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const
 	return m_sets.size();
 }
 
-void KexiDataAwarePropertySet::clear(uint tqminimumSize)
+void KexiDataAwarePropertySet::clear(uint minimumSize)
 {
 	m_sets.clear();
-	m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS));
+	m_sets.resize(TQMAX(minimumSize, MAX_FIELDS));
 	m_view->setDirty(true);
 	m_view->propertySetSwitched();
 }
@@ -206,7 +206,7 @@ void KexiDataAwarePropertySet::slotRowsDeleted( const TQValueList<int> &rows )
 }
 
 //void KexiDataAwarePropertySet::slotEmptyRowInserted(KexiTableItem*, uint /*index*/)
-void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*tqrepaint*/)
+void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*repaint*/)
 {
 	m_view->setDirty();
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index e24fbd8a..8db82ba2 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -97,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 	public slots:
 		void removeCurrentPropertySet();
 
-		void clear(uint tqminimumSize = 0);
+		void clear(uint minimumSize = 0);
 
 		/*! Inserts \a set property set at \a row position.
 		 If there was a buffer at this position before, it will be destroyed.
@@ -127,7 +127,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 		void slotRowsDeleted( const TQValueList<int> &rows );
 
 		//! Called on \a row insertion in a tableview.
-		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
 
 		//! Called on selecting another cell in a tableview.
 		void slotCellSelected(int, int row);
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index b68b4787..5a8cf297 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -25,16 +25,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -163,7 +163,7 @@ void
 KexiDateTableEdit::slotDateChanged(TQDate date)
 {
 	m_edit->setDate(date);
-	tqrepaint();
+	repaint();
 }
 
 void
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index 35c599cc..7d33b354 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -25,16 +25,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 1b834fe9..d057f517 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -22,11 +22,11 @@
 
 #include <tqregexp.h>
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtooltip.h>
 
 #include <kglobal.h>
@@ -47,7 +47,7 @@ class MyLineEdit : public KLineEdit
 		{}
 	protected:
 		virtual void drawFrame ( TQPainter * p ) {
-			p->setPen( TQPen( tqcolorGroup().text() ) );
+			p->setPen( TQPen( colorGroup().text() ) );
 			TQRect r = rect();
 			p->moveTo( r.topLeft() );
 			p->lineTo( r.topRight() );
@@ -100,7 +100,7 @@ void KexiInputTableEdit::init()
 	m_lineedit = new MyLineEdit(this, "KexiInputTableEdit-KLineEdit");
 	setViewWidget(m_lineedit);
 	if (align_right)
-		m_lineedit->tqsetAlignment(AlignRight);
+		m_lineedit->setAlignment(AlignRight);
 //	m_cview->setFrame(false);
 //	m_cview->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 //	m_cview->setLineWidth( 1 );
@@ -222,7 +222,7 @@ TQString KexiInputTableEdit::valueToText(KexiDB::Field* field, const TQVariant&
 void KexiInputTableEdit::paintEvent ( TQPaintEvent * /*e*/ )
 {
 	TQPainter p(this);
-	p.setPen( TQPen( tqcolorGroup().text() ) );
+	p.setPen( TQPen( colorGroup().text() ) );
 	p.drawRect( rect() );
 }
 
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index e531b814..68991f49 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -23,7 +23,7 @@
 #include <kexidb/field.h>
 #include <kexidb/utils.h>
 
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpainter.h>
 
 #include <kglobal.h>
@@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h)
 {
 	TQWidget::resize(w, h);
 	if (m_view) {
-		if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic
+		if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic
 			m_view->move(0,0);
 			m_view->resize(w, h);
 		}
diff --git a/kexi/widget/tableview/kexitableitem.cpp b/kexi/widget/tableview/kexitableitem.cpp
index 659e341e..d398dabb 100644
--- a/kexi/widget/tableview/kexitableitem.cpp
+++ b/kexi/widget/tableview/kexitableitem.cpp
@@ -55,7 +55,7 @@ KexiTableItem::clearValues()
 void
 KexiTableItem::debug() const
 {
-	TQString s = TQString("KexiTableItem (%1 items)").tqarg(size());
+	TQString s = TQString("KexiTableItem (%1 items)").arg(size());
 	for (uint i = 0; i < size(); i++)
 		s.append( TQString::number(i)+":"+at(i).toString()+" " );
 	kexidbg << s << endl;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 4ed993cd..eeb4e378 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -33,7 +33,7 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 #include <tqstyle.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
@@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis
 			const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0;
 			//const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0;
 			//const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0;
-			if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) {
+			if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) {
 				return i18n("Contains a pointer to the currently selected row");
 			}
-			else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) {
+			else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) {
 				return i18n("Row navigator");
 //				return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin ));
 			}
@@ -204,8 +204,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	setBackgroundMode(TQt::PaletteBackground);
 //	setEmptyAreaColor(d->appearance.baseColor);//palette().active().color(TQColorGroup::Base));
 
-//	d->baseColor = tqcolorGroup().base();
-//	d->textColor = tqcolorGroup().text();
+//	d->baseColor = colorGroup().base();
+//	d->textColor = colorGroup().text();
 
 //	d->altColor = KGlobalSettings::alternateBackgroundColor();
 //	d->grayColor = TQColor(200,200,200);
@@ -240,21 +240,21 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 	// Create headers
 	m_horizontalHeader = new KexiTableViewHeader(this, "topHeader");
-	m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+	m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 	m_horizontalHeader->setOrientation(Qt::Horizontal);
 	m_horizontalHeader->setTracking(false);
 	m_horizontalHeader->setMovingEnabled(false);
 	connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int)));
 
 	m_verticalHeader = new KexiRecordMarker(this, "rm");
-	m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+	m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 	m_verticalHeader->setCellHeight(d->rowHeight);
 //	m_verticalHeader->setFixedWidth(d->rowHeight);
 	m_verticalHeader->setCurrentRow(-1);
 
 	setMargins(
-		TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
-		m_horizontalHeader->tqsizeHint().height(), 0, 0);
+		TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+		m_horizontalHeader->sizeHint().height(), 0, 0);
 
 	setupNavigator();
 
@@ -288,7 +288,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	
 //	horizontalScrollBar()->show();
 	updateScrollBars();
-//	resize(tqsizeHint());
+//	resize(sizeHint());
 //	updateContents();
 //	setMinimumHeight(horizontalScrollBar()->height() + d->rowHeight + topMargin());
 
@@ -333,7 +333,7 @@ void KexiTableView::setupNavigator()
 	
 	m_navPanel = new KexiRecordNavigator(this, leftMargin(), "navPanel");
 	m_navPanel->setRecordHandler(this);
-	m_navPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+	m_navPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 }
 
 void KexiTableView::initDataContents()
@@ -366,7 +366,7 @@ void KexiTableView::updateWidgetContentsSize()
 
 void KexiTableView::slotRowsDeleted( const TQValueList<int> &rows )
 {
-	viewport()->tqrepaint();
+	viewport()->repaint();
 	updateWidgetContentsSize();
 	setCursorPosition(TQMAX(0, (int)m_curRow - (int)rows.count()), -1, true);
 }
@@ -384,7 +384,7 @@ void KexiTableView::setFont( const TQFont &font )
 	updateFonts(true);
 }
 
-void KexiTableView::updateFonts(bool tqrepaint)
+void KexiTableView::updateFonts(bool repaint)
 {
 #ifdef TQ_WS_WIN
 	d->rowHeight = fontMetrics().lineSpacing() + 4;
@@ -399,15 +399,15 @@ void KexiTableView::updateFonts(bool tqrepaint)
 //	if(d->rowHeight < 22)
 //		d->rowHeight = 22;
 	setMargins(
-		TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
-		m_horizontalHeader->tqsizeHint().height(), 0, 0);
+		TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+		m_horizontalHeader->sizeHint().height(), 0, 0);
 //	setMargins(14, d->rowHeight, 0, 0);
 	m_verticalHeader->setCellHeight(d->rowHeight);
 
 	KexiDisplayUtils::initDisplayForAutonumberSign(d->autonumberSignDisplayParameters, this);
 	KexiDisplayUtils::initDisplayForDefaultValue(d->defaultValueDisplayParameters, this);
 
-	if (tqrepaint)
+	if (repaint)
 		updateContents();
 }
 
@@ -425,7 +425,7 @@ void KexiTableView::updateAllVisibleRowsBelow(int row)
 		clipper()->width(), clipper()->height() - (rowPos(row) - contentsY()) );
 }
 
-void KexiTableView::clearColumnsInternal(bool /*tqrepaint*/)
+void KexiTableView::clearColumnsInternal(bool /*repaint*/)
 {
 	while(m_horizontalHeader->count()>0)
 		m_horizontalHeader->removeLabel(0);
@@ -494,29 +494,29 @@ TQSizePolicy KexiTableView::sizePolicy() const
 	return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 }
 
-TQSize KexiTableView::tqsizeHint() const
+TQSize KexiTableView::sizeHint() const
 {
 	const TQSize &ts = tableSize();
-	int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->tqsizeHint().width() + 2*2, 
+	int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->sizeHint().width() + 2*2, 
 		(m_navPanel->isVisible() ? m_navPanel->width() : 0) );
-	int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), 
-		tqminimumSizeHint().height() );
+	int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), 
+		minimumSizeHint().height() );
 	w = TQMIN( w, tqApp->desktop()->width()*3/4 ); //stretch
 	h = TQMIN( h, tqApp->desktop()->height()*3/4 ); //stretch
 
-//	kexidbg << "KexiTableView::tqsizeHint()= " <<w <<", " <<h << endl;
+//	kexidbg << "KexiTableView::sizeHint()= " <<w <<", " <<h << endl;
 
 	return TQSize(w, h);
 		/*TQSize(
 		TQMAX( ts.width() + leftMargin() + 2*2, (m_navPanel ? m_navPanel->width() : 0) ),
 		//+ TQMIN(m_verticalHeader->width(),d->rowHeight) + margin()*2,
-		TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), 
-			tqminimumSizeHint().height() )
+		TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), 
+			minimumSizeHint().height() )
 	);*/
-//		TQMAX(ts.height() + topMargin(), tqminimumSizeHint().height()) );
+//		TQMAX(ts.height() + topMargin(), minimumSizeHint().height()) );
 }
 
-TQSize KexiTableView::tqminimumSizeHint() const
+TQSize KexiTableView::minimumSizeHint() const
 {
 	return TQSize(
 		leftMargin() + ((columns()>0)?columnWidth(0):KEXI_DEFAULT_DATA_COLUMN_WIDTH) + 2*2, 
@@ -614,7 +614,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 	bool paintOnlyInsertRow = false;
 
 /*	kdDebug(44021) << TQString(" KexiTableView::drawContents(cx:%1 cy:%2 cw:%3 ch:%4)")
-			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;*/
+			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;*/
 
 	if (rowlast == -1) {
 		rowlast = rows() - 1;
@@ -658,7 +658,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 	if(d->pBufferPm->isNull())
 		return;
 	TQPainter *pb = new TQPainter(d->pBufferPm, this);
-//	pb->fillRect(0, 0, cw, ch, tqcolorGroup().base());
+//	pb->fillRect(0, 0, cw, ch, colorGroup().base());
 
 //	int maxwc = TQMIN(cw, (columnPos(d->numCols - 1) + columnWidth(d->numCols - 1)));
 	int maxwc = columnPos(columns() - 1) + columnWidth(columns() - 1);
@@ -812,7 +812,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 		&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
 		&& usesSelectedTextColor)
 	{
-		defaultPen = TQPen(tqcolorGroup().highlightedText()); //selected text
+		defaultPen = TQPen(colorGroup().highlightedText()); //selected text
 	}
 	else if (d->appearance.rowHighlightingEnabled && row == m_curRow 
 		&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
@@ -849,7 +849,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 	if (m_currentItem == item && (col == m_curCol || d->appearance.fullRowSelection)) {
 		if (edit && ((d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection) || (row == m_curRow && d->highlightedRow==-1 && d->appearance.fullRowSelection))) //!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted)
 			edit->paintSelectionBackground( p, isEnabled(), txt, align, x, y_offset, w, h,
-				isEnabled() ? tqcolorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
+				isEnabled() ? colorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
 				p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection );
 	}
 
@@ -931,9 +931,9 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 //	ts.setWidth( TQMIN( ts.width(), visibleWidth() ) );
 //	ts.setHeight( TQMIN( ts.height() - (m_navPanel ? m_navPanel->height() : 0), visibleHeight()) );
 /*	kdDebug(44021) << TQString(" (cx:%1 cy:%2 cw:%3 ch:%4)")
-			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;
+			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;
 	kdDebug(44021) << TQString(" (w:%3 h:%4)")
-			.tqarg(ts.width()).tqarg(ts.height()) << endl;*/
+			.arg(ts.width()).arg(ts.height()) << endl;*/
 	
 	// Region of the rect we should draw, calculated in viewport
 	// coordinates, as a region can't handle bigger coordinates
@@ -945,26 +945,26 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 	// Subtract the table from it
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts-TQSize(0,m_navPanel->isVisible() ? m_navPanel->height() : 0) ) );
 	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts
-		-TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->tqsizeHint().height())
-			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
+		-TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->sizeHint().height())
+			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
 			+ (horizontalScrollBar()->isVisible() ? 0 : 
 				d->internal_bottomMargin
-//	horizontalScrollBar()->tqsizeHint().height()/2
+//	horizontalScrollBar()->sizeHint().height()/2
 		)
-//- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
+//- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
 			+ contentsY()
-//			- (verticalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
+//			- (verticalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
 			)
 		) );
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) );
 
 	// And draw the rectangles (transformed inc contents coordinates as needed)
-	TQMemArray<TQRect> r = reg.tqrects();
+	TQMemArray<TQRect> r = reg.rects();
 	for ( int i = 0; i < (int)r.count(); i++ ) {
 		TQRect rect( viewportToContents2(r[i].topLeft()), r[i].size() );
 /*		kdDebug(44021) << TQString("- pEA: p->fillRect(x:%1 y:%2 w:%3 h:%4)")
-			.tqarg(rect.x()).tqarg(rect.y())
-			.tqarg(rect.width()).tqarg(rect.height()) << endl;*/
+			.arg(rect.x()).arg(rect.y())
+			.arg(rect.width()).arg(rect.height()) << endl;*/
 //		p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), d->emptyAreaColor );
 		p->fillRect( rect, d->appearance.emptyAreaColor );
 //		p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), viewport()->backgroundBrush() );
@@ -1261,7 +1261,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 
 	const int k = e->key();
 	const bool ro = isReadOnly();
-	TQWidget *w = tqfocusWidget();
+	TQWidget *w = focusWidget();
 //	if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) {
 //	if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) {
 	if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) {
@@ -1425,7 +1425,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 			else {
 				kexidbg << "KexiTableView::KeyPressEvent(): default" << endl;
 				if (e->text().isEmpty() || !e->text().isEmpty() && !e->text()[0].isPrint() ) {
-					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").tqarg(k,0,16) <<endl;
+					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").arg(k,0,16) <<endl;
 	//				e->ignore();
 					TQScrollView::keyPressEvent(e);
 					return;
@@ -1450,7 +1450,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 
 	m_vScrollBarValueChanged_enabled=false;
 
-	// if focus cell changes, tqrepaint
+	// if focus cell changes, repaint
 	setCursorPosition(curRow, curCol);
 
 	m_vScrollBarValueChanged_enabled=true;
@@ -1630,29 +1630,29 @@ void KexiTableView::resizeEvent(TQResizeEvent *e)
 		slotUpdate();
 		triggerUpdate();
 	}
-//	d->pTopHeader->tqrepaint();
+//	d->pTopHeader->repaint();
 
 
 /*		m_navPanel->setGeometry(
 			frameWidth(),
 			viewport()->height() +d->pTopHeader->height() 
-			-(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
+			-(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
 			+frameWidth(),
-			m_navPanel->tqsizeHint().width(), // - verticalScrollBar()->tqsizeHint().width() - horizontalScrollBar()->tqsizeHint().width(),
-			horizontalScrollBar()->tqsizeHint().height()
+			m_navPanel->sizeHint().width(), // - verticalScrollBar()->sizeHint().width() - horizontalScrollBar()->sizeHint().width(),
+			horizontalScrollBar()->sizeHint().height()
 		);*/
 //		updateContents();
 //		m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(),
 	//		m_navPanel->width(), horizontalScrollBar()->height());
 //	updateContents(0,0,2000,2000);//js
-//	erase(); tqrepaint();
+//	erase(); repaint();
 }
 
 void KexiTableView::viewportResizeEvent( TQResizeEvent *e )
 {
 	TQScrollView::viewportResizeEvent( e );
 	updateGeometries();
-//	erase(); tqrepaint();
+//	erase(); repaint();
 }
 
 void KexiTableView::showEvent(TQShowEvent *e)
@@ -1818,7 +1818,7 @@ void KexiTableView::slotColumnWidthChanged( int, int, int )
 	else {
 	//	updateContents( columnPos(col), 0, contentsWidth(), contentsHeight() );
 		updateContents(contentsX(), 0, viewport()->width(), contentsHeight());
-	//	viewport()->tqrepaint();
+	//	viewport()->repaint();
 	}
 
 //	updateContents(0, 0, d->pBufferPm->width(), d->pBufferPm->height());
@@ -1923,42 +1923,42 @@ TQSize KexiTableView::tableSize() const
 	if ((rows()+ (isInsertingEnabled()?1:0) ) > 0 && columns() > 0) {
 /*		kexidbg << "tableSize()= " << columnPos( columns() - 1 ) + columnWidth( columns() - 1 ) 
 			<< ", " << rowPos( rows()-1+(isInsertingEnabled()?1:0)) + d->rowHeight
-//			+ TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->tqsizeHint().height())
-			+ (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
+//			+ TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->sizeHint().height())
+			+ (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
 			+ margin() << endl;
 */
 //		kexidbg<< m_navPanel->isVisible() <<" "<<m_navPanel->height()<<" "
-//		<<horizontalScrollBar()->tqsizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
+//		<<horizontalScrollBar()->sizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
 
-		//int xx = horizontalScrollBar()->tqsizeHint().height()/2;
+		//int xx = horizontalScrollBar()->sizeHint().height()/2;
 
 		TQSize s( 
 			columnPos( columns() - 1 ) + columnWidth( columns() - 1 ),
-//			+ verticalScrollBar()->tqsizeHint().width(),
+//			+ verticalScrollBar()->sizeHint().width(),
 			rowPos( rows()-1+(isInsertingEnabled()?1:0) ) + d->rowHeight
-			+ (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
+			+ (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
 			+ d->internal_bottomMargin
-//				horizontalScrollBar()->tqsizeHint().height()/2
-//			- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
+//				horizontalScrollBar()->sizeHint().height()/2
+//			- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
 
 //			+ ( (m_navPanel && m_navPanel->isVisible() && verticalScrollBar()->isVisible()
 	//			&& !horizontalScrollBar()->isVisible()) 
-		//		? horizontalScrollBar()->tqsizeHint().height() : 0)
+		//		? horizontalScrollBar()->sizeHint().height() : 0)
 
 //			+ TQMAX( (m_navPanel && m_navPanel->isVisible()) ? m_navPanel->height() : 0, 
-//				horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() : 0)
+//				horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() : 0)
 
 //			+ (m_navPanel->isVisible() 
-//				? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
+//				? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
 
-//			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() :0 )
+//			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() :0 )
 			+ margin() 
 //-2*d->rowHeight
 		);
 
 //		kexidbg << rows()-1 <<" "<< (isInsertingEnabled()?1:0) <<" "<< (m_rowEditing?1:0) << " " <<  s << endl;
 		return s;
-//			+horizontalScrollBar()->tqsizeHint().height() + margin() );
+//			+horizontalScrollBar()->sizeHint().height() + margin() );
 	}
 	return TQSize(0,0);
 }
@@ -2271,13 +2271,13 @@ void KexiTableView::setVerticalHeaderVisible(bool set)
 	int left_width;
 	if (set) {
 		m_verticalHeader->show();
-		left_width = TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight);
+		left_width = TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight);
 	}
 	else {
 		m_verticalHeader->hide();
 		left_width = 0;
 	}
-	setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->tqsizeHint().height() : 0, 0, 0);
+	setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->sizeHint().height() : 0, 0, 0);
 }
 
 bool KexiTableView::horizontalHeaderVisible() const
@@ -2291,7 +2291,7 @@ void KexiTableView::setHorizontalHeaderVisible(bool set)
 	d->horizontalHeaderVisible = set; //needed because isVisible() is not always accurate
 	if (set) {
 		m_horizontalHeader->show();
-		top_height = m_horizontalHeader->tqsizeHint().height();
+		top_height = m_horizontalHeader->sizeHint().height();
 	}
 	else {
 		m_horizontalHeader->hide();
@@ -2478,10 +2478,10 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
 	}
 /*	else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
 		//hp==true if currently focused widget is a child of this table view
-		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
+		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
 		if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
 			//accept row editing if focus is moved to foreign widget 
-			//(not a child, like eg. editor) from one of our table view's tqchildren
+			//(not a child, like eg. editor) from one of our table view's children
 			//or from table view itself
 			if (!acceptRowEdit()) {
 				static_cast<TQWidget*>(o)->setFocus();
@@ -2508,9 +2508,9 @@ void KexiTableView::paletteChange( const TQPalette &oldPalette )
 	Q_UNUSED(oldPalette);
 	//update:
 	if (m_verticalHeader)
-		m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+		m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 	if (m_horizontalHeader)
-		m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
+		m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() );
 }
 
 const KexiTableView::Appearance& KexiTableView::appearance() const
@@ -2531,8 +2531,8 @@ void KexiTableView::setAppearance(const Appearance& a)
 		m_verticalHeader->setCellHeight(d->rowHeight);
 	if (m_horizontalHeader) {
 		setMargins(
-			TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
-			m_horizontalHeader->tqsizeHint().height(), 0, 0);
+			TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+			m_horizontalHeader->sizeHint().height(), 0, 0);
 	}
 //	}
 	if (a.rowHighlightingEnabled)
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 9cfcf47e..b602168a 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -223,8 +223,8 @@ public:
 
 	// reimplemented for internal reasons
 	virtual TQSizePolicy sizePolicy() const;
-	virtual TQSize tqsizeHint() const;
-	virtual TQSize tqminimumSizeHint() const;
+	virtual TQSize sizeHint() const;
+	virtual TQSize minimumSizeHint() const;
 
 	/*! Reimplemented to update cached fonts and row sizes for the painter. */
 	void setFont(const TQFont &f);
@@ -263,7 +263,7 @@ public slots:
 	virtual void setData( KexiTableViewData *data, bool owner = true )
 		{ KexiDataAwareObjectInterface::setData( data, owner ); }
 
-	virtual void clearColumnsInternal(bool tqrepaint);
+	virtual void clearColumnsInternal(bool repaint);
 
 	/*! Adjusts \a colNum column's width to its (current) contents. 
 	 If \a colNum == -1, all columns' width is adjusted. */
@@ -432,19 +432,19 @@ protected slots:
 	virtual void slotRowRepaintRequested(KexiTableItem& item);
 
 	//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
-	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
+	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
+	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
 
-	//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+	//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 	virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-	//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-	virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, tqrepaint); }
+	//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+	virtual void slotRowInserted(KexiTableItem *item, bool repaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, repaint); }
 
 	//! Like above, not db-aware version
-	virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, tqrepaint); }
+	virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, repaint); }
 
 	/*! Handles verticalScrollBar()'s valueChanged(int) signal. 
 	 Called when vscrollbar's value has been changed. */
@@ -504,7 +504,7 @@ protected:
 	 *value is set to the default value. */
 	bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0);
 
-	//! painting and tqlayout
+	//! painting and layout
 	void drawContents(TQPainter *p, int cx, int cy, int cw, int ch);
 	void createBuffer(int width, int height);
 	void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false);
@@ -588,7 +588,7 @@ protected:
 	virtual void removeEditor();
 
 	//! Internal: updated sched fonts for painting.
-	void updateFonts(bool tqrepaint = false);
+	void updateFonts(bool repaint = false);
 
 	/*! @internal Changes bottom margin settings, in pixels. 
 	 At this time, it's used by KexiComboBoxPopup to decrease margin for popup's table. */
@@ -614,7 +614,7 @@ protected:
 	virtual void paste();
 
 	/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-	 to tqrepaint tow \a row and all visible below. */
+	 to repaint tow \a row and all visible below. */
 	virtual void updateAllVisibleRowsBelow(int row);
 
 	void updateAfterCancelRowEdit();
@@ -626,7 +626,7 @@ protected:
 	bool getVisibleLookupValue(TQVariant& cellValue, KexiTableEdit *edit, 
 		KexiTableItem *item, KexiTableViewColumn *tvcol) const;
 
-//	//! Called to tqrepaint contents after a row is deleted.
+//	//! Called to repaint contents after a row is deleted.
 //	void repaintAfterDelete();
 
 	KexiTableViewPrivate *d;
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index d5e1641a..983378cb 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -48,7 +48,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
 //moved	scrollBarTipTimerCnt = 0;
 //moved	scrollBarTip = 0;
 	ensureCellVisibleOnShow = TQPoint(-1,-1);
-	internal_bottomMargin = tv->horizontalScrollBar()->tqsizeHint().height()/2;
+	internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height()/2;
 	highlightedRow = -1;
 	moveCursorOnMouseRelease = false;
 	horizontalHeaderVisible = true;
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 5905706b..a4e45daf 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 	const TQString &as = m_leftTmp.toString();
 	const TQString &bs = m_rightTmp.toString();
 
-	const TQChar *a = as.tqunicode();
-	const TQChar *b = bs.tqunicode();
+	const TQChar *a = as.unicode();
+	const TQChar *b = bs.unicode();
 
 	if ( a == b )
 		return 0;
@@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 
 	int l=TQMIN(as.length(),bs.length());
 
-	au = a->tqunicode();
-	bu = b->tqunicode();
+	au = a->unicode();
+	bu = b->unicode();
 	au = (au <= 0x17e ? charTable[au] : 0xffff);
 	bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 
 	while (l-- && au == bu)
 	{
 		a++,b++;
-		au = a->tqunicode();
-		bu = b->tqunicode();
+		au = a->unicode();
+		bu = b->unicode();
 		au = (au <= 0x17e ? charTable[au] : 0xffff);
 		bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 	}
@@ -635,7 +635,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item,
 	}
 
 //! @todo if there're multiple views for this data, we need multiple buffers!
-bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint)
+bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
 {
 	if (!m_pRowEditBuffer)
 		return true; //nothing to do
@@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint
 			if (val->isNull() && !f->isAutoIncrement()) {
 				//NOT NULL violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT NULL.");
 				m_result.column = col;
 				return false;
@@ -666,7 +666,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint
 			if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) {
 				//NOT EMPTY violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT EMPTY.");
 				m_result.column = col;
 				return false;
@@ -721,12 +721,12 @@ js: TODO: use KexiMainWindowImpl::showErrorMessage(const TQString &title, KexiDB
 	
 	m_pRowEditBuffer->clear();
 
-	if (tqrepaint)
+	if (repaint)
 		emit rowRepaintRequested(item);
 	return true;
 }
 
-bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
 {
 	kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl;
 	m_result.clear();
@@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
 	if (!m_result.success)
 		return false;
 
-	if (saveRow(item, false /*update*/, tqrepaint)) {
+	if (saveRow(item, false /*update*/, repaint)) {
 		emit rowUpdated(&item);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint)
 {
 	kdDebug() << "KexiTableViewData::saveNewRow()..." << endl;
 	m_result.clear();
-	emit aboutToInsertRow(&item, &m_result, tqrepaint);
+	emit aboutToInsertRow(&item, &m_result, repaint);
 	if (!m_result.success)
 		return false;
 	
-	if (saveRow(item, true /*insert*/, tqrepaint)) {
-		emit rowInserted(&item, tqrepaint);
+	if (saveRow(item, true /*insert*/, repaint)) {
+		emit rowInserted(&item, repaint);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
 {
 	m_result.clear();
-	emit aboutToDeleteRow(item, &m_result, tqrepaint);
+	emit aboutToDeleteRow(item, &m_result, repaint);
 	if (!m_result.success)
 		return false;
 
@@ -784,9 +784,9 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
 	return true;
 }
 
-void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint )
+void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool repaint )
 {
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 
 	if (rowsToDelete.isEmpty())
 		return;
@@ -804,11 +804,11 @@ void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool t
 	emit rowsDeleted( rowsToDelete );
 }
 
-void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint)
+void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint)
 {
 	if (!insert( index = TQMIN(index, count()), &item ))
 		return;
-	emit rowInserted(&item, index, tqrepaint);
+	emit rowInserted(&item, index, repaint);
 }
 
 void KexiTableViewData::clearInternal()
@@ -822,12 +822,12 @@ void KexiTableViewData::clearInternal()
 		removeLast();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if (i % 1000 == 0)
-			tqApp->tqprocessEvents( 1 );
+			tqApp->processEvents( 1 );
 #endif
 	}
 }
 
-bool KexiTableViewData::deleteAllRows(bool tqrepaint)
+bool KexiTableViewData::deleteAllRows(bool repaint)
 {
 	clearInternal();
 
@@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool tqrepaint)
 		res = m_cursor->deleteAllRows();
 	}
 
-	if (tqrepaint)
+	if (repaint)
 		emit reloadRequested();
 	return res;
 }
@@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows()
 		m_cursor->moveNext();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if ((i % 1000) == 0)
-			tqApp->tqprocessEvents( 1 );
+			tqApp->processEvents( 1 );
 #endif
 	}
 }
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index 7263f3fe..eb3d20df 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -359,27 +359,27 @@ public:
 	/*! \return last operation's result information (always not null). */
 	inline KexiDB::ResultInfo* result() { return &m_result; }
 
-	bool saveRowChanges(KexiTableItem& item, bool tqrepaint = false);
+	bool saveRowChanges(KexiTableItem& item, bool repaint = false);
 
-	bool saveNewRow(KexiTableItem& item, bool tqrepaint = false);
+	bool saveNewRow(KexiTableItem& item, bool repaint = false);
 
-	bool deleteRow(KexiTableItem& item, bool tqrepaint = false);
+	bool deleteRow(KexiTableItem& item, bool repaint = false);
 
 	/*! Deletes rows (by number) passed with \a rowsToDelete. 
 	 Currently, this method is only for non data-aware tables. */
-	void deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint = false );
+	void deleteRows( const TQValueList<int> &rowsToDelete, bool repaint = false );
 
 	/*! Deletes all rows. Works either for db-aware and non db-aware tables.
 	 Column's definition is not changed.
 	 For db-aware version, all rows are removed from a database.
 	 Row-edit buffer is cleared.
 
-	 If \a tqrepaint is true, reloadRequested() signal 
+	 If \a repaint is true, reloadRequested() signal 
 	 is emitted after deleting (if at least one row was deleted), 
-	 so presenters can tqrepaint their contents. 
+	 so presenters can repaint their contents. 
 
 	 \return true on success. */
-	virtual bool deleteAllRows(bool tqrepaint = false);
+	virtual bool deleteAllRows(bool repaint = false);
 
 	/*! @internal method, used mostly by specialized classes like KexiTableView.
 	 Clears internal row structures. Row-edit buffer is cleared. 
@@ -390,7 +390,7 @@ public:
 	/*! Inserts new \a item at index \a index. 
 	 \a item will be owned by this data object.
 	 Note: Reasonable only for not not-db-aware version. */
-	void insertRow(KexiTableItem& item, uint index, bool tqrepaint = false);
+	void insertRow(KexiTableItem& item, uint index, bool repaint = false);
 
 /*TODO: add this as well? 
 	void insertRow(KexiTableItem& item, KexiTableItem& aboveItem); */
@@ -445,7 +445,7 @@ signals:
 	/*! Emited before inserting of a new, current row.
 	 Connect this signal to your slot and set \a result->success to false 
 	 to disallow this inserting. You can also change columns in \a item row. */
-	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool tqrepaint);
+	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool repaint);
 
 	/*! Emited before changing of an edited, current row.
 	 Connect this signal to your slot and set \a result->success to false 
@@ -455,15 +455,15 @@ signals:
 
 	void rowUpdated(KexiTableItem*); //!< Current row has been updated
 
-	void rowInserted(KexiTableItem*, bool tqrepaint); //!< A row has been inserted
+	void rowInserted(KexiTableItem*, bool repaint); //!< A row has been inserted
 
 	//! A row has been inserted at \a index position (not db-aware data only)
-	void rowInserted(KexiTableItem*, uint index, bool tqrepaint);
+	void rowInserted(KexiTableItem*, uint index, bool repaint);
 
 	/*! Emited before deleting of a current row.
 	 Connect this signal to your slot and set \a result->success to false 
 	 to disallow this deleting. */
-	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
+	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
 
 	//! Current row has been deleted
 	void rowDeleted(); 
@@ -497,7 +497,7 @@ protected:
 	int cmpBLOB(Item item1, Item item2);
 
 	//! internal: for saveRowChanges() and saveNewRow()
-	bool saveRow(KexiTableItem& item, bool insert, bool tqrepaint);
+	bool saveRow(KexiTableItem& item, bool insert, bool repaint);
 
 	//! (logical) sorted column number, set by setSorting()
 	//! can differ from m_realSortedColumn if there's lookup column used
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 4a00be38..ef4c83da 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
 		 : KexiUtils::StyleProxy(parentStyle)
 		{
-			setBackgroundColor( widget->tqpalette().active().background() );
+			setBackgroundColor( widget->palette().active().background() );
 		}
 		~KexiTableViewHeaderStyle() {}
 
@@ -61,7 +61,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) 
 	: TQHeader(parent, name)
 	, m_lastToolTipSection(-1)
-	, m_selectionBackgroundColor(tqApp->tqpalette().active().highlight())
+	, m_selectionBackgroundColor(tqApp->palette().active().highlight())
 	, m_selectedSection(-1)
 	, m_styleChangeEnabled(true)
 {
@@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e)
 			TQString tip = m_toolTips[ section ];
 			if (tip.isEmpty()) { //try label
 				TQFontMetrics fm(font());
-				int minWidth = fm.width( label( section ) ) + tqstyle().tqpixelMetric( TQStyle::PM_HeaderMargin );
+				int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
 				TQIconSet *iset = iconSet( section );
 				if (iset)
 					minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
@@ -188,14 +188,14 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect &
 	if (paintSelection) {
 		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
 			KexiUtils::blendedColors( 
-				tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) );
+				palette().active().background(), m_selectionBackgroundColor, 2, 1) );
 	}
 
 	TQHeader::paintSection( p, index, fr );
 
 	if (paintSelection) { //revert the color for subsequent paints
 		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
-			tqpalette().active().background());
+			palette().active().background());
 	}
 }
 
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index 8110716b..6035aed5 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -23,16 +23,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index fa5c35ab..6279aa04 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete )
 
 void KexiArrowTip::drawContents(TQPainter& p)
 {
-	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+	p.setPen( TQPen(palette().active().foreground(), 1) );
 	p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight), 
 		TQt::AlignCenter, m_value.toString());
 }
 
 void KexiArrowTip::drawFrame(TQPainter& p)
 {
-	TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+	TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
 	p.setPen( pen );
 	/*
 	   /\
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 777fea1b..60f99f85 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -53,18 +53,18 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 
 	TQRect r = rect();
 	r.setHeight(r.height()+m_fixForHeight);
-	if (m_tqdrawComplexControl) {
+	if (m_drawComplexControl) {
 		if (m_fixForHeight>0 && m_paintedCombo->size()!=size()) {
 			m_paintedCombo->move(0,0);
 			m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size
 		}
-		tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, p,
-			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, tqcolorGroup(),
+		tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p,
+			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(),
 			flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None );
 	}
 	else {
 		r.setWidth(r.width()+2);
-		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, tqcolorGroup(), flags);
+		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
 	}
 }
 
@@ -77,7 +77,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
 	else
 		m_fixForHeight = 0;
 	//</hack>
-	m_tqdrawComplexControl =
+	m_drawComplexControl =
 		(tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0)
 		|| qstricmp(tqstyle().name(),"platinum")==0;
 	if (m_fixForHeight==0)
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h
index f480de74..94c26484 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.h
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h
@@ -41,7 +41,7 @@ class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton
 		virtual void styleChange( TQStyle & oldStyle );
 
 		int m_fixForHeight;
-		bool m_tqdrawComplexControl : 1;
+		bool m_drawComplexControl : 1;
 		KComboBox *m_paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle 
 		                           //!< (because styles use \<static_cast\>)
 };
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index 3c6b22f0..aeeec86d 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -96,7 +96,7 @@ KexiImageContextMenu::~KexiImageContextMenu()
 
 void KexiImageContextMenu::insertFromFile()
 {
-//	TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
+//	TQWidget *focusWidget = tqApp->focusWidget();
 #ifdef TQ_WS_WIN
 	TQString recentDir;
 	TQString fileName = TQFileDialog::getOpenFileName(
@@ -116,8 +116,8 @@ void KexiImageContextMenu::insertFromFile()
 	if (!url.isValid()) {
 		//focus the app again because to avoid annoying the user with unfocused main window
 		if (tqApp->mainWidget()) {
-			//tqfocusWidget->raise();
-			//tqfocusWidget->setFocus();
+			//focusWidget->raise();
+			//focusWidget->setFocus();
 			tqApp->mainWidget()->raise();
 		}
 		return;
@@ -133,8 +133,8 @@ void KexiImageContextMenu::insertFromFile()
 
 	emit insertFromFileRequested(url);
 	if (tqApp->mainWidget()) {
-//		tqfocusWidget->raise();
-//		tqfocusWidget->setFocus();
+//		focusWidget->raise();
+//		focusWidget->setFocus();
 		tqApp->mainWidget()->raise();
 	}
 }
@@ -187,7 +187,7 @@ void KexiImageContextMenu::saveAs()
 	if (f.exists() && KMessageBox::Yes != KMessageBox::warningYesNo(this, 
 		"<qt>"+i18n("File \"%1\" already exists."
 		"<p>Do you want to replace it with a new one?")
-		.tqarg(TQDir::convertSeparators(fileName))+"</qt>",0, 
+		.arg(TQDir::convertSeparators(fileName))+"</qt>",0, 
 		KGuiItem(i18n("&Replace")), KGuiItem(i18n("&Don't Replace"))))
 	{
 		return;
@@ -268,8 +268,8 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object
 /*! @todo look at makeFirstCharacterUpperCaseInCaptions setting [bool]
  (see doc/dev/settings.txt) */
 	TQString realTitle( i18n("Object name : Object type", "%1 : %2")
-		.tqarg( objectName[0].upper() + objectName.mid(1) )
-		.tqarg( objectTypeName ));
+		.arg( objectName[0].upper() + objectName.mid(1) )
+		.arg( objectTypeName ));
 
 	if (iconName.isEmpty())
 		title->setTitle(realTitle);
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 718fcbf6..298eda48 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -78,7 +78,7 @@ KexiDateFormatter::KexiDateFormatter()
 			m_order = TQDateEdit::YDM;
 //! @todo use TQRegExp (to replace %Y by %1, etc.) instead of hardcoded "%1%299%399" 
 //!       because df may contain also other characters
-			m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
+			m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator);
 			m_qtFormat = yearDateFormat+m_separator+dayDateFormat+m_separator+monthDateFormat;
 			m_yearpos = 0;
 			m_daypos = yearMask.length()+separatorLen;
@@ -86,7 +86,7 @@ KexiDateFormatter::KexiDateFormatter()
 		}
 		else if (daypos<monthpos && monthpos<yearpos) {
 			m_order = TQDateEdit::DMY;
-			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask);
+			m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask);
 			m_qtFormat = dayDateFormat+m_separator+monthDateFormat+m_separator+yearDateFormat;
 			m_daypos = 0;
 			m_monthpos = 2+separatorLen;
@@ -94,7 +94,7 @@ KexiDateFormatter::KexiDateFormatter()
 		}
 		else if (monthpos<daypos && daypos<yearpos) {
 			m_order = TQDateEdit::MDY;
-			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask);
+			m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask);
 			m_qtFormat = monthDateFormat+m_separator+dayDateFormat+m_separator+yearDateFormat;
 			m_monthpos = 0;
 			m_daypos = 2+separatorLen;
@@ -104,7 +104,7 @@ KexiDateFormatter::KexiDateFormatter()
 			ok = false;
 	}
 	if (!ok || m_order == TQDateEdit::YMD) {//default: YMD
-		m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
+		m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator);
 		m_qtFormat = yearDateFormat+m_separator+monthDateFormat+m_separator+dayDateFormat;
 		m_yearpos = 0;
 		m_monthpos = yearMask.length()+separatorLen;
@@ -294,20 +294,20 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
 	TQString s(m_outputFormat);
 	if (m_24h) {
 		if (m_hoursWithLeadingZero)
-			s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) );
+			s.replace( "%H", TQString::fromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) );
 		else
 			s.replace( "%k", TQString::number(time.hour()) );
 	}
 	else {
 		int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour();
 		if (m_hoursWithLeadingZero)
-			s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) );
+			s.replace( "%I", TQString::fromLatin1(time12<10 ? "0" : "") + TQString::number(time12) );
 		else
 			s.replace( "%l", TQString::number(time12) );
 	}
-	s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) );
+	s.replace( "%M", TQString::fromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) );
 	if (m_secpos>=0)
-		s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
+		s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
 	if (m_ampmpos>=0)
 		s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
 	return s;
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 1943b086..11b1d742 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -92,8 +92,8 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters()
 
 KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w)
 {
-	textColor = w->tqpalette().active().foreground();
-	selectedTextColor = w->tqpalette().active().highlightedText();
+	textColor = w->palette().active().foreground();
+	selectedTextColor = w->palette().active().highlightedText();
 	font = w->font();
 }
 
@@ -113,7 +113,7 @@ void KexiDisplayUtils::initDisplayForAutonumberSign(DisplayParameters& par, TQWi
 void KexiDisplayUtils::initDisplayForDefaultValue(DisplayParameters& par, TQWidget *widget)
 {
 	par.textColor = SPECIAL_TEXT_COLOR;
-	par.selectedTextColor = widget->tqpalette().active().highlightedText();
+	par.selectedTextColor = widget->palette().active().highlightedText();
 	par.font = widget->font();
 	par.font.setItalic(true);
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 909d507c..054192ce 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -28,7 +28,7 @@
 KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
  : TQToolButton(parent, "KexiDBImageBox::Button")
 {
-	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+	setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 //! @todo get this from a KStyle
 //	setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
 	int fixedWidth;
@@ -55,11 +55,11 @@ void KexiDropDownButton::drawButton( TQPainter *p )
 	if (isEnabled())
 		arrowFlags |= TQStyle::Style_Enabled;
 	tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
-		TQRect((width()-7)/2, height()-9, 7, 7), tqcolorGroup(),
+		TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
 		arrowFlags, TQStyleOption() );
 }
 
-TQSize KexiDropDownButton::tqsizeHint () const
+TQSize KexiDropDownButton::sizeHint () const
 {
 	return TQSize( fontMetrics().maxWidth() + 2*2, fontMetrics().height()*2 + 2*2 );
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h
index e61ab9f5..178f17a7 100644
--- a/kexi/widget/utils/kexidropdownbutton.h
+++ b/kexi/widget/utils/kexidropdownbutton.h
@@ -38,7 +38,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton
 
 		virtual void drawButton( TQPainter *p );
 		
-		virtual TQSize tqsizeHint () const;
+		virtual TQSize sizeHint () const;
 
 		virtual void keyPressEvent ( TQKeyEvent * e );
 };
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index e4bc4207..e2397ede 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent()
 	return (m_idx < (int)count()) ? m_list->take(m_idx) : 0;
 }
 
-//// The tqlayout itself
+//// The layout itself
 
 KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
  : TQLayout(parent, border, space, name)
@@ -134,10 +134,10 @@ KexiFlowLayout::widgetList() const
 }
 
 void
-KexiFlowLayout::tqinvalidate()
+KexiFlowLayout::invalidate()
 {
-	TQLayout::tqinvalidate();
-	m_cached_tqsizeHint = TQSize();
+	TQLayout::invalidate();
+	m_cached_sizeHint = TQSize();
 	m_cached_minSize = TQSize();
 	m_cached_width = 0;
 }
@@ -169,22 +169,22 @@ KexiFlowLayout::heightForWidth(int w) const
 }
 
 TQSize
-KexiFlowLayout::tqsizeHint() const
+KexiFlowLayout::sizeHint() const
 {
-	if(m_cached_tqsizeHint.isEmpty()) {
+	if(m_cached_sizeHint.isEmpty()) {
 		KexiFlowLayout *mthis = (KexiFlowLayout*)this;
 		TQRect r = TQRect(0, 0, 2000, 2000);
 		mthis->simulateLayout(r);
 	}
-	return m_cached_tqsizeHint;
+	return m_cached_sizeHint;
 }
 
 TQSize
-KexiFlowLayout::tqminimumSize() const
+KexiFlowLayout::minimumSize() const
 {
-//js: do we really need to simulate tqlayout here?
-//    I commented this out because it was impossible to stretch tqlayout conveniently.
-//    Now, minimum size is computed automatically based on item's tqminimumSize...
+//js: do we really need to simulate layout here?
+//    I commented this out because it was impossible to stretch layout conveniently.
+//    Now, minimum size is computed automatically based on item's minimumSize...
 #if 0
 	if(m_cached_minSize.isEmpty()) {
 		KexiFlowLayout *mthis = (KexiFlowLayout*)this;
@@ -234,7 +234,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 	TQPtrListIterator<TQLayoutItem> it(m_list);
 	TQPtrList<TQLayoutItem> currentLine;
 	TQLayoutItem *o;
-	TQSize minSize, tqsizeHint(20, 20);
+	TQSize minSize, sizeHint(20, 20);
 	int minSizeHeight = 0 - spacing();
 
 	while ( (o = it.current()) != 0 ) {
@@ -244,20 +244,20 @@ 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 layouts)
+		TQSize oSizeHint = o->sizeHint(); // 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
+			// do the layout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wx = r.x();
 			int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
 			while( (item = it2.current()) != 0 ) {
-				TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-				TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+				TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+				TQSize itemMinSize = item->minimumSize(); // a while to get them
 				TQSize s;
 				if(m_justify) {
 					if(expandingWidgets != 0) {
-						if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections)
+						if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections)
 							s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets
 								, r.width()), itemSizeHint.height() );
 						else
@@ -277,7 +277,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 				lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
 				++it2;
 			}
-			tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
+			sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
 			minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) );
 			minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
 			// start a new line
@@ -292,24 +292,24 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		x = x + spacing() + oSizeHint.width();
 		h = TQMAX( h,  oSizeHint.height() );
 		currentLine.append(o);
-		if(o->expandingDirections() == TQSizePolicy::Horizontally || o->expandingDirections() == TQSizePolicy::BothDirections)
+		if(o->expanding() == TQSizePolicy::Horizontally || o->expanding() == TQSizePolicy::BothDirections)
 			++expandingWidgets;
 		availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.width());
 		++it;
 	}
 
-	// don't forget to tqlayout the last line
+	// don't forget to layout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wx = r.x();
 	int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
 	while( (item = it2.current()) != 0 ) {
-		TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-		TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+		TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+		TQSize itemMinSize = item->minimumSize(); // a while to get them
 		TQSize s;
 		if(m_justify) {
 			if(expandingWidgets != 0) {
-				if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections)
+				if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections)
 					s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets
 						, r.width()), itemSizeHint.height() );
 				else
@@ -329,12 +329,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
 		++it2;
 	}
-	tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
+	sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
 	minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
 	minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
 
-	// store tqsizeHint() and tqminimumSize()
-	m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin());
+	// store sizeHint() and minimumSize()
+	m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin());
 	m_cached_minSize = minSize + TQSize(2* margin() , 2*margin());
 	// return our height
 	return y + h - r.y();
@@ -351,7 +351,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 	TQPtrListIterator<TQLayoutItem> it(m_list);
 	TQPtrList<TQLayoutItem> currentLine;
 	TQLayoutItem *o;
-	TQSize minSize, tqsizeHint(20, 20);
+	TQSize minSize, sizeHint(20, 20);
 	int minSizeWidth = 0 - spacing();
 
 	while ( (o = it.current()) != 0 ) {
@@ -360,20 +360,20 @@ 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 layouts)
+		TQSize oSizeHint = o->sizeHint(); // 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
+			// do the layout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wy = r.y();
 			int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
 			while( (item = it2.current()) != 0 ) {
-				TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-				TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+				TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+				TQSize itemMinSize = item->minimumSize(); // a while to get them
 				TQSize s;
 				if(m_justify) {
 					if(expandingWidgets != 0) {
-						if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections)
+						if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections)
 							s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets
 								, r.height()) );
 						else
@@ -393,7 +393,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 				colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
 				++it2;
 			}
-			tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) );
+			sizeHint = sizeHint.expandedTo( TQSize(0, sizeHintHeight) );
 			minSize = minSize.expandedTo( TQSize(0, minSizeHeight) );
 			minSizeWidth = minSizeWidth + spacing() + colMinWidth;
 			// start a new column
@@ -408,24 +408,24 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		y = y + spacing() + oSizeHint.height();
 		w = TQMAX( w,  oSizeHint.width() );
 		currentLine.append(o);
-		if(o->expandingDirections() == TQSizePolicy::Vertically || o->expandingDirections() == TQSizePolicy::BothDirections)
+		if(o->expanding() == TQSizePolicy::Vertically || o->expanding() == TQSizePolicy::BothDirections)
 			++expandingWidgets;
 		availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.height());
 		++it;
 	}
 
-	// don't forget to tqlayout the last line
+	// don't forget to layout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wy = r.y();
 	int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
 	while( (item = it2.current()) != 0 ) {
-		TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
-		TQSize itemMinSize = item->tqminimumSize(); // a while to get them
+		TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
+		TQSize itemMinSize = item->minimumSize(); // a while to get them
 		TQSize s;
 		if(m_justify) {
 			if(expandingWidgets != 0) {
-				if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections)
+				if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections)
 					s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets
 						, r.height()) );
 				else
@@ -445,12 +445,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
 		++it2;
 	}
-	tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
+	sizeHint = sizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
 	minSizeWidth = minSizeWidth + spacing() + colMinWidth;
 	minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
 
-	// store tqsizeHint() and tqminimumSize()
-	m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin());
+	// store sizeHint() and minimumSize()
+	m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin());
 	m_cached_minSize = minSize + TQSize(2* margin(), 2*margin());
 	// return our width
 	return x + w - r.x();
@@ -468,7 +468,7 @@ int KexiFlowLayout::count() const {
     \reimp
 */
 TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
-	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).tqat(index)) : 0;
+	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).at(index)) : 0;
 }
 
 /*!
@@ -477,8 +477,8 @@ TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
 TQLayoutItem* KexiFlowLayout::takeAt(int index) {
 	if (index < 0 || index >= m_list.count())
 		return 0;
-	TQLayoutItem *item = m_list.tqat(index);
-	m_list.remove(m_list.tqat(index));
+	TQLayoutItem *item = m_list.at(index);
+	m_list.remove(m_list.at(index));
 	delete item;
 	
 	invalidate();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index 0f6d8384..f48ed140 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -20,10 +20,10 @@
 #ifndef KEXIFLOWLAYOUT_H
 #define KEXIFLOWLAYOUT_H
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 
-//! @short a special "flow" tqlayout
+//! @short a special "flow" layout
 class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 {
 	public:
@@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 
 		~KexiFlowLayout();
 
-		/*! \return the widgets in the order of the tqlayout,
+		/*! \return the widgets in the order of the layout,
 		 ie as it is stored in m_list. You must delete the list after using it. */
 		TQPtrList<TQWidget>* widgetList() const;
 
-		/*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */
+		/*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
 		void  setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
 
-		/*! \return tqlayout's orientation. */
+		/*! \return layout's orientation. */
 		Qt::Orientation orientation() const { return m_orientation; }
 
 		void setJustified(bool justify) { m_justify = justify; }
@@ -49,12 +49,12 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		virtual void addItem(TQLayoutItem *item);
 		virtual void addSpacing(int size);
 		virtual TQLayoutIterator iterator();
-		virtual void  tqinvalidate();
+		virtual void  invalidate();
 
 		virtual bool hasHeightForWidth() const;
 		virtual int heightForWidth(int width) const;
-		virtual TQSize tqsizeHint() const;
-		virtual TQSize tqminimumSize() const;
+		virtual TQSize sizeHint() const;
+		virtual TQSize minimumSize() const;
 		virtual TQSizePolicy::ExpandData expanding() const;
 
 		virtual bool isEmpty();
@@ -75,7 +75,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		int m_cached_hfw;
 		bool m_justify;
 		Qt::Orientation m_orientation;
-		TQSize m_cached_tqsizeHint;
+		TQSize m_cached_sizeHint;
 		TQSize m_cached_minSize;
 };
 
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index 18d34447..d93b13ff 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -155,7 +155,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 	}
 
 	/**
-	All tqchildren need to have our background set.
+	All children need to have our background set.
 	*/
 	KPixmap partPixmap;
 	TQRect area;
@@ -180,7 +180,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 		under the current child-widget.
 		*/
 		if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
-			area = childWidget->tqgeometry();
+			area = childWidget->geometry();
 		} else {
 			area.setTopLeft( childWidget->mapTo( this,
 				childWidget->clipRegion().boundingRect().topLeft() ) );
@@ -311,7 +311,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 
 	/**
 	Exclude widgtes that don't have a parent.
-	This happens when tqchildren are removed
+	This happens when children are removed
 	which are in the knownWidgets-list.
 	*/
 	if ( childWidget->parent() == 0L )
@@ -330,7 +330,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 	under the current child-widget.
 	*/
 	if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
-		area = childWidget->tqgeometry();
+		area = childWidget->geometry();
 	} else {
 		area.setTopLeft( childWidget->mapTo( this,
 			childWidget->clipRegion().boundingRect().topLeft() ) );
diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h
index 3f9b894d..d11c4f04 100644
--- a/kexi/widget/utils/kexigradientwidget.h
+++ b/kexi/widget/utils/kexigradientwidget.h
@@ -184,11 +184,11 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget {
 
 	private:
 		/*!
-		Builds a list of tqchildren of \a p.
+		Builds a list of children of \a p.
 		Only widgets that work correctly with KexiGradientWidget
 		will be in this list.
 		The results will be stored in \a list.
-		The method recursively calls itself until all tqchildren of \a p
+		The method recursively calls itself until all children of \a p
 		have been found and stored in the list.
 		*/
 		static void buildChildrenList( WidgetList& list, TQWidget* p );
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index b22e0500..55a7c47a 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -100,7 +100,7 @@ public:
 	 , highlightedRow(-1)
 	 , editRow(-1)
 	 , rows(0)
-	 , selectionBackgroundColor(tqApp->tqpalette().active().highlight())
+	 , selectionBackgroundColor(tqApp->palette().active().highlight())
 	 , showInsertRow(true)
 	{
 	}
@@ -188,13 +188,13 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 	if(last > (d->rows-1+(d->showInsertRow?1:0)))
 		last = d->rows-1+(d->showInsertRow?1:0);
 
-	TQColorGroup selectedColorGroup(tqcolorGroup());
+	TQColorGroup selectedColorGroup(colorGroup());
 	selectedColorGroup.setColor( TQColorGroup::Button, 
 		KexiUtils::blendedColors( selectedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 2, 1) );
 	selectedColorGroup.setColor( TQColorGroup::Background, 
 		selectedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
-	TQColorGroup highlightedColorGroup(tqcolorGroup());
+	TQColorGroup highlightedColorGroup(colorGroup());
 	highlightedColorGroup.setColor( TQColorGroup::Button, 
 		KexiUtils::blendedColors( highlightedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 4, 1) );
@@ -206,7 +206,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		TQRect r(0, y, width(), d->rowHeight);
 		p.drawRect(r);
 		tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
-			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : tqcolorGroup()), 
+			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
 			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}
 	if (d->editRow!=-1 && d->editRow >= first && d->editRow <= (last/*+1 for insert row*/)) {
@@ -220,7 +220,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		&& (!d->showInsertRow || (d->showInsertRow && d->currentRow < last)))/*don't display marker for 'insert' row*/ 
 	{
 		//show marker
-		p.setBrush(tqcolorGroup().foreground());
+		p.setBrush(colorGroup().foreground());
 		p.setPen(TQPen(TQt::NoPen));
 		TQPointArray points(3);
 		int ofs = d->rowHeight / 4;
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 4c1dd02b..f4c96b58 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvalidator.h>
 #include <tqtooltip.h>
@@ -102,7 +102,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	d->lyr->addSpacing( 6 );
 	
 	d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) );
-	m_navRecordNumber->tqsetAlignment(AlignRight | AlignVCenter);
+	m_navRecordNumber->setAlignment(AlignRight | AlignVCenter);
 	m_navRecordNumber->setFocusPolicy(TQ_ClickFocus);
 	m_navRecordNumber->installEventFilter(this);
 //	m_navRowNumber->setFixedWidth(fw);
@@ -112,20 +112,20 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	TQToolTip::add(m_navRecordNumber, i18n("Current row number"));
 	
 	KLineEdit *lbl_of = new KLineEdit(i18n("of"), this);
-	lbl_of->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
+	lbl_of->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8);
 	lbl_of->setReadOnly(true);
 	lbl_of->setLineWidth(0);
 	lbl_of->setFocusPolicy(TQ_NoFocus);
-	lbl_of->tqsetAlignment(AlignCenter);
+	lbl_of->setAlignment(AlignCenter);
 	d->lyr->addWidget( lbl_of );
 	
 	d->lyr->addWidget( m_navRecordCount = new KLineEdit(this) );
-	m_navRecordCount->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
+	m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	m_navRecordCount->setReadOnly(true);
 	m_navRecordCount->setLineWidth(0);
 	m_navRecordCount->setFocusPolicy(TQ_NoFocus);
-	m_navRecordCount->tqsetAlignment(AlignLeft | AlignVCenter);
+	m_navRecordCount->setAlignment(AlignLeft | AlignVCenter);
 	TQToolTip::add(m_navRecordCount, i18n("Number of rows"));
 
 	lbl_of->setFont(f);
@@ -337,7 +337,7 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 	if (m_view) {
 		int navWidth;
 		if (m_view->horizontalScrollBar()->isVisible()) {
-			navWidth = tqsizeHint().width();
+			navWidth = sizeHint().width();
 		}
 		else {
 			navWidth = leftMargin + m_view->clipper()->width();
@@ -345,9 +345,9 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 		
 		setGeometry(
 			m_view->frameWidth(),
-			m_view->height() - m_view->horizontalScrollBar()->tqsizeHint().height()-m_view->frameWidth(),
+			m_view->height() - m_view->horizontalScrollBar()->sizeHint().height()-m_view->frameWidth(),
 			navWidth,
-			m_view->horizontalScrollBar()->tqsizeHint().height()
+			m_view->horizontalScrollBar()->sizeHint().height()
 		);
 
 		m_view->updateScrollBars();
@@ -361,7 +361,7 @@ void KexiRecordNavigator::setHBarGeometry( TQScrollBar & hbar, int x, int y, int
 
 void KexiRecordNavigator::setLabelText(const TQString& text)
 {
-	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::tqfromLatin1(" ")+text+" "));
+	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::fromLatin1(" ")+text+" "));
 }
 
 void KexiRecordNavigator::setInsertingButtonVisible(bool set)
@@ -429,7 +429,7 @@ void KexiRecordNavigator::setEditingIndicatorEnabled(bool set)
 	if (d->editingIndicatorEnabled) {
 		if (!d->editingIndicatorLabel) {
 			d->editingIndicatorLabel = new TQLabel(this);
-			d->editingIndicatorLabel->tqsetAlignment(TQt::AlignCenter);
+			d->editingIndicatorLabel->setAlignment(TQt::AlignCenter);
 			TQPixmap pix;
 			pix.convertFromImage( *KexiRecordMarker::penImage() );
 			d->editingIndicatorLabel->setFixedWidth( pix.width() + 2*2 );
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 9eae328b..6c666e78 100644
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@ -87,7 +87,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame
 		/*! \return record count displayed for this navigator. */
 		uint recordCount() const;
 
-		/*! Sets horizontal bar's \a hbar (at the bottom) tqgeometry so this record navigator
+		/*! Sets horizontal bar's \a hbar (at the bottom) geometry so this record navigator
 		 is properly positioned together with horizontal scroll bar. This method is used 
 		 in TQScrollView::setHBarGeometry() implementations:
 		 see KexiTableView::setHBarGeometry() and KexiFormScrollView::setHBarGeometry()
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index 7d71752c..2a36ef09 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -42,7 +42,7 @@ KexiToolTip::~KexiToolTip()
 {
 }
 
-TQSize KexiToolTip::tqsizeHint() const
+TQSize KexiToolTip::sizeHint() const
 {
 	TQSize sz(fontMetrics().boundingRect(m_value.toString()).size());
 	return sz;
@@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev )
 
 void KexiToolTip::drawFrame(TQPainter& p)
 {
-	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+	p.setPen( TQPen(palette().active().foreground(), 1) );
 	p.drawRect(rect());
 }
 
diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h
index cfa1b483..83d0d7e0 100644
--- a/kexi/widget/utils/kexitooltip.h
+++ b/kexi/widget/utils/kexitooltip.h
@@ -32,7 +32,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget
 		KexiToolTip(const TQVariant& value, TQWidget* parent);
 		virtual ~KexiToolTip();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	public slots:
 		virtual void show();