rename the following methods:

tqparent parent
tqmask mask

1 files changed, 5 insertions, 5 deletions

diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/select.c b/tqtinterface/qt4/src/3rdparty/sqlite/select.c
index 21416aa..d29c4a5 100644
--- a/tqtinterface/qt4/src/3rdparty/sqlite/select.c
+++ b/tqtinterface/qt4/src/3rdparty/sqlite/select.c
@@ -1618,7 +1618,7 @@ substExprList(ExprList *pList, int iTable, ExprList *pEList){
 */
 static int flattenSubquery(
   Parse *pParse,       /* The parsing context */
-  Select *p,           /* The tqparent or outer SELECT statement */
+  Select *p,           /* The parent or outer SELECT statement */
   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
   int isAgg,           /* True if outer SELECT uses aggregate functions */
   int subqueryIsAgg    /* True if the subquery uses aggregate functions */
@@ -1957,8 +1957,8 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 **
 ** 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.
+** with its parent to form a single flat query.  In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
 ** For that reason, the pParentAgg flag is passed as a pointer, so it
 ** can be changed.
 **
@@ -2198,7 +2198,7 @@ int sqliteSelect(
     isDistinct = p->isDistinct;
   }
 
-  /* Check to see if this is a subquery that can be "flattened" into its tqparent.
+  /* Check to see if this is a subquery that can be "flattened" into its parent.
   ** If flattening is a possiblity, do so and return immediately.  
   */
   if( pParent && pParentAgg &&
@@ -2379,7 +2379,7 @@ int sqliteSelect(
   }
 
   /* If this was a subquery, we have now converted the subquery into a
-  ** temporary table.  So delete the subquery structure from the tqparent
+  ** temporary table.  So delete the subquery structure from the parent
   ** to prevent this subquery from being evaluated again and to force the
   ** the use of the temporary table.
   */