From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 31 Jul 2010 19:48:06 +0000
Subject: Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 krfb/libvncserver/main.c      | 6 +++---
 krfb/libvncserver/rfb.h       | 6 +++---
 krfb/libvncserver/rfbserver.c | 4 ++--
 krfb/libvncserver/sockets.c   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'krfb/libvncserver')

diff --git a/krfb/libvncserver/main.c b/krfb/libvncserver/main.c
index 207e512d..5b318b8b 100644
--- a/krfb/libvncserver/main.c
+++ b/krfb/libvncserver/main.c
@@ -150,7 +150,7 @@ void rfbScheduleCopyRegion(rfbScreenInfoPtr rfbScreen,sraRegionPtr copyRegion,in
      } else {
        sraRgnOr(cl->modifiedRegion,copyRegion);
      }
-     TSIGNAL(cl->updateCond);
+     TQT_SIGNAL(cl->updateCond);
      UNLOCK(cl->updateMutex);
    }
 
@@ -208,7 +208,7 @@ void rfbMarkRegionAsModified(rfbScreenInfoPtr rfbScreen,sraRegionPtr modRegion)
    while((cl=rfbClientIteratorNext(iterator))) {
      LOCK(cl->updateMutex);
      sraRgnOr(cl->modifiedRegion,modRegion);
-     TSIGNAL(cl->updateCond);
+     TQT_SIGNAL(cl->updateCond);
      UNLOCK(cl->updateMutex);
    }
 
@@ -308,7 +308,7 @@ clientInput(void *data)
 
     /* Get rid of the output thread. */
     LOCK(cl->updateMutex);
-    TSIGNAL(cl->updateCond);
+    TQT_SIGNAL(cl->updateCond);
     UNLOCK(cl->updateMutex);
     IF_PTHREADS(pthread_join(output_thread, NULL));
 
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index 1d62aca5..7f613300 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -144,7 +144,7 @@ typedef unsigned long KeySym;
 #define MUTEX(mutex) int mutex
 #define INIT_MUTEX(mutex) fprintf(stderr,"%s:%d INIT_MUTEX(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex))
 #define TINI_MUTEX(mutex) fprintf(stderr,"%s:%d TINI_MUTEX(%s)\n",__FILE__,__LINE__,#mutex)
-#define SIGNAL(cond) fprintf(stderr,"%s:%d SIGNAL(%s)\n",__FILE__,__LINE__,#cond)
+#define VSIGNAL(cond) fprintf(stderr,"%s:%d VSIGNAL(%s)\n",__FILE__,__LINE__,#cond)
 #define WAIT(cond,mutex) /* fprintf(stderr,"%s:%d WAIT(%s,%s)\n",__FILE__,__LINE__,#cond,#mutex) */
 #define COND(cond)
 #define INIT_COND(cond) fprintf(stderr,"%s:%d INIT_COND(%s)\n",__FILE__,__LINE__,#cond)
@@ -156,7 +156,7 @@ typedef unsigned long KeySym;
 #define MUTEX(mutex) pthread_mutex_t (mutex)
 #define INIT_MUTEX(mutex) pthread_mutex_init(&(mutex),NULL)
 #define TINI_MUTEX(mutex) pthread_mutex_destroy(&(mutex))
-#define TSIGNAL(cond) pthread_cond_signal(&(cond))
+#define VSIGNAL(cond) pthread_cond_signal(&(cond))
 #define WAIT(cond,mutex) pthread_cond_wait(&(cond),&(mutex))
 #define TIMEDWAIT(cond,mutex,t) {struct timeval tv;\
   tv.tv_sec = (t) / 1000;\
@@ -173,7 +173,7 @@ typedef unsigned long KeySym;
 #define MUTEX(mutex)
 #define INIT_MUTEX(mutex)
 #define TINI_MUTEX(mutex)
-#define TSIGNAL(cond)
+#define VSIGNAL(cond)
 #define WAIT(cond,mutex) this_is_unsupported
 #define COND(cond)
 #define INIT_COND(cond)
diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c
index 66cc4ee3..baf21bb1 100644
--- a/krfb/libvncserver/rfbserver.c
+++ b/krfb/libvncserver/rfbserver.c
@@ -71,7 +71,7 @@ void rfbDecrClientRef(rfbClientPtr cl)
   LOCK(cl->refCountMutex);
   cl->refCount--;
   if(cl->refCount<=0) /* just to be sure also < 0 */
-    TSIGNAL(cl->deleteCond);
+    TQT_SIGNAL(cl->deleteCond);
   UNLOCK(cl->refCountMutex);
 }
 #else
@@ -837,7 +837,7 @@ rfbProcessClientNormalMessage(cl)
 	    sraRgnOr(cl->modifiedRegion,tmpRegion);
 	    sraRgnSubtract(cl->copyRegion,tmpRegion);
        }
-       TSIGNAL(cl->updateCond);
+       TQT_SIGNAL(cl->updateCond);
        UNLOCK(cl->updateMutex);
 
        sraRgnDestroy(tmpRegion);
diff --git a/krfb/libvncserver/sockets.c b/krfb/libvncserver/sockets.c
index 68025b3d..c375e928 100644
--- a/krfb/libvncserver/sockets.c
+++ b/krfb/libvncserver/sockets.c
@@ -318,7 +318,7 @@ rfbCloseClient(cl)
       close(cl->sock);
       cl->sock = -1;
     }
-    TSIGNAL(cl->updateCond);
+    TQT_SIGNAL(cl->updateCond);
     UNLOCK(cl->updateMutex);
 }
 
-- 
cgit v1.2.1