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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

29 files changed, 199 insertions, 199 deletions

diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index 02e01249..edcba8c9 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 alignment boundry for structures.
+** and 8-byte tqalignment boundry for structures.
 */
 #define ROUNDUP(X)  ((X+3) & ~3)
 
@@ -726,7 +726,7 @@ int sqliteBtreeOpen(
 }
 
 /*
-** Close an open database and invalidate all cursors.
+** Close an open database and tqinvalidate 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 children of the given page to be the given page.
+** Reparent all tqchildren of the given page to be the given page.
 ** In other words, for every child of pPage, invoke reparentPage()
 ** to make sure that each child knows that pPage is its 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 children then all children of pParent are taken.
+  ** has NB or fewer tqchildren then all tqchildren 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 children of all cells.
+  ** Reparent tqchildren 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 children.  Return
+** Erase the given database page and all its tqchildren.  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 children.
-**      7.  Verify that the depth of all children is the same.
+**      6.  Recursively call checkTreePage on all tqchildren.
+**      7.  Verify that the depth of all tqchildren 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 3954fe6d..86feaa5b 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 children are black
+ * (1) - If a node is red, both of it's tqchildren 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 children pZ has:
+   * to do this depends on how many tqchildren pZ has:
    *
-   * 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
+   * 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
    * 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 children. If pZ is black, and not the tree root, then we
+   * NULL if pZ has no tqchildren. 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 85872a5a..79eb15e5 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.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    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.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  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.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  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 212be42e..4ed6c51a 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 children.  The zerodata flag means that this page carries
+** this page has no tqchildren.  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 alignment on 64-bit architectures.
+** to force 8-byte tqalignment 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 alignment of pageSize */
+  assert( (pBt->pageSize & 7)==0 );  /* 8-byte tqalignment of pageSize */
   sqlite3pager_set_pagesize(pBt->pPager, pBt->pageSize);
   *ppBtree = pBt;
   return SQLITE_OK;
 }
 
 /*
-** Close an open database and invalidate all cursors.
+** Close an open database and tqinvalidate 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 children of page pPage. Also, if
+** Set the pointer-map entries for all tqchildren 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 children of pPage to point back
+** Change the pParent pointer of all tqchildren 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 children then all children of pParent are taken.
+  ** has NB or fewer tqchildren then all tqchildren 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
-  ** alignment */
+  ** tqalignment */
   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 alignment required */
+  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment 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 alignment required */
+    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
   }
   aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
+  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment 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
-    ** children of cells, the right-child of the page, or overflow pages
+    ** tqchildren 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 children of all cells.
+  ** Reparent tqchildren 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 children.  Return
+** Erase the given database page and all its tqchildren.  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 children.
-**      7.  Verify that the depth of all children is the same.
+**      6.  Recursively call checkTreePage on all tqchildren.
+**      7.  Verify that the depth of all tqchildren 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 67ed7975..9818c954 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 invalidate all pre-compiled statements.
+    ** to tqinvalidate 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 8d9cfbbd..ac209552 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 children
+** 0 means continue walking the tree.  1 means do not walk tqchildren
 ** 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 alignment of TK_ and OP_ constants
