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

diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index b715ca8a..aba56cfa 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -263,7 +263,7 @@ typedef struct _rfbScreenInfo
        themselves end up invoking drawing routines.
 
        Removing the cursor (rfbUndrawCursor) is eventually achieved by
-       doing a CopyArea from a pixmap to the screen, where the pixmap contains
+       doing a CopyArea from a pixmap to the screen, where the pixmap tqcontains
        the saved contents of the screen under the cursor.  Before doing this,
        however, we set cursorIsDrawn to FALSE.  Then, when CopyArea is called,
        it sees that cursorIsDrawn is FALSE and so doesn't feel the need to
@@ -542,10 +542,10 @@ typedef struct _rfbClientRec {
     Bool enableLastRectEncoding;   /* client supports LastRect encoding */
     Bool enableSoftCursorUpdates;  /* client supports softcursor updates */
     Bool disableBackground;        /* client wants to disable background */
-    Bool enableCursorShapeUpdates; /* client supports cursor shape updates */
+    Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */
     Bool useRichCursorEncoding;    /* rfbEncodingRichCursor is preferred */
-    Bool cursorWasChanged;         /* cursor shape update should be sent */
-    Bool cursorWasMoved;           /* cursor move shape update should be sent */
+    Bool cursorWasChanged;         /* cursor tqshape update should be sent */
+    Bool cursorWasMoved;           /* cursor move tqshape update should be sent */
 #ifdef BACKCHANNEL
     Bool enableBackChannel;
 #endif
@@ -576,8 +576,8 @@ typedef struct _rfbClientRec {
  */
 
 #define FB_UPDATE_PENDING(cl)                           \
-     ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) ||   \
-     ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) ||      \
+     ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) ||   \
+     ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) ||      \
      !sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion))
 
 /*
@@ -733,18 +733,18 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h);
 
 typedef struct rfbCursor {
     unsigned char *source;			/* points to bits */
-    unsigned char *mask;			/* points to bits */
+    unsigned char *tqmask;			/* points to bits */
     unsigned short width, height, xhot, yhot;	/* metrics */
     unsigned short foreRed, foreGreen, foreBlue; /* device-independent colour */
     unsigned short backRed, backGreen, backBlue; /* device-independent colour */
     unsigned char *richSource; /* source bytes for a rich cursor */
 } rfbCursor, *rfbCursorPtr;
 
-extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
+extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
 extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged);
 extern unsigned char rfbReverseByte[0x100];
 extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap);
-extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString);
+extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString);
 extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString);
 extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);
 extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);