diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
commit | b0e912c8b3d02a518fedda28c3180eb4794a7520 (patch) | |
tree | 07d344862562fab58cbe2df39d13d16f2e4d2bea /libdvdnav/decoder.c | |
parent | 4d695ec81fe4d4335ee82c7a9346ad9c9e144ecc (diff) | |
download | k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.tar.gz k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.zip |
TQt4 convert k9copy
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1233843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libdvdnav/decoder.c')
-rw-r--r-- | libdvdnav/decoder.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libdvdnav/decoder.c b/libdvdnav/decoder.c index 1c21f60..9586b30 100644 --- a/libdvdnav/decoder.c +++ b/libdvdnav/decoder.c @@ -35,7 +35,7 @@ uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) { uint64_t result = 0; - uint64_t bit_mask = 0; + uint64_t bit_tqmask = 0; uint64_t examining = 0; int32_t bits; @@ -50,12 +50,12 @@ uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) { abort(); } /* all ones, please */ - bit_mask = ~bit_mask; - bit_mask >>= 63 - start; + bit_tqmask = ~bit_tqmask; + bit_tqmask >>= 63 - start; bits = start + 1 - count; - examining = ((bit_mask >> bits) << bits ); + examining = ((bit_tqmask >> bits) << bits ); command->examined |= examining; - result = (command->instruction & bit_mask) >> bits; + result = (command->instruction & bit_tqmask) >> bits; return (uint32_t) result; } @@ -217,11 +217,11 @@ static int32_t eval_special_instruction(command_t* command, int32_t cond) { /* max number of rows < 256, so we will end this set */ line = 256; return cond ? 256 : 0; - case 3: /* Set temporary parental level and goto */ + case 3: /* Set temporary tqparental level and goto */ line = vm_getbits(command, 7, 8); level = vm_getbits(command, 11, 4); if(cond) { - /* This always succeeds now, if we want real parental protection */ + /* This always succeeds now, if we want real tqparental protection */ /* we need to ask the user and have passwords and stuff. */ command->registers->SPRM[13] = level; } |