+  /* Verify correct tqalignment 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 83356f43..8d6acd5c 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 invalidate all precompiled statements.
+  ** operation to continue but tqinvalidate 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 unicode
+  /* Because all the characters in the string are in the tqunicode
   ** 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, invalidate any pre-compiled statements.
+  ** are no active VMs, tqinvalidate 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 285d0805..f393b423 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.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    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.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  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.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  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 2b0a00ec..8c729136 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 *unicodeToUtf8(const WCHAR *zWideFilename){
+static char *tqunicodeToUtf8(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 = unicodeToUtf8(zWidePath);
+    zMulti = tqunicodeToUtf8(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 = unicodeToUtf8(zTemp);
+    zFull = tqunicodeToUtf8(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 4b981350..60cb43bd 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
-** children.  If all children are either missing or do not refer to
+** tqchildren.  If all tqchildren 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 a0c7be87..23bfa533 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 unicode
+    ** equivalent pointer into the UTF-16 string by counting the tqunicode
     ** 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 414c6cac..be29db69 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 invalidate
+** Once sqlite3_open() has been called, changing this variable will tqinvalidate
 ** 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 d42ab759..5efbfe78 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 unicode character.
+** part of a valid tqunicode 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 unicode character.
+** interpeted as part of a valid tqunicode 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 unicode string. If nByte is less than zero,
-** return the number of unicode characters in pZ up to (but not including)
+** 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)
 ** the first 0x00 byte. If nByte is not less than zero, return the
-** number of unicode characters in the first nByte of pZ (or up to 
+** number of tqunicode 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 unicode string. If nChar is less than zero,
+** pZ is a UTF-16 encoded tqunicode 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 unicode characters
+** then return the number of bytes in the first nChar tqunicode 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 4c732b09..89174271 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 unicode encoding as the main
+** Usually this is encoded in the same tqunicode 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 c0457ffc..5ab2e4e6 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 children that must disable us */
+  u8 nChild;              /* Number of tqchildren 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 be51e60e..8ea3b0b9 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -23,20 +23,20 @@
 #include <KoUnitWidgets.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", layout );
+    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
     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, layout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, tqlayout.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 &layout) {
-    m_preview->setPageLayout( layout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
+    m_preview->setPageLayout( tqlayout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index b9dcd6c2..8ebac1b2 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 layout the page layout that the preview should be initialzed with.
+     * @param tqlayout the page tqlayout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
 
     /**
-     * Update the page preview widget with the param layout.
-     * @param layout the new layout
+     * Update the page preview widget with the param tqlayout.
+     * @param tqlayout the new tqlayout
      */
-    void setLayout(KoPageLayout &layout);
+    void setLayout(KoPageLayout &tqlayout);
 public slots:
 
     /**
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
index 07cced25..325fe45e 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
index 5878ead5..00296957 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
@@ -20,7 +20,7 @@
 #include <KoPageLayoutHeader.moc>
 #include <KoUnitWidgets.h>
 
-#include <layout.h>
+#include <tqlayout.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 7f36378e..b3bd7978 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>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index 83cdfbb0..649f4c26 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -27,15 +27,15 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqhbox.h>
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent) {
-    m_layout = layout;
+    m_layout = tqlayout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -60,7 +60,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
@@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
@@ -159,9 +159,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     // ------------- spacers -----------
     TQWidget* spacer1 = new TQWidget( this );
     TQWidget* spacer2 = new TQWidget( this );
-    spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
-    spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer2->tqsetSizePolicy( 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 8e503551..06c08517 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 layout the page layout that this widget should be initialzed with.
+     * @param tqlayout the page tqlayout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, 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 layout the update layout structure with currently displayed info.
+     * @param tqlayout the update tqlayout 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 &layout);
+    void propertyChange(KoPageLayout &tqlayout);
 
 protected:
     TQComboBox *cpgUnit;
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index a88e3bcd..3541e6ea 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::fromLatin1("*/entry.desktop"));
+                                                            TQString::tqfromLatin1("*/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 316eba19..7888ba7d 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-layout-properties" ) );
+    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-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 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;
+    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;
 }
 
 struct PageFormatInfo
