Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3


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

10 files changed, 67 insertions, 67 deletions

diff --git a/kspell2/plugins/ispell/correct.cpp b/kspell2/plugins/ispell/correct.cpp
index 65e98fa6d..7e52dff2f 100644
--- a/kspell2/plugins/ispell/correct.cpp
+++ b/kspell2/plugins/ispell/correct.cpp
@@ -789,9 +789,9 @@ ISpellChecker::save_root_cap (ichar_t *word, ichar_t *pattern,
 #else /* NO_CAPITALIZATION_SUPPORT */
 #define flagsareok(dent)    \
     ((pfxent == NULL \
-	||  TSTMASKBIT (dent->mask, pfxent->flagbit)) \
+	||  TSTMASKBIT (dent->tqmask, pfxent->flagbit)) \
       &&  (sufent == NULL \
-	||  TSTMASKBIT (dent->mask, sufent->flagbit)))
+	||  TSTMASKBIT (dent->tqmask, sufent->flagbit)))
 
     dent = firstdent;
     if ((dent->flagfield & (CAPTYPEMASK | MOREVARIANTS)) == ALLCAPS)
diff --git a/kspell2/plugins/ispell/good.cpp b/kspell2/plugins/ispell/good.cpp
index 351106d99..1cd3c0dc0 100644
--- a/kspell2/plugins/ispell/good.cpp
+++ b/kspell2/plugins/ispell/good.cpp
@@ -145,7 +145,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/28 23:11:30  eric
  *
@@ -161,13 +161,13 @@
  * of this is a hack.
  *
  * 1.  added other/spell to the -I list in config/abi_defs
- * 2.  replaced other/spell/Makefile with one which is more like
+ * 2.  tqreplaced other/spell/Makefile with one which is more like
  * 	our build system.
  * 3.  added other/spell to other/Makefile so that the build will now
  * 	dive down and build the spell check library.
  * 4.  added the AbiSpell library to the Makefiles in wp/main
  * 5.  added a call to SpellCheckInit in wp/main/unix/UnixMain.cpp.
- * 	This call is a HACK and should be replaced with something
+ * 	This call is a HACK and should be tqreplaced with something
  * 	proper later.
  * 6.  added code to fv_View.cpp as follows:
  * 	whenever you double-click on a word, the spell checker
