diff options
| author | Niels Weber <niels.weber@digia.com> | 2013-05-15 10:22:57 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-30 17:21:14 +0200 |
| commit | e551301a64d62f121a01c4c2ac051a931c75d5e7 (patch) | |
| tree | b57a83df9d7f4df16b53e3b6d3bd23bf645b51ac /src/libs/installer/lib7z_facade.cpp | |
| parent | a2371edc51a3837d37bd99a93fc937e99eb34408 (diff) | |
Implementation of time and date functions related to 7z.
Change-Id: Icb706d829f8470d8cc3cc50925c99255cf5f2b26
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer/lib7z_facade.cpp')
| -rw-r--r-- | src/libs/installer/lib7z_facade.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp index 607d774ac..a818e9a61 100644 --- a/src/libs/installer/lib7z_facade.cpp +++ b/src/libs/installer/lib7z_facade.cpp @@ -257,10 +257,6 @@ static bool IsDST(const QDateTime& datetime = QDateTime()) static bool getFileTimeFromProperty(IInArchive* archive, int index, int propId, FILETIME *fileTime) { -// TODO: fix getFileTimeFromProperty under unix systems, till then just ignore the property -#ifndef Q_OS_WIN - return false; -#endif const NCOM::CPropVariant prop = readProperty(archive, index, propId); if (prop.vt != VT_FILETIME) { throw SevenZipException(QObject::tr("Property %1 for item %2 not of type VT_FILETIME but %3") @@ -281,12 +277,8 @@ QDateTime getDateTimeProperty(IInArchive* archive, int index, int propId, const return defaultValue; FILETIME localFileTime; -#ifndef Q_OS_UNIX - if (!FileTimeToLocalFileTime(&fileTime, &localFileTime)) - throw SevenZipException(QObject::tr("Could not convert file time to local time")); -#else - localFileTime = fileTime; -#endif + if (!FileTimeToLocalFileTime(&fileTime, &localFileTime)) + throw SevenZipException(QObject::tr("Could not convert file time to local time")); SYSTEMTIME st; if (!BOOLToBool(FileTimeToSystemTime(&localFileTime, &st))) |