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

diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
index b14220d1..eace389e 100644
--- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
@@ -603,7 +603,7 @@ MMRDecoder::scanruns(const unsigned short **endptr)
             b1 += *pr++;
             break;
           }
-          /* Horizontal Mode */
+          /*Qt::Horizontal Mode */
         case H: 
           { 
             // First run
@@ -617,7 +617,7 @@ MMRDecoder::scanruns(const unsigned short **endptr)
             *xr = rle; xr++; rle = 0;
             break;
           }
-          /* Vertical Modes */
+          /*Qt::Vertical Modes */
         case V0:
         case VR3:
         case VR2:
@@ -933,16 +933,16 @@ MMRDecoder::decode(GP<ByteStream> gbs)
       // Insert blocks into JB2Image
       for (int b=0; b<blocksperline; b++)
 	{
-	  JB2Shape shape;
-	  shape.bits = blocks[b];
-	  if (shape.bits) 
+	  JB2Shape tqshape;
+	  tqshape.bits = blocks[b];
+	  if (tqshape.bits) 
 	    {
-	      shape.parent = -1;
-	      shape.bits->compress();
+	      tqshape.tqparent = -1;
+	      tqshape.bits->compress();
 	      JB2Blit blit;
 	      blit.left = b*blocksize;
 	      blit.bottom = line+1;
-	      blit.shapeno = jimg->add_shape(shape);
+	      blit.tqshapeno = jimg->add_tqshape(tqshape);
 	      jimg->add_blit(blit);
 	    }
 	}