summaryrefslogtreecommitdiffstats
path: root/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commite7366c97c998679efa80cf61c88e64a11a3d3c33 (patch)
treea161d2940165f6cc47c05f0271ad8e5f64ffe6e8 /kviewshell/plugins/djvu/libdjvu/GThreads.cpp
parentda4be7880ff1de6415ab6256afd2514e64f5fa2e (diff)
downloadtdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.tar.gz
tdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kviewshell/plugins/djvu/libdjvu/GThreads.cpp')
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GThreads.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
index fa924324..ce88361e 100644
--- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
@@ -1837,16 +1837,16 @@ GSafeFlags::operator long(void) const
}
bool
-GSafeFlags::test_and_modify(long set_tqmask, long clr_tqmask,
- long set_tqmask1, long clr_tqmask1)
+GSafeFlags::test_and_modify(long set_mask, long clr_mask,
+ long set_mask1, long clr_mask1)
{
enter();
- if ((flags & set_tqmask)==set_tqmask &&
- (~flags & clr_tqmask)==clr_tqmask)
+ if ((flags & set_mask)==set_mask &&
+ (~flags & clr_mask)==clr_mask)
{
long new_flags=flags;
- new_flags|=set_tqmask1;
- new_flags&=~clr_tqmask1;
+ new_flags|=set_mask1;
+ new_flags&=~clr_mask1;
if (new_flags!=flags)
{
flags=new_flags;
@@ -1860,15 +1860,15 @@ GSafeFlags::test_and_modify(long set_tqmask, long clr_tqmask,
}
void
-GSafeFlags::wait_and_modify(long set_tqmask, long clr_tqmask,
- long set_tqmask1, long clr_tqmask1)
+GSafeFlags::wait_and_modify(long set_mask, long clr_mask,
+ long set_mask1, long clr_mask1)
{
enter();
- while((flags & set_tqmask)!=set_tqmask ||
- (~flags & clr_tqmask)!=clr_tqmask) wait();
+ while((flags & set_mask)!=set_mask ||
+ (~flags & clr_mask)!=clr_mask) wait();
long new_flags=flags;
- new_flags|=set_tqmask1;
- new_flags&=~clr_tqmask1;
+ new_flags|=set_mask1;
+ new_flags&=~clr_mask1;
if (flags!=new_flags)
{
flags=new_flags;