@@ -231,9 +231,9 @@ int		good P ((ichar_t * word, int ignoreflagbits, int allhits,
 */
 static int entryhasaffixes (struct dent *dent, struct success *hit)
 {
-    if (hit->prefix  &&  !TSTMASKBIT (dent->mask, hit->prefix->flagbit))
+    if (hit->prefix  &&  !TSTMASKBIT (dent->tqmask, hit->prefix->flagbit))
 		return 0;
-    if (hit->suffix  &&  !TSTMASKBIT (dent->mask, hit->suffix->flagbit))
+    if (hit->suffix  &&  !TSTMASKBIT (dent->tqmask, hit->suffix->flagbit))
 		return 0;
     return 1;			/* Yes, these affixes are legal */
 }
diff --git a/kspell2/plugins/ispell/hash.cpp b/kspell2/plugins/ispell/hash.cpp
index 03bd880bb..a072c080a 100644
--- a/kspell2/plugins/ispell/hash.cpp
+++ b/kspell2/plugins/ispell/hash.cpp
@@ -138,7 +138,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.2  1998/12/28 23:11:30  eric
  *
diff --git a/kspell2/plugins/ispell/ispell.h b/kspell2/plugins/ispell/ispell.h
index 587defc07..01e1aa8a2 100644
--- a/kspell2/plugins/ispell/ispell.h
+++ b/kspell2/plugins/ispell/ispell.h
@@ -199,7 +199,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.1  1998/12/28 18:04:43  davet
  * Spell checker code stripped from ispell.  At this point, there are
@@ -268,7 +268,7 @@ extern "C" {
 #endif
 
 /*
-** Number of mask bits (affix flags) supported.  Must be 32, 64, 128, or
+** Number of tqmask bits (affix flags) supported.  Must be 32, 64, 128, or
 ** 256.  If MASKBITS is 32 or 64, there are really only 26 or 58 flags
 ** available, respectively.  If it is 32, the flags are named with the
 ** 26 English uppercase letters;  lowercase will be converted to uppercase.
@@ -290,7 +290,7 @@ extern "C" {
 extern int		gnMaskBits;
 
 /*
-** C type to use for masks.  This should be a type that the processor
+** C type to use for tqmasks.  This should be a type that the processor
 ** accesses efficiently.
 **
 ** MASKTYPE_WIDTH must correctly reflect the number of bits in a
@@ -401,11 +401,11 @@ extern int		gnMaskBits;
 #define MASKSIZE	(gnMaskBits / MASKTYPE_WIDTH)
 
 #ifdef lint
-extern int	TSTMASKBIT P ((MASKTYPE * mask, int bit));
+extern int	TSTMASKBIT P ((MASKTYPE * tqmask, int bit));
 #else /* lint */
 /* The following is really testing for MASKSIZE <= 1, but cpp can't do that */
-#define TSTMASKBIT(mask, bit) \
-		    ((mask)[(bit) / MASKTYPE_WIDTH] & \
+#define TSTMASKBIT(tqmask, bit) \
+		    ((tqmask)[(bit) / MASKTYPE_WIDTH] & \
 		      ((MASKTYPE) 1 << ((bit) & (MASKTYPE_WIDTH - 1))))
 #endif /* lint */
 
@@ -466,7 +466,7 @@ struct dent
 {
     struct dent *	next;
     char *			word;
-    MASKTYPE		mask[2];
+    MASKTYPE		tqmask[2];
 #ifdef FULLMASKSET
     char			flags;
 #endif
@@ -474,7 +474,7 @@ struct dent
 
 /*
 ** Flags in the directory entry.  If FULLMASKSET is undefined, these are
-** stored in the highest bits of the last longword of the mask field.  If
+** stored in the highest bits of the last longword of the tqmask field.  If
 ** FULLMASKSET is defined, they are stored in the extra "flags" field.
 #ifndef NO_CAPITALIZATION_SUPPORT
 **
@@ -498,14 +498,14 @@ struct dent
 ** entries for it, linked together by the "next" field.  The initial
 ** entry for such words will be a dummy entry, primarily for use by code
 ** that ignores capitalization.  The "word" field of this entry will
-** again point to an all-uppercase copy of the word.  The "mask" field
-** will contain the logical OR of the mask fields of all variants.
+** again point to an all-uppercase copy of the word.  The "tqmask" field
+** will contain the logical OR of the tqmask fields of all variants.
 ** A header entry is indicated by a capitalization type of ALLCAPS,
 ** with the MOREVARIANTS bit set.
 **
 ** The following entries will define the individual variants.  Each
 ** entry except the last has the MOREVARIANTS flag set, and each
-** contains one of the following capitalization options:
+** tqcontains one of the following capitalization options:
 **
 **	ALLCAPS		The word must appear in all capitals.
 **	CAPITALIZED	The word must be capitalized (e.g., London).
@@ -519,7 +519,7 @@ struct dent
 **	ANYCASE		The word may appear in lowercase, capitalized,
 **			or all-capitals.
 **
-** The "mask" field for the entry contains only the affix flag bits that
+** The "tqmask" field for the entry tqcontains only the affix flag bits that
 ** are legal for that capitalization.  The "word" field will be null
 ** except for FOLLOWCASE entries, where it will point to the
 ** correctly-capitalized spelling of the root word.
@@ -532,7 +532,7 @@ struct dent
 ** that is illegal due to an affix.
 **
 ** Finally, note that variations in the KEEP flag can cause a multiple-variant
-** entry as well.  For example, if the personal dictionary contains "ALPHA",
+** entry as well.  For example, if the personal dictionary tqcontains "ALPHA",
 ** (KEEP flag set) and the user adds "alpha" with the KEEP flag clear, a
 ** multiple-variant entry will be created so that "alpha" will be accepted
 ** but only "ALPHA" will actually be kept.
@@ -541,7 +541,7 @@ struct dent
 #ifdef FULLMASKSET
 #define flagfield	flags
 #else
-#define flagfield	mask[1]
+#define flagfield	tqmask[1]
 #endif
 #define USED		((MASKTYPE) 1 << (FLAGBASE + 0))
 #define KEEP		((MASKTYPE) 1 << (FLAGBASE + 1))
diff --git a/kspell2/plugins/ispell/ispell_checker.cpp b/kspell2/plugins/ispell/ispell_checker.cpp
index 6b3d382af..2d96395dc 100644
--- a/kspell2/plugins/ispell/ispell_checker.cpp
+++ b/kspell2/plugins/ispell/ispell_checker.cpp
@@ -423,7 +423,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 	if (m_translate_in)
 		{
 			/* We still have to setup prefstringchar*/
-			prefstringchar = findfiletype("utf8", 1, deftflag < 0 ? &deftflag
+			prefstringchar = tqfindfiletype("utf8", 1, deftflag < 0 ? &deftflag
 						      : static_cast<int *>(NULL));
 
 			if (prefstringchar < 0)
@@ -432,7 +432,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 					for(int n1 = 1; n1 <= 15; n1++)
 						{
 							teststring = "latin" + n1;
-							prefstringchar = findfiletype(teststring.c_str(), 1,
+							prefstringchar = tqfindfiletype(teststring.c_str(), 1,
 										      deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
 							if (prefstringchar >= 0)
 								break;
@@ -443,7 +443,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 		}
 
 	/* Test for UTF-8 first */
-	prefstringchar = findfiletype("utf8", 1, deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
+	prefstringchar = tqfindfiletype("utf8", 1, deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
 	if (prefstringchar >= 0)
 		{
 			m_translate_in = TQTextCodec::codecForName("utf8");
@@ -459,7 +459,7 @@ ISpellChecker::setDictionaryEncoding( const TQString& hashname, const char * enc
 			for(int n1 = 1; n1 <= 15; n1++)
 				{
 					TQString teststring = TQString("latin%1").arg(n1);
-					prefstringchar = findfiletype(teststring.latin1(), 1,
+					prefstringchar = tqfindfiletype(teststring.latin1(), 1,
 								      deftflag < 0 ? &deftflag : static_cast<int *>(NULL));
 					if (prefstringchar >= 0)
 						{
diff --git a/kspell2/plugins/ispell/ispell_checker.h b/kspell2/plugins/ispell/ispell_checker.h
index 08783922a..52d8bfd41 100644
--- a/kspell2/plugins/ispell/ispell_checker.h
+++ b/kspell2/plugins/ispell/ispell_checker.h
@@ -107,12 +107,12 @@ private:
 	int strtoichar (ichar_t* out, char* in, int outlen, int canonical);
 	int ichartostr (char* out, ichar_t* in, int outlen, int canonical);
 	char * ichartosstr (ichar_t* in, int canonical);
-	int	findfiletype (const char * name, int searchnames, int * deformatter);
+	int	tqfindfiletype (const char * name, int searchnames, int * deformatter);
 	long whatcap (ichar_t* word);
 
 	/*
-		HACK: macros replaced with function implementations
-		so we could do a side-effect-free check for unicode
+		HACK: macros tqreplaced with function implementations
+		so we could do a side-effect-free check for tqunicode
 		characters which aren't in hashheader
 	*/
 	char myupper(ichar_t c);
@@ -167,12 +167,12 @@ private:
 			  struct flagptr * ind, int optflags, struct flagent * pfxent,
 			  int ignoreflagbits, int allhits));
 	int		expand_pre P ((char * croot, ichar_t * rootword,
-			  MASKTYPE mask[], int option, char * extra));
+			  MASKTYPE tqmask[], int option, char * extra));
 	int	pr_pre_expansion P ((char * croot, ichar_t * rootword,
-			  struct flagent * flent, MASKTYPE mask[], int option,
+			  struct flagent * flent, MASKTYPE tqmask[], int option,
 			  char * extra));
 	int		expand_suf P ((char * croot, ichar_t * rootword,
-			  MASKTYPE mask[], int optflags, int option, char * extra));
+			  MASKTYPE tqmask[], int optflags, int option, char * extra));
 	int	pr_suf_expansion P ((char * croot, ichar_t * rootword,
 			  struct flagent * flent, int option, char * extra));
 	void	forcelc P ((ichar_t * dst, int len));
@@ -261,7 +261,7 @@ private:
 					/* ..(defined as those using legal affixes) */
 
 	/*
-	 * The following array contains a list of characters that should be tried
+	 * The following array tqcontains a list of characters that should be tried
 	 * in "missingletter."  Note that lowercase characters are omitted.
 	 */
 	int	m_Trynum;		/* Size of "Try" array */
diff --git a/kspell2/plugins/ispell/lookup.cpp b/kspell2/plugins/ispell/lookup.cpp
index 6030f49d0..cf49641e6 100644
--- a/kspell2/plugins/ispell/lookup.cpp
+++ b/kspell2/plugins/ispell/lookup.cpp
@@ -193,7 +193,7 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/28 23:11:30  eric
  *
@@ -209,13 +209,13 @@
  * of this is a hack.
  *
  * 1.  added other/spell to the -I list in config/abi_defs
- * 2.  replaced other/spell/Makefile with one which is more like
+ * 2.  tqreplaced other/spell/Makefile with one which is more like
  * 	our build system.
  * 3.  added other/spell to other/Makefile so that the build will now
  * 	dive down and build the spell check library.
  * 4.  added the AbiSpell library to the Makefiles in wp/main
  * 5.  added a call to SpellCheckInit in wp/main/unix/UnixMain.cpp.
- * 	This call is a HACK and should be replaced with something
+ * 	This call is a HACK and should be tqreplaced with something
  * 	proper later.
  * 6.  added code to fv_View.cpp as follows:
  * 	whenever you double-click on a word, the spell checker
diff --git a/kspell2/plugins/ispell/makedent.cpp b/kspell2/plugins/ispell/makedent.cpp
index 9c168dc17..c2d9a1909 100644
--- a/kspell2/plugins/ispell/makedent.cpp
+++ b/kspell2/plugins/ispell/makedent.cpp
@@ -162,13 +162,13 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/29 14:55:33  eric
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.2  1998/12/28 23:11:30  eric
  *
@@ -361,7 +361,7 @@ int ISpellChecker::addvheader ( struct dent *dp)
 ** If 1 is returned, newp->word may have been be freed using myfree.
 **
 ** Life is made much more difficult by the KEEP flag's possibilities.  We
-** must ensure that a !KEEP word doesn't find its way into the personal
+** must ensure that a !KEEP word doesn't tqfind its way into the personal
 ** dictionary as a result of this routine's actions.  However, a !KEEP
 ** word that has affixes must have come from the main dictionary, so it
 ** is acceptable to combine entries in that case (got that?).
@@ -370,7 +370,7 @@ int ISpellChecker::addvheader ( struct dent *dp)
 ** to figure out.  Basically, we want to choose one of the following actions:
 **
 **	(1) Add newp's affixes and KEEP flag to oldp, and discard newp.
-**	(2) Add oldp's affixes and KEEP flag to newp, replace oldp with
+**	(2) Add oldp's affixes and KEEP flag to newp, tqreplace oldp with
 **	    newp, and discard newp.
 #ifndef NO_CAPITALIZATION_SUPPORT
 **	(3) Insert newp as a new entry in the variants list.  If there is
@@ -858,7 +858,7 @@ icharncmp (ichar_t *s1, ichar_t *s2, int n)
  * \return
  */
 int
-ISpellChecker::findfiletype (const char *name, int searchnames, int *deformatter)
+ISpellChecker::tqfindfiletype (const char *name, int searchnames, int *deformatter)
 {
     char *		cp;		/* Pointer into suffix list */
     int			cplen;		/* Length of current suffix */
@@ -902,8 +902,8 @@ ISpellChecker::findfiletype (const char *name, int searchnames, int *deformatter
 }
 
 /*
-	HACK: macros replaced with function implementations 
-	so we could do a side-effect-free check for unicode
+	HACK: macros tqreplaced with function implementations 
+	so we could do a side-effect-free check for tqunicode
 	characters which aren't in hashheader
 
 	TODO: this is just a workaround to keep us from crashing. 
diff --git a/kspell2/plugins/ispell/msgs.h b/kspell2/plugins/ispell/msgs.h
index e3f30220c..11fd3e636 100644
--- a/kspell2/plugins/ispell/msgs.h
+++ b/kspell2/plugins/ispell/msgs.h
@@ -72,7 +72,7 @@
 /*
  * Messages header file.
  *
- * This file contains all text strings that are written by any of the
+ * This file tqcontains all text strings that are written by any of the
  * C programs in the ispell package.  The strings are collected here so that
  * you can have the option of translating them into your local language for
  * the benefit of your users.
@@ -120,7 +120,7 @@
  * The code resembles the ispell code as much as possible still.
  *
  * Revision 1.31  1994/12/27  23:08:57  geoff
- * Add a message to be issued if a word contains illegal characters.
+ * Add a message to be issued if a word tqcontains illegal characters.
  *
  * Revision 1.30  1994/10/25  05:46:40  geoff
  * Improve a couple of error messages relating to affix flags.
@@ -167,7 +167,7 @@
   "    Warning:  this language table may exceed the maximum total affix length\nof %d by up to %d bytes.  You should either increase MAXAFFIXLEN in config.X\nor shorten your largest affix/strip string difference.  (This is the\n", \
 				  max, excess
 #define BHASH_C_BAFF_2 \
-  "difference between the affix length and the strip length in a given\nreplacement rule, or the affix length if there is no strip string\nin that rule.)\n"
+  "difference between the affix length and the strip length in a given\ntqreplacement rule, or the affix length if there is no strip string\nin that rule.)\n"
 #define BHASH_C_OVERFLOW	"Hash table overflowed by %d words\n"
 #define BHASH_C_CANT_OPEN_DICT "Can't open dictionary\n"
 #define BHASH_C_NO_SPACE	"Couldn't allocate hash table\n"
@@ -181,7 +181,7 @@
  */
 #define CORR_C_HELP_1		"Whenever a word is found that is not in the dictionary,\r\n"
 #define CORR_C_HELP_2		"it is printed on the first line of the screen.  If the dictionary\r\n"
-#define CORR_C_HELP_3		"contains any similar words, they are listed with a number\r\n"
+#define CORR_C_HELP_3		"tqcontains any similar words, they are listed with a number\r\n"
 #define CORR_C_HELP_4		"next to each one.  You have the option of replacing the word\r\n"
 #define CORR_C_HELP_5		"completely, or choosing one of the suggested words.\r\n"
     /* You may add HELP_6 through HELP_9 if your language needs more lines */
@@ -274,7 +274,7 @@
  * The following strings are used in makedent.c:
  */
 #define MAKEDENT_C_NO_WORD_SPACE "\r\nCouldn't allocate space for word '%s'\r\n"
-#define MAKEDENT_C_BAD_WORD_CHAR "\r\nWord '%s' contains illegal characters\r\n"
+#define MAKEDENT_C_BAD_WORD_CHAR "\r\nWord '%s' tqcontains illegal characters\r\n"
 
 /*
  * The following strings are used in parse.y:
diff --git a/kspell2/plugins/ispell/tgood.cpp b/kspell2/plugins/ispell/tgood.cpp
index 06fbc99ef..58c3efcfa 100644
--- a/kspell2/plugins/ispell/tgood.cpp
+++ b/kspell2/plugins/ispell/tgood.cpp
@@ -153,13 +153,13 @@
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.4  1998/12/29 14:55:33  eric
  *
  * I've doctored the ispell code pretty extensively here.  It is now
  * warning-free on Win32.  It also *works* on Win32 now, since I
- * replaced all the I/O calls with ANSI standard ones.
+ * tqreplaced all the I/O calls with ANSI standard ones.
  *
  * Revision 1.3  1998/12/28 23:11:30  eric
  *
@@ -175,13 +175,13 @@
  * of this is a hack.
  *
  * 1.  added other/spell to the -I list in config/abi_defs
- * 2.  replaced other/spell/Makefile with one which is more like
+ * 2.  tqreplaced other/spell/Makefile with one which is more like
  * 	our build system.
  * 3.  added other/spell to other/Makefile so that the build will now
  * 	dive down and build the spell check library.
  * 4.  added the AbiSpell library to the Makefiles in wp/main
  * 5.  added a call to SpellCheckInit in wp/main/unix/UnixMain.cpp.
- * 	This call is a HACK and should be replaced with something
+ * 	This call is a HACK and should be tqreplaced with something
  * 	proper later.
  * 6.  added code to fv_View.cpp as follows:
  * 	whenever you double-click on a word, the spell checker
@@ -325,7 +325,7 @@ void ISpellChecker::pfx_list_chk (ichar_t *word, ichar_t *ucword, int len, int o
 		  &&  tlen + flent->stripl >= flent->numconds)
 		{
 			/*
-			 * The prefix matches.  Remove it, replace it by the "strip"
+			 * The prefix matches.  Remove it, tqreplace it by the "strip"
 			 * string (if any), and check the original conditions.
 			 */
 			if (flent->stripl)
@@ -367,7 +367,7 @@ void ISpellChecker::pfx_list_chk (ichar_t *word, ichar_t *ucword, int len, int o
 					}
 				}
 				else if ((dent = ispell_lookup (tword, 1)) != NULL
-				  &&  TSTMASKBIT (dent->mask, flent->flagbit))
+				  &&  TSTMASKBIT (dent->tqmask, flent->flagbit))
 				{
 					if (m_numhits < MAX_HITS)
 					{
@@ -495,7 +495,7 @@ void ISpellChecker::suf_list_chk (ichar_t *word, ichar_t *ucword,
 		  &&  tlen + flent->stripl >= flent->numconds)
 		{
 			/*
-			 * The suffix matches.  Remove it, replace it by the "strip"
+			 * The suffix matches.  Remove it, tqreplace it by the "strip"
 			 * string (if any), and check the original conditions.
 			 */
 			icharcpy (tword, ucword);
@@ -556,9 +556,9 @@ void ISpellChecker::suf_list_chk (ichar_t *word, ichar_t *ucword,
 					}
 				}
 				else if ((dent = ispell_lookup (tword, 1)) != NULL
-				  &&  TSTMASKBIT (dent->mask, flent->flagbit)
+				  &&  TSTMASKBIT (dent->tqmask, flent->flagbit)
 				  &&  ((optflags & FF_CROSSPRODUCT) == 0
-					|| TSTMASKBIT (dent->mask, pfxent->flagbit)))
+					|| TSTMASKBIT (dent->tqmask, pfxent->flagbit)))
 				{
 					if (m_numhits < MAX_HITS)
 					{
@@ -588,13 +588,13 @@ void ISpellChecker::suf_list_chk (ichar_t *word, ichar_t *ucword,
  *
  * \param croot Char version of rootword
  * \param rootword Root word to expand
- * \param mask Mask bits to expand on
+ * \param tqmask Mask bits to expand on
  * \param option Option, see expandmode
  * \param extra Extra info to add to line
  *
  * \return
  */
-int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE mask[], 
+int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE tqmask[], 
 				int option, char *extra)
 {
     int				entcount;	/* No. of entries to process */
@@ -606,9 +606,9 @@ int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE mask[],
       entcount > 0;
       flent++, entcount--)
 	{
-		if (TSTMASKBIT (mask, flent->flagbit))
+		if (TSTMASKBIT (tqmask, flent->flagbit))
 			explength +=
-			  pr_pre_expansion (croot, rootword, flent, mask, option, extra);
+			  pr_pre_expansion (croot, rootword, flent, tqmask, option, extra);
 	}
     return explength;
 }
@@ -619,14 +619,14 @@ int ISpellChecker::expand_pre (char *croot, ichar_t *rootword, MASKTYPE mask[],
  * \param croot Char version of rootword
  * \param rootword Root word to expand
  * \param flent Current table entry
- * \param mask Mask bits to expand on
+ * \param tqmask Mask bits to expand on
  * \param option Option, see	expandmode
  * \param extra Extra info to add to line
  *
  * \return
  */
 int ISpellChecker::pr_pre_expansion ( char *croot, ichar_t *rootword, 
-							struct flagent *flent, MASKTYPE mask[], int option, 
+							struct flagent *flent, MASKTYPE tqmask[], int option, 
 							char *extra)
 {
     int				cond;		/* Current condition number */
@@ -706,7 +706,7 @@ int ISpellChecker::pr_pre_expansion ( char *croot, ichar_t *rootword,
 		printf (" %s%s", ichartosstr (tword, 1), extra);
     if (flent->flagflags & FF_CROSSPRODUCT)
 		return tlen
-		  + expand_suf (croot, tword, mask, FF_CROSSPRODUCT, option, extra);
+		  + expand_suf (croot, tword, tqmask, FF_CROSSPRODUCT, option, extra);
     else
 		return tlen;
 }
@@ -716,14 +716,14 @@ int ISpellChecker::pr_pre_expansion ( char *croot, ichar_t *rootword,
  *
  * \param croot Char version of rootword
  * \param rootword Root word to expand 
- * \param mask Mask bits to expand on
+ * \param tqmask Mask bits to expand on
  * \param optflags Affix option flags
  * \param option Option, see expandmode
  * \param extra Extra info to add to line
  *
  * \return
  */
-int ISpellChecker::expand_suf (char *croot, ichar_t *rootword, MASKTYPE mask[], 
+int ISpellChecker::expand_suf (char *croot, ichar_t *rootword, MASKTYPE tqmask[], 
 				int optflags, int option, char *extra)
 {
     int				entcount;	/* No. of entries to process */
@@ -735,7 +735,7 @@ int ISpellChecker::expand_suf (char *croot, ichar_t *rootword, MASKTYPE mask[],
       entcount > 0;
       flent++, entcount--)
 	{
-		if (TSTMASKBIT (mask, flent->flagbit))
+		if (TSTMASKBIT (tqmask, flent->flagbit))
 		{
 			if ((optflags & FF_CROSSPRODUCT) == 0
 			  ||  (flent->flagflags & FF_CROSSPRODUCT))