@@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
 {
     if ( format == PG_SCREEN )
     {
-            kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+            kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
             return KPrinter::A4;
     }
     else if ( format == PG_CUSTOM )
     {
-            kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+            kdWarning() << "The used page tqlayout (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::fromLatin1( pageFormatInfo[ format ].shortName );
-    return TQString::fromLatin1( "A4" );
+        return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
+    return TQString::tqfromLatin1( "A4" );
 }
 
 KoFormat KoPageFormat::formatFromString( const TQString & string )
 {
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
-        if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
+        if (string == TQString::tqfromLatin1( 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 eb922846..724f9275 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.h
+++ b/kexi/3rdparty/kolibs/koPageLayout.h
@@ -156,7 +156,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page layout, including
+ * This structure defines the page tqlayout, 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 layout to OASIS.
+     * Save this page tqlayout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page layout from OASIS
+     * Load this page tqlayout from OASIS
      */
     KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 #endif
 
     /**
-     * @return a page layout with the default page size depending on the locale settings,
+     * @return a page tqlayout 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 b757eef9..d81d1870 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( layout );
+    setPageLayout( tqlayout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set layout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &layout )
+/*=================== set tqlayout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
 {
     // 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 = layout.ptWidth * resolutionX;
-    m_pageHeight = layout.ptHeight * resolutionY;
+    m_pageWidth = tqlayout.ptWidth * resolutionX;
+    m_pageHeight = tqlayout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &layout )
     m_pageWidth *= z;
     m_pageHeight *= 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;
+    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;
 
-    repaint( true );
+    tqrepaint( true );
 }
 
-/*=================== set layout =================================*/
+/*=================== set tqlayout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    repaint( true );
+    tqrepaint( true );
 }
 
 /*======================== draw contents =========================*/
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& layout,
+                                  const KoPageLayout& tqlayout,
                                   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 = layout;
+    m_layout = tqlayout;
     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& layout,
+                  const KoPageLayout& tqlayout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = layout;
+    m_layout = tqlayout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
+        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
+        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
         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& layout, KoHeadFoot& hf, KoColumn
     return res;
 }
 
-/*===================== get a standard page layout ===============*/
+/*===================== get a standard page tqlayout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-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;
+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;
     if(m_columnsTab)
-        m_columnsTab->setLayout(layout);
+        m_columnsTab->setLayout(tqlayout);
 }
 
 /*================ 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->layout()->setSpacing(KDialog::spacingHint());
-    gHead->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
+    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
+    gHead->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 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->layout()->setSpacing(KDialog::spacingHint());
-    gFoot->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
+    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
+    gFoot->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 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->layout()->setMargin(0);
+    m_columnsTab->tqlayout()->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->layout()->setMargin(0);
+    m_headerTab->tqlayout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 1ed23ec5..21fe7df3 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page layout
+     *  set page tqlayout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the layout of the paper during printing.
+ *  With this dialog the user can specify the tqlayout 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 layout   The layout.
+     *  @param tqlayout   The tqlayout.
      *  @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& layout,
+             const KoPageLayout& tqlayout,
              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 layout     The layout.
+     *  @param tqlayout     The tqlayout.
      *  @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& layout,
+             const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page layout dialog.
+     *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page layout dialog.
+     *  Show page tqlayout 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 layout.
+     *  Retrieves a standard page tqlayout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the layout
+     *  Returns the tqlayout
      */
-    const KoPageLayout& layout() const { return m_layout; }
+    const KoPageLayout& tqlayout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // layout
+    // tqlayout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &layout);
+    void sizeUpdated(KoPageLayout &tqlayout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index e8dd16ff..506e24e1 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::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 ( _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 ( 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::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" );
+    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" );
 }
 
 #ifndef SIMPLE_KOLIBS
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 9943ee7e..16ec9a55 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 <layout.h>
+#include <tqlayout.h>
 
 
 // ----------------------------------------------------------------
@@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").tqarg( 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 )
 {
-    setAlignment( TQt::AlignRight );
+    tqsetAlignment( 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 )
 {
-    setAlignment( TQt::AlignRight );
+    tqsetAlignment( 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()->setAlignment( TQt::AlignRight );
+    lineEdit()->tqsetAlignment( 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()->setAlignment( TQt::AlignRight );
+    lineEdit()->tqsetAlignment( 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 *layout = new TQGridLayout( this, 2, 3 );
-    //layout->setMargin( 2 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
+    //tqlayout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    layout->addWidget( up, 0, 0 );
+    tqlayout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    layout->addWidget( down, 1, 0 );
+    tqlayout->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 ) ) );
-    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    tqlayout->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 *layout = new TQGridLayout( this, 2, 3 );
-    //layout->setMargin( 2 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
+    //tqlayout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    layout->addWidget( up, 0, 0 );
+    tqlayout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    layout->addWidget( down, 1, 0 );
+    tqlayout->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 ) ) );
-    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void