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 | e7366c97c998679efa80cf61c88e64a11a3d3c33 (patch) | |
tree | a161d2940165f6cc47c05f0271ad8e5f64ffe6e8 /kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp | |
parent | da4be7880ff1de6415ab6256afd2514e64f5fa2e (diff) | |
download | tdegraphics-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/DjVuFile.cpp')
-rw-r--r-- | kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp index 564cdb0c..862c5fd0 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp @@ -398,10 +398,10 @@ DjVuFile::notify_chunk_done(const DjVuPort *, const GUTF8String &) void DjVuFile::notify_file_flags_changed(const DjVuFile * src, - long set_tqmask, long clr_tqmask) + long set_mask, long clr_mask) { check(); - if (set_tqmask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED)) + if (set_mask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED)) { // Signal threads waiting for file termination finish_mon.enter(); @@ -414,7 +414,7 @@ DjVuFile::notify_file_flags_changed(const DjVuFile * src, chunk_mon.leave(); } - if ((set_tqmask & ALL_DATA_PRESENT) && src!=this && + if ((set_mask & ALL_DATA_PRESENT) && src!=this && are_incl_files_created() && is_data_present()) { if (src!=this && are_incl_files_created() && is_data_present()) @@ -931,7 +931,7 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP<ByteStream> &gbs, desc.format( ERR_MSG("DjVuFile.tqshape_dict") "\t%d", fgjd->get_tqshape_count() ); } - // Sjbz (JB2 encoded tqmask) + // Sjbz (JB2 encoded mask) else if (chkid=="Sjbz" && (djvu || djvi)) { if (this->fgjb) @@ -943,19 +943,19 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP<ByteStream> &gbs, // ---- end hack fgjb->decode(gbs, static_get_fgjd, (void*)this); this->fgjb = fgjb; - desc.format( ERR_MSG("DjVuFile.fg_tqmask") "\t%d\t%d\t%d", + desc.format( ERR_MSG("DjVuFile.fg_mask") "\t%d\t%d\t%d", fgjb->get_width(), fgjb->get_height(), get_dpi(fgjb->get_width(), fgjb->get_height())); } - // Smmr (MMR-G4 encoded tqmask) + // Smmr (MMR-G4 encoded mask) else if (chkid=="Smmr" && (djvu || djvi)) { if (this->fgjb) G_THROW( ERR_MSG("DjVuFile.dupl_Sxxx") ); set_can_compress(true); this->fgjb = MMRDecoder::decode(gbs); - desc.format( ERR_MSG("DjVuFile.G4_tqmask") "\t%d\t%d\t%d", + desc.format( ERR_MSG("DjVuFile.G4_mask") "\t%d\t%d\t%d", fgjb->get_width(), fgjb->get_height(), get_dpi(fgjb->get_width(), fgjb->get_height())); } |