diff options
author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 21:21:40 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 16:50:21 +0100 |
commit | d3fdc132fe67806fe4a5ab73c43effa281c6d8a2 (patch) | |
tree | 611578b8cf49dd00f69e68ab7e4d445c1080b479 /src/corelib/io/qfilesystemmetadata_p.h | |
parent | 0c29259fd7c6f6283d17b598ec61347fc214b869 (diff) |
Remove Symbian specific code from QtCore.
Change-Id: I131303e28a12dccb96de3de4ca0073b389a9bbae
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/io/qfilesystemmetadata_p.h')
-rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index b7749a38a3..ea981f0bbc 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -63,9 +63,6 @@ #ifndef IO_REPARSE_TAG_SYMLINK #define IO_REPARSE_TAG_SYMLINK (0xA000000CL) #endif -#elif defined(Q_OS_SYMBIAN) -#include <f32file.h> -#include <QtCore/private/qdatetime_p.h> #endif QT_BEGIN_NAMESPACE @@ -99,11 +96,7 @@ public: Permissions = OtherPermissions | GroupPermissions | UserPermissions | OwnerPermissions, // Type -#ifdef Q_OS_SYMBIAN - LinkType = 0, -#else LinkType = 0x00010000, -#endif FileType = 0x00020000, DirectoryType = 0x00040000, #if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES) @@ -154,12 +147,6 @@ public: | QFileSystemMetaData::Times | QFileSystemMetaData::OwnerIds, - SymbianTEntryFlags = QFileSystemMetaData::Permissions - | QFileSystemMetaData::FileType - | QFileSystemMetaData::DirectoryType - | QFileSystemMetaData::SequentialType - | QFileSystemMetaData::Attributes - | QFileSystemMetaData::Times, #if defined(Q_OS_WIN) WinStatFlags = QFileSystemMetaData::FileType | QFileSystemMetaData::DirectoryType @@ -227,10 +214,6 @@ public: void fillFromStatBuf(const QT_STATBUF &statBuffer); void fillFromDirEnt(const QT_DIRENT &statBuffer); #endif -#ifdef Q_OS_SYMBIAN - void fillFromTEntry(const TEntry& entry); - void fillFromVolumeInfo(const TVolumeInfo& info); -#endif #if defined(Q_OS_WIN) inline void fillFromFileAttribute(DWORD fileAttribute, bool isDriveRoot = false); @@ -251,8 +234,6 @@ private: FILETIME creationTime_; FILETIME lastAccessTime_; FILETIME lastWriteTime_; -#elif defined(Q_OS_SYMBIAN) - TTime modificationTime_; #else time_t creationTime_; time_t modificationTime_; @@ -274,7 +255,7 @@ inline bool QFileSystemMetaData::isBundle() const { return fal inline bool QFileSystemMetaData::isAlias() const { return false; } #endif -#if (defined(Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)) || defined (Q_OS_WIN) +#if defined(Q_OS_UNIX) || defined (Q_OS_WIN) inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime time) const { switch (time) { @@ -292,7 +273,7 @@ inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime tim } #endif -#if defined(Q_OS_UNIX) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) inline QDateTime QFileSystemMetaData::creationTime() const { return QDateTime::fromTime_t(creationTime_); } inline QDateTime QFileSystemMetaData::modificationTime() const { return QDateTime::fromTime_t(modificationTime_); } inline QDateTime QFileSystemMetaData::accessTime() const { return QDateTime::fromTime_t(accessTime_); } @@ -309,25 +290,6 @@ inline uint QFileSystemMetaData::ownerId(QAbstractFileEngine::FileOwner owner) c } #endif -#ifdef Q_OS_SYMBIAN -inline QDateTime QFileSystemMetaData::creationTime() const { return modificationTime(); } -inline QDateTime QFileSystemMetaData::modificationTime() const { return qt_symbian_TTime_To_QDateTime(modificationTime_); } -inline QDateTime QFileSystemMetaData::accessTime() const { return modificationTime(); } - -inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime time) const -{ - Q_UNUSED(time); - return modificationTime(); -} -inline uint QFileSystemMetaData::userId() const { return (uint) -2; } -inline uint QFileSystemMetaData::groupId() const { return (uint) -2; } -inline uint QFileSystemMetaData::ownerId(QAbstractFileEngine::FileOwner owner) const -{ - Q_UNUSED(owner); - return (uint) -2; -} -#endif - #if defined(Q_OS_WIN) inline uint QFileSystemMetaData::userId() const { return (uint) -2; } inline uint QFileSystemMetaData::groupId() const { return (uint) -2; } |