From kde-commits  Sun Sep 19 21:13:42 2004
From: Adriaan de Groot <groot () kde ! org>
Date: Sun, 19 Sep 2004 21:13:42 +0000
To: kde-commits
Subject: kdegraphics/kpdf/xpdf
Message-Id: <20040919211342.6F58B9AA6 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109562842830507

CVS commit by adridg: 

Make names unique, for --enable-final


  M +2 -2      CMap.cc   1.6
  M +2 -2      CharCodeToUnicode.cc   1.5
  M +5 -5      Lexer.cc   1.6
  M +3 -3      PSTokenizer.cc   1.4


--- kdegraphics/kpdf/xpdf/CMap.cc  #1.5:1.6
@@ -37,5 +37,5 @@ struct CMapVectorEntry {
 //------------------------------------------------------------------------
 
-static int getCharFromFile(void *data) {
+static int CMap_getCharFromFile(void *data) {
   return fgetc((FILE *)data);
 }
@@ -69,5 +69,5 @@ CMap *CMap::parse(CMapCache *cache, GStr
   cmap = new CMap(collectionA->copy(), cMapNameA->copy());
 
-  pst = new PSTokenizer(&getCharFromFile, f);
+  pst = new PSTokenizer(&CMap_getCharFromFile, f);
   pst->getToken(tok1, sizeof(tok1), &n1);
   while (pst->getToken(tok2, sizeof(tok2), &n2)) {

--- kdegraphics/kpdf/xpdf/CharCodeToUnicode.cc  #1.4:1.5
@@ -49,5 +49,5 @@ static int getCharFromString(void *data)
 }
 
-static int getCharFromFile(void *data) {
+static int CharCodeToUnicode_getCharFromFile(void *data) {
   return fgetc((FILE *)data);
 }
@@ -223,5 +223,5 @@ void CharCodeToUnicode::parseCMap1(int (
         name = new GString(tok1 + 1);
         if ((f = globalParams->findToUnicodeFile(name))) {
-          parseCMap1(&getCharFromFile, f, nBits);
+          parseCMap1(&CharCodeToUnicode_getCharFromFile, f, nBits);
           fclose(f);
         } else {

--- kdegraphics/kpdf/xpdf/Lexer.cc  #1.5:1.6
@@ -24,5 +24,5 @@
 // A '1' in this array means the character is white space.  A '1' or
 // '2' means the character ends a name or command.
-static char specialChars[256] = {
+static char Lexer_specialChars[256] = {
   1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
@@ -130,5 +130,5 @@ Object *Lexer::getObj(Object *obj) {
     } else if (c == '%') {
       comment = gTrue;
-    } else if (specialChars[c] != 1) {
+    } else if (Lexer_specialChars[c] != 1) {
       break;
     }
@@ -301,5 +301,5 @@ Object *Lexer::getObj(Object *obj) {
     p = tokBuf;
     n = 0;
-    while ((c = lookChar()) != EOF && !specialChars[c]) {
+    while ((c = lookChar()) != EOF && !Lexer_specialChars[c]) {
       getChar();
       if (c == '#') {
@@ -370,5 +370,5 @@ Object *Lexer::getObj(Object *obj) {
           error(getPos(), "Unterminated hex string");
           break;
-        } else if (specialChars[c] != 1) {
+        } else if (Lexer_specialChars[c] != 1) {
           c2 = c2 << 4;
           if (c >= '0' && c <= '9')
@@ -433,5 +433,5 @@ Object *Lexer::getObj(Object *obj) {
     *p++ = c;
     n = 1;
-    while ((c = lookChar()) != EOF && !specialChars[c]) {
+    while ((c = lookChar()) != EOF && !Lexer_specialChars[c]) {
       getChar();
       if (++n == tokBufSize) {

--- kdegraphics/kpdf/xpdf/PSTokenizer.cc  #1.3:1.4
@@ -21,5 +21,5 @@
 // A '1' in this array means the character is white space.  A '1' or
 // '2' means the character ends a name or command.
-static char specialChars[256] = {
+static char PSTokenizer_specialChars[256] = {
   1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
@@ -70,5 +70,5 @@ GBool PSTokenizer::getToken(char *buf, i
     } else if (c == '%') {
       comment = gTrue;
-    } else if (specialChars[c] != 1) {
+    } else if (PSTokenizer_specialChars[c] != 1) {
       break;
     }
@@ -104,5 +104,5 @@ GBool PSTokenizer::getToken(char *buf, i
     }
   } else if (c != '[' && c != ']') {
-    while ((c = lookChar()) != EOF && !specialChars[c]) {
+    while ((c = lookChar()) != EOF && !PSTokenizer_specialChars[c]) {
       getChar();
       if (i < size - 1) {