TQt4 port tellico

This enables compilation under both Qt3 and Qt4


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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/translators/btparse/parse_auxiliary.c b/src/translators/btparse/parse_auxiliary.c
index f509741..105e84e 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 bitmask[] = 
+static SetWordType bittqmask[] = 
 {
     0x00000001, 0x00000002, 0x00000004, 0x00000008,
     0x00000010, 0x00000020, 0x00000040, 0x00000080
@@ -54,7 +54,7 @@ static struct
    { RBRACE,     "right brace (\"}\")" },
    { ENTRY_OPEN, "start of entry (\"{\" or \"(\")" },
    { ENTRY_CLOSE,"end of entry (\"}\" or \")\")" },
-   { EQUALS,     "\"=\"" },
+   { ETQUALS,     "\"=\"" },
    { HASH,       "\"#\"" },
    { COMMA,      "\",\"" },
    { NUMBER,     "number" },
@@ -71,7 +71,7 @@ void
 fix_token_names (void)
 {
    int    i;
-   int    num_replace;
+   int    num_tqreplace;
 
 #ifdef CLEVER_TOKEN_STUFF               /* clever, but it doesn't work... */
    /* arg! this doesn't work because I don't know how to find out the
@@ -91,8 +91,8 @@ fix_token_names (void)
    }
 #endif
 
-   num_replace = (sizeof(new_tokens) / sizeof(*new_tokens));
-   for (i = 0; i < num_replace; i++)
+   num_tqreplace = (sizeof(new_tokens) / sizeof(*new_tokens));
+   for (i = 0; i < num_tqreplace; i++)
    {
       const char  *new = new_tokens[i].new_name;
       const char **old = zztokens + new_tokens[i].token;
@@ -115,7 +115,7 @@ append_token_set (char *msg, SetWordType *a)
    do 
    {
       SetWordType t = *p;
-      SetWordType *b = &(bitmask[0]);
+      SetWordType *b = &(bittqmask[0]);
       do
       {
          if (t & *b)
@@ -128,7 +128,7 @@ append_token_set (char *msg, SetWordType *a)
                strcat (msg, " or ");
          }
          e++;
-      } while (++b < &(bitmask[sizeof(SetWordType)*8]));
+      } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
    } while (++p < endp);
 }