kzip.cpp   kzip.cpp 
skipping to change at line 585 skipping to change at line 585
dev->seek( dev->pos() - 4 ); dev->seek( dev->pos() - 4 );
// go back 4 bytes, so that the magi c bytes can be found // go back 4 bytes, so that the magi c bytes can be found
// in the next cycle... // in the next cycle...
} }
} }
} }
else else
{ {
// qDebug() << "before interesting dev->pos(): " << dev ->pos(); // qDebug() << "before interesting dev->pos(): " << dev ->pos();
bool success = dev->seek( dev->pos() + compr_size ); // can this fail ??? bool success = dev->seek( dev->pos() + compr_size ); // can this fail ???
success = success; // annoying unused variable warni ng static_cast<void>(success); // annoying unused varia ble warning
Q_ASSERT( success ); // let' s see... Q_ASSERT( success ); // let' s see...
/* qDebug() << "after interesting dev->pos(): " << dev- >pos(); /* qDebug() << "after interesting dev->pos(): " << dev- >pos();
if ( success ) if ( success )
qDebug() << "dev->at was successful... "; qDebug() << "dev->at was successful... ";
else else
qDebug() << "dev->at failed... ";*/ qDebug() << "dev->at failed... ";*/
} }
} }
skipping to change at line 1392 skipping to change at line 1392
return limitedDev; return limitedDev;
if ( encoding() == 8 ) if ( encoding() == 8 )
{ {
// On top of that, create a device that uncompresses the zli b data // On top of that, create a device that uncompresses the zli b data
QIODevice* filterDev = KFilterDev::device( limitedDev, "appl ication/x-gzip" ); QIODevice* filterDev = KFilterDev::device( limitedDev, "appl ication/x-gzip" );
if ( !filterDev ) if ( !filterDev )
return 0L; // ouch return 0L; // ouch
static_cast<KFilterDev *>(filterDev)->setSkipHeaders(); // J ust zlib, not gzip static_cast<KFilterDev *>(filterDev)->setSkipHeaders(); // J ust zlib, not gzip
bool b = filterDev->open( QIODevice::ReadOnly ); bool b = filterDev->open( QIODevice::ReadOnly );
b = b; // annoying unused variable warning static_cast<void>(b); // annoying unused variable warning
Q_ASSERT( b ); Q_ASSERT( b );
return filterDev; return filterDev;
} }
qWarning() << "This zip file contains files compressed with method" qWarning() << "This zip file contains files compressed with method"
<< encoding() << ", this method is currently not s upported by KZip," << encoding() << ", this method is currently not s upported by KZip,"
<< "please use a command-line tool to handle this file."; << "please use a command-line tool to handle this file.";
return 0L; return 0L;
} }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/