Split up base class QFileDevice for open-file operations (read/write)

This will be used later on as a base class for QTemporaryFile and
QSaveFile.

Change-Id: Ic2e1d232f95dc29b8e2f75e24a881ab459d3f037
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 2 insertions, 18 deletions

diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h
index 3d2d3d678b..575d7d14b9 100644
--- a/src/corelib/io/qfile_p.h
+++ b/src/corelib/io/qfile_p.h
@@ -53,15 +53,13 @@
 // We mean it.
 //
 
-#include "private/qabstractfileengine_p.h"
-#include "private/qiodevice_p.h"
-#include "private/qringbuffer_p.h"
+#include "private/qfiledevice_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QTemporaryFile;
 
-class QFilePrivate : public QIODevicePrivate
+class QFilePrivate : public QFileDevicePrivate
 {
     Q_DECLARE_PUBLIC(QFile)
     friend class QTemporaryFile;
@@ -76,20 +74,6 @@ protected:
     virtual QAbstractFileEngine *engine() const;
 
     QString fileName;
-    mutable QAbstractFileEngine *fileEngine;
-
-    bool lastWasWrite;
-    QRingBuffer writeBuffer;
-    inline bool ensureFlushed() const;
-
-    bool putCharHelper(char c);
-    
-    QFile::FileError error;
-    void setError(QFile::FileError err);
-    void setError(QFile::FileError err, const QString &errorString);
-    void setError(QFile::FileError err, int errNum);
-
-    mutable qint64 cachedSize;
 
 private:
     static QFile::EncoderFn encoder;