From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 19 Jun 2011 19:03:33 +0000
Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kviewshell/plugins/djvu/libdjvu/GThreads.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'kviewshell/plugins/djvu/libdjvu/GThreads.cpp')

diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
index ce88361e..3b52faca 100644
--- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
@@ -1397,7 +1397,7 @@ cotask_select(int nfds,
     }
   // reschedule
   cotask_yield();
-  // call select to update masks
+  // call select to update tqmasks
   if (tm)
     {
       tm->tv_sec = maxwait/1000;
@@ -1837,16 +1837,16 @@ GSafeFlags::operator long(void) const
 }
 
 bool
-GSafeFlags::test_and_modify(long set_mask, long clr_mask,
-			    long set_mask1, long clr_mask1)
+GSafeFlags::test_and_modify(long set_tqmask, long clr_tqmask,
+			    long set_tqmask1, long clr_tqmask1)
 {
    enter();
-   if ((flags & set_mask)==set_mask &&
-       (~flags & clr_mask)==clr_mask)
+   if ((flags & set_tqmask)==set_tqmask &&
+       (~flags & clr_tqmask)==clr_tqmask)
    {
       long new_flags=flags;
-      new_flags|=set_mask1;
-      new_flags&=~clr_mask1;
+      new_flags|=set_tqmask1;
+      new_flags&=~clr_tqmask1;
       if (new_flags!=flags)
       {
 	 flags=new_flags;
@@ -1860,15 +1860,15 @@ GSafeFlags::test_and_modify(long set_mask, long clr_mask,
 }
 
 void
-GSafeFlags::wait_and_modify(long set_mask, long clr_mask,
-			    long set_mask1, long clr_mask1)
+GSafeFlags::wait_and_modify(long set_tqmask, long clr_tqmask,
+			    long set_tqmask1, long clr_tqmask1)
 {
    enter();
-   while((flags & set_mask)!=set_mask ||
-	 (~flags & clr_mask)!=clr_mask) wait();
+   while((flags & set_tqmask)!=set_tqmask ||
+	 (~flags & clr_tqmask)!=clr_tqmask) wait();
    long new_flags=flags;
-   new_flags|=set_mask1;
-   new_flags&=~clr_mask1;
+   new_flags|=set_tqmask1;
+   new_flags&=~clr_tqmask1;
    if (flags!=new_flags)
    {
       flags=new_flags;
-- 
cgit v1.2.1