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, 7 insertions, 7 deletions

diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp
index 4e49fe12..a3f11bd0 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp
@@ -107,7 +107,7 @@ fmin(float a, float b)
 
 
 DjVuPalette::DjVuPalette()
-  : mask(0), hist(0), pmap(0)
+  : tqmask(0), hist(0), pmap(0)
 {
 }
 
@@ -124,7 +124,7 @@ DjVuPalette::operator=(const DjVuPalette &ref)
     {
       delete hist;
       delete pmap;
-      mask = 0;
+      tqmask = 0;
       palette = ref.palette;
       colordata = ref.colordata;
     }
@@ -132,7 +132,7 @@ DjVuPalette::operator=(const DjVuPalette &ref)
 }
 
 DjVuPalette::DjVuPalette(const DjVuPalette &ref)
-  : mask(0), hist(0), pmap(0)
+  : tqmask(0), hist(0), pmap(0)
 {
   this->operator=(ref);
 }
@@ -147,18 +147,18 @@ DjVuPalette::allocate_hist()
   if (! hist)
     {
       hist = new GMap<int,int>;
-      mask = 0;
+      tqmask = 0;
     }
   else
     {
       GMap<int,int> *old = hist;
       hist = new GMap<int,int>;
-      mask = (mask<<1)|(0x010101);
+      tqmask = (tqmask<<1)|(0x010101);
       for (GPosition p = *old; p; ++p)
         {
           int k = old->key(p);
           int w = (*old)[p];
-          (*hist)[k | mask] += w;
+          (*hist)[k | tqmask] += w;
         }
       delete old;
     }
@@ -540,7 +540,7 @@ DjVuPalette::decode(GP<ByteStream> gbs)
   delete pmap;
   hist = 0;
   pmap = 0;
-  mask = 0;
+  tqmask = 0;
   // Code version
   int version = bs.read8();
   if ( (version & 0x7f) != DJVUPALETTEVERSION)