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

1 files changed, 29 insertions, 29 deletions

diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.h b/kviewshell/plugins/djvu/libdjvu/GThreads.h
index 92691db4..2235e2b6 100644
--- a/kviewshell/plugins/djvu/libdjvu/GThreads.h
+++ b/kviewshell/plugins/djvu/libdjvu/GThreads.h
@@ -516,36 +516,36 @@ public:
 
       /** Returns the value of the flags */
    operator long(void) const;
-      /** Modifies the flags by ORing them with the provided mask. A broadcast
+      /** Modifies the flags by ORing them with the provided tqmask. A broadcast
 	  will be sent after the modification is done. */
-   GSafeFlags &	operator|=(long mask);
-      /** Modifies the flags by ANDing them with the provided mask. A broadcast
+   GSafeFlags &	operator|=(long tqmask);
+      /** Modifies the flags by ANDing them with the provided tqmask. A broadcast
 	  will be sent after the modification is done. */
-   GSafeFlags &	operator&=(long mask);
+   GSafeFlags &	operator&=(long tqmask);
 
-      /** If all bits mentioned in #set_mask# are set in the flags and all
-	  bits mentioned in #clr_mask# are cleared in the flags, it sets all
-	  bits from #set_mask1# in the flags, clears all flags from
-	  #clr_mask1# in the flags and returns #TRUE#. Otherwise returns
+      /** If all bits mentioned in #set_tqmask# are set in the flags and all
+	  bits mentioned in #clr_tqmask# are cleared in the flags, it sets all
+	  bits from #set_tqmask1# in the flags, clears all flags from
+	  #clr_tqmask1# in the flags and returns #TRUE#. Otherwise returns
 	  #FALSE#. */
-   bool	test_and_modify(long set_mask, long clr_mask,
-			long set_mask1, long clr_mask1);
+   bool	test_and_modify(long set_tqmask, long clr_tqmask,
+			long set_tqmask1, long clr_tqmask1);
 
-      /** Waits until all bits mentioned in #set_mask# are set in the flags
+      /** Waits until all bits mentioned in #set_tqmask# are set in the flags
 	  and all bits mentioned in #clr_flags# are cleared in the flags.
-	  After that it sets bits from #set_mask1# and clears bits from
-	  #clr_mask1# in the flags. */
-   void	wait_and_modify(long set_mask, long clr_mask,
-			long set_mask1, long clr_mask1);
+	  After that it sets bits from #set_tqmask1# and clears bits from
+	  #clr_tqmask1# in the flags. */
+   void	wait_and_modify(long set_tqmask, long clr_tqmask,
+			long set_tqmask1, long clr_tqmask1);
 
-      /** Waits until all bits set in #set_mask# are set in the flags and
-	  all bits mentioned in #clr_mask# are cleared in the flags. */
-   void	wait_for_flags(long set_mask, long clr_mask=0) const;
+      /** Waits until all bits set in #set_tqmask# are set in the flags and
+	  all bits mentioned in #clr_tqmask# are cleared in the flags. */
+   void	wait_for_flags(long set_tqmask, long clr_tqmask=0) const;
 
-      /** Modifies the flags by setting all bits mentioned in #set_mask#
-	  and clearing all bits mentioned in #clr_mask#. If the flags have
+      /** Modifies the flags by setting all bits mentioned in #set_tqmask#
+	  and clearing all bits mentioned in #clr_tqmask#. If the flags have
 	  actually been modified, a broadcast will be sent. */
-   void	modify(long set_mask, long clr_mask);
+   void	modify(long set_tqmask, long clr_tqmask);
 };
 
 inline
@@ -555,28 +555,28 @@ GSafeFlags::GSafeFlags(long xflags)
 }
 
 inline void
-GSafeFlags::wait_for_flags(long set_mask, long clr_mask) const
+GSafeFlags::wait_for_flags(long set_tqmask, long clr_tqmask) const
 {
-   ((GSafeFlags *) this)->wait_and_modify(set_mask, clr_mask, 0, 0);
+   ((GSafeFlags *) this)->wait_and_modify(set_tqmask, clr_tqmask, 0, 0);
 }
 
 inline void
-GSafeFlags::modify(long set_mask, long clr_mask)
+GSafeFlags::modify(long set_tqmask, long clr_tqmask)
 {
-   test_and_modify(0, 0, set_mask, clr_mask);
+   test_and_modify(0, 0, set_tqmask, clr_tqmask);
 }
 
 inline GSafeFlags &
-GSafeFlags::operator|=(long mask)
+GSafeFlags::operator|=(long tqmask)
 {
-   test_and_modify(0, 0, mask, 0);
+   test_and_modify(0, 0, tqmask, 0);
    return *this;
 }
 
 inline GSafeFlags &
-GSafeFlags::operator&=(long mask)
+GSafeFlags::operator&=(long tqmask)
 {
-   test_and_modify(0, 0, 0, ~mask);
+   test_and_modify(0, 0, 0, ~tqmask);
    return *this;
 }