qzip.cpp   qzip.cpp 
skipping to change at line 42 skipping to change at line 42
** Foundation and appearing in the file LICENSE.GPL included in the ** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to ** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be ** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html. ** met: http://www.gnu.org/copyleft/gpl.html.
** **
** **
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
*************************************************************************** */ *************************************************************************** */
#include <qglobal.h> #include <QtGlobal>
#ifndef QT_NO_TEXTODFWRITER #ifndef QT_NO_TEXTODFWRITER
#include "qzipreader.h" #include "qzipreader.h"
#include "qzipwriter.h" #include "qzipwriter.h"
#include <qdatetime.h> #include <sys/stat.h>
#include <qplatformdefs.h> #include <QDateTime>
#include <qendian.h> #include <QDebug>
#include <qdebug.h> #include <QDir>
#include <qdir.h>
#include <zlib.h> #include <zlib.h>
// Zip standard version for archives handled by this API // Zip standard version for archives handled by this API
// (actually, the only basic support of this version is implemented but it is enough for now) // (actually, the only basic support of this version is implemented but it is enough for now)
#define ZIP_VERSION 20 #define ZIP_VERSION 20
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# undef S_IFREG # undef S_IFREG
# define S_IFREG 0100000 # define S_IFREG 0100000
skipping to change at line 104 skipping to change at line 103
#ifndef FILE_ATTRIBUTE_DIRECTORY #ifndef FILE_ATTRIBUTE_DIRECTORY
# define FILE_ATTRIBUTE_DIRECTORY 0x10 # define FILE_ATTRIBUTE_DIRECTORY 0x10
#endif #endif
#if 0 #if 0
#define ZDEBUG qDebug #define ZDEBUG qDebug
#else #else
#define ZDEBUG if (0) qDebug #define ZDEBUG if (0) qDebug
#endif #endif
QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE
namespace Stel {
static inline uint readUInt(const uchar *data) static inline uint readUInt(const uchar *data)
{ {
return (data[0]) + (data[1]<<8) + (data[2]<<16) + (data[3]<<24); return (data[0]) + (data[1]<<8) + (data[2]<<16) + (data[3]<<24);
} }
static inline ushort readUShort(const uchar *data) static inline ushort readUShort(const uchar *data)
{ {
return (data[0]) + (data[1]<<8); return (data[0]) + (data[1]<<8);
} }
skipping to change at line 1390 skipping to change at line 1390
writeUShort(eod.num_dir_entries, d->fileHeaders.size()); writeUShort(eod.num_dir_entries, d->fileHeaders.size());
writeUInt(eod.directory_size, dir_size); writeUInt(eod.directory_size, dir_size);
writeUInt(eod.dir_start_offset, d->start_of_directory); writeUInt(eod.dir_start_offset, d->start_of_directory);
writeUShort(eod.comment_length, d->comment.length()); writeUShort(eod.comment_length, d->comment.length());
d->device->write((const char *)&eod, sizeof(EndOfDirectory)); d->device->write((const char *)&eod, sizeof(EndOfDirectory));
d->device->write(d->comment); d->device->write(d->comment);
d->device->close(); d->device->close();
} }
QT_END_NAMESPACE // QT_END_NAMESPACE
}
#endif // QT_NO_TEXTODFWRITER #endif // QT_NO_TEXTODFWRITER
 End of changes. 4 change blocks. 
8 lines changed or deleted 9 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/