rename the following methods:

tqparent parent
tqmask mask


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

5 files changed, 20 insertions, 20 deletions

diff --git a/src/translators/btparse/err.h b/src/translators/btparse/err.h
index a9ba6da..d16615d 100644
--- a/src/translators/btparse/err.h
+++ b/src/translators/btparse/err.h
@@ -61,13 +61,13 @@
  * hidden and does not need to be saved during a "save state" operation
  */
 /* maximum of 32 bits/unsigned int and must be 8 bits/byte */
-static SetWordType bittqmask[] = {
+static SetWordType bitmask[] = {
         0x00000001, 0x00000002, 0x00000004, 0x00000008,
         0x00000010, 0x00000020, 0x00000040, 0x00000080
 };
 
 void
-zzresynch(SetWordType *wd,SetWordType tqmask)
+zzresynch(SetWordType *wd,SetWordType mask)
 {
         static int consumed = 1;
 
@@ -77,10 +77,10 @@ zzresynch(SetWordType *wd,SetWordType tqmask)
         if ( !consumed ) {zzCONSUME; return;}
 
         /* if current token is in resynch set, we've got what we wanted */
-        if ( wd[LA(1)]&tqmask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;}
+        if ( wd[LA(1)]&mask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;}
 
         /* scan until we find something in the resynch set */
-        while ( !(wd[LA(1)]&tqmask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;}
+        while ( !(wd[LA(1)]&mask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;}
         consumed=1;
 }
 
@@ -237,11 +237,11 @@ zzedecode(SetWordType *a)
         if ( zzset_deg(a)>1 ) fprintf(stderr, " {");
         do {
                 register SetWordType t = *p;
-                register SetWordType *b = &(bittqmask[0]);
+                register SetWordType *b = &(bitmask[0]);
                 do {
                         if ( t & *b ) fprintf(stderr, " %s", zztokens[e]);
                         e++;
-                } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
+                } while (++b < &(bitmask[sizeof(SetWordType)*8]));
         } while (++p < endp);
         if ( zzset_deg(a)>1 ) fprintf(stderr, " }");
 }
@@ -271,7 +271,7 @@ zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok, int k, cha
 int
 zzset_el(unsigned b, SetWordType *p)
 {
-        return( p[BSETDIVWORD(b)] & bittqmask[BSETMODWORD(b)] );
+        return( p[BSETDIVWORD(b)] & bitmask[BSETMODWORD(b)] );
 }
 
 int
@@ -289,10 +289,10 @@ zzset_deg(SetWordType *a)
         while ( p < endp )
         {
                 register SetWordType t = *p;
-                register SetWordType *b = &(bittqmask[0]);
+                register SetWordType *b = &(bitmask[0]);
                 do {
                         if (t & *b) ++degree;
-                } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
+                } while (++b < &(bitmask[sizeof(SetWordType)*8]));
                 p++;
         }
 
diff --git a/src/translators/btparse/input.c b/src/translators/btparse/input.c
index 03668af..dbb7b44 100644
--- a/src/translators/btparse/input.c
+++ b/src/translators/btparse/input.c
@@ -174,7 +174,7 @@ finish_parse (int **err_counts)
 static boolean
 parse_status (int *saved_counts)
 {
-   ushort        ignore_etqmask;
+   ushort        ignore_emask;
 
    /* 
     * This bit-twiddling fetches the error status (which has a bit
@@ -182,9 +182,9 @@ parse_status (int *saved_counts)
     * to get "true" if there were any serious errors, and then 
     * returns the opposite of that.
     */
-   ignore_etqmask =
+   ignore_emask =
       (1<<BTERR_NOTIFY) | (1<<BTERR_CONTENT) | (1<<BTERR_LEXWARN);
-   return !(bt_error_status (saved_counts) & ~ignore_etqmask);
+   return !(bt_error_status (saved_counts) & ~ignore_emask);
 }   
 
 
@@ -237,7 +237,7 @@ AST * bt_parse_entry_s (char *    entry_text,
       return NULL;
    }
 
