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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

12 files changed, 42 insertions, 42 deletions

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 */