summaryrefslogtreecommitdiffstats
path: root/krfb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-02 19:26:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-02 19:26:34 +0000
commit36e4074ba1536a63a121293b20663a38cad836b7 (patch)
tree5ec4cb3822a30ce8d43a9904931907ade1d7fe2c /krfb
parent47c8a359c5276062c4bc17f0e82410f29081b502 (diff)
downloadtdenetwork-36e4074ba1536a63a121293b20663a38cad836b7.tar.gz
tdenetwork-36e4074ba1536a63a121293b20663a38cad836b7.zip
TQt conversion fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1158449 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krfb')
-rw-r--r--krfb/krfb/rfbcontroller.h2
-rw-r--r--krfb/libvncserver/rfb.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index c7646d91..6ef49a6d 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -38,7 +38,7 @@
-class QCloseEvent;
+class TQCloseEvent;
class QClipboard;
class RFBController;
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index 7f613300..226c9fe7 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 VSIGNAL(cond) fprintf(stderr,"%s:%d VSIGNAL(%s)\n",__FILE__,__LINE__,#cond)
+#define VQT_SIGNAL(cond) fprintf(stderr,"%s:%d VQT_SIGNAL(%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 VSIGNAL(cond) pthread_cond_signal(&(cond))
+#define VQT_SIGNAL(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 VSIGNAL(cond)
+#define VQT_SIGNAL(cond)
#define WAIT(cond,mutex) this_is_unsupported
#define COND(cond)
#define INIT_COND(cond)