Changeset 846 for trunk/src/gui/text/qzip.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qzip.cpp (modified) (9 diffs)

trunk/src/gui/text/qzip.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -281 +281 @@
 }
 
+static QDateTime readMSDosDate(const uchar *src)
+{
+    uint dosDate = readUInt(src);
+    quint64 uDate;
+    uDate = (quint64)(dosDate >> 16);
+    uint tm_mday = (uDate & 0x1f);
+    uint tm_mon =  ((uDate & 0x1E0) >> 5);
+    uint tm_year = (((uDate & 0x0FE00) >> 9) + 1980);
+    uint tm_hour = ((dosDate & 0xF800) >> 11);
+    uint tm_min =  ((dosDate & 0x7E0) >> 5);
+    uint tm_sec =  ((dosDate & 0x1f) << 1);
+
+    return QDateTime(QDate(tm_year, tm_mon, tm_mday), QTime(tm_hour, tm_min, tm_sec));
+}
+
 struct LocalFileHeader
 {
@@ -344 +359 @@
 
 QZipReader::FileInfo::FileInfo()
-    : isDir(false), isFile(true), isSymLink(false), crc32(0), size(0)
+    : isDir(false), isFile(false), isSymLink(false), crc32(0), size(0)
 {
 }
@@ -366 +381 @@
     crc32 = other.crc32;
     size = other.size;
+    lastModified = other.lastModified;
     return *this;
+}
+
+bool QZipReader::FileInfo::isValid() const
+{
+    return isDir || isFile || isSymLink;
 }
 
@@ -404 +425 @@
     fileInfo.crc32 = readUInt(header.h.crc_32);
     fileInfo.size = readUInt(header.h.uncompressed_size);
+    fileInfo.lastModified = readMSDosDate(header.h.last_mod_file);
 }
 
@@ -751 +773 @@
 
 /*!
+    Returns device used for reading zip archive.
+*/
+QIODevice* QZipReader::device() const
+{
+    return d->device;
+}
+
+/*!
     Returns true if the user can read the file; otherwise returns false.
 */
@@ -796 +826 @@
 /*!
     Returns a FileInfo of an entry in the zipfile.
-    The \a index is the index into the directoy listing of the zipfile.
+    The \a index is the index into the directory listing of the zipfile.
+    Returns an invalid FileInfo if \a index is out of boundaries.
 
     \sa fileInfoList()
@@ -804 +835 @@
     d->scanFiles();
     QZipReader::FileInfo fi;
-    d->fillFileInfo(index, fi);
+    if (index >= 0 && index < d->fileHeaders.count())
+        d->fillFileInfo(index, fi);
     return fi;
 }
@@ -1023 +1055 @@
 
 /*!
+    Returns device used for writing zip archive.
+*/
+QIODevice* QZipWriter::device() const
+{
+    return d->device;
+}
+
+/*!
     Returns true if the user can write to the archive; otherwise returns false.
 */