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/qfsfileengine.cpp | |
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/qfsfileengine.cpp')
-rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index c82f2b8f30..4bf2e530a3 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -120,9 +120,6 @@ void QFSFileEnginePrivate::init() openMode = QIODevice::NotOpen; fd = -1; fh = 0; -#ifdef Q_OS_SYMBIAN - fileHandleForMaps = -1; -#endif lastIOCommand = IOFlushCommand; lastFlushFailed = false; closeFileHandle = false; @@ -365,12 +362,7 @@ bool QFSFileEngine::close() bool QFSFileEnginePrivate::closeFdFh() { Q_Q(QFSFileEngine); - if (fd == -1 && !fh -#ifdef Q_OS_SYMBIAN - && !symbianFile.SubSessionHandle() - && fileHandleForMaps == -1 -#endif - ) + if (fd == -1 && !fh) return false; // Flush the file if it's buffered, and if the last flush didn't fail. @@ -378,24 +370,10 @@ bool QFSFileEnginePrivate::closeFdFh() bool closed = true; tried_stat = 0; -#ifdef Q_OS_SYMBIAN - // Map handle is always owned by us so always close it - if (fileHandleForMaps >= 0) { - QT_CLOSE(fileHandleForMaps); - fileHandleForMaps = -1; - } -#endif - // Close the file if we created the handle. if (closeFileHandle) { int ret; do { -#ifdef Q_OS_SYMBIAN - if (symbianFile.SubSessionHandle()) { - symbianFile.Close(); - ret = 0; - } else -#endif if (fh) { // Close buffered file. ret = fclose(fh) != 0 ? -1 : 0; |