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

diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c
index 66cc4ee3..22c9202d 100644
--- a/krfb/libvncserver/rfbserver.c
+++ b/krfb/libvncserver/rfbserver.c
@@ -270,7 +270,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
       for (i = 0; i < 4; i++)
         cl->zsActive[i] = FALSE;
 
-      cl->enableCursorShapeUpdates = FALSE;
+      cl->enabletqCursorShapeUpdates = FALSE;
       cl->useRichCursorEncoding = FALSE;
       cl->enableLastRectEncoding = FALSE;
       cl->disableBackground = FALSE;
@@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl)
 
         cl->preferredEncoding = -1;
 	cl->useCopyRect = FALSE;
-	cl->enableCursorShapeUpdates = FALSE;
+	cl->enabletqCursorShapeUpdates = FALSE;
 	cl->enableLastRectEncoding = FALSE;
 	cl->disableBackground = FALSE;
 
@@ -729,7 +729,7 @@ rfbProcessClientNormalMessage(cl)
 		if(!cl->screen->dontConvertRichCursorToXCursor) {
 		    rfbLog("Enabling X-style cursor updates for client %s\n",
 			   cl->host);
-		    cl->enableCursorShapeUpdates = TRUE;
+		    cl->enabletqCursorShapeUpdates = TRUE;
 		    cl->cursorWasChanged = TRUE;
 		}
 		break;
@@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl)
 		      "%s\n", cl->host);
 		if (cl->enableSoftCursorUpdates)
 		  break;
-		cl->enableCursorShapeUpdates = TRUE;
+		cl->enabletqCursorShapeUpdates = TRUE;
 		cl->useRichCursorEncoding = TRUE;
 		cl->cursorWasChanged = TRUE;
 	        break;
@@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl)
 	        cl->enableSoftCursorUpdates = TRUE;
 	        cl->cursorWasChanged = TRUE;
 	        cl->cursorWasMoved = TRUE;
-		cl->enableCursorShapeUpdates = FALSE;
+		cl->enabletqCursorShapeUpdates = FALSE;
 		cl->useRichCursorEncoding = FALSE;
 	        break;
 	    case rfbEncodingLastRect:
@@ -959,24 +959,24 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
     rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf;
     sraRegionPtr updateRegion,updateCopyRegion,tmpRegion;
     int dx, dy;
-    Bool sendCursorShape = FALSE;
+    Bool sendtqCursorShape = FALSE;
     int sendSoftCursorRects = 0;
 
     if(cl->screen->displayHook)
       cl->screen->displayHook(cl);
     
     /*
-     * If this client understands cursor shape updates, cursor should be
+     * If this client understands cursor tqshape updates, cursor should be
      * removed from the framebuffer. Otherwise, make sure it's put up.
      */
 
-    if (cl->enableCursorShapeUpdates) {
+    if (cl->enabletqCursorShapeUpdates) {
       if (cl->screen->cursorIsDrawn) {
 	rfbUndrawCursor(cl->screen);
       }
       if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged &&
 	  cl->readyForSetColourMapEntries)
-	  sendCursorShape = TRUE;
+	  sendtqCursorShape = TRUE;
     }
     else if (cl->enableSoftCursorUpdates) {
       if (cl->screen->cursorIsDrawn) {
@@ -1012,7 +1012,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
     updateRegion = sraRgnCreateRgn(givenUpdateRegion);
     sraRgnOr(updateRegion,cl->copyRegion);
     if(!sraRgnAnd(updateRegion,cl->requestedRegion) && 
-       !(sendCursorShape || sendSoftCursorRects)) {
+       !(sendtqCursorShape || sendSoftCursorRects)) {
       sraRgnDestroy(updateRegion);
       UNLOCK(cl->updateMutex);
       return TRUE;
@@ -1113,15 +1113,15 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
     if (nUpdateRegionRects != 0xFFFF) {
 	fu->nRects = Swap16IfLE((CARD16)(sraRgnCountRects(updateCopyRegion)
 				+ nUpdateRegionRects 
-				+ !!sendCursorShape + sendSoftCursorRects));
+				+ !!sendtqCursorShape + sendSoftCursorRects));
     } else {
 	fu->nRects = 0xFFFF;
     }
     cl->ublen = sz_rfbFramebufferUpdateMsg;
 
-   if (sendCursorShape) {
+   if (sendtqCursorShape) {
 	cl->cursorWasChanged = FALSE;
-	if (!rfbSendCursorShape(cl)) {
+	if (!rfbSendtqCursorShape(cl)) {
 	    sraRgnDestroy(updateRegion);
 	    return FALSE;
 	}