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

2 files changed, 68 insertions, 68 deletions

diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
index aa85d2ed..1d55403b 100644
--- a/amarok/src/sqlite/sqlite3.c
+++ b/amarok/src/sqlite/sqlite3.c
@@ -1551,7 +1551,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
 ** </ul>
 **
 ** Conversions between UTF-16be and UTF-16le are always done in place and do
-** not tqinvalidate a prior pointer, though of course the content of the buffer
+** not invalidate a prior pointer, though of course the content of the buffer
 ** that the prior pointer points to will have been modified.  Other kinds
 ** of conversion are done in place when it is possible, but sometime it is
 ** not possible and in those cases prior pointers are invalidated.  
@@ -2045,7 +2045,7 @@ SQLITE_API int sqlite3_sleep(int);
 ** file directory.
 **
 ** Once [sqlite3_open()] has been called, changing this variable will
-** tqinvalidate the current temporary database, if any.  Generally speaking,
+** invalidate the current temporary database, if any.  Generally speaking,
 ** it is not safe to invoke this routine after [sqlite3_open()] has
 ** been called.
 */
@@ -5956,7 +5956,7 @@ extern const unsigned char sqlite3UtfTrans1[];
 **     invalid characters.
 **
 **  *  These routines accept an infinite number of different UTF8 encodings
-**     for tqunicode values 0x80 and greater.  They do not change over-length
+**     for unicode values 0x80 and greater.  They do not change over-length
 **     encodings to 0xfffd as some systems recommend.
 ** 
 */
