summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfsfileengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/io/qfsfileengine.cpp')
-rw-r--r--src/corelib/io/qfsfileengine.cpp24
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;