From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 19 Jun 2011 19:03:33 +0000
Subject: 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
---
 kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp
index 9d5b726d..350d792d 100644
--- a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp
@@ -104,7 +104,7 @@ static const int OVERFLOW=32;
 
 // Sorting tresholds
 static const int RANKSORT_THRESH=10;
-static const int QUICKSORT_STACK=512;
+static const int TQUICKSORT_STACK=512;
 static const int PRESORT_THRESH=10;
 static const int PRESORT_DEPTH=8;
 static const int RADIX_THRESH=32768;
@@ -283,8 +283,8 @@ void
 _BSort::quicksort3r(int lo, int hi, int depth)
 {
   /* Initialize stack */
-  int slo[QUICKSORT_STACK];
-  int shi[QUICKSORT_STACK];
+  int slo[TQUICKSORT_STACK];
+  int shi[TQUICKSORT_STACK];
   int sp = 1;
   slo[0] = lo;
   shi[0] = hi;
@@ -342,7 +342,7 @@ _BSort::quicksort3r(int lo, int hi, int depth)
           vswap(hi-tmp+1, h+1, tmp, posn);
           h1 = hi - (h1-h);
           // -- process segments
-          ASSERT(sp+2<QUICKSORT_STACK);
+          ASSERT(sp+2<TQUICKSORT_STACK);
           // ----- middle segment (=?) [l1, h1]
           for(int i=l1;i<=h1;i++) 
             rank[posn[i]] = h1;
@@ -437,9 +437,9 @@ void
 _BSort::quicksort3d(int lo, int hi, int depth)
 {
   /* Initialize stack */
-  int slo[QUICKSORT_STACK];
-  int shi[QUICKSORT_STACK];
-  int sd[QUICKSORT_STACK];
+  int slo[TQUICKSORT_STACK];
+  int shi[TQUICKSORT_STACK];
+  int sd[TQUICKSORT_STACK];
   int sp = 1;
   slo[0] = lo;
   shi[0] = hi;
@@ -518,7 +518,7 @@ _BSort::quicksort3d(int lo, int hi, int depth)
           vswap(hi-tmp+1, h+1, tmp, posn);
           h1 = hi - (h1-h);
           // -- process segments
-          ASSERT(sp+3<QUICKSORT_STACK);
+          ASSERT(sp+3<TQUICKSORT_STACK);
           // ----- middle segment (=?) [l1, h1]
           l = l1; h = h1;
           if (med==0) // special case for marker [slow]
-- 
cgit v1.2.1