diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 22:55:48 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 22:55:48 +0100 |
| commit | 360a51d64c607f5efae7a4f25a9a519424399b69 (patch) | |
| tree | 874eb46ab469865ce9d9b58b9d1cf86d49e5bd1c /src/corelib/io/qfsfileengine_p.h | |
| parent | 7359baee83f6691c31a0a14ffd6f6cc147ed71fd (diff) | |
| parent | 2b91557c93354b766c78cbc4ab48bcd58207bf1a (diff) | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/corelib/io/qfsfileengine_p.h')
| -rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 66e0219889..87f0737c1e 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -110,20 +110,16 @@ public: FILE *fh; #ifdef Q_WS_WIN HANDLE fileHandle; - QHash<uchar *, QPair<int /*offset*/, HANDLE /*handle*/> > maps; + HANDLE mapHandle; + QHash<uchar *, DWORD /* offset % AllocationGranularity */> maps; mutable int cachedFd; mutable DWORD fileAttrib; #else - QHash<uchar *, QPair<int /*offset*/, int /*handle|len*/> > maps; + QHash<uchar *, QPair<int /*offset % PageSize*/, size_t /*length + offset % PageSize*/> > maps; mutable QT_STATBUF st; #endif int fd; -#ifdef Q_USE_DEPRECATED_MAP_API - void mapHandleClose(); - HANDLE fileMapHandle; -#endif - enum LastIOCommand { IOFlushCommand, |