From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:00 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
---
 kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp | 64 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp')

diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp
index 7cece60b..f3a53bf7 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp
@@ -978,16 +978,16 @@ DjVuANT::get_mode(GLParser & parser)
   return retval;
 }
 
-static inline DjVuANT::alignment
+static inline DjVuANT::tqalignment
 legal_halign(const int i)
 {
-  DjVuANT::alignment retval;
-  switch((DjVuANT::alignment)i)
+  DjVuANT::tqalignment retval;
+  switch((DjVuANT::tqalignment)i)
   {
   case DjVuANT::ALIGN_LEFT:
   case DjVuANT::ALIGN_CENTER:
   case DjVuANT::ALIGN_RIGHT:
-    retval=(DjVuANT::alignment)i;
+    retval=(DjVuANT::tqalignment)i;
     break;
   default:
     retval=DjVuANT::ALIGN_UNSPEC;
@@ -996,16 +996,16 @@ legal_halign(const int i)
   return retval;
 }
 
-static inline DjVuANT::alignment
+static inline DjVuANT::tqalignment
 legal_valign(const int i)
 {
-  DjVuANT::alignment retval;
-  switch((DjVuANT::alignment)i)
+  DjVuANT::tqalignment retval;
+  switch((DjVuANT::tqalignment)i)
   {
   case DjVuANT::ALIGN_CENTER:
   case DjVuANT::ALIGN_TOP:
   case DjVuANT::ALIGN_BOTTOM:
-    retval=(DjVuANT::alignment)i;
+    retval=(DjVuANT::tqalignment)i;
     break;
   default:
     retval=DjVuANT::ALIGN_UNSPEC;
@@ -1014,12 +1014,12 @@ legal_valign(const int i)
   return retval;
 }
 
-DjVuANT::alignment
+DjVuANT::tqalignment
 DjVuANT::get_hor_align(GLParser & parser)
 {
   DEBUG_MSG("DjVuAnt::get_hor_align(): getting hor page alignemnt ...\n");
   DEBUG_MAKE_INDENT(3);
-  alignment retval=ALIGN_UNSPEC;
+  tqalignment retval=ALIGN_UNSPEC;
   G_TRY
   {
     GP<GLObject> obj=parser.get_object(ALIGN_TAG);
@@ -1030,7 +1030,7 @@ DjVuANT::get_hor_align(GLParser & parser)
       
       for(int i=(int)ALIGN_UNSPEC;(i<align_strings_size);++i)
       {
-        const alignment j=legal_halign(i);
+        const tqalignment j=legal_halign(i);
         if((i == (int)j)&&(align == align_strings[i]))
         {
           retval=j;
@@ -1048,18 +1048,18 @@ DjVuANT::get_hor_align(GLParser & parser)
 #ifndef NDEBUG
   if(retval == ALIGN_UNSPEC)
   {
-    DEBUG_MSG("resetting alignment to ALIGN_UNSPEC\n");
+    DEBUG_MSG("resetting tqalignment to ALIGN_UNSPEC\n");
   }
 #endif // NDEBUG
   return retval;
 }
 
-DjVuANT::alignment
+DjVuANT::tqalignment
 DjVuANT::get_ver_align(GLParser & parser)
 {
   DEBUG_MSG("DjVuAnt::get_ver_align(): getting vert page alignemnt ...\n");
   DEBUG_MAKE_INDENT(3);
-  alignment retval=ALIGN_UNSPEC;
+  tqalignment retval=ALIGN_UNSPEC;
   G_TRY
   {
     GP<GLObject> obj=parser.get_object(ALIGN_TAG);
@@ -1069,7 +1069,7 @@ DjVuANT::get_ver_align(GLParser & parser)
       DEBUG_MSG("ver_align='" << align << "'\n");
       for(int i=(int)ALIGN_UNSPEC;(i<align_strings_size);++i)
       {
-        const alignment j=legal_valign(i);
+        const tqalignment j=legal_valign(i);
         if((i == (int)j)&&(align == align_strings[i]))
         {
           retval=j;
@@ -1087,7 +1087,7 @@ DjVuANT::get_ver_align(GLParser & parser)
 #ifndef NDEBUG
   if(retval == ALIGN_UNSPEC)
   {
-    DEBUG_MSG("resetting alignment to ALIGN_UNSPEC\n");
+    DEBUG_MSG("resetting tqalignment to ALIGN_UNSPEC\n");
   }
 #endif // NDEBUG
   return retval;
@@ -1166,38 +1166,38 @@ DjVuANT::get_map_areas(GLParser & parser)
           DEBUG_MSG("found maparea '" << comment << "' (" <<
             url << ":" << target << ")\n");
         
-          GLObject * shape=obj[2];
+          GLObject * tqshape=obj[2];
           GP<GMapArea> map_area;
-          if (shape->get_type()==GLObject::LIST)
+          if (tqshape->get_type()==GLObject::LIST)
           {
-            if (shape->get_name()==GMapArea::RECT_TAG)
+            if (tqshape->get_name()==GMapArea::RECT_TAG)
             {
               DEBUG_MSG("it's a rectangle.\n");
-              GRect grect((*shape)[0]->get_number(),
-                          (*shape)[1]->get_number(),
-                          (*shape)[2]->get_number(),
-                          (*shape)[3]->get_number());
+              GRect grect((*tqshape)[0]->get_number(),
+                          (*tqshape)[1]->get_number(),
+                          (*tqshape)[2]->get_number(),
+                          (*tqshape)[3]->get_number());
               GP<GMapRect> map_rect=GMapRect::create(grect);
               map_area=(GMapRect *)map_rect;
-            } else if (shape->get_name()==GMapArea::POLY_TAG)
+            } else if (tqshape->get_name()==GMapArea::POLY_TAG)
             {
               DEBUG_MSG("it's a polygon.\n");
-              int points=shape->get_list().size()/2;
+              int points=tqshape->get_list().size()/2;
               GTArray<int> xx(points-1), yy(points-1);
               for(int i=0;i<points;i++)
               {
-                xx[i]=(*shape)[2*i]->get_number();
-                yy[i]=(*shape)[2*i+1]->get_number();
+                xx[i]=(*tqshape)[2*i]->get_number();
+                yy[i]=(*tqshape)[2*i+1]->get_number();
               }
               GP<GMapPoly> map_poly=GMapPoly::create(xx,yy,points);
               map_area=(GMapPoly *)map_poly;
-            } else if (shape->get_name()==GMapArea::OVAL_TAG)
+            } else if (tqshape->get_name()==GMapArea::OVAL_TAG)
             {
               DEBUG_MSG("it's an ellipse.\n");
-              GRect grect((*shape)[0]->get_number(),
-                          (*shape)[1]->get_number(),
-                          (*shape)[2]->get_number(),
-                          (*shape)[3]->get_number());
+              GRect grect((*tqshape)[0]->get_number(),
+                          (*tqshape)[1]->get_number(),
+                          (*tqshape)[2]->get_number(),
+                          (*tqshape)[3]->get_number());
               GP<GMapOval> map_oval=GMapOval::create(grect);
               map_area=(GMapOval *)map_oval;
             }
-- 
cgit v1.2.3