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

4 files changed, 20 insertions, 20 deletions

diff --git a/kexi/3rdparty/kexisql/src/pager.c b/kexi/3rdparty/kexisql/src/pager.c
index 5259e085..566c778c 100644
--- a/kexi/3rdparty/kexisql/src/pager.c
+++ b/kexi/3rdparty/kexisql/src/pager.c
@@ -435,7 +435,7 @@ static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
 /*
 ** Unlock the database and clear the in-memory cache.  This routine
 ** sets the state of the pager back to what it was when it was first
-** opened.  Any outstanding pages are tqinvalidated and subsequent attempts
+** opened.  Any outstanding pages are invalidated and subsequent attempts
 ** to access those pages will likely result in a coredump.
 */
 static void pager_reset(Pager *pPager){
@@ -1059,7 +1059,7 @@ int sqlitepager_truncate(Pager *pPager, Pgno nPage){
 ** Shutdown the page cache.  Free all memory and close all files.
 **
 ** If a transaction was in progress when this routine is called, that
-** transaction is rolled back.  All outstanding pages are tqinvalidated
+** transaction is rolled back.  All outstanding pages are invalidated
 ** and their memory is freed.  Any attempt to use a page associated
 ** with this page cache after this function returns will likely
 ** result in a coredump.
diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c
index cc13aec8..28136e76 100644
--- a/kexi/3rdparty/kexisql/src/select.c
+++ b/kexi/3rdparty/kexisql/src/select.c
@@ -1985,7 +1985,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 ** This routine does NOT free the Select structure passed in.  The
 ** calling function needs to do that.
 **
-** The pParent, tqparentTab, and *pParentAgg fields are filled in if this
+** The pParent, parentTab, and *pParentAgg fields are filled in if this
 ** SELECT is a subquery.  This routine may try to combine this SELECT
 ** with its tqparent to form a single flat query.  In so doing, it might
 ** change the tqparent query from a non-aggregate to an aggregate query.
@@ -2003,7 +2003,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 ** pParent will be NULL.  During the processing of the outer query, this 
 ** routine is called recursively to handle the subquery.  For the recursive
 ** call, pParent will point to the outer query.  Because the subquery is
-** the second element in a three-way join, the tqparentTab parameter will
+** the second element in a three-way join, the parentTab parameter will
 ** be 1 (the 2nd value of a 0-indexed array.)
 */
 int sqliteSelect(
@@ -2012,7 +2012,7 @@ int sqliteSelect(
   int eDest,             /* How to dispose of the results */
   int iParm,             /* A parameter used by the eDest disposal method */
   Select *pParent,       /* Another SELECT for which this is a sub-query */
-  int tqparentTab,         /* Index in pParent->pSrc of this query */
+  int parentTab,         /* Index in pParent->pSrc of this query */
   int *pParentAgg        /* True if pParent uses aggregate functions */
 ){
   int i;
@@ -2232,7 +2232,7 @@ int sqliteSelect(
   ** If flattening is a possiblity, do so and return immediately.  
   */
   if( pParent && pParentAgg &&
-      flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){
+      flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){
     if( isAgg ) *pParentAgg = 1;
     return rc;
   }
@@ -2414,10 +2414,10 @@ int sqliteSelect(
   ** the use of the temporary table.
   */
   if( pParent ){
-    assert( pParent->pSrc->nSrc>tqparentTab );
-    assert( pParent->pSrc->a[tqparentTab].pSelect==p );
+    assert( pParent->pSrc->nSrc>parentTab );
+    assert( pParent->pSrc->a[parentTab].pSelect==p );
     sqliteSelectDelete(p);
-    pParent->pSrc->a[tqparentTab].pSelect = 0;
+    pParent->pSrc->a[parentTab].pSelect = 0;
   }
 
   /* The SELECT was successfully coded.   Set the return code to 0
diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c
index dcf56bf5..6ac81058 100644
--- a/kexi/3rdparty/kexisql/src/vdbe.c
+++ b/kexi/3rdparty/kexisql/src/vdbe.c
@@ -309,7 +309,7 @@ static int toInt(const char *zNum, int *pNum){
 ** Convert the given stack entity into a integer if it isn't one
 ** already.
 **
-** Any prior string or real representation is tqinvalidated.  
+** Any prior string or real representation is invalidated.  
 ** NULLs are converted into 0.
 */
 #define Integerify(P) if(((P)->flags&MEM_Int)==0){ hardIntegerify(P); }
diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c
index 2b94ad3c..58b6e3d0 100644
--- a/kexi/3rdparty/kexisql/src/where.c
+++ b/kexi/3rdparty/kexisql/src/where.c
@@ -36,7 +36,7 @@ struct ExprInfo {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bittqmasks.  The VDBE cursor numbers
+** between VDBE cursor numbers and bitmasks.  The VDBE cursor numbers
 ** are small integers contained in SrcList_item.iCursor and Expr.iTable
 ** fields.  For any given WHERE clause, we want to track which cursors
 ** are being used, so we assign a single bit in a 32-bit word to track
@@ -391,7 +391,7 @@ WhereInfo *sqliteWhereBegin(
   int nExpr;           /* Number of subexpressions in the WHERE clause */
   int loopMask;        /* One bit set for each outer loop */
   int haveKey;         /* True if KEY is on the stack */
-  ExprMaskSet tqmaskSet; /* The expression tqmask set */
+  ExprMaskSet maskSet; /* The expression tqmask set */
   int iDirectEq[32];   /* Term of the form ROWID==X for the N-th table */
   int iDirectLt[32];   /* Term of the form ROWID<X or ROWID<=X */
   int iDirectGt[32];   /* Term of the form ROWID>X or ROWID>=X */
@@ -407,7 +407,7 @@ WhereInfo *sqliteWhereBegin(
   ** array fills up, the last entry might point to an expression which
   ** contains additional unfactored AND operators.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   memset(aExpr, 0, sizeof(aExpr));
   nExpr = exprSplit(ARRAYSIZE(aExpr), aExpr, pWhere);
   if( nExpr==ARRAYSIZE(aExpr) ){
@@ -440,21 +440,21 @@ WhereInfo *sqliteWhereBegin(
   /* Analyze all of the subexpressions.
   */
   for(i=0; i<nExpr; i++){
-    exprAnalyze(&tqmaskSet, &aExpr[i]);
+    exprAnalyze(&maskSet, &aExpr[i]);
 
     /* If we are executing a trigger body, remove all references to
-    ** new.* and old.* tables from the prerequisite tqmasks.
+    ** new.* and old.* tables from the prerequisite masks.
     */
     if( pParse->trigStack ){
       int x;
       if( (x = pParse->trigStack->newIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
       }
       if( (x = pParse->trigStack->oldIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
@@ -482,7 +482,7 @@ WhereInfo *sqliteWhereBegin(
   for(i=0; i<pTabList->nSrc && i<ARRAYSIZE(iDirectEq); i++){
     int j;
     int iCur = pTabList->a[i].iCursor;    /* The cursor for this table */
-    int tqmask = getMask(&tqmaskSet, iCur);   /* Cursor tqmask for this table */
+    int tqmask = getMask(&maskSet, iCur);   /* Cursor tqmask for this table */
     Table *pTab = pTabList->a[i].pTab;
     Index *pIdx;
     Index *pBestIdx = 0;
@@ -1132,7 +1132,7 @@ WhereInfo *sqliteWhereBegin(
       pLevel->p1 = pLevel->iCur;
       pLevel->p2 = start;
     }
-    loopMask |= getMask(&tqmaskSet, iCur);
+    loopMask |= getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.
@@ -1179,7 +1179,7 @@ WhereInfo *sqliteWhereBegin(
   if( pushKey && !haveKey ){
     sqliteVdbeAddOp(v, OP_Recno, pTabList->a[0].iCursor, 0);
   }
-  freeMaskSet(&tqmaskSet);
+  freeMaskSet(&maskSet);
   return pWInfo;
 }