1 files changed, 19 insertions, 19 deletions

diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
index d197e5cf..fe1185d7 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
@@ -46,7 +46,7 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
   char *tok1, *tok2, *tok3;
 
   if (!(f = globalParams->getUnicodeMapFile(encodingNameA))) {
-    error(-1, "Couldn't find tqunicodeMap file for the '%s' encoding",
+    error(-1, "Couldn't find unicodeMap file for the '%s' encoding",
 	  encodingNameA->getCString());
     return NULL;
   }
@@ -93,11 +93,11 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 	eMap->nBytes = nBytes;
 	++map->eMapsLen;
       } else {
-	error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
+	error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
 	      line, encodingNameA->getCString());
       }
     } else {
-      error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
+      error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
 	    line, encodingNameA->getCString());
     }
     ++line;
@@ -110,8 +110,8 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 
 UnicodeMap::UnicodeMap(GString *encodingNameA) {
   encodingName = encodingNameA;
-  tqunicodeOut = gFalse;
-  kind = tqunicodeMapUser;
+  unicodeOut = gFalse;
+  kind = unicodeMapUser;
   ranges = NULL;
   len = 0;
   eMaps = NULL;
@@ -119,11 +119,11 @@ UnicodeMap::UnicodeMap(GString *encodingNameA) {
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 		       UnicodeMapRange *rangesA, int lenA) {
   encodingName = new GString(encodingNameA);
-  tqunicodeOut = tqunicodeOutA;
-  kind = tqunicodeMapResident;
+  unicodeOut = unicodeOutA;
+  kind = unicodeMapResident;
   ranges = rangesA;
   len = lenA;
   eMaps = NULL;
@@ -131,11 +131,11 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 		       UnicodeMapFunc funcA) {
   encodingName = new GString(encodingNameA);
-  tqunicodeOut = tqunicodeOutA;
-  kind = tqunicodeMapFunc;
+  unicodeOut = unicodeOutA;
+  kind = unicodeMapFunc;
   func = funcA;
   eMaps = NULL;
   eMapsLen = 0;
@@ -144,7 +144,7 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 
 UnicodeMap::~UnicodeMap() {
   delete encodingName;
-  if (kind == tqunicodeMapUser && ranges) {
+  if (kind == unicodeMapUser && ranges) {
     gfree(ranges);
   }
   if (eMaps) {
@@ -170,7 +170,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) {
   int a, b, m, n, i, j;
   Guint code;
 
-  if (kind == tqunicodeMapFunc) {
+  if (kind == unicodeMapFunc) {
     return (*func)(u, buf, bufSize);
   }
 
@@ -219,7 +219,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) {
 UnicodeMapCache::UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
+  for (i = 0; i < unicodeMapCacheSize; ++i) {
     cache[i] = NULL;
   }
 }
@@ -227,7 +227,7 @@ UnicodeMapCache::UnicodeMapCache() {
 UnicodeMapCache::~UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
+  for (i = 0; i < unicodeMapCacheSize; ++i) {
     if (cache[i]) {
       cache[i]->decRefCnt();
     }
@@ -242,7 +242,7 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) {
     cache[0]->incRefCnt();
     return cache[0];
   }
-  for (i = 1; i < tqunicodeMapCacheSize; ++i) {
+  for (i = 1; i < unicodeMapCacheSize; ++i) {
     if (cache[i] && cache[i]->match(encodingName)) {
       map = cache[i];
       for (j = i; j >= 1; --j) {
@@ -254,10 +254,10 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) {
     }
   }
   if ((map = UnicodeMap::parse(encodingName))) {
-    if (cache[tqunicodeMapCacheSize - 1]) {
-      cache[tqunicodeMapCacheSize - 1]->decRefCnt();
+    if (cache[unicodeMapCacheSize - 1]) {
+      cache[unicodeMapCacheSize - 1]->decRefCnt();
     }
-    for (j = tqunicodeMapCacheSize - 1; j >= 1; --j) {
+    for (j = unicodeMapCacheSize - 1; j >= 1; --j) {
       cache[j] = cache[j - 1];
     }
     cache[0] = map;