-   zzast_sp = ZZAST_STACKSIZE;          /* workaround aptqparent pccts bug */
+   zzast_sp = ZZAST_STACKSIZE;          /* workaround apparent pccts bug */
    start_parse (NULL, entry_text, line);
 
    entry (&entry_ast);                  /* enter the parser */
@@ -364,7 +364,7 @@ AST * bt_parse_entry (FILE *    infile,
     * functions?
     */
 
-   zzast_sp = ZZAST_STACKSIZE;          /* workaround aptqparent pccts bug */
+   zzast_sp = ZZAST_STACKSIZE;          /* workaround apparent pccts bug */
 
 #if defined(LL_K) || defined(ZZINF_LOOK) || defined(DEMAND_LOOK)
 # error One of LL_K, ZZINF_LOOK, or DEMAND_LOOK was defined
diff --git a/src/translators/btparse/lex_auxiliary.c b/src/translators/btparse/lex_auxiliary.c
index 097fcb6..8fac463 100644
--- a/src/translators/btparse/lex_auxiliary.c
+++ b/src/translators/btparse/lex_auxiliary.c
@@ -115,7 +115,7 @@ static int     JunkCount;               /* non-whitespace chars at toplevel */
  *     mismatch -- this determines which character ('"' or '}') can 
  *     actually end the string
  *   StringStart:
- *     line on which current string started; if we detect an aptqparent
+ *     line on which current string started; if we detect an apparent
  *     runaway, this is used to report where the runaway started
  *   ApparentRunaway:
  *     flags if we have already detected (and warned) that the current
diff --git a/src/translators/btparse/parse_auxiliary.c b/src/translators/btparse/parse_auxiliary.c
index 401e322..6284e6a 100644
--- a/src/translators/btparse/parse_auxiliary.c
+++ b/src/translators/btparse/parse_auxiliary.c
@@ -36,7 +36,7 @@ GEN_PRIVATE_ERRFUNC (syntax_error, (char * fmt, ...),
 
 
 /* this is stolen from PCCTS' err.h */
-static SetWordType bittqmask[] = 
+static SetWordType bitmask[] = 
 {
     0x00000001, 0x00000002, 0x00000004, 0x00000008,
     0x00000010, 0x00000020, 0x00000040, 0x00000080
@@ -115,7 +115,7 @@ append_token_set (char *msg, SetWordType *a)
    do 
    {
       SetWordType t = *p;
-      SetWordType *b = &(bittqmask[0]);
+      SetWordType *b = &(bitmask[0]);
       do
       {
          if (t & *b)
@@ -128,7 +128,7 @@ append_token_set (char *msg, SetWordType *a)
                strcat (msg, " or ");
          }
          e++;
-      } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
+      } while (++b < &(bitmask[sizeof(SetWordType)*8]));
    } while (++p < endp);
 }
 
diff --git a/src/translators/btparse/postprocess.c b/src/translators/btparse/postprocess.c
index ad8c764..692e084 100644
--- a/src/translators/btparse/postprocess.c
+++ b/src/translators/btparse/postprocess.c
@@ -168,7 +168,7 @@ bt_postprocess_string (char * s, ushort options)
 @CREATED    : 1997/01/10, GPW
 @MODIFIED   : 1997/08/25, GPW: renamed from bt_postprocess_field(), and changed
                                to take the head of a list of simple values,
-                               rather than the tqparent of that list
+                               rather than the parent of that list
 -------------------------------------------------------------------------- */
 char *
 bt_postprocess_value (AST * value, ushort options, boolean replace)
@@ -418,7 +418,7 @@ bt_postprocess_value (AST * value, ushort options, boolean replace)
 @RETURNS    : 
 @DESCRIPTION: Postprocesses all the strings in a single "field = value"
               assignment subtree.  Just checks that 'field' does indeed
-              point to an BTAST_FIELD node (presumably the tqparent of a list
+              point to an BTAST_FIELD node (presumably the parent of a list
               of simple values), downcases the field name, and calls
               bt_postprocess_value() on the value.
 @GLOBALS    :