@@ -9412,7 +9412,7 @@ struct Cursor {
   ** aRow might point to (ephemeral) data for the current row, or it might
   ** be NULL.
   */
-  int cachetqStatus;      /* Cache is valid if this matches Vdbe.cacheCtr */
+  int cacheStatus;      /* Cache is valid if this matches Vdbe.cacheCtr */
   int payloadSize;      /* Total number of bytes in the record */
   u32 *aType;           /* Type values for all entries in the record */
   u32 *aOffset;         /* Cached offsets to the start of each columns data */
@@ -9466,7 +9466,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.
@@ -10100,10 +10100,10 @@ SQLITE_PRIVATE 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).
 */
 SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){
@@ -10142,10 +10142,10 @@ SQLITE_PRIVATE char *sqlite3Utf16to8(const void *z, int nByte){
 }
 
 /*
-** 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).
 */
 SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){
@@ -16229,7 +16229,7 @@ int sqlite3_os_type = 0;
 #endif /* OS_WINCE */
 
 /*
-** Convert a UTF-8 string to microsoft tqunicode (UTF-16?). 
+** Convert a UTF-8 string to microsoft unicode (UTF-16?). 
 **
 ** Space to hold the returned string is obtained from sqliteMalloc.
 */
@@ -16251,10 +16251,10 @@ static WCHAR *utf8ToUnicode(const char *zFilename){
 }
 
 /*
-** Convert microsoft tqunicode to UTF-8.  Space to hold the returned string is
+** Convert microsoft unicode 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;
 
@@ -16273,7 +16273,7 @@ static char *tqunicodeToUtf8(const WCHAR *zWideFilename){
 }
 
 /*
-** Convert an ansi string to microsoft tqunicode, based on the
+** Convert an ansi string to microsoft unicode, based on the
 ** current codepage settings for file apis.
 ** 
 ** Space to hold the returned string is obtained
@@ -16298,13 +16298,13 @@ static WCHAR *mbcsToUnicode(const char *zFilename){
 }
 
 /*
-** Convert microsoft tqunicode to multibyte character string, based on the
+** Convert microsoft unicode to multibyte character string, based on the
 ** user's Ansi codepage.
 **
 ** Space to hold the returned string is obtained from
 ** sqliteMalloc().
 */
-static char *tqunicodeToMbcs(const WCHAR *zWideFilename){
+static char *unicodeToMbcs(const WCHAR *zWideFilename){
   int nByte;
   char *zFilename;
   int codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
@@ -16335,7 +16335,7 @@ static char *mbcsToUtf8(const char *zFilename){
   if( zTmpWide==0 ){
     return 0;
   }
-  zFilenameUtf8 = tqunicodeToUtf8(zTmpWide);
+  zFilenameUtf8 = unicodeToUtf8(zTmpWide);
   sqliteFree(zTmpWide);
   return zFilenameUtf8;
 }
@@ -16352,7 +16352,7 @@ static char *utf8ToMbcs(const char *zFilename){
   if( zTmpWide==0 ){
     return 0;
   }
-  zFilenameMbcs = tqunicodeToMbcs(zTmpWide);
+  zFilenameMbcs = unicodeToMbcs(zTmpWide);
   sqliteFree(zTmpWide);
   return zFilenameMbcs;
 }
@@ -17025,7 +17025,7 @@ SQLITE_PRIVATE int sqlite3WinTempFileName(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;
@@ -17513,7 +17513,7 @@ SQLITE_PRIVATE char *sqlite3WinFullPathname(const char *zRelative){
     }
     GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, 0);
     sqliteFree(zConverted);
-    zFull = tqunicodeToUtf8(zTemp);
+    zFull = unicodeToUtf8(zTemp);
     sqliteFree(zTemp);
   }else{
     char *zTemp;
@@ -19084,7 +19084,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){
@@ -22474,7 +22474,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){
 **      8       4      Right child (the Ptr(N) 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.
@@ -22555,7 +22555,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){
 */
 
 /* 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)
 
@@ -24060,7 +24060,7 @@ SQLITE_PRIVATE 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 */
   sqlite3PagerSetPagesize(pBt->pPager, pBt->pageSize);
 
 #if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO)
@@ -24090,7 +24090,7 @@ btree_open_out:
 }
 
 /*
-** Close an open database and tqinvalidate all cursors.
+** Close an open database and invalidate all cursors.
 */
 SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){
   BtShared *pBt = p->pBt;
@@ -24571,7 +24571,7 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, 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.
 */
@@ -25611,7 +25611,7 @@ static int copyPayload(
 ** Once an overflow page-list cache has been allocated, it may be
 ** invalidated if some other cursor writes to the same table, or if
 ** the cursor is moved to a different row. Additionally, in auto-vacuum
-** mode, the following events may tqinvalidate an overflow page-list cache.
+** mode, the following events may invalidate an overflow page-list cache.
 **
 **   * An incremental vacuum,
 **   * A commit in auto_vacuum="full" mode,
@@ -26888,7 +26888,7 @@ static int reparentPage(BtShared *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()
@@ -27331,7 +27331,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 ){
@@ -27362,7 +27362,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;
 
   /*
@@ -27381,13 +27381,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];
@@ -27656,7 +27656,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 ){
@@ -27758,7 +27758,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]);
@@ -28351,7 +28351,7 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, 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(
@@ -28811,8 +28811,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.
 */
@@ -32090,7 +32090,7 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){
     sqlite3_search_count++;
 #endif
     p->deferredMoveto = 0;
-    p->cachetqStatus = CACHE_STALE;
+    p->cacheStatus = CACHE_STALE;
   }
   return SQLITE_OK;
 }
@@ -35529,7 +35529,7 @@ case OP_Column: {
     pCrsr = pC->pCursor;
     if( pC->nullRow ){
       payloadSize = 0;
-    }else if( pC->cachetqStatus==p->cacheCtr ){
+    }else if( pC->cacheStatus==p->cacheCtr ){
       payloadSize = pC->payloadSize;
       zRec = (char*)pC->aRow;
     }else if( pC->isIndex ){
@@ -35544,7 +35544,7 @@ case OP_Column: {
     /* The record is the sole entry of a pseudo-table */
     payloadSize = pC->nData;
     zRec = pC->pData;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
     assert( payloadSize==0 || zRec!=0 );
     nField = pC->nField;
     pCrsr = 0;
@@ -35569,7 +35569,7 @@ case OP_Column: {
   /* Read and parse the table header.  Store the results of the parse
   ** into the record header cache fields of the cursor.
   */
-  if( pC && pC->cachetqStatus==p->cacheCtr ){
+  if( pC && pC->cacheStatus==p->cacheCtr ){
     aType = pC->aType;
     aOffset = pC->aOffset;
   }else{
@@ -35588,7 +35588,7 @@ case OP_Column: {
     }
     pC->aOffset = aOffset = &aType[nField];
     pC->payloadSize = payloadSize;
-    pC->cachetqStatus = p->cacheCtr;
+    pC->cacheStatus = p->cacheCtr;
 
     /* Figure out how many bytes are in the header */
     if( zRec ){
@@ -36485,7 +36485,7 @@ case OP_MoveGt: {       /* no-push */
       pC->rowidIsValid = 0;
     }
     pC->deferredMoveto = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
     *pC->pIncrKey = 0;
 #ifdef SQLITE_TEST
     sqlite3_search_count++;
@@ -36589,7 +36589,7 @@ case OP_Found: {        /* no-push */
     rx = sqlite3BtreeMoveto(pC->pCursor, pTos->z, pTos->n, 0, &res);
     alreadyExists = rx==SQLITE_OK && res==0;
     pC->deferredMoveto = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
   }
   if( pOp->opcode==OP_Found ){
     if( alreadyExists ) pc = pOp->p2 - 1;
@@ -36664,7 +36664,7 @@ case OP_IsUnique: {        /* no-push */
     ** If there is no such entry, jump immediately to P2.
     */
     assert( pCx->deferredMoveto==0 );
-    pCx->cachetqStatus = CACHE_STALE;
+    pCx->cacheStatus = CACHE_STALE;
     rc = sqlite3BtreeMoveto(pCrsr, zKey, len, 0, &res);
     if( rc!=SQLITE_OK ){
       goto abort_due_to_error;
@@ -36739,7 +36739,7 @@ case OP_NotExists: {        /* no-push */
     pC->lastRowid = pTos->u.i;
     pC->rowidIsValid = res==0;
     pC->nullRow = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
     /* res might be uninitialized if rc!=SQLITE_OK.  But if rc!=SQLITE_OK
     ** processing is about to abort so we really do not care whether or not
     ** the following jump is taken.  (In other words, do not stress over
@@ -36920,7 +36920,7 @@ case OP_NewRowid: {
     }
     pC->rowidIsValid = 0;
     pC->deferredMoveto = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
   }
   pTos++;
   pTos->u.i = v;
@@ -37002,7 +37002,7 @@ case OP_Insert: {         /* no-push */
     
     pC->rowidIsValid = 0;
     pC->deferredMoveto = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
 
     /* Invoke the update-hook if required. */
     if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){
@@ -37062,7 +37062,7 @@ case OP_Delete: {        /* no-push */
     if( rc ) goto abort_due_to_error;
     rc = sqlite3BtreeDelete(pC->pCursor);
     pC->nextRowidValid = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
 
     /* Invoke the update-hook if required. */
     if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){
@@ -37245,7 +37245,7 @@ case OP_Last: {        /* no-push */
     rc = sqlite3BtreeLast(pCrsr, &res);
     pC->nullRow = res;
     pC->deferredMoveto = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
     if( res && pOp->p2>0 ){
       pc = pOp->p2 - 1;
     }
@@ -37296,7 +37296,7 @@ case OP_Rewind: {        /* no-push */
     rc = sqlite3BtreeFirst(pCrsr, &res);
     pC->atFirst = res==0;
     pC->deferredMoveto = 0;
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
   }else{
     res = 1;
   }
@@ -37343,7 +37343,7 @@ case OP_Next: {        /* no-push */
       rc = pOp->opcode==OP_Next ? sqlite3BtreeNext(pCrsr, &res) :
                                   sqlite3BtreePrevious(pCrsr, &res);
       pC->nullRow = res;
-      pC->cachetqStatus = CACHE_STALE;
+      pC->cacheStatus = CACHE_STALE;
     }
     if( res==0 ){
       pc = pOp->p2 - 1;
@@ -37386,7 +37386,7 @@ case OP_IdxInsert: {        /* no-push */
       const char *zKey = pTos->z;
       rc = sqlite3BtreeInsert(pCrsr, zKey, nKey, "", 0, 0, pOp->p2);
       assert( pC->deferredMoveto==0 );
-      pC->cachetqStatus = CACHE_STALE;
+      pC->cacheStatus = CACHE_STALE;
     }
   }
   Release(pTos);
@@ -37415,7 +37415,7 @@ case OP_IdxDelete: {        /* no-push */
       rc = sqlite3BtreeDelete(pCrsr);
     }
     assert( pC->deferredMoveto==0 );
-    pC->cachetqStatus = CACHE_STALE;
+    pC->cacheStatus = CACHE_STALE;
   }
   Release(pTos);
   pTos--;
@@ -39775,7 +39775,7 @@ static void heightOfSelect(Select *p, int *pnHeight){
 
 /*
 ** Set the Expr.nHeight variable in the structure passed as an 
-** argument. An expression with no tqchildren, Expr.pList or 
+** argument. An expression with no children, Expr.pList or 
 ** Expr.pSelect member has a height of 1. Any other expression
 ** has a height equal to the maximum height of any other 
 ** referenced Expr plus one.
@@ -39821,7 +39821,7 @@ SQLITE_PRIVATE 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.
 **
@@ -41310,7 +41310,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
   */
   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 );
@@ -46026,7 +46026,7 @@ SQLITE_PRIVATE 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);
@@ -48125,7 +48125,7 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
   if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
   z2 = (char*)sqlite3_value_text(argv[0]);
   n = sqlite3_value_bytes(argv[0]);
-  /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */
+  /* Verify that the call to _bytes() does not invalidate the _text() pointer */
   assert( z2==(char*)sqlite3_value_text(argv[0]) );
   if( z2 ){
     z1 = sqlite3_malloc(n+1);
@@ -48145,7 +48145,7 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
   if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
   z2 = (char*)sqlite3_value_text(argv[0]);
   n = sqlite3_value_bytes(argv[0]);
-  /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */
+  /* Verify that the call to _bytes() does not invalidate the _text() pointer */
   assert( z2==(char*)sqlite3_value_text(argv[0]) );
   if( z2 ){
     z1 = sqlite3_malloc(n+1);
@@ -53685,7 +53685,7 @@ static int sqlite3Prepare16(
 
   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.
     */
@@ -60019,7 +60019,7 @@ struct WhereTerm {
   i16 leftColumn;         /* Column number of X in "X <op> <expr>" */
   u16 eOperator;          /* 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 */
@@ -66935,7 +66935,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
   /* 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 ){
@@ -67205,7 +67205,7 @@ SQLITE_API const char *sqlite3_errmsg(sqlite3 *db){
 ** error.
 */
 SQLITE_API 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].
@@ -67292,7 +67292,7 @@ static int createCollation(
 
   /* 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)enc2, zName, strlen(zName), 0);
   if( pColl && pColl->xCmp ){
diff --git a/amarok/src/sqlite/sqlite3.h b/amarok/src/sqlite/sqlite3.h
index 474b8936..cb1fdb6c 100644
--- a/amarok/src/sqlite/sqlite3.h
+++ b/amarok/src/sqlite/sqlite3.h
@@ -1522,7 +1522,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
 ** </ul>
 **
 ** Conversions between UTF-16be and UTF-16le are always done in place and do
-** not tqinvalidate a prior pointer, though of course the content of the buffer
+** not invalidate a prior pointer, though of course the content of the buffer
 ** that the prior pointer points to will have been modified.  Other kinds
 ** of conversion are done in place when it is possible, but sometime it is
 ** not possible and in those cases prior pointers are invalidated.  
@@ -2016,7 +2016,7 @@ int sqlite3_sleep(int);
 ** file directory.
 **
 ** Once [sqlite3_open()] has been called, changing this variable will
-** tqinvalidate the current temporary database, if any.  Generally speaking,
+** invalidate the current temporary database, if any.  Generally speaking,
 ** it is not safe to invoke this routine after [sqlite3_open()] has
 ** been called.
 */