diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 16e768c7ecc5aeb226178faeb39349386da8663d (patch) | |
| tree | e875e5221ce4f80b741a58a6e7019016bf4ef6e3 /lib/libchmfile | |
| parent | 8cbd3f41229fc385698bfd9a5524ba2610777543 (diff) | |
| download | kchmviewer-16e768c7ecc5aeb226178faeb39349386da8663d.tar.gz kchmviewer-16e768c7ecc5aeb226178faeb39349386da8663d.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kchmviewer@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/libchmfile')
| -rw-r--r-- | lib/libchmfile/bitfiddle.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/libchmfile/bitfiddle.h b/lib/libchmfile/bitfiddle.h index 14a4bdc..cd97b8e 100644 --- a/lib/libchmfile/bitfiddle.h +++ b/lib/libchmfile/bitfiddle.h @@ -84,7 +84,7 @@ inline u_int64_t sr_int(unsigned char* byte, int* bit, unsigned char s, unsigned char r, size_t& length) { u_int64_t ret; - unsigned char tqmask; + unsigned char mask; int n, n_bits, num_bits, base, count; length = 0; size_t fflen; @@ -105,37 +105,37 @@ inline u_int64_t sr_int(unsigned char* byte, int* bit, switch(num_bits){ case 0: - tqmask = 1; + mask = 1; break; case 1: - tqmask = 3; + mask = 3; break; case 2: - tqmask = 7; + mask = 7; break; case 3: - tqmask = 0xf; + mask = 0xf; break; case 4: - tqmask = 0x1f; + mask = 0x1f; break; case 5: - tqmask = 0x3f; + mask = 0x3f; break; case 6: - tqmask = 0x7f; + mask = 0x7f; break; case 7: - tqmask = 0xff; + mask = 0xff; break; default: - tqmask = 0xff; + mask = 0xff; break; } - tqmask <<= base; + mask <<= base; ret = (ret << (num_bits+1)) | - (u_int64_t)((*byte & tqmask) >> base); + (u_int64_t)((*byte & mask) >> base); if( n > *bit ){ ++byte; |