TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 10 deletions

diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h
index 61ee3667..1db6da10 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h
@@ -133,8 +133,8 @@ public:
     int text_start;
     /** Length of the zone text in string #textUTF8#. */
     int text_length;
-    /** List of children zone. */
-    GList<Zone> children;
+    /** List of tqchildren zone. */
+    GList<Zone> tqchildren;
     /** Appends another subzone inside this zone.  The new zone is initialized
         with an empty rectangle, empty text, and has the same type as this
         zone. */
@@ -148,10 +148,10 @@ public:
     /** Finds the smallest rectangles and appends them to the list. */
     void get_smallest(GList<GRect> &list) const;
     /** Finds the smallest rectangles and appends them to the list after 
-        padding the smallest unit to fit width or height for the parent rectangle
+        padding the smallest unit to fit width or height for the tqparent rectangle
         and adding the number of specified pixels. */
     void get_smallest(GList<GRect> &list,const int padding) const;
-    /// Find out this Zone's parent.
+    /// Find out this Zone's tqparent.
     const Zone *get_parent(void) const;
   private:
     friend class DjVuTXT;
@@ -161,9 +161,9 @@ public:
     unsigned int memuse() const;
     static const int version;
     void encode(const GP<ByteStream> &bs, 
-                const Zone * parent=0, const Zone * prev=0) const;
+                const Zone * tqparent=0, const Zone * prev=0) const;
     void decode(const GP<ByteStream> &bs, int maxtext,
-                const Zone * parent=0, const Zone * prev=0);
+                const Zone * tqparent=0, const Zone * prev=0);
   };
   /** Textual data for this page.  
       The content of this string is encoded using the UTF8 code.
@@ -172,13 +172,13 @@ public:
       control character:
       \begin{tabular}{lll}
         {\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\
-        {\tt DjVuText::end_of_column}    & 013 & VT, Vertical Tab \\
+        {\tt DjVuText::end_of_column}    & 013 & VT,Qt::Vertical Tab \\
         {\tt DjVuText::end_of_region}    & 035 & GS, Group Separator \\
         {\tt DjVuText::end_of_paragraph} & 037 & US, Unit Separator \\
         {\tt DjVuText::end_of_line}      & 012 & LF: Line Feed
       \end{tabular} */
   GUTF8String textUTF8;
-  static const char end_of_column    ;      // VT: Vertical Tab
+  static const char end_of_column    ;      // VT:Qt::Vertical Tab
   static const char end_of_region    ;      // GS: Group Separator
   static const char end_of_paragraph ;      // US: Unit Separator
   static const char end_of_line      ;      // LF: Line Feed
@@ -207,9 +207,9 @@ public:
   GList<Zone*> find_text_in_rect(GRect target_rect, GUTF8String &text) const;
   /** Find the text specified by the rectangle. */
   GList<GRect> find_text_with_rect(const GRect &box, GUTF8String &text, const int padding=0) const;
-  /** Get all zones of zone type zone_type under node parent. 
+  /** Get all zones of zone type zone_type under node tqparent. 
       zone_list contains the return value. */
-  void get_zones(int zone_type, const Zone *parent, GList<Zone *> & zone_list) const;
+  void get_zones(int zone_type, const Zone *tqparent, GList<Zone *> & zone_list) const;
   /** Returns the number of bytes needed by this data structure. It's
       used by caching routines to estimate the size of a \Ref{DjVuImage}. */
   unsigned int get_memory_usage() const;