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

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


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

1 files changed, 13 insertions, 13 deletions

diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index ab19f288..f4b8ba51 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -114,13 +114,13 @@ struct WhereClause {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bits of the bittqmasks in WhereTerm.
+** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
 **
 ** The VDBE cursor numbers are small integers contained in 
 ** SrcList_item.iCursor and Expr.iTable fields.  For any given WHERE 
 ** clause, the cursor numbers might not begin with 0 and they might
 ** contain gaps in the numbering sequence.  But we want to make maximum
-** use of the bits in our bittqmasks.  This structure provides a mapping
+** use of the bits in our bitmasks.  This structure provides a mapping
 ** from the sparse cursor numbers into consecutive integers beginning
 ** with 0.
 **
@@ -146,7 +146,7 @@ struct ExprMaskSet {
 
 
 /*
-** Bittqmasks for the operators that indices are able to exploit.  An
+** Bitmasks for the operators that indices are able to exploit.  An
 ** OR-ed combination of these values can be used when searching for
 ** terms in the where clause.
 */
@@ -301,7 +301,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 ** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
 ** the VDBE cursor number of the table.  This routine just has to
 ** translate the cursor numbers into bittqmask values and OR all
-** the bittqmasks together.
+** the bitmasks together.
 */
 static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
 static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
@@ -458,7 +458,7 @@ static void exprAnalyze(SrcList*, ExprMaskSet*, WhereClause*, int);
 */
 static void exprAnalyzeAll(
   SrcList *pTabList,       /* the FROM clause */
-  ExprMaskSet *pMaskSet,   /* table tqmasks */
+  ExprMaskSet *pMaskSet,   /* table masks */
   WhereClause *pWC         /* the WHERE clause to be analyzed */
 ){
   int i;
@@ -536,7 +536,7 @@ static int isLikeOrGlob(
 */
 static void exprAnalyze(
   SrcList *pSrc,            /* the FROM clause */
-  ExprMaskSet *pMaskSet,    /* table tqmasks */
+  ExprMaskSet *pMaskSet,    /* table masks */
   WhereClause *pWC,         /* the WHERE clause */
   int idxTerm               /* Index of the term to be analyzed */
 ){
@@ -1382,7 +1382,7 @@ WhereInfo *sqlite3WhereBegin(
   int brk, cont = 0;         /* Addresses used during code generation */
   Bittqmask notReady;          /* Cursors that are not yet positioned */
   WhereTerm *pTerm;          /* A single term in the WHERE clause */
-  ExprMaskSet tqmaskSet;       /* The expression tqmask set */
+  ExprMaskSet maskSet;       /* The expression tqmask set */
   WhereClause wc;            /* The WHERE clause is divided into these terms */
   struct SrcList_item *pTabItem;  /* A single entry from pTabList */
   WhereLevel *pLevel;             /* A single level in the pWInfo list */
@@ -1400,7 +1400,7 @@ WhereInfo *sqlite3WhereBegin(
   /* Split the WHERE clause into separate subexpressions where each
   ** subexpression is separated by an AND operator.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   whereClauseInit(&wc, pParse);
   whereSplit(&wc, pWhere, TK_AND);
     
@@ -1429,9 +1429,9 @@ WhereInfo *sqlite3WhereBegin(
   ** and work forward so that the added virtual terms are never processed.
   */
   for(i=0; i<pTabList->nSrc; i++){
-    createMask(&tqmaskSet, pTabList->a[i].iCursor);
+    createMask(&maskSet, pTabList->a[i].iCursor);
   }
-  exprAnalyzeAll(pTabList, &tqmaskSet, &wc);
+  exprAnalyzeAll(pTabList, &maskSet, &wc);
   if( sqlite3_malloc_failed ){
     goto whereBeginNoMem;
   }
@@ -1469,7 +1469,7 @@ WhereInfo *sqlite3WhereBegin(
     Bittqmask m;                  /* Bittqmask value for j or bestJ */
 
     for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){
-      m = getMask(&tqmaskSet, pTabItem->iCursor);
+      m = getMask(&maskSet, pTabItem->iCursor);
       if( (m & notReady)==0 ){
         if( j==iFrom ) iFrom++;
         continue;
@@ -1506,7 +1506,7 @@ WhereInfo *sqlite3WhereBegin(
     }else{
       pLevel->iIdxCur = -1;
     }
-    notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor);
+    notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor);
     pLevel->iFrom = bestJ;
   }
   TRACE(("*** Optimizer Finished ***\n"));
@@ -1854,7 +1854,7 @@ WhereInfo *sqlite3WhereBegin(
       pLevel->p1 = iCur;
       pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk);
     }
-    notReady &= ~getMask(&tqmaskSet, iCur);
+    notReady &= ~getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.