TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 10 deletions

diff --git a/krfb/libvncserver/x11vnc.c b/krfb/libvncserver/x11vnc.c
index 4e298f4a..47d46ae8 100644
--- a/krfb/libvncserver/x11vnc.c
+++ b/krfb/libvncserver/x11vnc.c
@@ -263,7 +263,7 @@ int probeX=0,probeY=0;
 void probeScreen(rfbScreenInfoPtr s,int xscreen)
 {
   int i,j,/*pixel,i1,*/j1,
-    bpp=s->rfbServerFormat.bitsPerPixel/8,/*mask=(1<<bpp)-1,*/
+    bpp=s->rfbServerFormat.bitsPerPixel/8,/*tqmask=(1<<bpp)-1,*/
     rstride=s->paddedWidthInBytes;
   XImage* im;
   //fprintf(stderr,"/%d,%d",probeX,probeY);
@@ -433,20 +433,20 @@ int main(int argc,char** argv)
      }
   } else {
     screen->rfbServerFormat.redShift = 0;
-    if ( framebufferImage->red_mask )
-      while ( ! ( framebufferImage->red_mask & (1 << screen->rfbServerFormat.redShift) ) )
+    if ( framebufferImage->red_tqmask )
+      while ( ! ( framebufferImage->red_tqmask & (1 << screen->rfbServerFormat.redShift) ) )
         screen->rfbServerFormat.redShift++;
     screen->rfbServerFormat.greenShift = 0;
-    if ( framebufferImage->green_mask )
-      while ( ! ( framebufferImage->green_mask & (1 << screen->rfbServerFormat.greenShift) ) )
+    if ( framebufferImage->green_tqmask )
+      while ( ! ( framebufferImage->green_tqmask & (1 << screen->rfbServerFormat.greenShift) ) )
         screen->rfbServerFormat.greenShift++;
     screen->rfbServerFormat.blueShift = 0;
-    if ( framebufferImage->blue_mask )
-      while ( ! ( framebufferImage->blue_mask & (1 << screen->rfbServerFormat.blueShift) ) )
+    if ( framebufferImage->blue_tqmask )
+      while ( ! ( framebufferImage->blue_tqmask & (1 << screen->rfbServerFormat.blueShift) ) )
       screen->rfbServerFormat.blueShift++;
-    screen->rfbServerFormat.redMax   = framebufferImage->red_mask   >> screen->rfbServerFormat.redShift;
-    screen->rfbServerFormat.greenMax = framebufferImage->green_mask >> screen->rfbServerFormat.greenShift;
-    screen->rfbServerFormat.blueMax  = framebufferImage->blue_mask  >> screen->rfbServerFormat.blueShift;
+    screen->rfbServerFormat.redMax   = framebufferImage->red_tqmask   >> screen->rfbServerFormat.redShift;
+    screen->rfbServerFormat.greenMax = framebufferImage->green_tqmask >> screen->rfbServerFormat.greenShift;
+    screen->rfbServerFormat.blueMax  = framebufferImage->blue_tqmask  >> screen->rfbServerFormat.blueShift;
   }
 
   backupImage = malloc(screen->height*screen->paddedWidthInBytes);