QFSFileEnginePrivate cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/io/qfsfileengine.cpp b/src/core/io/qfsfileengine.cpp
index 0f26f3f..f5e8e6e 100644 (file)
--- a/src/core/io/qfsfileengine.cpp
+++ b/src/core/io/qfsfileengine.cpp
@@ -79,9 +79,7 @@ QFSFileEnginePrivate::QFSFileEnginePrivate() : QAbstractFileEnginePrivate()
 void QFSFileEnginePrivate::init()
 {
     is_sequential = 0;
-    tried_stat = 0;
-    need_lstat = 1;
-    is_link = 0;
+    tried_stat = false;
     openMode = QIODevice::NotOpen;
     fd = -1;
     fh = 0;
@@ -171,7 +169,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode)
 
     d->openMode = openMode;
     d->lastFlushFailed = false;
-    d->tried_stat = 0;
+    d->tried_stat = false;
     d->fh = 0;
     d->fd = -1;
 
@@ -211,7 +209,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh, QFile::FileHand
     d->lastFlushFailed = false;
     d->closeFileHandle = (handleFlags & QFile::AutoCloseHandle);
     d->fileEntry.clear();
-    d->tried_stat = 0;
+    d->tried_stat = false;
     d->fd = -1;
 
     return d->openFh(openMode, fh);
@@ -282,7 +280,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd, QFile::FileHandle
     d->fileEntry.clear();
     d->fh = 0;
     d->fd = -1;
-    d->tried_stat = 0;
+    d->tried_stat = false;
 
     return d->openFd(openMode, fd);
 }
@@ -342,7 +340,7 @@ bool QFSFileEnginePrivate::closeFdFh()
     // Flush the file if it's buffered, and if the last flush didn't fail.
     bool flushed = !fh || (!lastFlushFailed && q->flush());
     bool closed = true;
-    tried_stat = 0;
+    tried_stat = false;
 
 
     // Close the file if we created the handle.
@@ -433,7 +431,7 @@ qint64 QFSFileEnginePrivate::sizeFdFh() const
     Q_Q(const QFSFileEngine);
     const_cast<QFSFileEngine *>(q)->flush();
 
-    tried_stat = 0;
+    tried_stat = false;
     metaData.clearFlags(QFileSystemMetaData::SizeAttribute);
     if (!doStat(QFileSystemMetaData::SizeAttribute))
         return 0;

diff --git a/src/core/io/qfsfileengine_p.h b/src/core/io/qfsfileengine_p.h
index d12c4bc..0b2f9f8 100644 (file)
--- a/src/core/io/qfsfileengine_p.h
+++ b/src/core/io/qfsfileengine_p.h
@@ -108,11 +108,8 @@ public:
     bool lastFlushFailed;
     bool closeFileHandle;
 
-    mutable uint is_sequential : 2;
-    mutable uint could_stat : 1;
-    mutable uint tried_stat : 1;
-    mutable uint need_lstat : 1;
-    mutable uint is_link : 1;
+    mutable uint is_sequential;
+    mutable bool tried_stat;
 
     bool doStat(QFileSystemMetaData::MetaDataFlags flags = QFileSystemMetaData::PosixStatFlags) const;
     bool isSymlink() const;

diff --git a/src/core/io/qfsfileengine_unix.cpp b/src/core/io/qfsfileengine_unix.cpp
index b99948b..86fd82f 100644 (file)
--- a/src/core/io/qfsfileengine_unix.cpp
+++ b/src/core/io/qfsfileengine_unix.cpp
@@ -450,7 +450,7 @@ QString QFSFileEngine::tempPath()
 bool QFSFileEnginePrivate::doStat(QFileSystemMetaData::MetaDataFlags flags) const
 {
     if (!tried_stat || !metaData.hasFlags(flags)) {
-        tried_stat = 1;
+        tried_stat = true;
 
         int localFd = fd;
         if (fh && fileEntry.isEmpty())